345 files changed, 135853 insertions, 120882 deletions

diff --git a/.gitignore b/.gitignore
index 1cde3a625..217622c84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,4 +24,4 @@ config-*.php
 good-config.php
 lac08.log
 php.log
-
+.DS_Store
diff --git a/EVENTS.txt b/EVENTS.txt
index 5d34a9e13..c788a9215 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -129,6 +129,9 @@ StartSubGroupNav: Showing the subscriptions group nav menu
 EndSubGroupNav: At the end of the subscriptions group nav menu
 - $action: the current action
 
+StartInitializeRouter: Before the router instance has been initialized; good place to add routes
+- $m: the Net_URL_Mapper that has just been set up
+
 RouterInitialized: After the router instance has been initialized
 - $m: the Net_URL_Mapper that has just been set up
 
@@ -159,6 +162,42 @@ StartAccountSettingsNav: Before showing the account settings menu
 EndAccountSettingsNav: After showing the account settings menu
 - $action: the current action
 
+StartAccountSettingsProfileMenuItem: Before showing the Profile menu item
+- $widget: AccountSettingsNav instance being shown
+
+EndAccountSettingsProfileMenuItem: After showing the Profile menu item
+- $widget: AccountSettingsNav instance being shown
+
+StartAccountSettingsAvatarMenuItem: Before showing the Avatar menu item
+- $widget: AccountSettingsNav instance being shown
+
+EndAccountSettingsAvatarMenuItem: After showing the Avatar menu item
+- $widget: AccountSettingsNav instance being shown
+
+StartAccountSettingsPasswordMenuItem: Before showing the Password menu item
+- $widget: AccountSettingsNav instance being shown
+
+EndAccountSettingsPasswordMenuItem: After showing the Password menu item
+- $widget: AccountSettingsNav instance being shown
+
+StartAccountSettingsEmailMenuItem: Before showing the Email menu item
+- $widget: AccountSettingsNav instance being shown
+
+EndAccountSettingsEmailMenuItem: After showing the Email menu item
+- $widget: AccountSettingsNav instance being shown
+
+StartAccountSettingsDesignMenuItem: Before showing the Design menu item
+- $widget: AccountSettingsNav instance being shown
+
+EndAccountSettingsDesignMenuItem: After showing the Design menu item
+- $widget: AccountSettingsNav instance being shown
+
+StartAccountSettingsOtherMenuItem: Before showing the Other menu item
+- $widget: AccountSettingsNav instance being shown
+
+EndAccountSettingsOtherMenuItem: After showing the Other menu item
+- $widget: AccountSettingsNav instance being shown
+
 Autoload: When trying to autoload a class
 - $cls: the class being sought. A plugin might require_once the file for the class.
 
@@ -188,6 +227,12 @@ StartPersonalGroupNav: beginning of personal group nav menu
 EndPersonalGroupNav: end of personal group nav menu (good place to add a menu item)
 - $action: action object being shown
 
+StartGroupGroupNav: Showing the group nav menu
+- $action: the current action
+
+EndGroupGroupNav: At the end of the group nav menu
+- $action: the current action
+
 StartEndHTML: just before the </html> tag
 - $action: action object being shown
 
@@ -295,99 +340,99 @@ CheckSchema: chance to check the schema
 StartProfilePageProfileSection: Starting to show the section of the
                               profile page with the actual profile data;
                               hook to prevent showing the profile (e.g.)
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 StartProfilePageProfileElements: inside the section, before the first
                                element; prepend elements here
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 EndProfilePageProfileElements: inside the section, after the last element;
                              append elements here
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 EndProfilePageProfileSection: After showing the section of the profile
                             page with the profile elements
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 StartProfilePageActionsSection: Starting to show the section of the
                                     profile page with action links; hook
                                     to hide them (for example)
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 StartProfilePageActionsElements: inside the list, before the first
                                      element; prepend elements here
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 EndProfilePageActionsElements: inside the list, after the last element;
                                    append elements here
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 EndProfilePageActionsSection: After showing the section of the profile
                                   page with the entity actions
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 StartProfilePageAvatar: before showing the avatar on the profile page
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 EndProfilePageAvatar: after showing the avatar on the profile page
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 StartProfilePageNickname: before showing the nickname on the profile page
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 EndProfilePageNickname: after showing the nickname on the profile page
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 StartProfilePageFullName: before showing the fullname on the profile page
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 EndProfilePageFullName: after showing the fullname on the profile page
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 StartProfilePageLocation: before showing the location on the profile page
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 EndProfilePageLocation: after showing the location on the profile page
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 StartProfilePageHomepage: before showing the homepage link on the profile page
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 EndProfilePageHomepage: after showing the homepage on the profile page
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 StartProfilePageBio: before showing the bio on the profile page
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 EndProfilePageBio: after showing the bio on the profile page
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 StartProfilePageProfileTags: before showing the tags on the profile page
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 EndProfilePageProfileTags: after showing the tags on the profile page
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 StartProfileList: when starting a list of profiles (before <ul>)
@@ -455,3 +500,55 @@ StartProfileListItemActionElements: Showing the profile list actions (prepend a
 
 EndProfileListItemActionElements: Showing profile list actions (append a button here)
 - $item: ProfileListItem widget
+
+StartUserXRDS: Start XRDS output (right after the opening XRDS tag)
+- $action: the current action
+- &$xrdsoutputter - XRDSOutputter object to write to
+
+EndUserXRDS: End XRDS output (right before the closing XRDS tag)
+- $action: the current action
+- &$xrdsoutputter - XRDSOutputter object to write to
+
+StartPublicXRDS: Start XRDS output (right after the opening XRDS tag)
+- $action: the current action
+- &$xrdsoutputter - XRDSOutputter object to write to
+
+EndPublicXRDS: End XRDS output (right before the closing XRDS tag)
+- $action: the current action
+- &$xrdsoutputter - XRDSOutputter object to write to
+
+StartCheckPassword: Check a username/password
+- $nickname: The nickname to check
+- $password: The password to check
+- &$authenticatedUser: set to User object if credentials match a user.
+
+EndCheckPassword: After checking a username/password pair
+- $nickname: The nickname that was checked
+- $password: The password that was checked
+- $authenticatedUser: User object if credentials match a user, else null.
+
+StartChangePassword: Before changing a password
+- $user: user
+- $oldpassword: the user's old password
+- $newpassword: the desired new password
+
+EndChangePassword: After changing a password
+- $user: user
+
+UserDeleteRelated: Specify additional tables to delete entries from when deleting users
+- $user: User object
+- &$related: array of DB_DataObject class names to delete entries on matching user_id.
+
+GetUrlShorteners: Specify URL shorteners that are available for use
+- &$shorteners: append your shortener to this array like so: $shorteners[shortenerName]=array('display'=>display, 'freeService'=>boolean)
+
+StartShortenUrl: About to shorten a URL
+- $url: url to be shortened
+- $shortenerName: name of the requested shortener
+- &$shortenedUrl: short version of the url
+
+EndShortenUrl: After a URL has been shortened
+- $url: url to be shortened
+- $shortenerName: name of the requested shortener
+- $shortenedUrl: short version of the url
+
diff --git a/README b/README
index 03064ba18..fb78ab01d 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ README
 ------
 
 StatusNet 0.8.2 ("Life and How to Live It")
-26 Aug 2009
+1 Nov 2009
 
 This is the README file for StatusNet (formerly Laconica), the Open
 Source microblogging platform. It includes installation instructions,
@@ -77,49 +77,82 @@ for additional terms.
 New this version
 ================
 
-This is a minor feature and bugfix release since version 0.8.0,
-released Jul 15 2009. Notable changes this version:
-
-- Laconica has been renamed StatusNet. With a few minor compatibility
-  exceptions, all references to "Laconica" in code, documentation
-  and comments were changed to "StatusNet".
-- A new plugin to support "infinite scroll".
-- A new plugin to support reCaptcha <http://recaptcha.net>.
-- Better logging of server errors.
-- Add an Openid-only mode for authentication.
-- 'lite' parameter for some Twitter API methods.
-- A new plugin to auto-complete nicknames for @-replies.
-- Configuration options to disable OpenID, SMS, Twitter, post-by-email, and IM.
-- Support for lighttpd <http://lighttpd.org/> using 404-based
-  rewrites.
-- Support for using Twitter's OAuth authentication as a client.
-- First version of the groups API.
-- Can configure a site-wide design, including background image and
-  colors.
-- Improved algorithm for replies and conversations, making
-  conversation trees more accurate and useful.
-- Add a script to create a simulation database for testing/debugging.
-- Sanitize HTML for OEmbed.
-- Improved queue management for DB-based queuing.
-- More complete URL detection.
-- Hashtags now support full Unicode character set.
-- Notice inboxes are now garbage-collected on a regular basis
-  at notice-write time.
-- PiwikAnalyticsPlugin updated for latest Piwik interface.
-- Attachment and notice pages can be embedded with OEmbed
-  <http://www.oembed.com>.
-- Failed authentication is logged.
-- PostgreSQL schema and support brought up-to-date with 0.8.x features.
-- The installer works with PostgreSQL as well as MySQL.
-- RSS 1.0 feeds use HTTP Basic authentication in private mode.
-- Many, many bug fixes, particularly with performance.
-- Better (=working) garbage collection for old sessions.
-- Better (=working) search queries.
-- Some cleanup of HTML output.
-- Better error handling when updating Facebook.
-- Considerably better performance when using replication for API
-  calls.
-- Initial unit tests.
+This is a minor feature and bugfix release since version 0.8.1,
+released Aug 26 2009. Notable changes this version:
+
+- New script for deleting user accounts. Not particularly safe or
+  community-friendly. Better for deleting abusive accounts than for
+  users who are 'retiring'.
+- Improved detection of URLs in notices, specifically for punctuation
+  chars like ~, :, $, _, -, +, !, @, and %.
+- Removed some extra <dl> semantic HTML code.
+- Correct error in status-network database ini file (having multiple
+  statusnet sites with a single codebase)
+- Fixed error output for Twitter posting failures.
+- Fixed bug in Twitter queue handler that requeued inapplicable
+  notices ad infinitum.
+- Improve FOAF output for remote users.
+- new commands to join and leave groups.
+- Fixed bug in which you cannot turn off importing friends timelines
+  flag.
+- Better error handling in Twitter posting.
+- Show oEmbed data for XHTML files as well as plain HTML.
+- Updated bug database link in README.
+- require HTML tidy extension.
+- add support for HTTP Basic Auth in PHP CGI or FastCGI (e.g. GoDaddy).
+- autofocus input to selected entry elements depending on page.
+- updated layout for filter-by-tag form.
+- better layout for inbox and outbox pages.
+- fix highlighting search terms in attributes of notice list elements.
+- Correctly handle errors in linkback plugin.
+- Updated biz theme.
+- Updated cloudy theme.
+- Don't match '::' as an IPv6 address.
+- Use the same decision logic for deciding whether to mark an
+  attachment as an enclosure in RSS or as a paperclip item in Web
+  output.
+- Fixed a bug in the Piwik plugin that hard-coded the site ID.
+- Add a param, inreplyto, to notice/new to allow an explicit response
+  to another notice.
+- Show username in subject of emails.
+- Check if avatar exists before trying to delete it.
+- Correctly add omb_version to response for request token in OMB.
+- Add a few more SMS carriers.
+- Add a few more notice sources.
+- Vary: header.
+- Improvements to the AutoCompletePlugin.
+- Check for 'dl' before using it.
+- Make it impossible to delete self-subscriptions via the API.
+- Fix pagination of tagged user pages.
+- Make PiwikAnalyticsPlugin work with addPlugin().
+- Removed trailing single space in user nicknames in notice lists.
+- Show context link if a notice starts a conversation.
+- blacklist all files and directories in install dir.
+- handle GoDaddy-style PATH_INFO, including script name.
+- add home_timeline synonym for friends_timeline.
+- Add a popup window for the realtime plugin.
+- Add some more streams for the realtime plugin.
+- Fix a bug that overwrote group creation timestamp on every edit.
+- Moved HTTP error code strings to a class variable.
+- The Twitter API now returns server errors in the correct format.
+- Reset the doctype for HTML output.
+- Fixed a number of notices.
+- Don't show search suggestions for private sites.
+- Some corrections to FBConnect nav overrides.
+- Slightly less database-intensive session management.
+- Updated name of software in installer script.
+- Include long-form attachment URLs if url-shortener is disabled.
+- Include updated localisations for Polish, Greek, Hebrew, Icelandic,
+  Norwegian, and Chinese.
+- Include upstream fixes to gettext.php.
+- Correct for regression in Facebook API for updates.
+- Ignore "Sent from my iPhone" (and similar) in mail updates.
+- Use the NICKNAME_FMT constant for detecting nicknames.
+- Check for site servername config'd.
+- Compatibility fix for empty status updates with Twitter API.
+- Option to show files privately (EXPERIMENTAL! Use with caution.)
+- a script to register a new user.
+- a script to make a user admin of a group.
 
 Prerequisites
 =============
@@ -225,9 +258,9 @@ especially if you've previously installed PHP/MySQL packages.
 1. Unpack the tarball you downloaded on your Web server. Usually a
    command like this will work:
 
-   	   tar zxf statusnet-0.8.1.tar.gz
+   	   tar zxf statusnet-0.8.2.tar.gz
 
-   ...which will make a statusnet-0.8.1 subdirectory in your current
+   ...which will make a statusnet-0.8.2 subdirectory in your current
    directory. (If you don't have shell access on your Web server, you
    may have to unpack the tarball on your local computer and FTP the
    files to the server.)
@@ -235,7 +268,7 @@ especially if you've previously installed PHP/MySQL packages.
 2. Move the tarball to a directory of your choosing in your Web root
    directory. Usually something like this will work:
 
-   	   mv statusnet-0.8.1 /var/www/mublog
+   	   mv statusnet-0.8.2 /var/www/mublog
 
    This will make your StatusNet instance available in the mublog path of
    your server, like "http://example.net/mublog". "microblog" or
@@ -356,20 +389,16 @@ the server first.
 Sphinx
 ------
 
-To use a Sphinx server to search users and notices, you also need
-to install, compile and enable the sphinx pecl extension for php on the
-client side, which itself depends on the sphinx development files.
-"pecl install sphinx" should take care of that. Add "extension=sphinx.so"
-to your php.ini and reload apache to enable it.
+To use a Sphinx server to search users and notices, you'll need to
+enable the SphinxSearch plugin. Add to your config.php:
 
-You can update your MySQL or Postgresql databases to drop their fulltext
-search indexes, since they're now provided by sphinx.
+  addPlugin('SphinxSearch');
+  $config['sphinx']['server'] = 'searchhost.local';
 
-On the sphinx server side, a script reads the main database and build
-the keyword index. A cron job reads the database and keeps the sphinx
-indexes up to date. scripts/sphinx-cron.sh should be called by cron
-every 5 minutes, for example. scripts/sphinx.sh is an init.d script
-to start and stop the sphinx search daemon.
+You also need to install, compile and enable the sphinx pecl extension for
+php on the client side, which itself depends on the sphinx development files.
+
+See plugins/SphinxSearch/README for more details and server setup.
 
 SMS
 ---
@@ -656,6 +685,16 @@ private site, but users of the private site may be able to subscribe
 to users on a remote site. (Or not... it's not well tested.) The
 "proper behaviour" hasn't been defined here, so handle with care.
 
+If fancy URLs is enabled, access to file attachments can also be
+restricted to logged-in users only. Uncomment the appropriate rewrite
+<<<<<<< HEAD:README
+rule in .htaccess or your server's httpd.conf. (This most likely will
+not work if you are using a virtual server for attachments, so consider
+the performance/security tradeoff.)
+=======
+rule in .htaccess or your server's httpd.conf.
+>>>>>>> 446de62... Revert "Added some explanatory text to README":README
+
 Upgrading
 =========
 
@@ -669,7 +708,7 @@ with this situation.
 If you've been using StatusNet 0.7, 0.6, 0.5 or lower, or if you've
 been tracking the "git" version of the software, you will probably
 want to upgrade and keep your existing data. There is no automated
-upgrade procedure in StatusNet 0.8.1. Try these step-by-step
+upgrade procedure in StatusNet 0.8.2. Try these step-by-step
 instructions; read to the end first before trying them.
 
 0. Download StatusNet and set up all the prerequisites as if you were
@@ -690,7 +729,7 @@ instructions; read to the end first before trying them.
 5. Once all writing processes to your site are turned off, make a
    final backup of the Web directory and database.
 6. Move your StatusNet directory to a backup spot, like "mublog.bak".
-7. Unpack your StatusNet 0.8.1 tarball and move it to "mublog" or
+7. Unpack your StatusNet 0.8.2 tarball and move it to "mublog" or
    wherever your code used to be.
 8. Copy the config.php file and avatar directory from your old
    directory to your new directory.
@@ -1125,17 +1164,6 @@ base: memcached uses key-value pairs to store data. We build long,
       StatusNet site using your memcached server.
 port: Port to connect to; defaults to 11211.
 
-sphinx
-------
-
-You can get a significant boost in performance using Sphinx Search
-instead of your database server to search for users and notices.
-<http://sphinxsearch.com/>.
-
-enabled: Set to true to enable. Default false.
-server: a string with the hostname of the sphinx server.
-port: an integer with the port number of the sphinx server.
-
 emailpost
 ---------
 
@@ -1432,7 +1460,7 @@ repository (see below), and you get a compilation error ("unexpected
 T_STRING") in the browser, check to see that you don't have any
 conflicts in your code.
 
-If you upgraded to StatusNet 0.8.1 without reading the "Notice
+If you upgraded to StatusNet 0.8.2 without reading the "Notice
 inboxes" section above, and all your users' 'Personal' tabs are empty,
 read the "Notice inboxes" section above.
 
@@ -1540,6 +1568,7 @@ if anyone's been overlooked in error.
 * Jeffery To
 * Federico Marani
 * Craig Andrews
+* mEDI
 
 Thanks also to the developers of our upstream library code and to the
 thousands of people who have tried out Identi.ca, installed StatusNet,
diff --git a/actions/all.php b/actions/all.php
index f1786462e..61cedce74 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -99,19 +99,17 @@ class AllAction extends ProfileAction
                 sprintf(_('Feed for friends of %s (RSS 1.0)'), $this->user->nickname)),
             new Feed(Feed::RSS2,
                 common_local_url(
-                    'api', array(
-                        'apiaction' => 'statuses',
-                        'method' => 'friends_timeline',
-                        'argument' => $this->user->nickname.'.rss'
+                    'ApiTimelineFriends', array(
+                        'format' => 'rss',
+                        'id' => $this->user->nickname
                     )
                 ),
                 sprintf(_('Feed for friends of %s (RSS 2.0)'), $this->user->nickname)),
             new Feed(Feed::ATOM,
                 common_local_url(
-                    'api', array(
-                        'apiaction' => 'statuses',
-                        'method' => 'friends_timeline',
-                        'argument' => $this->user->nickname.'.atom'
+                    'ApiTimelineFriends', array(
+                        'format' => 'atom',
+                        'id' => $this->user->nickname
                     )
                 ),
                 sprintf(_('Feed for friends of %s (Atom)'), $this->user->nickname))
diff --git a/actions/apiaccountratelimitstatus.php b/actions/apiaccountratelimitstatus.php
index 96179f175..1a5afd552 100644
--- a/actions/apiaccountratelimitstatus.php
+++ b/actions/apiaccountratelimitstatus.php
@@ -67,7 +67,7 @@ class ApiAccountRateLimitStatusAction extends ApiBareAuthAction
 
         if (!in_array($this->format, array('xml', 'json'))) {
             $this->clientError(
-                _('API method not found!'),
+                _('API method not found.'),
                 404,
                 $this->format
             );
diff --git a/actions/apiaccountupdatedeliverydevice.php b/actions/apiaccountupdatedeliverydevice.php
new file mode 100644
index 000000000..684906fe9
--- /dev/null
+++ b/actions/apiaccountupdatedeliverydevice.php
@@ -0,0 +1,157 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Update the authenticating user notification channels
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/apiauth.php';
+
+/**
+ * Sets which channel (device) StatusNet delivers updates to for
+ * the authenticating user. Sending none as the device parameter
+ * will disable IM and/or SMS updates.
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiAccountUpdateDeliveryDeviceAction extends ApiAuthAction
+{
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $this->user   = $this->auth_user;
+        $this->device = $this->trimmed('device');
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * See which request params have been set, and update the user settings
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            $this->clientError(
+                _('This method requires a POST.'),
+                400, $this->format
+            );
+            return;
+        }
+
+        if (!in_array($this->format, array('xml', 'json'))) {
+            $this->clientError(
+                _('API method not found.'),
+                404,
+                $this->format
+            );
+            return;
+        }
+
+        // Note: Twitter no longer supports IM
+
+        if (!in_array(strtolower($this->device), array('sms', 'im', 'none'))) {
+            $this->clientError(
+                _(
+                    'You must specify a parameter named ' .
+                    '\'device\' with a value of one of: sms, im, none'
+                )
+            );
+            return;
+        }
+
+        if (empty($this->user)) {
+            $this->clientError(_('No such user.'), 404, $this->format);
+            return;
+        }
+
+        $original = clone($this->user);
+
+        if (strtolower($this->device) == 'sms') {
+            $this->user->smsnotify = true;
+        } elseif (strtolower($this->device) == 'im') {
+            $this->user->jabbernotify = true;
+        } elseif (strtolower($this->device == 'none')) {
+            $this->user->smsnotify    = false;
+            $this->user->jabbernotify = false;
+        }
+
+        $result = $this->user->update($original);
+
+        if ($result === false) {
+            common_log_db_error($this->user, 'UPDATE', __FILE__);
+            $this->serverError(_('Could not update user.'));
+            return;
+        }
+
+        $profile = $this->user->getProfile();
+
+        $twitter_user = $this->twitterUserArray($profile, true);
+
+        // Note: this Twitter API method is retarded because it doesn't give
+        // any success/failure information. Twitter's docs claim that the
+        // notification field will change to reflect notification choice,
+        // but that's not true; notification> is used to indicate
+        // whether the auth user is following the user in question.
+
+        if ($this->format == 'xml') {
+            $this->initDocument('xml');
+            $this->showTwitterXmlUser($twitter_user);
+            $this->endDocument('xml');
+        } elseif ($this->format == 'json') {
+            $this->initDocument('json');
+            $this->showJsonObjects($twitter_user);
+            $this->endDocument('json');
+        }
+    }
+
+}
diff --git a/actions/apiaccountupdateprofile.php b/actions/apiaccountupdateprofile.php
new file mode 100644
index 000000000..fd4384a25
--- /dev/null
+++ b/actions/apiaccountupdateprofile.php
@@ -0,0 +1,166 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Update the authenticating user's profile
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/apiauth.php';
+
+/**
+ * API analog to the profile settings page
+ * Only the parameters specified will be updated.
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiAccountUpdateProfileAction extends ApiAuthAction
+{
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $this->user = $this->auth_user;
+
+        $this->name        = $this->trimmed('name');
+        $this->url         = $this->trimmed('url');
+        $this->location    = $this->trimmed('location');
+        $this->description = $this->trimmed('description');
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * See which request params have been set, and update the profile
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            $this->clientError(
+                _('This method requires a POST.'),
+                400, $this->format
+            );
+            return;
+        }
+
+        if (!in_array($this->format, array('xml', 'json'))) {
+            $this->clientError(
+                _('API method not found.'),
+                404,
+                $this->format
+            );
+            return;
+        }
+
+        if (empty($this->user)) {
+            $this->clientError(_('No such user.'), 404, $this->format);
+            return;
+        }
+
+        $profile = $this->user->getProfile();
+
+        if (empty($profile)) {
+            $this->clientError(_('User has no profile.'));
+            return;
+        }
+
+        $original = clone($profile);
+
+        if (empty($this->name)) {
+            $profile->fullname = $this->name;
+        }
+
+        if (empty($this->url)) {
+            $profile->homepage = $this->url;
+        }
+
+        if (!empty($this->description)) {
+            $profile->bio = $this->description;
+        }
+
+        if (!empty($this->location)) {
+            $profile->location = $this->location;
+
+            $loc = Location::fromName($location);
+
+            if (!empty($loc)) {
+                $profile->lat         = $loc->lat;
+                $profile->lon         = $loc->lon;
+                $profile->location_id = $loc->location_id;
+                $profile->location_ns = $loc->location_ns;
+            }
+        }
+
+        $result = $profile->update($original);
+
+        if (!$result) {
+            common_log_db_error($profile, 'UPDATE', __FILE__);
+            $this->serverError(_('Could not save profile.'));
+            return;
+        }
+
+        common_broadcast_profile($profile);
+
+        $twitter_user = $this->twitterUserArray($profile, true);
+
+        if ($this->format == 'xml') {
+            $this->initDocument('xml');
+            $this->showTwitterXmlUser($twitter_user);
+            $this->endDocument('xml');
+        } elseif ($this->format == 'json') {
+            $this->initDocument('json');
+            $this->showJsonObjects($twitter_user);
+            $this->endDocument('json');
+        }
+    }
+
+}
diff --git a/actions/apiaccountupdateprofilebackgroundimage.php b/actions/apiaccountupdateprofilebackgroundimage.php
new file mode 100644
index 000000000..3537b9f97
--- /dev/null
+++ b/actions/apiaccountupdateprofilebackgroundimage.php
@@ -0,0 +1,211 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Update the authenticating user's profile background image
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/apiauth.php';
+
+/**
+ * Update the authenticating user's profile background image
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiAccountUpdateProfileBackgroundImageAction extends ApiAuthAction
+{
+
+    var $tile = false;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $this->user  = $this->auth_user;
+        $this->tile  = $this->arg('tile');
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Check whether the credentials are valid and output the result
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            $this->clientError(
+                _('This method requires a POST.'),
+                400, $this->format
+            );
+            return;
+        }
+
+        if (!in_array($this->format, array('xml', 'json'))) {
+            $this->clientError(
+                _('API method not found.'),
+                404,
+                $this->format
+            );
+            return;
+        }
+
+        // Workaround for PHP returning empty $_POST and $_FILES when POST
+        // length > post_max_size in php.ini
+
+        if (empty($_FILES)
+            && empty($_POST)
+            && ($_SERVER['CONTENT_LENGTH'] > 0)
+        ) {
+             $msg = _('The server was unable to handle that much POST ' .
+                    'data (%s bytes) due to its current configuration.');
+
+            $this->clientError(sprintf($msg, $_SERVER['CONTENT_LENGTH']));
+            return;
+        }
+
+        if (empty($this->user)) {
+            $this->clientError(_('No such user.'), 404, $this->format);
+            return;
+        }
+
+        $design = $this->user->getDesign();
+
+        // XXX: This is kinda gross, but before we can add a background
+        // img we have to make sure there's a Design because design ID
+        // is part of the img filename.
+
+        if (empty($design)) {
+
+            $this->user->query('BEGIN');
+
+            // save new design
+            $design = new Design();
+            $id = $design->insert();
+
+            if (empty($id)) {
+                common_log_db_error($id, 'INSERT', __FILE__);
+                $this->clientError(_('Unable to save your design settings.'));
+                return;
+            }
+
+            $original              = clone($this->user);
+            $this->user->design_id = $id;
+            $result                = $this->user->update($original);
+
+            if (empty($result)) {
+                common_log_db_error($original, 'UPDATE', __FILE__);
+                $this->clientError(_('Unable to save your design settings.'));
+                $this->user->query('ROLLBACK');
+                return;
+            }
+
+            $this->user->query('COMMIT');
+        }
+
+        // Okay, now get the image and add it to the design
+
+        try {
+            $imagefile = ImageFile::fromUpload('image');
+        } catch (Exception $e) {
+            $this->clientError($e->getMessage(), 400, $this->format);
+            return;
+        }
+
+        $filename = Design::filename(
+            $design->id,
+            image_type_to_extension($imagefile->type),
+            common_timestamp()
+        );
+
+        $filepath = Design::path($filename);
+
+        move_uploaded_file($imagefile->filepath, $filepath);
+
+        // delete any old backround img laying around
+
+        if (isset($design->backgroundimage)) {
+            @unlink(Design::path($design->backgroundimage));
+        }
+
+        $original = clone($design);
+        $design->backgroundimage = $filename;
+        $design->setDisposition(true, false, ($this->tile == 'true'));
+
+        $result = $design->update($original);
+
+        if ($result === false) {
+            common_log_db_error($design, 'UPDATE', __FILE__);
+            $this->showForm(_('Could not update your design.'));
+            return;
+        }
+
+        $profile = $this->user->getProfile();
+
+        if (empty($profile)) {
+            $this->clientError(_('User has no profile.'));
+            return;
+        }
+
+        $twitter_user = $this->twitterUserArray($profile, true);
+
+        if ($this->format == 'xml') {
+            $this->initDocument('xml');
+            $this->showTwitterXmlUser($twitter_user);
+            $this->endDocument('xml');
+        } elseif ($this->format == 'json') {
+            $this->initDocument('json');
+            $this->showJsonObjects($twitter_user);
+            $this->endDocument('json');
+        }
+    }
+
+}
diff --git a/actions/apiaccountupdateprofilecolors.php b/actions/apiaccountupdateprofilecolors.php
new file mode 100644
index 000000000..3cac82974
--- /dev/null
+++ b/actions/apiaccountupdateprofilecolors.php
@@ -0,0 +1,246 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Update a user's design colors
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/apiauth.php';
+
+/**
+ * Sets one or more hex values that control the color scheme of the
+ * authenticating user's design
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiAccountUpdateProfileColorsAction extends ApiAuthAction
+{
+
+    var $profile_background_color     = null;
+    var $profile_text_color           = null;
+    var $profile_link_color           = null;
+    var $profile_sidebar_fill_color   = null;
+    var $profile_sidebar_border_color = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $this->user   = $this->auth_user;
+
+        $this->profile_background_color
+            = $this->trimmed('profile_background_color');
+        $this->profile_text_color
+            = $this->trimmed('profile_text_color');
+        $this->profile_link_color
+            = $this->trimmed('profile_link_color');
+        $this->profile_sidebar_fill_color
+            = $this->trimmed('profile_sidebar_fill_color');
+
+        // XXX: we don't support changing the sidebar border color
+        // in our designs.
+
+        $this->profile_sidebar_border_color
+            = $this->trimmed('profile_sidebar_border_color');
+
+        // XXX: Unlike Twitter, we do allow people to change the 'content color'
+
+        $this->profile_content_color = $this->trimmed('profile_content_color');
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Try to save the user's colors in her design. Create a new design
+     * if the user doesn't already have one.
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            $this->clientError(
+                _('This method requires a POST.'),
+                400, $this->format
+            );
+            return;
+        }
+
+        if (!in_array($this->format, array('xml', 'json'))) {
+            $this->clientError(
+                _('API method not found.'),
+                404,
+                $this->format
+            );
+            return;
+        }
+
+        $design = $this->user->getDesign();
+
+        if (!empty($design)) {
+
+            $original = clone($design);
+
+            try {
+                $this->setColors($design);
+            } catch (WebColorException $e) {
+                $this->clientError($e->getMessage());
+                return false;
+            }
+
+            $result = $design->update($original);
+
+            if ($result === false) {
+                common_log_db_error($design, 'UPDATE', __FILE__);
+                $this->clientError(_('Could not update your design.'));
+                return;
+            }
+
+        } else {
+
+            $this->user->query('BEGIN');
+
+            // save new design
+            $design = new Design();
+
+            try {
+                $this->setColors($design);
+            } catch (WebColorException $e) {
+                $this->clientError($e->getMessage());
+                return false;
+            }
+
+            $id = $design->insert();
+
+            if (empty($id)) {
+                common_log_db_error($id, 'INSERT', __FILE__);
+                $this->clientError(_('Unable to save your design settings.'));
+                return;
+            }
+
+            $original              = clone($this->user);
+            $this->user->design_id = $id;
+            $result                = $this->user->update($original);
+
+            if (empty($result)) {
+                common_log_db_error($original, 'UPDATE', __FILE__);
+                $this->clientError(_('Unable to save your design settings.'));
+                $this->user->query('ROLLBACK');
+                return;
+            }
+
+            $this->user->query('COMMIT');
+        }
+
+        $profile = $this->user->getProfile();
+
+        if (empty($profile)) {
+            $this->clientError(_('User has no profile.'));
+            return;
+        }
+
+        $twitter_user = $this->twitterUserArray($profile, true);
+
+        if ($this->format == 'xml') {
+            $this->initDocument('xml');
+            $this->showTwitterXmlUser($twitter_user);
+            $this->endDocument('xml');
+        } elseif ($this->format == 'json') {
+            $this->initDocument('json');
+            $this->showJsonObjects($twitter_user);
+            $this->endDocument('json');
+        }
+    }
+
+    /**
+     * Sets the user's design colors based on the request parameters
+     *
+     * @param Design $design the user's Design
+     *
+     * @return void
+     */
+
+    function setColors($design)
+    {
+        $bgcolor = empty($this->profile_background_color) ?
+            null : new WebColor($this->profile_background_color);
+        $tcolor  = empty($this->profile_text_color) ?
+            null : new WebColor($this->profile_text_color);
+        $sbcolor = empty($this->profile_sidebar_fill_color) ?
+            null : new WebColor($this->profile_sidebar_fill_color);
+        $lcolor  = empty($this->profile_link_color) ?
+            null : new WebColor($this->profile_link_color);
+        $ccolor  = empty($this->profile_content_color) ?
+            null : new WebColor($this->profile_content_color);
+
+        if (!empty($bgcolor)) {
+            $design->backgroundcolor = $bgcolor->intValue();
+        }
+
+        if (!empty($ccolor)) {
+            $design->contentcolor = $ccolor->intValue();
+        }
+
+        if (!empty($sbcolor)) {
+            $design->sidebarcolor = $sbcolor->intValue();
+        }
+
+        if (!empty($tcolor)) {
+            $design->textcolor = $tcolor->intValue();
+        }
+
+        if (!empty($lcolor)) {
+            $design->linkcolor = $lcolor->intValue();
+        }
+
+        return true;
+    }
+
+}
diff --git a/actions/apiaccountupdateprofileimage.php b/actions/apiaccountupdateprofileimage.php
new file mode 100644
index 000000000..153ef7818
--- /dev/null
+++ b/actions/apiaccountupdateprofileimage.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Update the authenticating user's profile image
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/apiauth.php';
+
+/**
+ * Updates the authenticating user's profile image. Note that this API method
+ * expects raw multipart data, not a URL to an image.
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiAccountUpdateProfileImageAction extends ApiAuthAction
+{
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $this->user   = $this->auth_user;
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Check whether the credentials are valid and output the result
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            $this->clientError(
+                _('This method requires a POST.'),
+                400, $this->format
+            );
+            return;
+        }
+
+        // Workaround for PHP returning empty $_POST and $_FILES when POST
+        // length > post_max_size in php.ini
+
+        if (empty($_FILES)
+            && empty($_POST)
+            && ($_SERVER['CONTENT_LENGTH'] > 0)
+        ) {
+             $msg = _('The server was unable to handle that much POST ' .
+                    'data (%s bytes) due to its current configuration.');
+
+            $this->clientError(sprintf($msg, $_SERVER['CONTENT_LENGTH']));
+            return;
+        }
+
+        if (empty($this->user)) {
+            $this->clientError(_('No such user.'), 404, $this->format);
+            return;
+        }
+
+        try {
+            $imagefile = ImageFile::fromUpload('image');
+        } catch (Exception $e) {
+            $this->clientError($e->getMessage(), 400, $this->format);
+            return;
+        }
+
+        $filename = Avatar::filename(
+            $user->id,
+            image_type_to_extension($imagefile->type),
+            null,
+            'tmp'.common_timestamp()
+        );
+
+        $filepath = Avatar::path($filename);
+
+        move_uploaded_file($imagefile->filepath, $filepath);
+
+        $profile = $this->user->getProfile();
+
+        if (empty($profile)) {
+            $this->clientError(_('User has no profile.'));
+            return;
+        }
+
+        $profile->setOriginal($filename);
+
+        common_broadcast_profile($profile);
+
+        $twitter_user = $this->twitterUserArray($profile, true);
+
+        if ($this->format == 'xml') {
+            $this->initDocument('xml');
+            $this->showTwitterXmlUser($twitter_user);
+            $this->endDocument('xml');
+        } elseif ($this->format == 'json') {
+            $this->initDocument('json');
+            $this->showJsonObjects($twitter_user);
+            $this->endDocument('json');
+        }
+    }
+
+}
diff --git a/actions/apiblockcreate.php b/actions/apiblockcreate.php
index 1cab2df5d..4f941f6c3 100644
--- a/actions/apiblockcreate.php
+++ b/actions/apiblockcreate.php
@@ -94,7 +94,7 @@ class ApiBlockCreateAction extends ApiAuthAction
         }
 
         if (empty($this->user) || empty($this->other)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
diff --git a/actions/apiblockdestroy.php b/actions/apiblockdestroy.php
index 16dbf94ca..328f18ab0 100644
--- a/actions/apiblockdestroy.php
+++ b/actions/apiblockdestroy.php
@@ -93,7 +93,7 @@ class ApiBlockDestroyAction extends ApiAuthAction
         }
 
         if (empty($this->user) || empty($this->other)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
diff --git a/actions/apidirectmessage.php b/actions/apidirectmessage.php
index a21fe86d2..5b3f412ad 100644
--- a/actions/apidirectmessage.php
+++ b/actions/apidirectmessage.php
@@ -74,7 +74,7 @@ class ApiDirectMessageAction extends ApiAuthAction
         $this->user = $this->auth_user;
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
diff --git a/actions/apidirectmessagenew.php b/actions/apidirectmessagenew.php
index ca1ee70dd..fed6acc30 100644
--- a/actions/apidirectmessagenew.php
+++ b/actions/apidirectmessagenew.php
@@ -72,7 +72,7 @@ class ApiDirectMessageNewAction extends ApiAuthAction
         $this->user = $this->auth_user;
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
diff --git a/actions/apifriendshipsexists.php b/actions/apifriendshipsexists.php
index ae50c512c..c040b9f6a 100644
--- a/actions/apifriendshipsexists.php
+++ b/actions/apifriendshipsexists.php
@@ -33,7 +33,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/api.php';
+require_once INSTALLDIR . '/lib/apiprivateauth.php';
 
 /**
  * Tests for the existence of friendship between two users. Will return true if
@@ -48,7 +48,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiFriendshipsExistsAction extends ApiAction
+class ApiFriendshipsExistsAction extends ApiPrivateAuthAction
 {
     var $user_a = null;
     var $user_b = null;
@@ -69,16 +69,7 @@ class ApiFriendshipsExistsAction extends ApiAction
         $user_a_id = $this->trimmed('user_a');
         $user_b_id = $this->trimmed('user_b');
 
-        common_debug("user_a = " . $user_a_id);
-        common_debug("user_b = " . $user_b_id);
-
-
         $this->user_a = $this->getTargetUser($user_a_id);
-
-        if (empty($this->user_a)) {
-            common_debug('gargargra');
-        }
-
         $this->user_b = $this->getTargetUser($user_b_id);
 
         return true;
diff --git a/actions/apigroupcreate.php b/actions/apigroupcreate.php
index f66e83073..895dfb7ab 100644
--- a/actions/apigroupcreate.php
+++ b/actions/apigroupcreate.php
@@ -109,7 +109,7 @@ class ApiGroupCreateAction extends ApiAuthAction
         }
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
diff --git a/actions/apigroupismember.php b/actions/apigroupismember.php
index a8a40a6b3..08348e97b 100644
--- a/actions/apigroupismember.php
+++ b/actions/apigroupismember.php
@@ -87,12 +87,12 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction
         parent::handle($args);
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
         if (empty($this->group)) {
-            $this->clientError('Group not found!', 404, $this->format);
+            $this->clientError(_('Group not found!'), 404, $this->format);
             return false;
         }
 
diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php
index 071cd9290..b531d9501 100644
--- a/actions/apigroupjoin.php
+++ b/actions/apigroupjoin.php
@@ -96,12 +96,12 @@ class ApiGroupJoinAction extends ApiAuthAction
         }
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
         if (empty($this->group)) {
-            $this->clientError('Group not found!', 404, $this->format);
+            $this->clientError(_('Group not found!'), 404, $this->format);
             return false;
         }
 
diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php
index 0d4bb9e4d..514a3a557 100644
--- a/actions/apigroupleave.php
+++ b/actions/apigroupleave.php
@@ -96,12 +96,12 @@ class ApiGroupLeaveAction extends ApiAuthAction
         }
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
         if (empty($this->group)) {
-            $this->clientError('Group not found!', 404, $this->format);
+            $this->clientError(_('Group not found!'), 404, $this->format);
             return false;
         }
 
diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php
index c529c1e40..7b05f8a96 100644
--- a/actions/apigrouplist.php
+++ b/actions/apigrouplist.php
@@ -87,7 +87,7 @@ class ApiGroupListAction extends ApiBareAuthAction
         parent::handle($args);
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
diff --git a/actions/apigrouplistall.php b/actions/apigrouplistall.php
index 89469f36f..c597839a8 100644
--- a/actions/apigrouplistall.php
+++ b/actions/apigrouplistall.php
@@ -34,7 +34,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/api.php';
+require_once INSTALLDIR . '/lib/apiprivateauth.php';
 
 /**
  * Returns of the lastest 20 groups for the site
@@ -49,7 +49,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiGroupListAllAction extends ApiAction
+class ApiGroupListAllAction extends ApiPrivateAuthAction
 {
     var $groups   = null;
 
diff --git a/actions/apigroupmembership.php b/actions/apigroupmembership.php
index b31e47b39..dd2843161 100644
--- a/actions/apigroupmembership.php
+++ b/actions/apigroupmembership.php
@@ -34,7 +34,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/api.php';
+require_once INSTALLDIR . '/lib/apiprivateauth.php';
 
 /**
  * List 20 newest members of the group specified by name or ID.
@@ -49,7 +49,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiGroupMembershipAction extends ApiAction
+class ApiGroupMembershipAction extends ApiPrivateAuthAction
 {
     var $group    = null;
     var $profiles = null;
@@ -87,6 +87,11 @@ class ApiGroupMembershipAction extends ApiAction
     {
         parent::handle($args);
 
+        if (empty($this->group)) {
+            $this->clientError(_('Group not found!'), 404, $this->format);
+            return false;
+        }
+
         // XXX: RSS and Atom
 
         switch($this->format) {
diff --git a/actions/apigroupshow.php b/actions/apigroupshow.php
index 2bdb22bc4..f9b960747 100644
--- a/actions/apigroupshow.php
+++ b/actions/apigroupshow.php
@@ -34,7 +34,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/api.php';
+require_once INSTALLDIR . '/lib/apiprivateauth.php';
 
 /**
  * Outputs detailed information about the group specified by ID
@@ -49,7 +49,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiGroupShowAction extends ApiAction
+class ApiGroupShowAction extends ApiPrivateAuthAction
 {
     var $group = null;
 
@@ -87,7 +87,7 @@ class ApiGroupShowAction extends ApiAction
 
         if (empty($this->group)) {
             $this->clientError(
-                'Group not found!',
+                _('Group not found!'),
                 404,
                 $this->format
             );
diff --git a/actions/apihelptest.php b/actions/apihelptest.php
index e4ef55f2e..f2c459e6f 100644
--- a/actions/apihelptest.php
+++ b/actions/apihelptest.php
@@ -32,7 +32,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/api.php';
+require_once INSTALLDIR . '/lib/apiprivateauth.php';
 
 /**
  * Returns the string "ok" in the requested format with a 200 OK HTTP status code.
@@ -45,7 +45,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiHelpTestAction extends ApiAction
+class ApiHelpTestAction extends ApiPrivateAuthAction
 {
 
     /**
diff --git a/actions/apistatusesshow.php b/actions/apistatusesshow.php
index 3be22ca59..e26c009c4 100644
--- a/actions/apistatusesshow.php
+++ b/actions/apistatusesshow.php
@@ -37,7 +37,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/api.php';
+require_once INSTALLDIR . '/lib/apiprivateauth.php';
 
 /**
  * Returns the notice specified by id as a Twitter-style status and inline user
@@ -55,7 +55,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiStatusesShowAction extends ApiAction
+class ApiStatusesShowAction extends ApiPrivateAuthAction
 {
 
     var $notice_id = null;
diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php
index 0d71e1512..7ddf7703b 100644
--- a/actions/apistatusesupdate.php
+++ b/actions/apistatusesupdate.php
@@ -38,6 +38,7 @@ if (!defined('STATUSNET')) {
 }
 
 require_once INSTALLDIR . '/lib/apiauth.php';
+require_once INSTALLDIR . '/lib/mediafile.php';
 
 /**
  * Updates the authenticating user's status (posts a notice).
@@ -60,6 +61,8 @@ class ApiStatusesUpdateAction extends ApiAuthAction
     var $source                = null;
     var $status                = null;
     var $in_reply_to_status_id = null;
+    var $lat                   = null;
+    var $lon                   = null;
 
     static $reserved_sources = array('web', 'omb', 'mail', 'xmpp', 'api');
 
@@ -76,28 +79,13 @@ class ApiStatusesUpdateAction extends ApiAuthAction
     {
         parent::prepare($args);
 
-        $this->user = $this->auth_user;
-
-        if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
-            return false;
-        }
-
+        $this->user   = $this->auth_user;
         $this->status = $this->trimmed('status');
-
-        if (empty($this->status)) {
-            $this->clientError(
-                'Client must provide a \'status\' parameter with a value.',
-                400,
-                $this->format
-            );
-
-            return false;
-        }
-
         $this->source = $this->trimmed('source');
+        $this->lat    = $this->trimmed('lat');
+        $this->lon    = $this->trimmed('long');
 
-        if (empty($this->source) || in_array($source, $this->reserved_sources)) {
+        if (empty($this->source) || in_array($source, self::$reserved_sources)) {
             $this->source = 'api';
         }
 
@@ -129,6 +117,34 @@ class ApiStatusesUpdateAction extends ApiAuthAction
             return;
         }
 
+        // Workaround for PHP returning empty $_POST and $_FILES when POST
+        // length > post_max_size in php.ini
+
+        if (empty($_FILES)
+            && empty($_POST)
+            && ($_SERVER['CONTENT_LENGTH'] > 0)
+        ) {
+             $msg = _('The server was unable to handle that much POST ' .
+                    'data (%s bytes) due to its current configuration.');
+
+            $this->clientError(sprintf($msg, $_SERVER['CONTENT_LENGTH']));
+            return;
+        }
+
+        if (empty($this->status)) {
+            $this->clientError(
+                'Client must provide a \'status\' parameter with a value.',
+                400,
+                $this->format
+            );
+            return;
+        }
+
+        if (empty($this->user)) {
+            $this->clientError(_('No such user.'), 404, $this->format);
+            return;
+        }
+
         $status_shortened = common_shorten_links($this->status);
 
         if (Notice::contentTooLong($status_shortened)) {
@@ -187,14 +203,52 @@ class ApiStatusesUpdateAction extends ApiAuthAction
                 }
             }
 
+            $location = null;
+
+            if (!empty($this->lat) && !empty($this->lon)) {
+                $location = Location::fromLatLon($this->lat, $this->lon);
+            }
+
+            $upload = null;
+
+            try {
+                $upload = MediaFile::fromUpload('media', $this->user);
+            } catch (ClientException $ce) {
+                $this->clientError($ce->getMessage());
+                return;
+            }
+
+            if (isset($upload)) {
+                $status_shortened .= ' ' . $upload->shortUrl();
+
+                if (Notice::contentTooLong($status_shortened)) {
+                    $upload->delete();
+                    $msg = _(
+                        'Max notice size is %d chars, ' .
+                        'including attachment URL.'
+                    );
+                    $this->clientError(sprintf($msg, Notice::maxContent()));
+                }
+            }
+
             $this->notice = Notice::saveNew(
                 $this->user->id,
-                html_entity_decode($this->status, ENT_NOQUOTES, 'UTF-8'),
+                html_entity_decode($status_shortened, ENT_NOQUOTES, 'UTF-8'),
                 $this->source,
                 1,
-                $reply_to
+                $reply_to,
+                null,
+                null,
+                empty($location) ? null : $location->lat,
+                empty($location) ? null : $location->lon,
+                empty($location) ? null : $location->location_id,
+                empty($location) ? null : $location->location_ns
             );
 
+            if (isset($upload)) {
+                $upload->attachToNotice($this->notice);
+            }
+
             common_broadcast_notice($this->notice);
         }
 
diff --git a/actions/apistatusnetversion.php b/actions/apistatusnetversion.php
index e73ab983b..bbf891a89 100644
--- a/actions/apistatusnetversion.php
+++ b/actions/apistatusnetversion.php
@@ -32,7 +32,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/api.php';
+require_once INSTALLDIR . '/lib/apiprivateauth.php';
 
 /**
  * Returns a version number for this version of StatusNet, which
@@ -48,7 +48,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiStatusnetVersionAction extends ApiAction
+class ApiStatusnetVersionAction extends ApiPrivateAuthAction
 {
     /**
      * Take arguments for running
diff --git a/actions/apisubscriptions.php b/actions/apisubscriptions.php
index bc68dd192..2c691bb84 100644
--- a/actions/apisubscriptions.php
+++ b/actions/apisubscriptions.php
@@ -84,7 +84,7 @@ class ApiSubscriptionsAction extends ApiBareAuthAction
         $this->user = $this->getTargetUser($this->arg('id'));
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return false;
         }
 
diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php
index b8ae74f13..f84d7b4cb 100644
--- a/actions/apitimelinefavorites.php
+++ b/actions/apitimelinefavorites.php
@@ -67,7 +67,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
         $this->user = $this->getTargetUser($this->arg('id'));
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php
index 1ea35866e..e84f77372 100644
--- a/actions/apitimelinefriends.php
+++ b/actions/apitimelinefriends.php
@@ -72,11 +72,11 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
     function prepare($args)
     {
         parent::prepare($args);
-
+        common_debug("api friends_timeline");
         $this->user = $this->getTargetUser($this->arg('id'));
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index 5d0542918..de13e7eb9 100644
--- a/actions/apitimelinegroup.php
+++ b/actions/apitimelinegroup.php
@@ -34,7 +34,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/api.php';
+require_once INSTALLDIR . '/lib/apiprivateauth.php';
 
 /**
  * Returns the most recent notices (default 20) posted to the group specified by ID
@@ -49,7 +49,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiTimelineGroupAction extends ApiAction
+class ApiTimelineGroupAction extends ApiPrivateAuthAction
 {
 
     var $group   = null;
@@ -69,7 +69,6 @@ class ApiTimelineGroupAction extends ApiAction
         parent::prepare($args);
 
         $this->group   = $this->getTargetGroup($this->arg('id'));
-        $this->notices = $this->getNotices();
 
         return true;
     }
@@ -87,6 +86,13 @@ class ApiTimelineGroupAction extends ApiAction
     function handle($args)
     {
         parent::handle($args);
+
+        if (empty($this->group)) {
+            $this->clientError(_('Group not found!'), 404, $this->format);
+            return false;
+        }
+
+        $this->notices = $this->getNotices();
         $this->showTimeline();
     }
 
diff --git a/actions/apitimelinementions.php b/actions/apitimelinementions.php
index fe5ff0f28..0956ccdce 100644
--- a/actions/apitimelinementions.php
+++ b/actions/apitimelinementions.php
@@ -76,7 +76,7 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
         $this->user = $this->getTargetUser($this->arg('id'));
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
diff --git a/actions/apitimelinepublic.php b/actions/apitimelinepublic.php
index 58e267734..7a8504259 100644
--- a/actions/apitimelinepublic.php
+++ b/actions/apitimelinepublic.php
@@ -37,7 +37,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/api.php';
+require_once INSTALLDIR . '/lib/apiprivateauth.php';
 
 /**
  * Returns the most recent notices (default 20) posted by everybody
@@ -55,7 +55,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiTimelinePublicAction extends ApiAction
+class ApiTimelinePublicAction extends ApiPrivateAuthAction
 {
 
     var $notices = null;
diff --git a/actions/apitimelinetag.php b/actions/apitimelinetag.php
index a274daac0..452593c11 100644
--- a/actions/apitimelinetag.php
+++ b/actions/apitimelinetag.php
@@ -34,7 +34,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/api.php';
+require_once INSTALLDIR . '/lib/apiprivateauth.php';
 
 /**
  * Returns the 20 most recent notices tagged by a given tag
@@ -49,7 +49,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiTimelineTagAction extends ApiAction
+class ApiTimelineTagAction extends ApiPrivateAuthAction
 {
 
     var $notices = null;
diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php
index 285735fd1..ca1d21772 100644
--- a/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@ -78,7 +78,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
         $this->user = $this->getTargetUser($this->arg('id'));
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
diff --git a/actions/apiusershow.php b/actions/apiusershow.php
index b3a939b43..aa7aec5a4 100644
--- a/actions/apiusershow.php
+++ b/actions/apiusershow.php
@@ -34,7 +34,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/api.php';
+require_once INSTALLDIR . '/lib/apiprivateauth.php';
 
 /**
  * Ouputs information for a user, specified by ID or screen name.
@@ -50,7 +50,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiUserShowAction extends ApiAction
+class ApiUserShowAction extends ApiPrivateAuthAction
 {
     /**
      * Take arguments for running
diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index ded419dd7..879e44842 100644
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -244,11 +244,25 @@ class AvatarsettingsAction extends AccountSettingsAction
 
     function handlePost()
     {
+        // Workaround for PHP returning empty $_POST and $_FILES when POST
+        // length > post_max_size in php.ini
+
+        if (empty($_FILES)
+            && empty($_POST)
+            && ($_SERVER['CONTENT_LENGTH'] > 0)
+        ) {
+            $msg = _('The server was unable to handle that much POST ' .
+                'data (%s bytes) due to its current configuration.');
+
+            $this->showForm(sprintf($msg, $_SERVER['CONTENT_LENGTH']));
+            return;
+        }
+
         // CSRF protection
 
         $token = $this->trimmed('token');
         if (!$token || $token != common_session_token()) {
-            $this->show_form(_('There was a problem with your session token. '.
+            $this->showForm(_('There was a problem with your session token. '.
                                'Try again, please.'));
             return;
         }
diff --git a/actions/block.php b/actions/block.php
index 408f16434..71a34e087 100644
--- a/actions/block.php
+++ b/actions/block.php
@@ -42,9 +42,11 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
-class BlockAction extends Action
+
+class BlockAction extends ProfileFormAction
 {
     var $profile = null;
+
     /**
      * Take arguments for running
      *
@@ -52,28 +54,22 @@ class BlockAction extends Action
      *
      * @return boolean success flag
      */
+
     function prepare($args)
     {
-        parent::prepare($args);
-        if (!common_logged_in()) {
-            $this->clientError(_('Not logged in.'));
-            return false;
-        }
-        $token = $this->trimmed('token');
-        if (!$token || $token != common_session_token()) {
-            $this->clientError(_('There was a problem with your session token. Try again, please.'));
-            return;
-        }
-        $id = $this->trimmed('blockto');
-        if (!$id) {
-            $this->clientError(_('No profile specified.'));
+        if (!parent::prepare($args)) {
             return false;
         }
-        $this->profile = Profile::staticGet('id', $id);
-        if (!$this->profile) {
-            $this->clientError(_('No profile with that ID.'));
+
+        $cur = common_current_user();
+
+        assert(!empty($cur)); // checked by parent
+
+        if ($cur->hasBlocked($this->profile)) {
+            $this->clientError(_("You already blocked that user."));
             return false;
         }
+
         return true;
     }
 
@@ -86,18 +82,16 @@ class BlockAction extends Action
      *
      * @return void
      */
+
     function handle($args)
     {
-        parent::handle($args);
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             if ($this->arg('no')) {
-                $cur = common_current_user();
-                $other = Profile::staticGet('id', $this->arg('blockto'));
-                common_redirect(common_local_url('showstream', array('nickname' => $other->nickname)),
-                                303);
+                $this->returnToArgs();
             } elseif ($this->arg('yes')) {
-                $this->blockProfile();
-            } elseif ($this->arg('blockto')) {
+                $this->handlePost();
+                $this->returnToArgs();
+            } else {
                 $this->showPage();
             }
         }
@@ -138,7 +132,7 @@ class BlockAction extends Action
                          'unable to subscribe to you in the future, and '.
                          'you will not be notified of any @-replies from them.'));
         $this->element('input', array('id' => 'blockto-' . $id,
-                                      'name' => 'blockto',
+                                      'name' => 'profileid',
                                       'type' => 'hidden',
                                       'value' => $id));
         foreach ($this->args as $k => $v) {
@@ -146,8 +140,8 @@ class BlockAction extends Action
                 $this->hidden($k, $v);
             }
         }
-        $this->submit('form_action-no', _('No'), 'submit form_action-primary', 'no', _("Do not block this user from this group"));
-        $this->submit('form_action-yes', _('Yes'), 'submit form_action-secondary', 'yes', _('Block this user from this group'));
+        $this->submit('form_action-no', _('No'), 'submit form_action-primary', 'no', _("Do not block this user"));
+        $this->submit('form_action-yes', _('Yes'), 'submit form_action-secondary', 'yes', _('Block this user'));
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
@@ -157,36 +151,17 @@ class BlockAction extends Action
      *
      * @return void
      */
-    function blockProfile()
+
+    function handlePost()
     {
         $cur = common_current_user();
 
-        if ($cur->hasBlocked($this->profile)) {
-            $this->clientError(_('You have already blocked this user.'));
-            return;
-        }
         $result = $cur->block($this->profile);
+
         if (!$result) {
             $this->serverError(_('Failed to save block information.'));
             return;
         }
-
-        // Now, gotta figure where we go back to
-        foreach ($this->args as $k => $v) {
-            if ($k == 'returnto-action') {
-                $action = $v;
-            } elseif (substr($k, 0, 9) == 'returnto-') {
-                $args[substr($k, 9)] = $v;
-            }
-        }
-
-        if ($action) {
-            common_redirect(common_local_url($action, $args), 303);
-        } else {
-            common_redirect(common_local_url('subscribers',
-                                             array('nickname' => $cur->nickname)),
-                            303);
-        }
     }
 }
 
diff --git a/actions/bookmarklet.php b/actions/bookmarklet.php
new file mode 100644
index 000000000..0603a7456
--- /dev/null
+++ b/actions/bookmarklet.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Handler for posting new notices
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Bookmarklet
+ * @package   StatusNet
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @copyright 2008-2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/actions/newnotice.php';
+
+/**
+ * Action for posting a notice 
+ *
+ * @category Bookmarklet
+ * @package  StatusNet
+ * @author   Sarven Capadisli <csarven@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class BookmarkletAction extends NewnoticeAction
+{
+    function showTitle()
+    {
+        $this->element('title', null, _('Post to ').common_config('site', 'name'));
+    }
+
+    function showHeader()
+    {
+        $this->elementStart('div', array('id' => 'header'));
+        $this->elementStart('address');
+        $this->element('a', array('class' => 'url',
+                                  'href' => common_local_url('public')),
+                         '');
+        $this->elementEnd('address');
+        if (common_logged_in()) {
+            $this->showNoticeForm();
+        }
+        $this->elementEnd('div');
+    }
+
+    function showCore()
+    {
+    }
+
+    function showFooter()
+    {
+    }
+}
+
diff --git a/actions/deletenotice.php b/actions/deletenotice.php
index 4a48a9c34..ba8e86d0f 100644
--- a/actions/deletenotice.php
+++ b/actions/deletenotice.php
@@ -67,7 +67,7 @@ class DeletenoticeAction extends Action
             common_user_error(_('Not logged in.'));
             exit;
         } else if ($this->notice->profile_id != $this->user_profile->id &&
-                   !$this->user->hasRight(Right::deleteOthersNotice)) {
+                   !$this->user->hasRight(Right::DELETEOTHERSNOTICE)) {
             common_user_error(_('Can\'t delete this notice.'));
             exit;
         }
diff --git a/actions/deleteuser.php b/actions/deleteuser.php
new file mode 100644
index 000000000..32b703aa7
--- /dev/null
+++ b/actions/deleteuser.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Action class to delete a user
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Delete a user
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ */
+
+class DeleteuserAction extends ProfileFormAction
+{
+    var $user = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     */
+
+    function prepare($args)
+    {
+        if (!parent::prepare($args)) {
+            return false;
+        }
+
+        $cur = common_current_user();
+
+        assert(!empty($cur)); // checked by parent
+
+        if (!$cur->hasRight(Right::DELETEUSER)) {
+            $this->clientError(_("You cannot delete users."));
+            return false;
+        }
+
+        $this->user = User::staticGet('id', $this->profile->id);
+
+        if (empty($this->user)) {
+            $this->clientError(_("You can only delete local users."));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Handle request
+     *
+     * Shows a page with list of favorite notices
+     *
+     * @param array $args $_REQUEST args; handled in prepare()
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+            if ($this->arg('no')) {
+                $this->returnToArgs();
+            } elseif ($this->arg('yes')) {
+                $this->handlePost();
+                $this->returnToArgs();
+            } else {
+                $this->showPage();
+            }
+        }
+    }
+
+    function showContent() {
+        $this->areYouSureForm();
+    }
+
+    function title() {
+        return _('Delete user');
+    }
+
+    function showNoticeForm() {
+        // nop
+    }
+
+    /**
+     * Confirm with user.
+     *
+     * Shows a confirmation form.
+     *
+     * @return void
+     */
+    function areYouSureForm()
+    {
+        $id = $this->profile->id;
+        $this->elementStart('form', array('id' => 'deleteuser-' . $id,
+                                           'method' => 'post',
+                                           'class' => 'form_settings form_entity_block',
+                                           'action' => common_local_url('deleteuser')));
+        $this->elementStart('fieldset');
+        $this->hidden('token', common_session_token());
+        $this->element('legend', _('Delete user'));
+        $this->element('p', null,
+                       _('Are you sure you want to delete this user? '.
+                         'This will clear all data about the user from the '.
+                         'database, without a backup.'));
+        $this->element('input', array('id' => 'deleteuserto-' . $id,
+                                      'name' => 'profileid',
+                                      'type' => 'hidden',
+                                      'value' => $id));
+        foreach ($this->args as $k => $v) {
+            if (substr($k, 0, 9) == 'returnto-') {
+                $this->hidden($k, $v);
+            }
+        }
+        $this->submit('form_action-no', _('No'), 'submit form_action-primary', 'no', _("Do not block this user"));
+        $this->submit('form_action-yes', _('Yes'), 'submit form_action-secondary', 'yes', _('Delete this user'));
+        $this->elementEnd('fieldset');
+        $this->elementEnd('form');
+    }
+
+    /**
+     * Actually delete a user.
+     *
+     * @return void
+     */
+
+    function handlePost()
+    {
+        $this->user->delete();
+    }
+}
+
diff --git a/actions/designadminpanel.php b/actions/designadminpanel.php
new file mode 100644
index 000000000..024cbe251
--- /dev/null
+++ b/actions/designadminpanel.php
@@ -0,0 +1,231 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Design administration panel
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Settings
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Zach Copley <zach@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @copyright 2008-2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Administer design settings
+ *
+ * @category Admin
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Zach Copley <zach@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class DesignadminpanelAction extends AdminPanelAction
+{
+    /**
+     * Returns the page title
+     *
+     * @return string page title
+     */
+
+    function title()
+    {
+        return _('Design');
+    }
+
+    /**
+     * Instructions for using this form.
+     *
+     * @return string instructions
+     */
+
+    function getInstructions()
+    {
+        return _('Design settings for this StatusNet site.');
+    }
+
+    /**
+     * Show the site admin panel form
+     *
+     * @return void
+     */
+
+    function showForm()
+    {
+        $form = new DesignAdminPanelForm($this);
+        $form->show();
+        return;
+    }
+
+    /**
+     * Save settings from the form
+     *
+     * @return void
+     */
+
+    function saveSettings()
+    {
+        static $settings = array('theme');
+
+        $values = array();
+
+        foreach ($settings as $setting) {
+            $values[$setting] = $this->trimmed($setting);
+        }
+
+        // This throws an exception on validation errors
+
+        $this->validate($values);
+
+        // assert(all values are valid);
+
+        $config = new Config();
+
+        $config->query('BEGIN');
+
+        foreach ($settings as $setting) {
+            Config::save('site', $setting, $values[$setting]);
+        }
+
+        $config->query('COMMIT');
+
+        return;
+    }
+
+    function validate(&$values)
+    {
+        if (!in_array($values['theme'], Theme::listAvailable())) {
+            $this->clientError(sprintf(_("Theme not available: %s"), $values['theme']));
+        }
+    }
+}
+
+class DesignAdminPanelForm extends Form
+{
+    /**
+     * ID of the form
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'form_design_admin_panel';
+    }
+
+    /**
+     * class of the form
+     *
+     * @return string class of the form
+     */
+
+    function formClass()
+    {
+        return 'form_settings';
+    }
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+
+    function action()
+    {
+        return common_local_url('designadminpanel');
+    }
+
+    /**
+     * Data elements of the form
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $themes = Theme::listAvailable();
+
+        asort($themes);
+
+        $themes = array_combine($themes, $themes);
+
+        $this->out->elementStart('ul');
+        $this->out->elementStart('li');
+
+        $this->out->dropdown('theme', _('Theme'),
+                             $themes, _('Theme for the site.'),
+                             true, $this->value('theme'));
+
+        $this->out->elementEnd('li');
+        $this->out->elementEnd('ul');
+    }
+
+    /**
+     * Utility to simplify some of the duplicated code around
+     * params and settings.
+     *
+     * @param string $setting      Name of the setting
+     * @param string $title        Title to use for the input
+     * @param string $instructions Instructions for this field
+     *
+     * @return void
+     */
+
+    function input($setting, $title, $instructions)
+    {
+        $this->out->input($setting, $title, $this->value($setting), $instructions);
+    }
+
+    /**
+     * Utility to simplify getting the posted-or-stored setting value
+     *
+     * @param string $setting Name of the setting
+     *
+     * @return string param value if posted, or current config value
+     */
+
+    function value($setting)
+    {
+        $value = $this->out->trimmed($setting);
+        if (empty($value)) {
+            $value = common_config('site', $setting);
+        }
+        return $value;
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->out->submit('submit', _('Save'), 'submit', null, _('Save site settings'));
+    }
+}
diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 6eff06c0d..67b991cdc 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -326,7 +326,7 @@ class EmailsettingsAction extends AccountSettingsAction
             $this->showForm(_('Cannot normalize that email address'));
             return;
         }
-        if (!Validate::email($email, true)) {
+        if (!Validate::email($email, common_config('email', 'check_domain'))) {
             $this->showForm(_('Not a valid email address'));
             return;
         } else if ($user->email == $email) {
diff --git a/actions/getfile.php b/actions/getfile.php
new file mode 100644
index 000000000..ecda34c0f
--- /dev/null
+++ b/actions/getfile.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Returns a given file attachment, allowing private sites to only allow
+ * access to file attachments after login.
+ *
+ * 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  Personal
+ * @package   StatusNet
+ * @author    Jeffery To <jeffery.to@gmail.com>
+ * @copyright 2008-2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+require_once 'MIME/Type.php';
+
+/**
+ * Action for getting a file attachment
+ *
+ * @category Personal
+ * @package  StatusNet
+ * @author   Jeffery To <jeffery.to@gmail.com>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class GetfileAction extends Action
+{
+    /**
+     * Path of file to return
+     */
+
+    var $path = null;
+
+    /**
+     * Get file name
+     *
+     * @param array $args $_REQUEST array
+     *
+     * @return success flag
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $filename = $this->trimmed('filename');
+        $path = null;
+
+        if ($filename) {
+            $path = common_config('attachments', 'dir') . $filename;
+        }
+
+        if (empty($path) or !file_exists($path)) {
+            $this->clientError(_('No such file.'), 404);
+            return false;
+        }
+        if (!is_readable($path)) {
+            $this->clientError(_('Cannot read file.'), 403);
+            return false;
+        }
+
+        $this->path = $path;
+        return true;
+    }
+
+    /**
+     * Is this page read-only?
+     *
+     * @return boolean true
+     */
+
+    function isReadOnly($args)
+    {
+        return true;
+    }
+
+    /**
+     * Last-modified date for file
+     *
+     * @return int last-modified date as unix timestamp
+     */
+
+    function lastModified()
+    {
+        return filemtime($this->path);
+    }
+
+    /**
+     * etag for file
+     *
+     * This returns the same data (inode, size, mtime) as Apache would,
+     * but in decimal instead of hex.
+     *
+     * @return string etag http header
+     */
+    function etag()
+    {
+        $stat = stat($this->path);
+        return '"' . $stat['ino'] . '-' . $stat['size'] . '-' . $stat['mtime'] . '"';
+    }
+
+    /**
+     * Handle input, produce output
+     *
+     * @param array $args $_REQUEST contents
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        // undo headers set by PHP sessions
+        $sec = session_cache_expire() * 60;
+        header('Expires: ' . date(DATE_RFC1123, time() + $sec));
+        header('Cache-Control: public, max-age=' . $sec);
+        header('Pragma: public');
+
+        parent::handle($args);
+
+        $path = $this->path;
+        header('Content-Type: ' . MIME_Type::autoDetect($path));
+        readfile($path);
+    }
+}
diff --git a/actions/groupblock.php b/actions/groupblock.php
index 979a56a81..faf18c6ad 100644
--- a/actions/groupblock.php
+++ b/actions/groupblock.php
@@ -151,17 +151,19 @@ class GroupblockAction extends Action
     function areYouSureForm()
     {
         $id = $this->profile->id;
+        $this->elementStart('form', array('id' => 'block-' . $id,
+                                           'method' => 'post',
+                                           'class' => 'form_settings form_entity_block',
+                                           'action' => common_local_url('groupblock')));
+        $this->elementStart('fieldset');
+        $this->hidden('token', common_session_token());
+        $this->element('legend', _('Block user'));
         $this->element('p', null,
                        sprintf(_('Are you sure you want to block user "%s" from the group "%s"? '.
                                  'They will be removed from the group, unable to post, and '.
                                  'unable to subscribe to the group in the future.'),
                                $this->profile->getBestName(),
                                $this->group->getBestName()));
-        $this->elementStart('form', array('id' => 'block-' . $id,
-                                           'method' => 'post',
-                                           'class' => 'block',
-                                           'action' => common_local_url('groupblock')));
-        $this->hidden('token', common_session_token());
         $this->hidden('blockto-' . $this->profile->id,
                       $this->profile->id,
                       'blockto');
@@ -173,8 +175,9 @@ class GroupblockAction extends Action
                 $this->hidden($k, $v);
             }
         }
-        $this->submit('no', _('No'));
-        $this->submit('yes', _('Yes'));
+        $this->submit('form_action-no', _('No'), 'submit form_action-primary', 'no', _("Do not block this user from this group"));
+        $this->submit('form_action-yes', _('Yes'), 'submit form_action-secondary', 'yes', _('Block this user from this group'));
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
 
diff --git a/actions/invite.php b/actions/invite.php
index 788130c58..3015202e9 100644
--- a/actions/invite.php
+++ b/actions/invite.php
@@ -68,7 +68,7 @@ class InviteAction extends CurrentUserDesignAction
 
         foreach ($addresses as $email) {
             $email = trim($email);
-            if (!Validate::email($email, true)) {
+            if (!Validate::email($email, common_config('email', 'check_domain'))) {
                 $this->showForm(sprintf(_('Invalid email address: %s'), $email));
                 return;
             }
diff --git a/actions/login.php b/actions/login.php
index f6d016310..ad57dd667 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -79,6 +79,8 @@ class LoginAction extends Action
             $this->clientError(_('Already logged in.'));
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $this->checkLogin();
+        } else if (isset($args['user_id']) && isset($args['token'])){
+            $this->checkLogin($args['user_id'],$args['token']);
         } else {
             common_ensure_session();
             $this->showForm();
@@ -95,23 +97,48 @@ class LoginAction extends Action
      * @return void
      */
 
-    function checkLogin()
+    function checkLogin($user_id=null, $token=null)
     {
-        // XXX: login throttle
-
-        // CSRF protection - token set in NoticeForm
-        $token = $this->trimmed('token');
-        if (!$token || $token != common_session_token()) {
-            $this->clientError(_('There was a problem with your session token. '.
-                                 'Try again, please.'));
-            return;
+        if(isset($token) && isset($user_id)){
+            //Token based login (from the LoginCommand)
+            $login_token = Login_token::staticGet('user_id',$user_id);
+            if($login_token && $login_token->token == $token){
+                if($login_token->modified > time()+2*60){
+                    //token has expired
+                    //delete the token as it is useless
+                    $login_token->delete();
+                    $this->showForm(_('Invalid or expired token.'));
+                    return;
+                }else{
+                    //delete the token so it cannot be reused
+                    $login_token->delete();
+                    //it's a valid token - let them log in
+                    $user = User::staticGet('id', $user_id);
+                    //$user = User::staticGet('nickname', "candrews");
+                }
+            }else{
+                $this->showForm(_('Invalid or expired token.'));
+                return;
+            }
+        }else{
+            // Regular form submission login
+
+            // XXX: login throttle
+
+            // CSRF protection - token set in NoticeForm
+            $token = $this->trimmed('token');
+            if (!$token || $token != common_session_token()) {
+                $this->clientError(_('There was a problem with your session token. '.
+                                     'Try again, please.'));
+                return;
+            }
+
+            $nickname = common_canonical_nickname($this->trimmed('nickname'));
+            $password = $this->arg('password');
+
+            $user = common_check_user($nickname, $password);
         }
 
-        $nickname = common_canonical_nickname($this->trimmed('nickname'));
-        $password = $this->arg('password');
-
-        $user = common_check_user($nickname, $password);
-
         if (!$user) {
             $this->showForm(_('Incorrect username or password.'));
             return;
diff --git a/actions/microsummary.php b/actions/microsummary.php
index 5c01a9ce0..5c761e8bb 100644
--- a/actions/microsummary.php
+++ b/actions/microsummary.php
@@ -59,7 +59,7 @@ class MicrosummaryAction extends Action
         $user     = User::staticGet('nickname', $nickname);
 
         if (!$user) {
-            $this->clientError(_('No such user'), 404);
+            $this->clientError(_('No such user.'), 404);
             return;
         }
         
diff --git a/actions/newmessage.php b/actions/newmessage.php
index a0b17fc18..0db2e7181 100644
--- a/actions/newmessage.php
+++ b/actions/newmessage.php
@@ -99,7 +99,9 @@ class NewmessageAction extends Action
         $user = common_current_user();
 
         if (!$user) {
-            $this->clientError(_('Only logged-in users can send direct messages.'), 403);
+            /* Go log in, and then come back. */
+            common_set_returnto($_SERVER['REQUEST_URI']);
+            common_redirect(common_local_url('login'));
             return false;
         }
 
@@ -111,7 +113,7 @@ class NewmessageAction extends Action
             $this->other = User::staticGet('id', $this->to);
 
             if (!$this->other) {
-                $this->clientError(_('No such user'), 404);
+                $this->clientError(_('No such user.'), 404);
                 return false;
             }
 
@@ -221,7 +223,21 @@ class NewmessageAction extends Action
         }
 
         $this->msg = $msg;
-        $this->showPage();
+        if ($this->trimmed('ajax')) {
+            header('Content-Type: text/xml;charset=utf-8');
+            $this->xw->startDocument('1.0', 'UTF-8');
+            $this->elementStart('html');
+            $this->elementStart('head');
+            $this->element('title', null, _('New message'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
+            $this->showNoticeForm();
+            $this->elementEnd('body');
+            $this->endHTML();
+        }
+        else {
+            $this->showPage();
+        }
     }
 
     function showPageNotice()
diff --git a/actions/newnotice.php b/actions/newnotice.php
index 9ee031f93..fbd7ab6bc 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -33,7 +33,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/noticelist.php';
+require_once INSTALLDIR . '/lib/noticelist.php';
+require_once INSTALLDIR . '/lib/mediafile.php';
 
 /**
  * Action for posting new notices
@@ -113,33 +114,6 @@ class NewnoticeAction extends Action
         }
     }
 
-    function getUploadedFileType() {
-        require_once 'MIME/Type.php';
-
-        $cmd = &PEAR::getStaticProperty('MIME_Type', 'fileCmd');
-        $cmd = common_config('attachments', 'filecommand');
-
-        $filetype = MIME_Type::autoDetect($_FILES['attach']['tmp_name']);
-        if (in_array($filetype, common_config('attachments', 'supported'))) {
-            return $filetype;
-        }
-        $media = MIME_Type::getMedia($filetype);
-        if ('application' !== $media) {
-            $hint = sprintf(_(' Try using another %s format.'), $media);
-        } else {
-            $hint = '';
-        }
-        $this->clientError(sprintf(
-                                   _('%s is not a supported filetype on this server.'), $filetype) . $hint);
-    }
-
-    function isRespectsQuota($user) {
-        $file = new File;
-        $ret = $file->isRespectsQuota($user,$_FILES['attach']['size']);
-        if (true === $ret) return true;
-        $this->clientError($ret);
-    }
-
     /**
      * Save a new notice, based on arguments
      *
@@ -160,18 +134,12 @@ class NewnoticeAction extends Action
 
         if (!$content) {
             $this->clientError(_('No content!'));
-        } else {
-            $content_shortened = common_shorten_links($content);
-            if (Notice::contentTooLong($content_shortened)) {
-                $this->clientError(sprintf(_('That\'s too long. '.
-                                             'Max notice size is %d chars.'),
-                                           Notice::maxContent()));
-            }
+            return;
         }
 
         $inter = new CommandInterpreter();
 
-        $cmd = $inter->handle_command($user, $content_shortened);
+        $cmd = $inter->handle_command($user, $content);
 
         if ($cmd) {
             if ($this->boolean('ajax')) {
@@ -182,6 +150,13 @@ class NewnoticeAction extends Action
             return;
         }
 
+        $content_shortened = common_shorten_links($content);
+        if (Notice::contentTooLong($content_shortened)) {
+            $this->clientError(sprintf(_('That\'s too long. '.
+                                         'Max notice size is %d chars.'),
+                                       Notice::maxContent()));
+        }
+
         $replyto = $this->trimmed('inreplyto');
         #If an ID of 0 is wrongly passed here, it will cause a database error,
         #so override it...
@@ -189,84 +164,37 @@ class NewnoticeAction extends Action
             $replyto = 'false';
         }
 
-        if (isset($_FILES['attach']['error'])) {
-            switch ($_FILES['attach']['error']) {
-             case UPLOAD_ERR_NO_FILE:
-                // no file uploaded, nothing to do
-                break;
-
-             case UPLOAD_ERR_OK:
-                $mimetype = $this->getUploadedFileType();
-                if (!$this->isRespectsQuota($user)) {
-                    die('clientError() should trigger an exception before reaching here.');
-                }
-                break;
-
-             case UPLOAD_ERR_INI_SIZE:
-                $this->clientError(_('The uploaded file exceeds the upload_max_filesize directive in php.ini.'));
-
-             case UPLOAD_ERR_FORM_SIZE:
-                $this->clientError(_('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'));
+        $upload = null;
+        $upload = MediaFile::fromUpload('attach');
 
-             case UPLOAD_ERR_PARTIAL:
-                $this->clientError(_('The uploaded file was only partially uploaded.'));
+        if (isset($upload)) {
 
-             case  UPLOAD_ERR_NO_TMP_DIR:
-                $this->clientError(_('Missing a temporary folder.'));
-
-             case UPLOAD_ERR_CANT_WRITE:
-                $this->clientError(_('Failed to write file to disk.'));
-
-             case UPLOAD_ERR_EXTENSION:
-                $this->clientError(_('File upload stopped by extension.'));
-
-             default:
-                die('Should never reach here.');
-            }
-        }
-
-        if (isset($mimetype)) {
-            $filename = $this->saveFile($mimetype);
-            if (empty($filename)) {
-                $this->clientError(_('Couldn\'t save file.'));
-            }
-
-            $fileRecord = $this->storeFile($filename, $mimetype);
-
-            $fileurl = common_local_url('attachment',
-                                        array('attachment' => $fileRecord->id));
-
-            // not sure this is necessary -- Zach
-            $this->maybeAddRedir($fileRecord->id, $fileurl);
-
-            $short_fileurl = common_shorten_url($fileurl);
-            if (!$short_fileurl) {
-                // todo -- Consider forcing default shortener if none selected?
-                $short_fileurl = $fileurl;
-            }
-            $content_shortened .= ' ' . $short_fileurl;
+            $content_shortened .= ' ' . $upload->shortUrl();
 
             if (Notice::contentTooLong($content_shortened)) {
-                $this->deleteFile($filename);
-                $this->clientError(sprintf(_('Max notice size is %d chars, including attachment URL.'),
-                                           Notice::maxContent()));
+                $upload->delete();
+                $this->clientError(
+                    sprintf(
+                        _('Max notice size is %d chars, including attachment URL.'),
+                          Notice::maxContent()
+                    )
+                );
             }
-
-            // Also, not sure this is necessary -- Zach
-            $this->maybeAddRedir($fileRecord->id, $short_fileurl);
         }
 
         $notice = Notice::saveNew($user->id, $content_shortened, 'web', 1,
                                   ($replyto == 'false') ? null : $replyto);
 
-        if (isset($mimetype)) {
-            $this->attachFile($notice, $fileRecord);
+        if (isset($upload)) {
+            $upload->attachToNotice($notice);
         }
 
         common_broadcast_notice($notice);
 
         if ($this->boolean('ajax')) {
-            $this->startHTML('text/xml;charset=utf-8');
+            header('Content-Type: text/xml;charset=utf-8');
+            $this->xw->startDocument('1.0', 'UTF-8');
+            $this->elementStart('html');
             $this->elementStart('head');
             $this->element('title', null, _('Notice posted'));
             $this->elementEnd('head');
@@ -288,87 +216,6 @@ class NewnoticeAction extends Action
         }
     }
 
-    function saveFile($mimetype) {
-
-        $cur = common_current_user();
-
-        if (empty($cur)) {
-            $this->serverError(_('Somehow lost the login in saveFile'));
-        }
-
-        $basename = basename($_FILES['attach']['name']);
-
-        $filename = File::filename($cur->getProfile(), $basename, $mimetype);
-
-        $filepath = File::path($filename);
-
-        if (move_uploaded_file($_FILES['attach']['tmp_name'], $filepath)) {
-            return $filename;
-        } else {
-            $this->clientError(_('File could not be moved to destination directory.'));
-        }
-    }
-
-    function deleteFile($filename)
-    {
-        $filepath = File::path($filename);
-        @unlink($filepath);
-    }
-
-    function storeFile($filename, $mimetype) {
-
-        $file = new File;
-        $file->filename = $filename;
-
-        $file->url = File::url($filename);
-
-        $filepath = File::path($filename);
-
-        $file->size = filesize($filepath);
-        $file->date = time();
-        $file->mimetype = $mimetype;
-
-        $file_id = $file->insert();
-
-        if (!$file_id) {
-            common_log_db_error($file, "INSERT", __FILE__);
-            $this->clientError(_('There was a database error while saving your file. Please try again.'));
-        }
-
-        return $file;
-    }
-
-    function rememberFile($file, $short)
-    {
-        $this->maybeAddRedir($file->id, $short);
-    }
-
-    function maybeAddRedir($file_id, $url)
-    {
-        $file_redir = File_redirection::staticGet('url', $url);
-
-        if (empty($file_redir)) {
-            $file_redir = new File_redirection;
-            $file_redir->url = $url;
-            $file_redir->file_id = $file_id;
-
-            $result = $file_redir->insert();
-
-            if (!$result) {
-                common_log_db_error($file_redir, "INSERT", __FILE__);
-                $this->clientError(_('There was a database error while saving your file. Please try again.'));
-            }
-        }
-    }
-
-    function attachFile($notice, $filerec)
-    {
-        File_to_post::processNew($filerec->id, $notice->id);
-
-        $this->maybeAddRedir($filerec->id,
-                             common_local_url('file', array('notice' => $notice->id)));
-    }
-
     /**
      * Show an Ajax-y error message
      *
diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index 79cf572cc..76c877ff2 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -104,7 +104,7 @@ class NoticesearchAction extends SearchAction
     {
         $notice        = new Notice();
 
-        $search_engine = $notice->getSearchEngine('identica_notices');
+        $search_engine = $notice->getSearchEngine('notice');
         $search_engine->set_sort_mode('chron');
         // Ask for an extra to see if there's more.
         $search_engine->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
@@ -121,7 +121,7 @@ class NoticesearchAction extends SearchAction
                 $message = sprintf(_('Be the first to [post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!'), urlencode($q));
             }
             else {
-                $message = sprintf(_('Why not [register an account](%%%%action.register%%%%) and be the first to  [post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!'), urlencode($q));
+                $message = sprintf(_('Why not [register an account](%%%%action.register%%%%) and be the first to [post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!'), urlencode($q));
             }
 
             $this->elementStart('div', 'guide');
diff --git a/actions/noticesearchrss.php b/actions/noticesearchrss.php
index f59ad7962..18f07f855 100644
--- a/actions/noticesearchrss.php
+++ b/actions/noticesearchrss.php
@@ -62,7 +62,7 @@ class NoticesearchrssAction extends Rss10Action
 
         $notice = new Notice();
 
-        $search_engine = $notice->getSearchEngine('identica_notices');
+        $search_engine = $notice->getSearchEngine('notice');
         $search_engine->set_sort_mode('chron');
 
         if (!$limit) $limit = 20;
diff --git a/actions/opensearch.php b/actions/opensearch.php
index d5e6698f3..861b53d7d 100644
--- a/actions/opensearch.php
+++ b/actions/opensearch.php
@@ -75,7 +75,7 @@ class OpensearchAction extends Action
         $this->element('Url', array('type' => 'text/html', 'method' => 'get',
                        'template' => str_replace('---', '{searchTerms}', common_local_url($type, array('q' => '---')))));
         $this->element('Image', array('height' => 16, 'width' => 16, 'type' => 'image/vnd.microsoft.icon'), common_path('favicon.ico'));
-        $this->element('Image', array('height' => 50, 'width' => 50, 'type' => 'image/png'), theme_path('logo.png'));
+        $this->element('Image', array('height' => 50, 'width' => 50, 'type' => 'image/png'), Theme::path('logo.png'));
         $this->element('AdultContent', null, 'false');
         $this->element('Language', null, common_language());
         $this->element('OutputEncoding', null, 'UTF-8');
diff --git a/actions/othersettings.php b/actions/othersettings.php
index 011b4fc83..0de7cd908 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -96,28 +96,28 @@ class OthersettingsAction extends AccountSettingsAction
                                           common_local_url('othersettings')));
         $this->elementStart('fieldset');
         $this->hidden('token', common_session_token());
+        $this->elementStart('ul', 'form_data');
 
-        $services=array();
-        global $_shorteners;
-        if($_shorteners){
-            foreach($_shorteners as $name=>$value)
-            {
-                $services[$name]=$name;
-                if($value['info']['freeService']){
-                    // I18N
-                    $services[$name].=' (free service)';
-                }
+        $shorteners = array();
+        Event::handle('GetUrlShorteners', array(&$shorteners));
+        $services = array();
+        foreach($shorteners as $name=>$value)
+        {
+            $services[$name]=$name;
+            if($value['freeService']){
+                $services[$name].=_(' (free service)');
             }
         }
-        asort($services);
-        $services['']='None';
-
-        $this->elementStart('ul', 'form_data');
-        $this->elementStart('li');
-        $this->dropdown('urlshorteningservice', _('Shorten URLs with'),
-                        $services, _('Automatic shortening service to use.'),
-                        false, $user->urlshorteningservice);
-        $this->elementEnd('li');
+        if($services)
+        {
+            asort($services);
+
+            $this->elementStart('li');
+            $this->dropdown('urlshorteningservice', _('Shorten URLs with'),
+                            $services, _('Automatic shortening service to use.'),
+                            false, $user->urlshorteningservice);
+            $this->elementEnd('li');
+        }
         $this->elementStart('li');
         $this->checkbox('viewdesigns', _('View profile designs'),
                         $user->viewdesigns, _('Show or hide profile designs.'));
diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php
index cd4beac3f..11d7bf785 100644
--- a/actions/passwordsettings.php
+++ b/actions/passwordsettings.php
@@ -86,6 +86,7 @@ class PasswordsettingsAction extends AccountSettingsAction
     function showContent()
     {
         $user = common_current_user();
+
         $this->elementStart('form', array('method' => 'POST',
                                           'id' => 'form_password',
                                           'class' => 'form_settings',
@@ -164,21 +165,28 @@ class PasswordsettingsAction extends AccountSettingsAction
                 $this->showForm(_('Incorrect old password'));
                 return;
             }
+        }else{
+            $oldpassword = null;
         }
 
-        $original = clone($user);
+        $success = false;
+        if(! Event::handle('StartChangePassword', array($user, $oldpassword, $newpassword))){
+            //no handler changed the password, so change the password internally
+            $original = clone($user);
 
-        $user->password = common_munge_password($newpassword, $user->id);
+            $user->password = common_munge_password($newpassword, $user->id);
 
-        $val = $user->validate();
-        if ($val !== true) {
-            $this->showForm(_('Error saving user; invalid.'));
-            return;
-        }
+            $val = $user->validate();
+            if ($val !== true) {
+                $this->showForm(_('Error saving user; invalid.'));
+                return;
+            }
 
-        if (!$user->update($original)) {
-            $this->serverError(_('Can\'t save new password.'));
-            return;
+            if (!$user->update($original)) {
+                $this->serverError(_('Can\'t save new password.'));
+                return;
+            }
+            Event::handle('EndChangePassword', array($user));
         }
 
         $this->showForm(_('Password saved.'), true);
diff --git a/actions/peoplesearch.php b/actions/peoplesearch.php
index 38135ecbd..69de44859 100644
--- a/actions/peoplesearch.php
+++ b/actions/peoplesearch.php
@@ -61,7 +61,7 @@ class PeoplesearchAction extends SearchAction
     function showResults($q, $page)
     {
         $profile = new Profile();
-        $search_engine = $profile->getSearchEngine('identica_people');
+        $search_engine = $profile->getSearchEngine('profile');
         $search_engine->set_sort_mode('chron');
         // Ask for an extra to see if there's more.
         $search_engine->limit((($page-1)*PROFILES_PER_PAGE), PROFILES_PER_PAGE + 1);
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 5445d9bb2..0a0cc5997 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -306,6 +306,16 @@ class ProfilesettingsAction extends AccountSettingsAction
             $profile->homepage = $homepage;
             $profile->bio = $bio;
             $profile->location = $location;
+
+            $loc = Location::fromName($location);
+
+            if (!empty($loc)) {
+                $profile->lat         = $loc->lat;
+                $profile->lon         = $loc->lon;
+                $profile->location_id = $loc->location_id;
+                $profile->location_ns = $loc->location_ns;
+            }
+
             $profile->profileurl = common_profile_url($nickname);
 
             common_debug('Old profile: ' . common_log_objstring($orig_profile), __FILE__);
diff --git a/actions/public.php b/actions/public.php
index 73fad182a..982dfde15 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -131,6 +131,13 @@ class PublicAction extends Action
             return _('Public timeline');
         }
     }
+    
+    function extraHead()
+    {
+        parent::extraHead();
+        $this->element('meta', array('http-equiv' => 'X-XRDS-Location',
+                                           'content' => common_local_url('publicxrds')));
+    }
 
     /**
      * Output <head> elements for RSS and Atom feeds
@@ -143,14 +150,12 @@ class PublicAction extends Action
         return array(new Feed(Feed::RSS1, common_local_url('publicrss'),
                               _('Public Stream Feed (RSS 1.0)')),
                      new Feed(Feed::RSS2,
-                              common_local_url('api',
-                                               array('apiaction' => 'statuses',
-                                                     'method' => 'public_timeline.rss')),
+                              common_local_url('ApiTimelinePublic',
+                                               array('format' => 'rss')),
                               _('Public Stream Feed (RSS 2.0)')),
                      new Feed(Feed::ATOM,
-                              common_local_url('api',
-                                               array('apiaction' => 'statuses',
-                                                     'method' => 'public_timeline.atom')),
+                              common_local_url('ApiTimelinePublic',
+                                               array('format' => 'atom')),
                               _('Public Stream Feed (Atom)')));
     }
 
diff --git a/actions/publicxrds.php b/actions/publicxrds.php
new file mode 100644
index 000000000..5fd4eead7
--- /dev/null
+++ b/actions/publicxrds.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * Public XRDS for OpenID
+ *
+ * PHP version 5
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/plugins/OpenID/openid.php';
+require_once INSTALLDIR.'/lib/xrdsoutputter.php';
+
+/**
+ * Public XRDS
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * @todo factor out similarities with XrdsAction
+ */
+class PublicxrdsAction extends Action
+{
+    /**
+     * Is read only?
+     *
+     * @return boolean true
+     */
+    function isReadOnly($args)
+    {
+        return true;
+    }
+
+    /**
+     * Class handler.
+     *
+     * @param array $args array of arguments
+     *
+     * @return nothing
+     */
+    function handle($args)
+    {
+        parent::handle($args);
+        $xrdsOutputter = new XRDSOutputter();
+        $xrdsOutputter->startXRDS();
+        Event::handle('StartPublicXRDS', array($this,&$xrdsOutputter));
+        Event::handle('EndPublicXRDS', array($this,&$xrdsOutputter));
+        $xrdsOutputter->endXRDS();
+    }
+}
+
diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php
index 9776c1fb4..dcff35f6e 100644
--- a/actions/recoverpassword.php
+++ b/actions/recoverpassword.php
@@ -149,13 +149,13 @@ class RecoverpasswordAction extends Action
             $this->elementStart('div', 'instructions');
             if ($this->mode == 'recover') {
                 $this->element('p', null,
-                               _('If you\'ve forgotten or lost your' .
+                               _('If you have forgotten or lost your' .
                                  ' password, you can get a new one sent to' .
                                  ' the email address you have stored' .
                                  ' in your account.'));
             } else if ($this->mode == 'reset') {
                 $this->element('p', null,
-                               _('You\'ve been identified. Enter a' .
+                               _('You have been identified. Enter a' .
                                  ' new password below. '));
             }
             $this->elementEnd('div');
@@ -185,10 +185,10 @@ class RecoverpasswordAction extends Action
                                            'class' => 'form_settings',
                                            'action' => common_local_url('recoverpassword')));
         $this->elementStart('fieldset');
-        $this->element('legend', null, _('Password recover'));
+        $this->element('legend', null, _('Password recovery'));
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
-        $this->input('nicknameoremail', _('Nickname or email'),
+        $this->input('nicknameoremail', _('Nickname or email address'),
                      $this->trimmed('nicknameoremail'),
                      _('Your nickname on this server, ' .
                         'or your registered email address.'));
diff --git a/actions/register.php b/actions/register.php
index 100ab7424..57f8e7bdf 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -56,6 +56,12 @@ class RegisterAction extends Action
     var $registered = false;
 
     /**
+     * Are we processing an invite?
+     */
+
+    var $invite = null;
+
+    /**
      * Prepare page to run
      *
      *
@@ -191,7 +197,7 @@ class RegisterAction extends Action
             if (!$this->boolean('license')) {
                 $this->showForm(_('You can\'t register if you don\'t '.
                                   'agree to the license.'));
-            } else if ($email && !Validate::email($email, true)) {
+            } else if ($email && !Validate::email($email, common_config('email', 'check_domain'))) {
                 $this->showForm(_('Not a valid email address.'));
             } else if (!Validate::string($nickname, array('min_length' => 1,
                                                           'max_length' => 64,
diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index aee2a5d8e..74025cf80 100644
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -151,7 +151,7 @@ class RemotesubscribeAction extends Action
         $this->profile_url = $this->trimmed('profile_url');
 
         if (!$this->profile_url) {
-            $this->showForm(_('No such user'));
+            $this->showForm(_('No such user.'));
             return;
         }
 
diff --git a/actions/replies.php b/actions/replies.php
index 6003ad30b..a13b5a227 100644
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -138,11 +138,25 @@ class RepliesAction extends OwnerDesignAction
 
     function getFeeds()
     {
-        $rssurl   = common_local_url('repliesrss',
-                                     array('nickname' => $this->user->nickname));
-        $rsstitle = sprintf(_('Feed for replies to %s'), $this->user->nickname);
-
-        return array(new Feed(Feed::RSS1, $rssurl, $rsstitle));
+        return array(new Feed(Feed::RSS1,
+                              common_local_url('repliesrss',
+                                               array('nickname' => $this->user->nickname)),
+                              sprintf(_('Replies feed for %s (RSS 1.0)'),
+                                      $this->user->nickname)),
+                     new Feed(Feed::RSS2,
+                              common_local_url('ApiTimelineMentions',
+                                               array(
+                                                    'id' => $this->user->nickname,
+                                                    'format' => 'rss')),
+                              sprintf(_('Replies feed for %s (RSS 2.0)'),
+                                      $this->user->nickname)),
+                     new Feed(Feed::ATOM,
+                              common_local_url('ApiTimelineMentions',
+                                               array(
+                                                    'id' => $this->user->nickname,
+                                                    'format' => 'atom')),
+                              sprintf(_('Replies feed for %s (Atom)'),
+                                    $this->user->nickname)));
     }
 
     /**
diff --git a/actions/sandbox.php b/actions/sandbox.php
new file mode 100644
index 000000000..5b034ff07
--- /dev/null
+++ b/actions/sandbox.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Action class to sandbox an abusive user
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Sandbox a user.
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ */
+
+class SandboxAction extends ProfileFormAction
+{
+    /**
+     * Check parameters
+     *
+     * @param array $args action arguments (URL, GET, POST)
+     *
+     * @return boolean success flag
+     */
+
+    function prepare($args)
+    {
+        if (!parent::prepare($args)) {
+            return false;
+        }
+
+        $cur = common_current_user();
+
+        assert(!empty($cur)); // checked by parent
+
+        if (!$cur->hasRight(Right::SANDBOXUSER)) {
+            $this->clientError(_("You cannot sandbox users on this site."));
+            return false;
+        }
+
+        assert(!empty($this->profile)); // checked by parent
+
+        if ($this->profile->isSandboxed()) {
+            $this->clientError(_("User is already sandboxed."));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Sandbox a user.
+     *
+     * @return void
+     */
+
+    function handlePost()
+    {
+        $this->profile->sandbox();
+    }
+}
diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index b96d2af37..b12fcdd9a 100644
--- a/actions/showfavorites.php
+++ b/actions/showfavorites.php
@@ -164,13 +164,25 @@ class ShowfavoritesAction extends OwnerDesignAction
 
     function getFeeds()
     {
-        $feedurl   = common_local_url('favoritesrss',
-                                      array('nickname' =>
-                                            $this->user->nickname));
-        $feedtitle = sprintf(_('Feed for favorites of %s'),
-                             $this->user->nickname);
-
-        return array(new Feed(Feed::RSS1, $feedurl, $feedtitle));
+        return array(new Feed(Feed::RSS1,
+                              common_local_url('favoritesrss',
+                                               array('nickname' => $this->user->nickname)),
+                              sprintf(_('Feed for favorites of %s (RSS 1.0)'),
+                                      $this->user->nickname)),
+                     new Feed(Feed::RSS2,
+                              common_local_url('ApiTimelineFavorites',
+                                               array(
+                                                    'id' => $this->user->nickname,
+                                                    'format' => 'rss')),
+                              sprintf(_('Feed for favorites of %s (RSS 2.0)'),
+                                      $this->user->nickname)),
+                     new Feed(Feed::ATOM,
+                              common_local_url('ApiTimelineFavorites',
+                                               array(
+                                                    'id' => $this->user->nickname,
+                                                    'format' => 'atom')),
+                              sprintf(_('Feed for favorites of %s (Atom)'),
+                                      $this->user->nickname)));
     }
 
     /**
diff --git a/actions/showgroup.php b/actions/showgroup.php
index bfe45ddad..a4af29391 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -328,17 +328,15 @@ class ShowgroupAction extends GroupDesignAction
                               sprintf(_('Notice feed for %s group (RSS 1.0)'),
                                       $this->group->nickname)),
                      new Feed(Feed::RSS2,
-                              common_local_url('api',
-                                               array('apiaction' => 'groups',
-                                                     'method' => 'timeline',
-                                                     'argument' => $this->group->nickname.'.rss')),
+                              common_local_url('ApiTimelineGroup',
+                                               array('format' => 'rss',
+                                                     'id' => $this->group->nickname)),
                               sprintf(_('Notice feed for %s group (RSS 2.0)'),
                                       $this->group->nickname)),
                      new Feed(Feed::ATOM,
-                              common_local_url('api',
-                                               array('apiaction' => 'groups',
-                                                     'method' => 'timeline',
-                                                     'argument' => $this->group->nickname.'.atom')),
+                              common_local_url('ApiTimelineGroup',
+                                               array('format' => 'atom',
+                                                     'id' => $this->group->nickname)),
                               sprintf(_('Notice feed for %s group (Atom)'),
                                       $this->group->nickname)),
                      new Feed(Feed::FOAF,
diff --git a/actions/shownotice.php b/actions/shownotice.php
index 41408c23c..5d16fdad9 100644
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -172,9 +172,9 @@ class ShownoticeAction extends OwnerDesignAction
     function title()
     {
         if (!empty($this->profile->fullname)) {
-            $base = $this->profile->fullname . ' (' . $this->user->nickname . ') ';
+            $base = $this->profile->fullname . ' (' . $this->profile->nickname . ') ';
         } else {
-            $base = $this->user->nickname;
+            $base = $this->profile->nickname;
         }
 
         return sprintf(_('%1$s\'s status on %2$s'),
diff --git a/actions/showstream.php b/actions/showstream.php
index b3a9b1f05..663638c18 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -33,6 +33,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 }
 
 require_once INSTALLDIR.'/lib/personalgroupnav.php';
+require_once INSTALLDIR.'/lib/userprofile.php';
 require_once INSTALLDIR.'/lib/noticelist.php';
 require_once INSTALLDIR.'/lib/profileminilist.php';
 require_once INSTALLDIR.'/lib/groupminilist.php';
@@ -128,17 +129,17 @@ class ShowstreamAction extends ProfileAction
                               sprintf(_('Notice feed for %s (RSS 1.0)'),
                                       $this->user->nickname)),
                      new Feed(Feed::RSS2,
-                              common_local_url('api',
-                                               array('apiaction' => 'statuses',
-                                                     'method' => 'user_timeline',
-                                                     'argument' => $this->user->nickname.'.rss')),
+                              common_local_url('ApiTimelineUser',
+                                               array(
+                                                    'id' => $this->user->nickname,
+                                                    'format' => 'rss')),
                               sprintf(_('Notice feed for %s (RSS 2.0)'),
                                       $this->user->nickname)),
                      new Feed(Feed::ATOM,
-                              common_local_url('api',
-                                               array('apiaction' => 'statuses',
-                                                     'method' => 'user_timeline',
-                                                     'argument' => $this->user->nickname.'.atom')),
+                              common_local_url('ApiTimelineUser',
+                                               array(
+                                                    'id' => $this->user->nickname,
+                                                    'format' => 'atom')),
                               sprintf(_('Notice feed for %s (Atom)'),
                                       $this->user->nickname)),
                      new Feed(Feed::FOAF,
@@ -181,260 +182,8 @@ class ShowstreamAction extends ProfileAction
 
     function showProfile()
     {
-        $this->showProfileData();
-        $this->showEntityActions();
-    }
-
-    function showProfileData()
-    {
-        if (Event::handle('StartProfilePageProfileSection', array(&$this, $this->profile))) {
-
-            $this->elementStart('div', 'entity_profile vcard author');
-            $this->element('h2', null, _('User profile'));
-
-            if (Event::handle('StartProfilePageProfileElements', array(&$this, $this->profile))) {
-
-                $this->showAvatar();
-                $this->showNickname();
-                $this->showFullName();
-                $this->showLocation();
-                $this->showHomepage();
-                $this->showBio();
-                $this->showProfileTags();
-
-                Event::handle('EndProfilePageProfileElements', array(&$this, $this->profile));
-            }
-
-            $this->elementEnd('div');
-            Event::handle('EndProfilePageProfileSection', array(&$this, $this->profile));
-        }
-    }
-
-    function showAvatar()
-    {
-        if (Event::handle('StartProfilePageAvatar', array($this, $this->profile))) {
-
-            $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
-
-            $this->elementStart('dl', 'entity_depiction');
-            $this->element('dt', null, _('Photo'));
-            $this->elementStart('dd');
-            $this->element('img', array('src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE),
-                                        'class' => 'photo avatar',
-                                        'width' => AVATAR_PROFILE_SIZE,
-                                        'height' => AVATAR_PROFILE_SIZE,
-                                        'alt' => $this->profile->nickname));
-            $this->elementEnd('dd');
-
-            $user = User::staticGet('id', $this->profile->id);
-
-            $cur = common_current_user();
-            if ($cur && $cur->id == $user->id) {
-                $this->elementStart('dd');
-                $this->element('a', array('href' => common_local_url('avatarsettings')), _('Edit Avatar'));
-                $this->elementEnd('dd');
-            }
-
-            $this->elementEnd('dl');
-
-            Event::handle('EndProfilePageAvatar', array($this, $this->profile));
-        }
-    }
-
-    function showNickname()
-    {
-        if (Event::handle('StartProfilePageNickname', array($this, $this->profile))) {
-
-            $this->elementStart('dl', 'entity_nickname');
-            $this->element('dt', null, _('Nickname'));
-            $this->elementStart('dd');
-            $hasFN = ($this->profile->fullname) ? 'nickname url uid' : 'fn nickname url uid';
-            $this->element('a', array('href' => $this->profile->profileurl,
-                                      'rel' => 'me', 'class' => $hasFN),
-                           $this->profile->nickname);
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
-
-            Event::handle('EndProfilePageNickname', array($this, $this->profile));
-        }
-    }
-
-    function showFullName()
-    {
-        if (Event::handle('StartProfilePageFullName', array($this, $this->profile))) {
-            if ($this->profile->fullname) {
-                $this->elementStart('dl', 'entity_fn');
-                $this->element('dt', null, _('Full name'));
-                $this->elementStart('dd');
-                $this->element('span', 'fn', $this->profile->fullname);
-                $this->elementEnd('dd');
-                $this->elementEnd('dl');
-            }
-            Event::handle('EndProfilePageFullName', array($this, $this->profile));
-        }
-    }
-
-    function showLocation()
-    {
-        if (Event::handle('StartProfilePageLocation', array($this, $this->profile))) {
-            if ($this->profile->location) {
-                $this->elementStart('dl', 'entity_location');
-                $this->element('dt', null, _('Location'));
-                $this->element('dd', 'label', $this->profile->location);
-                $this->elementEnd('dl');
-            }
-            Event::handle('EndProfilePageLocation', array($this, $this->profile));
-        }
-    }
-
-    function showHomepage()
-    {
-        if (Event::handle('StartProfilePageHomepage', array($this, $this->profile))) {
-            if ($this->profile->homepage) {
-                $this->elementStart('dl', 'entity_url');
-                $this->element('dt', null, _('URL'));
-                $this->elementStart('dd');
-                $this->element('a', array('href' => $this->profile->homepage,
-                                          'rel' => 'me', 'class' => 'url'),
-                               $this->profile->homepage);
-                $this->elementEnd('dd');
-                $this->elementEnd('dl');
-            }
-            Event::handle('EndProfilePageHomepage', array($this, $this->profile));
-        }
-    }
-
-    function showBio()
-    {
-        if (Event::handle('StartProfilePageBio', array($this, $this->profile))) {
-            if ($this->profile->bio) {
-                $this->elementStart('dl', 'entity_note');
-                $this->element('dt', null, _('Note'));
-                $this->element('dd', 'note', $this->profile->bio);
-                $this->elementEnd('dl');
-            }
-            Event::handle('EndProfilePageBio', array($this, $this->profile));
-        }
-    }
-
-    function showProfileTags()
-    {
-        if (Event::handle('StartProfilePageProfileTags', array($this, $this->profile))) {
-            $tags = Profile_tag::getTags($this->profile->id, $this->profile->id);
-
-            if (count($tags) > 0) {
-                $this->elementStart('dl', 'entity_tags');
-                $this->element('dt', null, _('Tags'));
-                $this->elementStart('dd');
-                $this->elementStart('ul', 'tags xoxo');
-                foreach ($tags as $tag) {
-                    $this->elementStart('li');
-                    // Avoid space by using raw output.
-                    $pt = '<span class="mark_hash">#</span><a rel="tag" href="' .
-                      common_local_url('peopletag', array('tag' => $tag)) .
-                      '">' . $tag . '</a>';
-                    $this->raw($pt);
-                    $this->elementEnd('li');
-                }
-                $this->elementEnd('ul');
-                $this->elementEnd('dd');
-                $this->elementEnd('dl');
-            }
-            Event::handle('EndProfilePageProfileTags', array($this, $this->profile));
-        }
-    }
-
-    function showEntityActions()
-    {
-        if (Event::handle('StartProfilePageActionsSection', array(&$this, $this->profile))) {
-
-            $this->elementStart('div', 'entity_actions');
-            $this->element('h2', null, _('User actions'));
-            $this->elementStart('ul');
-
-            if (Event::handle('StartProfilePageActionsElements', array(&$this, $this->profile))) {
-                if (empty($cur)) { // not logged in
-                    $this->elementStart('li', 'entity_subscribe');
-                    $this->showRemoteSubscribeLink();
-                    $this->elementEnd('li');
-                } else {
-                    if ($cur->id == $this->profile->id) { // your own page
-                        $this->elementStart('li', 'entity_edit');
-                        $this->element('a', array('href' => common_local_url('profilesettings'),
-                                                  'title' => _('Edit profile settings')),
-                                       _('Edit'));
-                        $this->elementEnd('li');
-                    } else { // someone else's page
-
-                        // subscribe/unsubscribe button
-
-                        $this->elementStart('li', 'entity_subscribe');
-
-                        if ($cur->isSubscribed($this->profile)) {
-                            $usf = new UnsubscribeForm($this, $this->profile);
-                            $usf->show();
-                        } else {
-                            $sf = new SubscribeForm($this, $this->profile);
-                            $sf->show();
-                        }
-                        $this->elementEnd('li');
-
-                        if ($cur->mutuallySubscribed($user)) {
-
-                            // message
-
-                            $this->elementStart('li', 'entity_send-a-message');
-                            $this->element('a', array('href' => common_local_url('newmessage', array('to' => $user->id)),
-                                                      'title' => _('Send a direct message to this user')),
-                                           _('Message'));
-                            $this->elementEnd('li');
-
-                            // nudge
-
-                            if ($user->email && $user->emailnotifynudge) {
-                                $this->elementStart('li', 'entity_nudge');
-                                $nf = new NudgeForm($this, $user);
-                                $nf->show();
-                                $this->elementEnd('li');
-                            }
-                        }
-
-                        // block/unblock
-
-                        $blocked = $cur->hasBlocked($this->profile);
-                        $this->elementStart('li', 'entity_block');
-                        if ($blocked) {
-                            $ubf = new UnblockForm($this, $this->profile,
-                                                   array('action' => 'showstream',
-                                                         'nickname' => $this->profile->nickname));
-                            $ubf->show();
-                        } else {
-                            $bf = new BlockForm($this, $this->profile,
-                                                array('action' => 'showstream',
-                                                      'nickname' => $this->profile->nickname));
-                            $bf->show();
-                        }
-                        $this->elementEnd('li');
-                    }
-                }
-
-                Event::handle('EndProfilePageActionsElements', array(&$this, $this->profile));
-            }
-
-            $this->elementEnd('ul');
-            $this->elementEnd('div');
-
-            Event::handle('EndProfilePageActionsSection', array(&$this, $this->profile));
-        }
-    }
-
-    function showRemoteSubscribeLink()
-    {
-        $url = common_local_url('remotesubscribe',
-                                array('nickname' => $this->profile->nickname));
-        $this->element('a', array('href' => $url,
-                                  'class' => 'entity_remote_subscribe'),
-                       _('Subscribe'));
+        $profile = new UserProfile($this, $this->user, $this->profile);
+        $profile->show();
     }
 
     function showEmptyListMessage()
diff --git a/actions/silence.php b/actions/silence.php
new file mode 100644
index 000000000..206e5ba87
--- /dev/null
+++ b/actions/silence.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Action class to silence an abusive user
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Silence a user.
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ */
+
+class SilenceAction extends ProfileFormAction
+{
+    /**
+     * Check parameters
+     *
+     * @param array $args action arguments (URL, GET, POST)
+     *
+     * @return boolean success flag
+     */
+
+    function prepare($args)
+    {
+        if (!parent::prepare($args)) {
+            return false;
+        }
+
+        $cur = common_current_user();
+
+        assert(!empty($cur)); // checked by parent
+
+        if (!$cur->hasRight(Right::SILENCEUSER)) {
+            $this->clientError(_("You cannot silence users on this site."));
+            return false;
+        }
+
+        assert(!empty($this->profile)); // checked by parent
+
+        if ($this->profile->isSilenced()) {
+            $this->clientError(_("User is already silenced."));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Silence a user.
+     *
+     * @return void
+     */
+
+    function handlePost()
+    {
+        $this->profile->silence();
+    }
+}
diff --git a/actions/siteadminpanel.php b/actions/siteadminpanel.php
new file mode 100644
index 000000000..c316f8e17
--- /dev/null
+++ b/actions/siteadminpanel.php
@@ -0,0 +1,373 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Site administration panel
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Settings
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Zach Copley <zach@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @copyright 2008-2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Administer site settings
+ *
+ * @category Admin
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Zach Copley <zach@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class SiteadminpanelAction extends AdminPanelAction
+{
+    /**
+     * Returns the page title
+     *
+     * @return string page title
+     */
+
+    function title()
+    {
+        return _('Site');
+    }
+
+    /**
+     * Instructions for using this form.
+     *
+     * @return string instructions
+     */
+
+    function getInstructions()
+    {
+        return _('Basic settings for this StatusNet site.');
+    }
+
+    /**
+     * Show the site admin panel form
+     *
+     * @return void
+     */
+
+    function showForm()
+    {
+        $form = new SiteAdminPanelForm($this);
+        $form->show();
+        return;
+    }
+
+    /**
+     * Save settings from the form
+     *
+     * @return void
+     */
+
+    function saveSettings()
+    {
+        static $settings = array('site' => array('name', 'broughtby', 'broughtbyurl',
+                                                 'email', 'timezone', 'language'),
+                                 'snapshot' => array('run', 'reporturl', 'frequency'));
+
+        static $booleans = array('site' => array('private'));
+
+        $values = array();
+
+        foreach ($settings as $section => $parts) {
+            foreach ($parts as $setting) {
+                $values[$section][$setting] = $this->trimmed($setting);
+            }
+        }
+
+        foreach ($booleans as $section => $parts) {
+            foreach ($parts as $setting) {
+                $values[$section][$setting] = ($this->boolean($setting)) ? 1 : 0;
+            }
+        }
+
+        // This throws an exception on validation errors
+
+        $this->validate($values);
+
+        // assert(all values are valid);
+
+        $config = new Config();
+
+        $config->query('BEGIN');
+
+        foreach ($settings as $section => $parts) {
+            foreach ($parts as $setting) {
+                Config::save($section, $setting, $values[$section][$setting]);
+            }
+        }
+
+        foreach ($booleans as $section => $parts) {
+            foreach ($parts as $setting) {
+                Config::save($section, $setting, $values[$section][$setting]);
+            }
+        }
+
+        $config->query('COMMIT');
+
+        return;
+    }
+
+    function validate(&$values)
+    {
+        // Validate site name
+
+        if (empty($values['site']['name'])) {
+            $this->clientError(_("Site name must have non-zero length."));
+        }
+
+        // Validate email
+
+        $values['site']['email'] = common_canonical_email($values['site']['email']);
+
+        if (empty($values['site']['email'])) {
+            $this->clientError(_('You must have a valid contact email address'));
+        }
+        if (!Validate::email($values['site']['email'], common_config('email', 'check_domain'))) {
+            $this->clientError(_('Not a valid email address'));
+        }
+
+        // Validate timezone
+
+        if (is_null($values['site']['timezone']) ||
+            !in_array($values['site']['timezone'], DateTimeZone::listIdentifiers())) {
+            $this->clientError(_('Timezone not selected.'));
+            return;
+        }
+
+        // Validate language
+
+        if (!is_null($values['site']['language']) &&
+            !in_array($values['site']['language'], array_keys(get_nice_language_list()))) {
+            $this->clientError(sprintf(_('Unknown language "%s"'), $values['site']['language']));
+        }
+
+        // Validate report URL
+
+        if (!is_null($values['snapshot']['reporturl']) &&
+            !Validate::uri($values['snapshot']['reporturl'], array('allowed_schemes' => array('http', 'https')))) {
+            $this->clientError(_("Invalid snapshot report URL."));
+        }
+
+        // Validate snapshot run value
+
+        if (!in_array($values['snapshot']['run'], array('web', 'cron', 'never'))) {
+            $this->clientError(_("Invalid snapshot run value."));
+        }
+
+        // Validate snapshot run value
+
+        if (!Validate::number($values['snapshot']['frequency'])) {
+            $this->clientError(_("Snapshot frequency must be a number."));
+        }
+
+    }
+}
+
+class SiteAdminPanelForm extends Form
+{
+    /**
+     * ID of the form
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'form_site_admin_panel';
+    }
+
+    /**
+     * class of the form
+     *
+     * @return string class of the form
+     */
+
+    function formClass()
+    {
+        return 'form_settings';
+    }
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+
+    function action()
+    {
+        return common_local_url('siteadminpanel');
+    }
+
+    /**
+     * Data elements of the form
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $this->out->elementStart('ul', 'form_data');
+        $this->li();
+        $this->input('name', _('Site name'),
+                     _('The name of your site, like "Yourcompany Microblog"'));
+        $this->unli();
+        $this->li();
+        $this->input('broughtby', _('Brought by'),
+                     _('Text used for credits link in footer of each page'));
+        $this->unli();
+        $this->li();
+        $this->input('broughtbyurl', _('Brought by URL'),
+                     _('URL used for credits link in footer of each page'));
+        $this->unli();
+        $this->li();
+        $this->input('email', _('Email'),
+                     _('contact email address for your site'));
+
+        $this->unli();
+
+        $timezones = array();
+
+        foreach (DateTimeZone::listIdentifiers() as $k => $v) {
+            $timezones[$v] = $v;
+        }
+
+        asort($timezones);
+
+        $this->li();
+
+        $this->out->dropdown('timezone', _('Default timezone'),
+                             $timezones, _('Default timezone for the site; usually UTC.'),
+                             true, $this->value('timezone'));
+
+        $this->unli();
+        $this->li();
+
+        $this->out->dropdown('language', _('Language'),
+                             get_nice_language_list(), _('Default site language'),
+                             false, $this->value('language'));
+
+        $this->unli();
+        $this->li();
+
+        $this->out->checkbox('private', _('Private'),
+                             (bool) $this->value('private'),
+                             _('Prohibit anonymous users (not logged in) from viewing site?'));
+
+        $this->unli();
+
+        $this->li();
+
+        $snapshot = array('web' => _('Randomly during Web hit'),
+                          'cron' => _('In a scheduled job'),
+                          'never' => _('Never'));
+
+        $this->out->dropdown('run', _('Data snapshots'),
+                             $snapshot, _('When to send statistical data to status.net servers'),
+                             false, $this->value('run', 'snapshot'));
+
+        $this->unli();
+        $this->li();
+
+        $this->input('frequency', _('Frequency'),
+                     _('Snapshots will be sent once every N Web hits'),
+                     'snapshot');
+
+        $this->unli();
+
+        $this->li();
+
+        $this->input('reporturl', _('Report URL'),
+                     _('Snapshots will be sent to this URL'),
+                     'snapshot');
+
+        $this->unli();
+
+        $this->out->elementEnd('ul');
+    }
+
+    /**
+     * Utility to simplify some of the duplicated code around
+     * params and settings.
+     *
+     * @param string $setting      Name of the setting
+     * @param string $title        Title to use for the input
+     * @param string $instructions Instructions for this field
+     * @param string $section      config section, default = 'site'
+     *
+     * @return void
+     */
+
+    function input($setting, $title, $instructions, $section='site')
+    {
+        $this->out->input($setting, $title, $this->value($setting, $section), $instructions);
+    }
+
+    /**
+     * Utility to simplify getting the posted-or-stored setting value
+     *
+     * @param string $setting Name of the setting
+     * @param string $main    configuration section, default = 'site'
+     *
+     * @return string param value if posted, or current config value
+     */
+
+    function value($setting, $main='site')
+    {
+        $value = $this->out->trimmed($setting);
+        if (empty($value)) {
+            $value = common_config($main, $setting);
+        }
+        return $value;
+    }
+
+    function li()
+    {
+        $this->out->elementStart('li');
+    }
+
+    function unli()
+    {
+        $this->out->elementEnd('li');
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->out->submit('submit', _('Save'), 'submit', null, _('Save site settings'));
+    }
+}
diff --git a/actions/tag.php b/actions/tag.php
index f0ab30308..3a88c1229 100644
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -86,17 +86,15 @@ class TagAction extends Action
                               sprintf(_('Notice feed for tag %s (RSS 1.0)'),
                                       $this->tag)),
                      new Feed(Feed::RSS2,   
-                              common_local_url('api',
-                                               array('apiaction' => 'tags',
-                                                     'method' => 'timeline',
-                                                     'argument' => $this->tag.'.rss')),
-                              sprintf(_('Notice feed for %s group (RSS 2.0)'),
+                              common_local_url('ApiTimelineTag',
+                                               array('format' => 'rss',
+                                                     'tag' => $this->tag)),
+                              sprintf(_('Notice feed for tag %s (RSS 2.0)'),
                                       $this->tag)),
                      new Feed(Feed::ATOM,
-                              common_local_url('api',
-                                               array('apiaction' => 'tags',
-                                                     'method' => 'timeline',
-                                                     'argument' => $this->tag.'.atom')),
+                              common_local_url('ApiTimelineTag',
+                                               array('format' => 'atom',
+                                                     'tag' => $this->tag)),
                               sprintf(_('Notice feed for tag %s (Atom)'),
                                       $this->tag)));
     }
diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php
index 7d618c471..526ca2ae8 100644
--- a/actions/twitapisearchatom.php
+++ b/actions/twitapisearchatom.php
@@ -161,7 +161,7 @@ class TwitapisearchatomAction extends ApiAction
         // lcase it for comparison
         $q = strtolower($this->query);
 
-        $search_engine = $notice->getSearchEngine('identica_notices');
+        $search_engine = $notice->getSearchEngine('notice');
         $search_engine->set_sort_mode('chron');
         $search_engine->limit(($this->page - 1) * $this->rpp,
             $this->rpp + 1, true);
diff --git a/actions/twitapisearchjson.php b/actions/twitapisearchjson.php
index c7fa741a0..741ed78d6 100644
--- a/actions/twitapisearchjson.php
+++ b/actions/twitapisearchjson.php
@@ -121,7 +121,7 @@ class TwitapisearchjsonAction extends ApiAction
         // lcase it for comparison
         $q = strtolower($this->query);
 
-        $search_engine = $notice->getSearchEngine('identica_notices');
+        $search_engine = $notice->getSearchEngine('notice');
         $search_engine->set_sort_mode('chron');
         $search_engine->limit(($this->page - 1) * $this->rpp, $this->rpp + 1, true);
         if (false === $search_engine->query($q)) {
diff --git a/actions/unblock.php b/actions/unblock.php
index dc28d5d54..c60458cd3 100644
--- a/actions/unblock.php
+++ b/actions/unblock.php
@@ -42,57 +42,25 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
-class UnblockAction extends Action
-{
-    var $profile = null;
 
-    /**
-     * Take arguments for running
-     *
-     * @param array $args $_REQUEST args
-     *
-     * @return boolean success flag
-     */
+class UnblockAction extends ProfileFormAction
+{
     function prepare($args)
     {
-        parent::prepare($args);
-        if (!common_logged_in()) {
-            $this->clientError(_('Not logged in.'));
-            return false;
-        }
-        $token = $this->trimmed('token');
-        if (!$token || $token != common_session_token()) {
-            $this->clientError(_('There was a problem with your session token. Try again, please.'));
-            return;
-        }
-        $id = $this->trimmed('unblockto');
-        if (!$id) {
-            $this->clientError(_('No profile specified.'));
+        if (!parent::prepare($args)) {
             return false;
         }
-        $this->profile = Profile::staticGet('id', $id);
-        if (!$this->profile) {
-            $this->clientError(_('No profile with that ID.'));
+
+        $cur = common_current_user();
+
+        assert(!empty($cur)); // checked by parent
+
+        if (!$cur->hasBlocked($this->profile)) {
+            $this->clientError(_("You haven't blocked that user."));
             return false;
         }
-        return true;
-    }
 
-    /**
-     * Handle request
-     *
-     * Shows a page with list of favorite notices
-     *
-     * @param array $args $_REQUEST args; handled in prepare()
-     *
-     * @return void
-     */
-    function handle($args)
-    {
-        parent::handle($args);
-        if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-            $this->unblockProfile();
-        }
+        return true;
     }
 
     /**
@@ -100,7 +68,8 @@ class UnblockAction extends Action
      *
      * @return void
      */
-    function unblockProfile()
+
+    function handlePost()
     {
         $cur    = common_current_user();
         $result = $cur->unblock($this->profile);
@@ -108,20 +77,5 @@ class UnblockAction extends Action
             $this->serverError(_('Error removing the block.'));
             return;
         }
-        foreach ($this->args as $k => $v) {
-            if ($k == 'returnto-action') {
-                $action = $v;
-            } else if (substr($k, 0, 9) == 'returnto-') {
-                $args[substr($k, 9)] = $v;
-            }
-        }
-        if ($action) {
-            common_redirect(common_local_url($action, $args), 303);
-        } else {
-            common_redirect(common_local_url('subscribers',
-                                             array('nickname' => $cur->nickname)),
-                            303);
-        }
     }
 }
-
diff --git a/actions/unsandbox.php b/actions/unsandbox.php
new file mode 100644
index 000000000..22f4d8e76
--- /dev/null
+++ b/actions/unsandbox.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Action class to unsandbox a user
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Unsandbox a user.
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ */
+
+class UnsandboxAction extends ProfileFormAction
+{
+    /**
+     * Check parameters
+     *
+     * @param array $args action arguments (URL, GET, POST)
+     *
+     * @return boolean success flag
+     */
+
+    function prepare($args)
+    {
+        if (!parent::prepare($args)) {
+            return false;
+        }
+
+        $cur = common_current_user();
+
+        assert(!empty($cur)); // checked by parent
+
+        if (!$cur->hasRight(Right::SANDBOXUSER)) {
+            $this->clientError(_("You cannot sandbox users on this site."));
+            return false;
+        }
+
+        assert(!empty($this->profile)); // checked by parent
+
+        if (!$this->profile->isSandboxed()) {
+            $this->clientError(_("User is not sandboxed."));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Unsandbox a user.
+     *
+     * @return void
+     */
+
+    function handlePost()
+    {
+        $this->profile->unsandbox();
+    }
+}
diff --git a/actions/unsilence.php b/actions/unsilence.php
new file mode 100644
index 000000000..9ff1b828b
--- /dev/null
+++ b/actions/unsilence.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Action class to unsilence a user
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Silence a user.
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ */
+
+class UnsilenceAction extends ProfileFormAction
+{
+    /**
+     * Check parameters
+     *
+     * @param array $args action arguments (URL, GET, POST)
+     *
+     * @return boolean success flag
+     */
+
+    function prepare($args)
+    {
+        if (!parent::prepare($args)) {
+            return false;
+        }
+
+        $cur = common_current_user();
+
+        assert(!empty($cur)); // checked by parent
+
+        if (!$cur->hasRight(Right::SILENCEUSER)) {
+            $this->clientError(_("You cannot silence users on this site."));
+            return false;
+        }
+
+        assert(!empty($this->profile)); // checked by parent
+
+        if (!$this->profile->isSilenced()) {
+            $this->clientError(_("User is not silenced."));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Silence a user.
+     *
+     * @return void
+     */
+
+    function handlePost()
+    {
+        $this->profile->unsilence();
+    }
+}
diff --git a/actions/useradminpanel.php b/actions/useradminpanel.php
new file mode 100644
index 000000000..de475a27b
--- /dev/null
+++ b/actions/useradminpanel.php
@@ -0,0 +1,228 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * User administration panel
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Settings
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Zach Copley <zach@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @copyright 2008-2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Administer user settings
+ *
+ * @category Admin
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Zach Copley <zach@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class UseradminpanelAction extends AdminPanelAction
+{
+    /**
+     * Returns the page title
+     *
+     * @return string page title
+     */
+
+    function title()
+    {
+        return _('User');
+    }
+
+    /**
+     * Instructions for using this form.
+     *
+     * @return string instructions
+     */
+
+    function getInstructions()
+    {
+        return _('User settings for this StatusNet site.');
+    }
+
+    /**
+     * Show the site admin panel form
+     *
+     * @return void
+     */
+
+    function showForm()
+    {
+        $form = new UserAdminPanelForm($this);
+        $form->show();
+        return;
+    }
+
+    /**
+     * Save settings from the form
+     *
+     * @return void
+     */
+
+    function saveSettings()
+    {
+        static $settings = array('theme');
+        static $booleans = array('closed', 'inviteonly', 'private');
+
+        $values = array();
+
+        foreach ($settings as $setting) {
+            $values[$setting] = $this->trimmed($setting);
+        }
+
+        // This throws an exception on validation errors
+
+        $this->validate($values);
+
+        // assert(all values are valid);
+
+        $config = new Config();
+
+        $config->query('BEGIN');
+
+        foreach ($settings as $setting) {
+            Config::save('site', $setting, $values[$setting]);
+        }
+
+        $config->query('COMMIT');
+
+        return;
+    }
+
+    function validate(&$values)
+    {
+    }
+}
+
+class UserAdminPanelForm extends Form
+{
+    /**
+     * ID of the form
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'useradminpanel';
+    }
+
+    /**
+     * class of the form
+     *
+     * @return string class of the form
+     */
+
+    function formClass()
+    {
+        return 'form_user_admin_panel';
+    }
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+
+    function action()
+    {
+        return common_local_url('useradminpanel');
+    }
+
+    /**
+     * Data elements of the form
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $this->li();
+
+        $this->out->checkbox('closed', _('Closed'),
+                             (bool) $this->value('closed'),
+                             _('Is registration on this site prohibited?'));
+
+        $this->unli();
+        $this->li();
+
+        $this->out->checkbox('inviteonly', _('Invite-only'),
+                             (bool) $this->value('inviteonly'),
+                             _('Is registration on this site only open to invited users?'));
+
+        $this->unli();
+    }
+
+    /**
+     * Utility to simplify some of the duplicated code around
+     * params and settings.
+     *
+     * @param string $setting      Name of the setting
+     * @param string $title        Title to use for the input
+     * @param string $instructions Instructions for this field
+     *
+     * @return void
+     */
+
+    function input($setting, $title, $instructions)
+    {
+        $this->out->input($setting, $title, $this->value($setting), $instructions);
+    }
+
+    /**
+     * Utility to simplify getting the posted-or-stored setting value
+     *
+     * @param string $setting Name of the setting
+     *
+     * @return string param value if posted, or current config value
+     */
+
+    function value($cat, $setting)
+    {
+        $value = $this->out->trimmed($setting);
+        if (empty($value)) {
+            $value = common_config($cat, $setting);
+        }
+        return $value;
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->out->submit('submit', _('Save'), 'submit', null, _('Save site settings'));
+    }
+}
diff --git a/actions/userbyid.php b/actions/userbyid.php
index 802bcb081..86a61f20b 100644
--- a/actions/userbyid.php
+++ b/actions/userbyid.php
@@ -74,8 +74,11 @@ class UserbyidAction extends Action
             $this->clientError(_('No such user.'));
         }
 
-        // support redirecting to FOAF rdf/xml if the agent prefers it
-        $page_prefs = 'application/rdf+xml,text/html,application/xhtml+xml,application/xml;q=0.3,text/xml;q=0.2';
+        // Support redirecting to FOAF rdf/xml if the agent prefers it...
+        // Internet Explorer doesn't specify "text/html" and does list "*/*"
+        // at least through version 8. We need to list text/html up front to
+        // ensure that only user-agents who specifically ask for RDF get it.
+        $page_prefs = 'text/html,application/xhtml+xml,application/rdf+xml,application/xml;q=0.3,text/xml;q=0.2';
         $httpaccept = isset($_SERVER['HTTP_ACCEPT'])
                       ? $_SERVER['HTTP_ACCEPT'] : null;
         $type       = common_negotiate_type(common_accept_to_prefs($httpaccept),
diff --git a/actions/xrds.php b/actions/xrds.php
index 8ba89fec0..534182e3e 100644
--- a/actions/xrds.php
+++ b/actions/xrds.php
@@ -36,6 +36,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 require_once INSTALLDIR.'/lib/omb.php';
 require_once INSTALLDIR.'/extlib/libomb/service_provider.php';
 require_once INSTALLDIR.'/extlib/libomb/xrds_mapper.php';
+require_once INSTALLDIR.'/lib/xrdsoutputter.php';
 
 /**
  * XRDS for OpenMicroBlogging
@@ -49,6 +50,8 @@ require_once INSTALLDIR.'/extlib/libomb/xrds_mapper.php';
  */
 class XrdsAction extends Action
 {
+    var $user;
+
     /**
      * Is read only?
      *
@@ -58,60 +61,81 @@ class XrdsAction extends Action
     {
         return true;
     }
-
-    /**
-     * Class handler.
-     *
-     * @param array $args query arguments
-     *
-     * @return void
-     */
-    function handle($args)
+    
+    function prepare($args)
     {
-        parent::handle($args);
+        parent::prepare($args);
         $nickname = $this->trimmed('nickname');
-        $user     = User::staticGet('nickname', $nickname);
-        if (!$user) {
+        $this->user     = User::staticGet('nickname', $nickname);
+        if (!$this->user) {
             $this->clientError(_('No such user.'));
             return;
         }
-        $this->showXrds($user);
+        return true;
     }
 
     /**
-     * Show XRDS for a user.
+     * Class handler.
      *
-     * @param class $user XRDS for this user.
+     * @param array $args query arguments
      *
      * @return void
      */
-    function showXrds($user)
+    function handle($args)
     {
-        $srv = new OMB_Service_Provider(profile_to_omb_profile($user->uri,
-                                        $user->getProfile()));
-        /* Use libomb’s default XRDS Writer. */
-        $xrds_writer = null;
-        $srv->writeXRDS(new Laconica_XRDS_Mapper(), $xrds_writer);
-    }
-}
+        parent::handle($args);
+        $xrdsOutputter = new XRDSOutputter();
+        $xrdsOutputter->startXRDS();
 
-class Laconica_XRDS_Mapper implements OMB_XRDS_Mapper
-{
-    protected $urls;
+        Event::handle('StartUserXRDS', array($this,&$xrdsOutputter));
 
-    public function __construct()
-    {
-        $this->urls = array(
-            OAUTH_ENDPOINT_REQUEST => 'requesttoken',
-            OAUTH_ENDPOINT_AUTHORIZE => 'userauthorization',
-            OAUTH_ENDPOINT_ACCESS => 'accesstoken',
-            OMB_ENDPOINT_POSTNOTICE => 'postnotice',
-            OMB_ENDPOINT_UPDATEPROFILE => 'updateprofile');
-    }
+        //oauth
+        $xrdsOutputter->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
+                                          'xml:id' => 'oauth',
+                                          'xmlns:simple' => 'http://xrds-simple.net/core/1.0',
+                                          'version' => '2.0'));
+        $xrdsOutputter->element('Type', null, 'xri://$xrds*simple');
+        $xrdsOutputter->showXrdsService(OAUTH_ENDPOINT_REQUEST,
+                            common_local_url('requesttoken'),
+                            array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1),
+                            null,
+                            $this->user->uri);
+        $xrdsOutputter->showXrdsService( OAUTH_ENDPOINT_AUTHORIZE,
+                            common_local_url('userauthorization'),
+                            array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1));
+        $xrdsOutputter->showXrdsService(OAUTH_ENDPOINT_ACCESS,
+                            common_local_url('accesstoken'),
+                            array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1));
+        $xrdsOutputter->showXrdsService(OAUTH_ENDPOINT_RESOURCE,
+                            null,
+                            array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1));
+        $xrdsOutputter->elementEnd('XRD');
+        
+        //omb
+        $xrdsOutputter->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
+                                          'xml:id' => 'omb',
+                                          'xmlns:simple' => 'http://xrds-simple.net/core/1.0',
+                                          'version' => '2.0'));
+        $xrdsOutputter->element('Type', null, 'xri://$xrds*simple');
+        $xrdsOutputter->showXrdsService(OMB_ENDPOINT_POSTNOTICE,
+                            common_local_url('postnotice'));
+        $xrdsOutputter->showXrdsService(OMB_ENDPOINT_UPDATEPROFILE,
+                            common_local_url('updateprofile'));
+        $xrdsOutputter->elementEnd('XRD');
+        
+        Event::handle('EndUserXRDS', array($this,&$xrdsOutputter));
 
-    public function getURL($action)
-    {
-        return common_local_url($this->urls[$action]);
+        //misc
+        $xrdsOutputter->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
+                                          'version' => '2.0'));
+        $xrdsOutputter->showXrdsService(OAUTH_DISCOVERY,
+                            '#oauth');
+        $xrdsOutputter->showXrdsService(OMB_VERSION,
+                            '#omb');
+        $xrdsOutputter->elementEnd('XRD');
+
+        $xrdsOutputter->endXRDS();
+        
     }
 }
 ?>
diff --git a/classes/Avatar.php b/classes/Avatar.php
index 64f105179..cc7a6b647 100644
--- a/classes/Avatar.php
+++ b/classes/Avatar.php
@@ -102,6 +102,6 @@ class Avatar extends Memcached_DataObject
         static $sizenames = array(AVATAR_PROFILE_SIZE => 'profile',
                                   AVATAR_STREAM_SIZE => 'stream',
                                   AVATAR_MINI_SIZE => 'mini');
-        return theme_path('default-avatar-'.$sizenames[$size].'.png');
+        return Theme::path('default-avatar-'.$sizenames[$size].'.png');
     }
 }
diff --git a/classes/Config.php b/classes/Config.php
index 92f237d7f..390d75381 100644
--- a/classes/Config.php
+++ b/classes/Config.php
@@ -120,6 +120,35 @@ class Config extends Memcached_DataObject
         return $result;
     }
 
+    function &pkeyGet($kv)
+    {
+        return Memcached_DataObject::pkeyGet('Config', $kv);
+    }
+
+    static function save($section, $setting, $value)
+    {
+        $result = null;
+
+        $config = Config::pkeyGet(array('section' => $section,
+                                        'setting' => $setting));
+
+        if (!empty($config)) {
+            $orig = clone($config);
+            $config->value = $value;
+            $result = $config->update($orig);
+        } else {
+            $config = new Config();
+
+            $config->section = $section;
+            $config->setting = $setting;
+            $config->value   = $value;
+
+            $result = $config->insert();
+        }
+
+        return $result;
+    }
+
     function _blowSettingsCache()
     {
         $c = self::memcache();
diff --git a/classes/File_redirection.php b/classes/File_redirection.php
index 79052bf7d..08a6e8d8b 100644
--- a/classes/File_redirection.php
+++ b/classes/File_redirection.php
@@ -47,18 +47,15 @@ class File_redirection extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function _commonCurl($url, $redirs) {
-        $curlh = curl_init();
-        curl_setopt($curlh, CURLOPT_URL, $url);
-        curl_setopt($curlh, CURLOPT_AUTOREFERER, true); // # setup referer header when folowing redirects
-        curl_setopt($curlh, CURLOPT_CONNECTTIMEOUT, 10); // # seconds to wait
-        curl_setopt($curlh, CURLOPT_MAXREDIRS, $redirs); // # max number of http redirections to follow
-        curl_setopt($curlh, CURLOPT_USERAGENT, USER_AGENT);
-        curl_setopt($curlh, CURLOPT_FOLLOWLOCATION, true); // Follow redirects
-        curl_setopt($curlh, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($curlh, CURLOPT_FILETIME, true);
-        curl_setopt($curlh, CURLOPT_HEADER, true); // Include header in output
-        return $curlh;
+    static function _commonHttp($url, $redirs) {
+        $request = new HTTPClient($url);
+        $request->setConfig(array(
+            'connect_timeout' => 10, // # seconds to wait
+            'max_redirs' => $redirs, // # max number of http redirections to follow
+            'follow_redirects' => true, // Follow redirects
+            'store_body' => false, // We won't need body content here.
+        ));
+        return $request;
     }
 
     function _redirectWhere_imp($short_url, $redirs = 10, $protected = false) {
@@ -82,32 +79,39 @@ class File_redirection extends Memcached_DataObject
         if(strpos($short_url,'://') === false){
             return $short_url;
         }
-        $curlh = File_redirection::_commonCurl($short_url, $redirs);
-        // Don't include body in output
-        curl_setopt($curlh, CURLOPT_NOBODY, true);
-        curl_exec($curlh);
-        $info = curl_getinfo($curlh);
-        curl_close($curlh);
-
-        if (405 == $info['http_code']) {
-            $curlh = File_redirection::_commonCurl($short_url, $redirs);
-            curl_exec($curlh);
-            $info = curl_getinfo($curlh);
-            curl_close($curlh);
+        try {
+            $request = self::_commonHttp($short_url, $redirs);
+            // Don't include body in output
+            $request->setMethod(HTTP_Request2::METHOD_HEAD);
+            $response = $request->send();
+
+            if (405 == $response->getStatus()) {
+                // Server doesn't support HEAD method? Can this really happen?
+                // We'll try again as a GET and ignore the response data.
+                $request = self::_commonHttp($short_url, $redirs);
+                $response = $request->send();
+            }
+        } catch (Exception $e) {
+            // Invalid URL or failure to reach server
+            return $short_url;
         }
 
-        if (!empty($info['redirect_count']) && File::isProtected($info['url'])) {
-            return File_redirection::_redirectWhere_imp($short_url, $info['redirect_count'] - 1, true);
+        if ($response->getRedirectCount() && File::isProtected($response->getUrl())) {
+            // Bump back up the redirect chain until we find a non-protected URL
+            return self::_redirectWhere_imp($short_url, $response->getRedirectCount() - 1, true);
         }
 
-        $ret = array('code' => $info['http_code']
-                , 'redirects' => $info['redirect_count']
-                , 'url' => $info['url']);
+        $ret = array('code' => $response->getStatus()
+                , 'redirects' => $response->getRedirectCount()
+                , 'url' => $response->getUrl());
 
-        if (!empty($info['content_type'])) $ret['type'] = $info['content_type'];
+        $type = $response->getHeader('Content-Type');
+        if ($type) $ret['type'] = $type;
         if ($protected) $ret['protected'] = true;
-        if (!empty($info['download_content_length'])) $ret['size'] = $info['download_content_length'];
-        if (isset($info['filetime']) && ($info['filetime'] > 0)) $ret['time'] = $info['filetime'];
+        $size = $response->getHeader('Content-Length'); // @fixme bytes?
+        if ($size) $ret['size'] = $size;
+        $time = $response->getHeader('Last-Modified');
+        if ($time) $ret['time'] = strtotime($time);
         return $ret;
     }
 
diff --git a/classes/User_role.php b/classes/Location_namespace.php
index 85ecfb422..5ab95d9ef 100644
--- a/classes/User_role.php
+++ b/classes/Location_namespace.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
+ * Copyright (C) 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -20,29 +20,27 @@
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 /**
- * Table Definition for user_role
+ * Table Definition for location_namespace
  */
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class User_role extends Memcached_DataObject
+class Location_namespace extends Memcached_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
 
-    public $__table = 'user_role';                       // table name
-    public $user_id;                         // int(4)  primary_key not_null
-    public $role;                            // varchar(32)  primary_key not_null
+    public $__table = 'location_namespace';              // table name
+    public $id;                              // int(4)  primary_key not_null
+    public $description;                     // varchar(255)
     public $created;                         // datetime()   not_null
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('User_role',$k,$v); }
+    function staticGet($k,$v=NULL) {
+        return Memcached_DataObject::staticGet('Location_namespace',$k,$v);
+    }
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
-
-    function &pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('User_role', $kv);
-    }
 }
diff --git a/classes/Login_token.php b/classes/Login_token.php
new file mode 100644
index 000000000..bd6381f90
--- /dev/null
+++ b/classes/Login_token.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Table Definition for group_alias
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+
+require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
+
+class Login_token extends Memcached_DataObject
+{
+    ###START_AUTOCODE
+    /* the code below is auto generated do not remove the above tag */
+
+    public $__table = 'login_token';         // table name
+    public $user_id;                         // int(4)  primary_key not_null
+    public $token;                           // char(32)  not_null
+    public $created;                         // datetime()   not_null
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
+
+    /* Static get */
+    function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Login_token',$k,$v); }
+
+    /* the code above is auto generated do not remove the tag below */
+    ###END_AUTOCODE
+}
diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index 9c2ac3e01..753fe954e 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -184,27 +184,20 @@ class Memcached_DataObject extends DB_DataObject
         require_once INSTALLDIR.'/lib/search_engines.php';
         static $search_engine;
         if (!isset($search_engine)) {
-                $connected = false;
-                if (common_config('sphinx', 'enabled')) {
-                    $search_engine = new SphinxSearch($this, $table);
-                    $connected = $search_engine->is_connected();
-                }
-
-                // unable to connect to sphinx' search daemon
-                if (!$connected) {
-                    if ('mysql' === common_config('db', 'type')) {
-                        $type = common_config('search', 'type');
-                        if ($type == 'like') {
-                            $search_engine = new MySQLLikeSearch($this, $table);
-                        } else if ($type == 'fulltext') {
-                            $search_engine = new MySQLSearch($this, $table);
-                        } else {
-                            throw new ServerException('Unknown search type: ' . $type);
-                        }
+            if (Event::handle('GetSearchEngine', array($this, $table, &$search_engine))) {
+                if ('mysql' === common_config('db', 'type')) {
+                    $type = common_config('search', 'type');
+                    if ($type == 'like') {
+                        $search_engine = new MySQLLikeSearch($this, $table);
+                    } else if ($type == 'fulltext') {
+                        $search_engine = new MySQLSearch($this, $table);
                     } else {
-                        $search_engine = new PGSearch($this, $table);
+                        throw new ServerException('Unknown search type: ' . $type);
                     }
+                } else {
+                    $search_engine = new PGSearch($this, $table);
                 }
+            }
         }
         return $search_engine;
     }
diff --git a/classes/Message.php b/classes/Message.php
index 979e6e87c..718a9d922 100644
--- a/classes/Message.php
+++ b/classes/Message.php
@@ -39,6 +39,12 @@ class Message extends Memcached_DataObject
 
     static function saveNew($from, $to, $content, $source) {
 
+        $sender = Profile::staticGet('id', $from);
+
+        if (!$sender->hasRight(Right::NEWMESSAGE)) {
+            throw new ClientException(_('You are banned from sending direct messages.'));
+        }
+
         $msg = new Message();
 
         $msg->from_profile = $from;
diff --git a/classes/Notice.php b/classes/Notice.php
index cd3906ca1..ebb5022b9 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -66,9 +66,15 @@ class Notice extends Memcached_DataObject
     public $is_local;                        // tinyint(1)
     public $source;                          // varchar(32)
     public $conversation;                    // int(4)
+    public $lat;                             // decimal(10,7)
+    public $lon;                             // decimal(10,7)
+    public $location_id;                     // int(4)
+    public $location_ns;                     // int(4)
 
     /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Notice',$k,$v); }
+    function staticGet($k,$v=NULL) {
+        return Memcached_DataObject::staticGet('Notice',$k,$v);
+    }
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -162,7 +168,8 @@ class Notice extends Memcached_DataObject
     }
 
     static function saveNew($profile_id, $content, $source=null,
-                            $is_local=Notice::LOCAL_PUBLIC, $reply_to=null, $uri=null, $created=null) {
+                            $is_local=Notice::LOCAL_PUBLIC, $reply_to=null, $uri=null, $created=null,
+                            $lat=null, $lon=null, $location_id=null, $location_ns=null) {
 
         $profile = Profile::staticGet($profile_id);
 
@@ -172,7 +179,7 @@ class Notice extends Memcached_DataObject
             throw new ClientException(_('Problem saving notice. Too long.'));
         }
 
-        if (!$profile) {
+        if (empty($profile)) {
             throw new ClientException(_('Problem saving notice. Unknown user.'));
         }
 
@@ -188,22 +195,19 @@ class Notice extends Memcached_DataObject
                                         ' take a breather and post again in a few minutes.'));
         }
 
-        $banned = common_config('profile', 'banned');
-
-        if ( in_array($profile_id, $banned) || in_array($profile->nickname, $banned)) {
-            common_log(LOG_WARNING, "Attempted post from banned user: $profile->nickname (user id = $profile_id).");
+        if (!$profile->hasRight(Right::NEWNOTICE)) {
+            common_log(LOG_WARNING, "Attempted post from user disallowed to post: " . $profile->nickname);
             throw new ClientException(_('You are banned from posting notices on this site.'));
         }
 
         $notice = new Notice();
         $notice->profile_id = $profile_id;
 
-        $blacklist = common_config('public', 'blacklist');
         $autosource = common_config('public', 'autosource');
 
-        # Blacklisted are non-false, but not 1, either
+        # Sandboxed are non-false, but not 1, either
 
-        if (($blacklist && in_array($profile_id, $blacklist)) ||
+        if (!$profile->hasRight(Right::PUBLICNOTICE) ||
             ($source && $autosource && in_array($source, $autosource))) {
             $notice->is_local = Notice::LOCAL_NONPUBLIC;
         } else {
@@ -228,6 +232,26 @@ class Notice extends Memcached_DataObject
             $notice->conversation = $reply->conversation;
         }
 
+        if (!empty($lat) && !empty($lon)) {
+            $notice->lat = $lat;
+            $notice->lon = $lon;
+            $notice->location_id = $location_id;
+            $notice->location_ns = $location_ns;
+        } else if (!empty($location_ns) && !empty($location_id)) {
+            $location = Location::fromId($location_id, $location_ns);
+            if (!empty($location)) {
+                $notice->lat = $location->lat;
+                $notice->lon = $location->lon;
+                $notice->location_id = $location_id;
+                $notice->location_ns = $location_ns;
+            }
+        } else {
+            $notice->lat         = $profile->lat;
+            $notice->lon         = $profile->lon;
+            $notice->location_id = $profile->location_id;
+            $notice->location_ns = $profile->location_ns;
+        }
+
         if (Event::handle('StartNoticeSave', array(&$notice))) {
 
             // XXX: some of these functions write to the DB
@@ -269,7 +293,6 @@ class Notice extends Memcached_DataObject
 
             // XXX: do we need to change this for remote users?
 
-            $notice->saveReplies();
             $notice->saveTags();
 
             $notice->addToInboxes();
@@ -307,11 +330,11 @@ class Notice extends Memcached_DataObject
 
     static function checkDupes($profile_id, $content) {
         $profile = Profile::staticGet($profile_id);
-        if (!$profile) {
+        if (empty($profile)) {
             return false;
         }
         $notice = $profile->getNotices(0, NOTICE_CACHE_WINDOW);
-        if ($notice) {
+        if (!empty($notice)) {
             $last = 0;
             while ($notice->fetch()) {
                 if (time() - strtotime($notice->created) >= common_config('site', 'dupelimit')) {
@@ -337,7 +360,7 @@ class Notice extends Memcached_DataObject
 
     static function checkEditThrottle($profile_id) {
         $profile = Profile::staticGet($profile_id);
-        if (!$profile) {
+        if (empty($profile)) {
             return false;
         }
         # Get the Nth notice
@@ -658,7 +681,7 @@ class Notice extends Memcached_DataObject
 
         $cache = common_memcache();
 
-        if (!$cache) {
+        if (empty($cache)) {
             return Notice::getStreamDirect($qry, $offset, $limit, null, null, $order, null);
         }
 
@@ -719,7 +742,7 @@ class Notice extends Memcached_DataObject
 
         # If there are no hits, just return the value
 
-        if (!$notice) {
+        if (empty($notice)) {
             return $notice;
         }
 
@@ -904,7 +927,22 @@ class Notice extends Memcached_DataObject
             $users = $group->getUserMembers();
             foreach ($users as $id) {
                 if (!array_key_exists($id, $ni)) {
-                    $ni[$id] = NOTICE_INBOX_SOURCE_GROUP;
+                    $user = User::staticGet('id', $id);
+                    if (!$user->hasBlocked($notice->profile_id)) {
+                        $ni[$id] = NOTICE_INBOX_SOURCE_GROUP;
+                    }
+                }
+            }
+        }
+
+        $recipients = $this->saveReplies();
+
+        foreach ($recipients as $recipient) {
+
+            if (!array_key_exists($recipient, $ni)) {
+                $recipientUser = User::staticGet('id', $recipient);
+                if (!empty($recipientUser)) {
+                    $ni[$recipient] = NOTICE_INBOX_SOURCE_REPLY;
                 }
             }
         }
@@ -1061,12 +1099,12 @@ class Notice extends Memcached_DataObject
         for ($i=0; $i<count($names); $i++) {
             $nickname = $names[$i];
             $recipient = common_relative_profile($sender, $nickname, $this->created);
-            if (!$recipient) {
+            if (empty($recipient)) {
                 continue;
             }
             // Don't save replies from blocked profile to local user
             $recipient_user = User::staticGet('id', $recipient->id);
-            if ($recipient_user && $recipient_user->hasBlocked($sender)) {
+            if (!empty($recipient_user) && $recipient_user->hasBlocked($sender)) {
                 continue;
             }
             $reply = new Reply();
@@ -1077,7 +1115,7 @@ class Notice extends Memcached_DataObject
                 $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
                 common_log(LOG_ERR, 'DB error inserting reply: ' . $last_error->message);
                 common_server_error(sprintf(_('DB error inserting reply: %s'), $last_error->message));
-                return;
+                return array();
             } else {
                 $replied[$recipient->id] = 1;
             }
@@ -1101,7 +1139,7 @@ class Notice extends Memcached_DataObject
                         $id = $reply->insert();
                         if (!$id) {
                             common_log_db_error($reply, 'INSERT', __FILE__);
-                            return;
+                            return array();
                         } else {
                             $replied[$recipient->id] = 1;
                         }
@@ -1110,12 +1148,16 @@ class Notice extends Memcached_DataObject
             }
         }
 
-        foreach (array_keys($replied) as $recipient) {
+        $recipientIds = array_keys($replied);
+
+        foreach ($recipientIds as $recipient) {
             $user = User::staticGet('id', $recipient);
             if ($user) {
                 mail_notify_attn($user, $this);
             }
         }
+
+        return $recipientIds;
     }
 
     function asAtomEntry($namespace=false, $source=false)
@@ -1139,10 +1181,9 @@ class Notice extends Memcached_DataObject
             $xs->element('link', array('href' => $profile->profileurl));
             $user = User::staticGet('id', $profile->id);
             if (!empty($user)) {
-                $atom_feed = common_local_url('api',
-                                              array('apiaction' => 'statuses',
-                                                    'method' => 'user_timeline',
-                                                    'argument' => $profile->nickname.'.atom'));
+                $atom_feed = common_local_url('ApiTimelineUser',
+                                              array('format' => 'atom',
+                                                    'id' => $profile->nickname));
                 $xs->element('link', array('rel' => 'self',
                                            'type' => 'application/atom+xml',
                                            'href' => $profile->profileurl));
@@ -1210,6 +1251,12 @@ class Notice extends Memcached_DataObject
             }
         }
 
+        if (!empty($this->lat) && !empty($this->lon)) {
+            $xs->elementStart('geo', array('xmlns:georss' => 'http://www.georss.org/georss'));
+            $xs->element('georss:point', null, $this->lat . ' ' . $this->lon);
+            $xs->elementEnd('geo');
+        }
+
         $xs->elementEnd('entry');
 
         return $xs->getString();
@@ -1370,4 +1417,21 @@ class Notice extends Memcached_DataObject
         $contentlimit = self::maxContent();
         return ($contentlimit > 0 && !empty($content) && (mb_strlen($content) > $contentlimit));
     }
+
+    function getLocation()
+    {
+        $location = null;
+
+        if (!empty($this->location_id) && !empty($this->location_ns)) {
+            $location = Location::fromId($this->location_id, $this->location_ns);
+        }
+
+        if (is_null($location)) { // no ID, or Location::fromId() failed
+            if (!empty($this->lat) && !empty($this->lon)) {
+                $location = Location::fromLatLon($this->lat, $this->lon);
+            }
+        }
+
+        return $location;
+    }
 }
diff --git a/classes/Plugin_DataObject.php b/classes/Plugin_DataObject.php
new file mode 100644
index 000000000..d5cecf0f7
--- /dev/null
+++ b/classes/Plugin_DataObject.php
@@ -0,0 +1,195 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+
+require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
+
+abstract class Plugin_DataObject extends Memcached_DataObject
+{
+    function table() {
+        static $table = null;
+        if($table == null) {
+            $table = array();
+            $DB = $this->getDatabaseConnection();
+            $dbtype = $DB->phptype;
+            $tableDef = $this->tableDef();
+            foreach($tableDef->columns as $columnDef){
+                switch(strtoupper($columnDef->type)) {
+                    /*shamelessly copied from DB_DataObject_Generator*/
+                    case 'INT':
+                    case 'INT2':    // postgres
+                    case 'INT4':    // postgres
+                    case 'INT8':    // postgres
+                    case 'SERIAL4': // postgres
+                    case 'SERIAL8': // postgres
+                    case 'INTEGER':
+                    case 'TINYINT':
+                    case 'SMALLINT':
+                    case 'MEDIUMINT':
+                    case 'BIGINT':
+                        $type = DB_DATAOBJECT_INT;
+                        if ($columnDef->size == 1) {
+                            $type +=  DB_DATAOBJECT_BOOL;
+                        }
+                        break;
+                   
+                    case 'REAL':
+                    case 'DOUBLE':
+                    case 'DOUBLE PRECISION': // double precision (firebird)
+                    case 'FLOAT':
+                    case 'FLOAT4': // real (postgres)
+                    case 'FLOAT8': // double precision (postgres)
+                    case 'DECIMAL':
+                    case 'MONEY':  // mssql and maybe others
+                    case 'NUMERIC':
+                    case 'NUMBER': // oci8 
+                        $type = DB_DATAOBJECT_INT; // should really by FLOAT!!! / MONEY...
+                        break;
+                        
+                    case 'YEAR':
+                        $type = DB_DATAOBJECT_INT; 
+                        break;
+                        
+                    case 'BIT':
+                    case 'BOOL':   
+                    case 'BOOLEAN':   
+                    
+                        $type = DB_DATAOBJECT_BOOL;
+                        // postgres needs to quote '0'
+                        if ($dbtype == 'pgsql') {
+                            $type +=  DB_DATAOBJECT_STR;
+                        }
+                        break;
+                        
+                    case 'STRING':
+                    case 'CHAR':
+                    case 'VARCHAR':
+                    case 'VARCHAR2':
+                    case 'TINYTEXT':
+                    
+                    case 'ENUM':
+                    case 'SET':         // not really but oh well
+                    
+                    case 'POINT':       // mysql geometry stuff - not really string - but will do..
+                    
+                    case 'TIMESTAMPTZ': // postgres
+                    case 'BPCHAR':      // postgres
+                    case 'INTERVAL':    // postgres (eg. '12 days')
+                    
+                    case 'CIDR':        // postgres IP net spec
+                    case 'INET':        // postgres IP
+                    case 'MACADDR':     // postgress network Mac address.
+                    
+                    case 'INTEGER[]':   // postgres type
+                    case 'BOOLEAN[]':   // postgres type
+                    
+                        $type = DB_DATAOBJECT_STR;
+                        break;
+                    
+                    case 'TEXT':
+                    case 'MEDIUMTEXT':
+                    case 'LONGTEXT':
+                        
+                        $type = DB_DATAOBJECT_STR + DB_DATAOBJECT_TXT;
+                        break;
+                    
+                    
+                    case 'DATE':    
+                        $type = DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE;
+                        break;
+                        
+                    case 'TIME':    
+                        $type = DB_DATAOBJECT_STR + DB_DATAOBJECT_TIME;
+                        break;    
+                        
+                    
+                    case 'DATETIME': 
+                         
+                        $type = DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME;
+                        break;    
+                        
+                    case 'TIMESTAMP': // do other databases use this???
+                        
+                        $type = ($dbtype == 'mysql') ?
+                            DB_DATAOBJECT_MYSQLTIMESTAMP : 
+                            DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME;
+                        break;    
+                        
+                    
+                    case 'BLOB':       /// these should really be ignored!!!???
+                    case 'TINYBLOB':
+                    case 'MEDIUMBLOB':
+                    case 'LONGBLOB':
+                    
+                    case 'CLOB': // oracle character lob support
+                    
+                    case 'BYTEA':   // postgres blob support..
+                        $type = DB_DATAOBJECT_STR + DB_DATAOBJECT_BLOB;
+                        break;
+                        
+                    default:
+                        throw new Exception("Cannot handle datatype: $columnDef->type");
+                }
+                if(! $columnDef->nullable) {
+                    $type+=DB_DATAOBJECT_NOTNULL;
+                }
+                $table[$columnDef->name]=$type;
+            }
+        }
+        return $table;
+    }
+
+    function keys() {
+        static $keys = null;
+        if($keys == null) {
+            $keys = array();
+            $tableDef = $this->tableDef();
+            foreach($tableDef->columns as $columnDef){
+                if($columnDef->key != null){
+                    $keys[] = $columnDef->name;
+                }
+            }
+        }
+        return $keys;
+    }
+
+    function sequenceKey() {
+        static $sequenceKey = null;
+        if($sequenceKey == null) {
+            $sequenceKey = array(false,false);
+            $tableDef = $this->tableDef();
+            foreach($tableDef->columns as $columnDef){
+                if($columnDef->key == 'PRI' && $columnDef->auto_increment){
+                    $sequenceKey=array($columnDef->name,true);
+                }
+            }
+        }
+        return $sequenceKey;
+    }
+
+    /**
+    * Get the TableDef object that represents the table backing this class
+    * Ideally, this function would a static function, but PHP doesn't allow
+    * abstract static functions
+    * @return TableDef TableDef instance
+    */
+    abstract function tableDef();
+}
+
diff --git a/classes/Profile.php b/classes/Profile.php
index a78a27f4a..1b9cdb52f 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -37,11 +37,17 @@ class Profile extends Memcached_DataObject
     public $homepage;                        // varchar(255)  multiple_key
     public $bio;                             // text()  multiple_key
     public $location;                        // varchar(255)  multiple_key
+    public $lat;                             // decimal(10,7)
+    public $lon;                             // decimal(10,7)
+    public $location_id;                     // int(4)
+    public $location_ns;                     // int(4)
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Profile',$k,$v); }
+    function staticGet($k,$v=NULL) {
+        return Memcached_DataObject::staticGet('Profile',$k,$v);
+    }
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -304,10 +310,12 @@ class Profile extends Memcached_DataObject
           'AND subscription.subscribed != subscription.subscriber ' .
           'ORDER BY subscription.created DESC ';
 
-        if (common_config('db','type') == 'pgsql') {
-            $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
-        } else {
-            $qry .= ' LIMIT ' . $offset . ', ' . $limit;
+        if ($offset>0 && !is_null($limit)){
+            if (common_config('db','type') == 'pgsql') {
+                $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
+            } else {
+                $qry .= ' LIMIT ' . $offset . ', ' . $limit;
+            }
         }
 
         $profile = new Profile();
@@ -327,11 +335,13 @@ class Profile extends Memcached_DataObject
           'AND subscription.subscribed != subscription.subscriber ' .
           'ORDER BY subscription.created DESC ';
 
-        if ($offset) {
-            if (common_config('db','type') == 'pgsql') {
-                $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
-            } else {
-                $qry .= ' LIMIT ' . $offset . ', ' . $limit;
+        if ($offset>0 && !is_null($limit)){
+            if ($offset) {
+                if (common_config('db','type') == 'pgsql') {
+                    $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
+                } else {
+                    $qry .= ' LIMIT ' . $offset . ', ' . $limit;
+                }
             }
         }
 
@@ -556,4 +566,149 @@ class Profile extends Memcached_DataObject
         $block->blocked = $this->id;
         $block->delete();
     }
+
+    // XXX: identical to Notice::getLocation.
+
+    function getLocation()
+    {
+        $location = null;
+
+        if (!empty($this->location_id) && !empty($this->location_ns)) {
+            $location = Location::fromId($this->location_id, $this->location_ns);
+        }
+
+        if (is_null($location)) { // no ID, or Location::fromId() failed
+            if (!empty($this->lat) && !empty($this->lon)) {
+                $location = Location::fromLatLon($this->lat, $this->lon);
+            }
+        }
+
+        if (is_null($location)) { // still haven't found it!
+            if (!empty($this->location)) {
+                $location = Location::fromName($this->location);
+            }
+        }
+
+        return $location;
+    }
+
+    function hasRole($name)
+    {
+        $role = Profile_role::pkeyGet(array('profile_id' => $this->id,
+                                            'role' => $name));
+        return (!empty($role));
+    }
+
+    function grantRole($name)
+    {
+        $role = new Profile_role();
+
+        $role->profile_id = $this->id;
+        $role->role       = $name;
+        $role->created    = common_sql_now();
+
+        $result = $role->insert();
+
+        if (!$result) {
+            common_log_db_error($role, 'INSERT', __FILE__);
+            return false;
+        }
+
+        return true;
+    }
+
+    function revokeRole($name)
+    {
+        $role = Profile_role::pkeyGet(array('profile_id' => $this->id,
+                                            'role' => $name));
+
+        if (empty($role)) {
+            throw new Exception('Cannot revoke role "'.$name.'" for user #'.$this->id.'; does not exist.');
+        }
+
+        $result = $role->delete();
+
+        if (!$result) {
+            common_log_db_error($role, 'DELETE', __FILE__);
+            throw new Exception('Cannot revoke role "'.$name.'" for user #'.$this->id.'; database error.');
+        }
+
+        return true;
+    }
+
+    function isSandboxed()
+    {
+        return $this->hasRole(Profile_role::SANDBOXED);
+    }
+
+    function isSilenced()
+    {
+        return $this->hasRole(Profile_role::SILENCED);
+    }
+
+    function sandbox()
+    {
+        $this->grantRole(Profile_role::SANDBOXED);
+    }
+
+    function unsandbox()
+    {
+        $this->revokeRole(Profile_role::SANDBOXED);
+    }
+
+    function silence()
+    {
+        $this->grantRole(Profile_role::SILENCED);
+    }
+
+    function unsilence()
+    {
+        $this->revokeRole(Profile_role::SILENCED);
+    }
+
+    /**
+     * Does this user have the right to do X?
+     *
+     * With our role-based authorization, this is merely a lookup for whether the user
+     * has a particular role. The implementation currently uses a switch statement
+     * to determine if the user has the pre-defined role to exercise the right. Future
+     * implementations may allow per-site roles, and different mappings of roles to rights.
+     *
+     * @param $right string Name of the right, usually a constant in class Right
+     * @return boolean whether the user has the right in question
+     */
+
+    function hasRight($right)
+    {
+        $result = false;
+        if (Event::handle('UserRightsCheck', array($this, $right, &$result))) {
+            switch ($right)
+            {
+            case Right::DELETEOTHERSNOTICE:
+            case Right::SANDBOXUSER:
+            case Right::SILENCEUSER:
+            case Right::DELETEUSER:
+                $result = $this->hasRole(Profile_role::MODERATOR);
+                break;
+            case Right::CONFIGURESITE:
+                $result = $this->hasRole(Profile_role::ADMINISTRATOR);
+                break;
+            case Right::NEWNOTICE:
+            case Right::NEWMESSAGE:
+            case Right::SUBSCRIBE:
+                $result = !$this->isSilenced();
+                break;
+            case Right::PUBLICNOTICE:
+            case Right::EMAILONREPLY:
+            case Right::EMAILONSUBSCRIBE:
+            case Right::EMAILONFAVE:
+                $result = !$this->isSandboxed();
+                break;
+            default:
+                $result = false;
+                break;
+            }
+        }
+        return $result;
+    }
 }
diff --git a/classes/Profile_role.php b/classes/Profile_role.php
new file mode 100644
index 000000000..afa7fb74e
--- /dev/null
+++ b/classes/Profile_role.php
@@ -0,0 +1,55 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Table Definition for profile_role
+ */
+
+require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
+
+class Profile_role extends Memcached_DataObject
+{
+    ###START_AUTOCODE
+    /* the code below is auto generated do not remove the above tag */
+
+    public $__table = 'profile_role';                    // table name
+    public $profile_id;                      // int(4)  primary_key not_null
+    public $role;                            // varchar(32)  primary_key not_null
+    public $created;                         // datetime   not_null default_0000-00-00%2000%3A00%3A00
+
+    /* Static get */
+    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Profile_role',$k,$v); }
+
+    /* the code above is auto generated do not remove the tag below */
+    ###END_AUTOCODE
+
+    function &pkeyGet($kv)
+    {
+        return Memcached_DataObject::pkeyGet('Profile_role', $kv);
+    }
+
+    const MODERATOR     = 'moderator';
+    const ADMINISTRATOR = 'administrator';
+    const SANDBOXED     = 'sandboxed';
+    const SILENCED      = 'silenced';
+}
diff --git a/classes/Status_network.php b/classes/Status_network.php
index fe4f0b0c5..b3117640d 100644
--- a/classes/Status_network.php
+++ b/classes/Status_network.php
@@ -57,14 +57,16 @@ class Status_network extends DB_DataObject
         $config['db']['ini_'.$dbname] = INSTALLDIR.'/classes/status_network.ini';
         $config['db']['table_status_network'] = $dbname;
 
-        self::$cache = new Memcache();
+        if (class_exists('Memcache')) {
+            self::$cache = new Memcache();
 
-        if (is_array($servers)) {
-            foreach($servers as $server) {
-                self::$cache->addServer($server);
+            if (is_array($servers)) {
+                foreach($servers as $server) {
+                    self::$cache->addServer($server);
+                }
+            } else {
+                self::$cache->addServer($servers);
             }
-        } else {
-            self::$cache->addServer($servers);
         }
 
         self::$base = $dbname;
@@ -76,6 +78,10 @@ class Status_network extends DB_DataObject
 
     static function memGet($k, $v)
     {
+        if (!self::$cache) {
+            return self::staticGet($k, $v);
+        }
+
         $ck = self::cacheKey($k, $v);
 
         $sn = self::$cache->get($ck);
@@ -92,10 +98,12 @@ class Status_network extends DB_DataObject
 
     function decache()
     {
-        $keys = array('nickname', 'hostname', 'pathname');
-        foreach ($keys as $k) {
-            $ck = self::cacheKey($k, $this->$k);
-            self::$cache->delete($ck);
+        if (self::$cache) {
+            $keys = array('nickname', 'hostname', 'pathname');
+            foreach ($keys as $k) {
+                $ck = self::cacheKey($k, $this->$k);
+                self::$cache->delete($ck);
+            }
         }
     }
 
diff --git a/classes/User.php b/classes/User.php
index 0a70c9801..f905ea2b7 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -114,11 +114,10 @@ class User extends Memcached_DataObject
         return $result;
     }
 
-    function allowed_nickname($nickname)
+    static function allowed_nickname($nickname)
     {
         // XXX: should already be validated for size, content, etc.
-
-        $blacklist = array();
+        $blacklist = common_config('nickname', 'blacklist');
 
         //all directory and file names should be blacklisted
         $d = dir(INSTALLDIR);
@@ -126,8 +125,15 @@ class User extends Memcached_DataObject
             $blacklist[]=$entry;
         }
         $d->close();
-        $merged = array_merge($blacklist, common_config('nickname', 'blacklist'));
-        return !in_array($nickname, $merged);
+
+        //all top level names in the router should be blacklisted
+        $router = Router::get();
+        foreach(array_keys($router->m->getPaths()) as $path){
+            if(preg_match('/^\/(.*?)[\/\?]/',$path,$matches)){
+                $blacklist[]=$matches[1];
+            }
+        }
+        return !in_array($nickname, $blacklist);
     }
 
     function getCurrentNotice($dt=null)
@@ -184,7 +190,17 @@ class User extends Memcached_DataObject
 
         $profile->query('BEGIN');
 
+        if(!empty($email))
+        {
+            $email = common_canonical_email($email);
+        }
+
+        $nickname = common_canonical_nickname($nickname);
         $profile->nickname = $nickname;
+        if(! User::allowed_nickname($nickname)){
+            common_log(LOG_WARNING, sprintf("Attempted to register a nickname that is not allowed: %s", $profile->nickname),
+                           __FILE__);
+        }
         $profile->profileurl = common_profile_url($nickname);
 
         if (!empty($fullname)) {
@@ -198,6 +214,15 @@ class User extends Memcached_DataObject
         }
         if (!empty($location)) {
             $profile->location = $location;
+
+            $loc = Location::fromName($location);
+
+            if (!empty($loc)) {
+                $profile->lat         = $loc->lat;
+                $profile->lon         = $loc->lon;
+                $profile->location_id = $loc->location_id;
+                $profile->location_ns = $loc->location_ns;
+            }
         }
 
         $profile->created = common_sql_now();
@@ -227,6 +252,10 @@ class User extends Memcached_DataObject
             }
         }
 
+        if(isset($email_confirmed) && $email_confirmed) {
+            $user->email = $email;
+        }
+
         // This flag is ignored but still set to 1
 
         $user->inboxed = 1;
@@ -319,6 +348,7 @@ class User extends Memcached_DataObject
                                                   common_config('site', 'name'),
                                                   $user->nickname),
                                           'system');
+                common_broadcast_notice($notice);
             }
         }
 
@@ -547,11 +577,13 @@ class User extends Memcached_DataObject
           'WHERE group_member.profile_id = %d ' .
           'ORDER BY group_member.created DESC ';
 
-        if ($offset) {
-            if (common_config('db','type') == 'pgsql') {
-                $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
-            } else {
-                $qry .= ' LIMIT ' . $offset . ', ' . $limit;
+        if ($offset>0 && !is_null($limit)) {
+            if ($offset) {
+                if (common_config('db','type') == 'pgsql') {
+                    $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
+                } else {
+                    $qry .= ' LIMIT ' . $offset . ', ' . $limit;
+                }
             }
         }
 
@@ -627,92 +659,27 @@ class User extends Memcached_DataObject
         return Design::staticGet('id', $this->design_id);
     }
 
-    function hasRole($name)
-    {
-        $role = User_role::pkeyGet(array('user_id' => $this->id,
-                                         'role' => $name));
-        return (!empty($role));
-    }
-
-    function grantRole($name)
-    {
-        $role = new User_role();
-
-        $role->user_id = $this->id;
-        $role->role    = $name;
-        $role->created = common_sql_now();
-
-        $result = $role->insert();
-
-        if (!$result) {
-            common_log_db_error($role, 'INSERT', __FILE__);
-            return false;
-        }
-
-        return true;
-    }
-
-    function revokeRole($name)
-    {
-        $role = User_role::pkeyGet(array('user_id' => $this->id,
-                                         'role' => $name));
-
-        if (empty($role)) {
-            throw new Exception('Cannot revoke role "'.$name.'" for user #'.$this->id.'; does not exist.');
-        }
-
-        $result = $role->delete();
-
-        if (!$result) {
-            common_log_db_error($role, 'DELETE', __FILE__);
-            throw new Exception('Cannot revoke role "'.$name.'" for user #'.$this->id.'; database error.');
-        }
-
-        return true;
-    }
-
-    /**
-     * Does this user have the right to do X?
-     *
-     * With our role-based authorization, this is merely a lookup for whether the user
-     * has a particular role. The implementation currently uses a switch statement
-     * to determine if the user has the pre-defined role to exercise the right. Future
-     * implementations may allow per-site roles, and different mappings of roles to rights.
-     *
-     * @param $right string Name of the right, usually a constant in class Right
-     * @return boolean whether the user has the right in question
-     */
-
     function hasRight($right)
     {
-        $result = false;
-        if (Event::handle('UserRightsCheck', array($this, $right, &$result))) {
-            switch ($right)
-            {
-             case Right::deleteOthersNotice:
-                $result = $this->hasRole('moderator');
-                break;
-             default:
-                $result = false;
-                break;
-            }
-        }
-        return $result;
+        $profile = $this->getProfile();
+        return $profile->hasRight($right);
     }
 
     function delete()
     {
         $profile = $this->getProfile();
-        $profile->delete();
+        if ($profile) {
+            $profile->delete();
+        }
 
         $related = array('Fave',
-                         'User_openid',
                          'Confirm_address',
                          'Remember_me',
                          'Foreign_link',
                          'Invitation',
                          'Notice_inbox',
                          );
+        Event::handle('UserDeleteRelated', array($this, &$related));
 
         foreach ($related as $cls) {
             $inst = new $cls();
@@ -740,4 +707,34 @@ class User extends Memcached_DataObject
         $block->delete();
         // XXX delete group block? Reset blocker?
     }
+
+    function hasRole($name)
+    {
+        $profile = $this->getProfile();
+        return $profile->hasRole($name);
+    }
+
+    function grantRole($name)
+    {
+        $profile = $this->getProfile();
+        return $profile->grantRole($name);
+    }
+
+    function revokeRole($name)
+    {
+        $profile = $this->getProfile();
+        return $profile->revokeRole($name);
+    }
+
+    function isSandboxed()
+    {
+        $profile = $this->getProfile();
+        return $profile->isSandboxed();
+    }
+
+    function isSilenced()
+    {
+        $profile = $this->getProfile();
+        return $profile->isSilenced();
+    }
 }
diff --git a/classes/User_group.php b/classes/User_group.php
index 310ecff1e..b92638f7a 100644
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -34,7 +34,7 @@ class User_group extends Memcached_DataObject
         static $sizenames = array(AVATAR_PROFILE_SIZE => 'profile',
                                   AVATAR_STREAM_SIZE => 'stream',
                                   AVATAR_MINI_SIZE => 'mini');
-        return theme_path('default-avatar-'.$sizenames[$size].'.png');
+        return Theme::path('default-avatar-'.$sizenames[$size].'.png');
     }
 
     function homeUrl()
diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index 453981cd6..b2509dac5 100644
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -1,3 +1,4 @@
+
 [avatar]
 profile_id = 129
 original = 17
@@ -243,6 +244,24 @@ created = 142
 [invitation__keys]
 code = K
 
+[location_namespace]
+id = 129
+description = 2
+created = 142
+modified = 384
+
+[location_namespace__keys]
+id = K
+
+[login_token]
+user_id = 129
+token = 130
+created = 142
+modified = 384
+
+[login_token__keys]
+user_id = K
+
 [message]
 id = 129
 uri = 2
@@ -284,6 +303,10 @@ reply_to = 1
 is_local = 17
 source = 2
 conversation = 1
+lat = 1
+lon = 1
+location_id = 1
+location_ns = 1
 
 [notice__keys]
 id = N
@@ -325,6 +348,10 @@ profileurl = 2
 homepage = 2
 bio = 34
 location = 2
+lat = 1
+lon = 1
+location_id = 1
+location_ns = 1
 created = 142
 modified = 384
 
@@ -340,6 +367,15 @@ modified = 384
 blocker = K
 blocked = K
 
+[profile_role]
+profile_id = 129
+role = 130
+created = 142
+
+[profile_role__keys]
+profile_id = K
+role = K
+
 [profile_tag]
 tagger = 129
 tagged = 129
@@ -506,24 +542,4 @@ created = 142
 modified = 384
 
 [user_group__keys]
-id = N
-
-[user_openid]
-canonical = 130
-display = 130
-user_id = 129
-created = 142
-modified = 384
-
-[user_openid__keys]
-canonical = K
-display = U
-
-[user_role]
-user_id = 129
-role = 130
-created = 142
-
-[user_role__keys]
-user_id = K
-role = K
+id = N
\ No newline at end of file
diff --git a/config.php.sample b/config.php.sample
index 997c9d6b0..9fccb84f3 100644
--- a/config.php.sample
+++ b/config.php.sample
@@ -104,6 +104,10 @@ $config['sphinx']['port'] = 3312;
 // $config['site']['timezone'] = 'Pacific/Auckland';
 // $config['site']['language'] = 'en_NZ';
 
+// When validating user supplied email addresses, validate if the domain
+// is running an SMTP server.
+// $config['mail']['check_domain'] = true;
+
 // Email info, used for all outbound email
 // $config['mail']['notifyfrom'] = 'microblog@example.net';
 // $config['mail']['domain'] = 'microblog.example.net';
diff --git a/db/08to09.sql b/db/08to09.sql
index 953e0e5f4..028fe56a4 100644
--- a/db/08to09.sql
+++ b/db/08to09.sql
@@ -32,3 +32,26 @@ create table user_role (
     constraint primary key (user_id, role)
 
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+
+create table login_token (
+    user_id integer not null comment 'user owning this token' references user (id),
+    token char(32) not null comment 'token useable for logging in',
+    created datetime not null comment 'date this record was created',
+    modified timestamp comment 'date this record was modified',
+
+    constraint primary key (user_id)
+) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+
+alter table fave
+    drop index fave_user_id_idx,
+    add index fave_user_id_idx (user_id,modified);
+
+alter table subscription
+    drop index subscription_subscriber_idx,
+    add index subscription_subscriber_idx (subscriber,created),
+    drop index subscription_subscribed_idx,
+    add index subscription_subscribed_idx (subscribed,created);
+
+alter table notice
+    drop index notice_profile_id_idx,
+    add index notice_profile_id_idx (profile_id,created,id);
diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql
index 9e37314aa..d9b57fb84 100644
--- a/db/08to09_pg.sql
+++ b/db/08to09_pg.sql
@@ -38,3 +38,25 @@ create table user_role (
     primary key (user_id, role)
 
 );
+
+create table login_token (
+    user_id integer not null /* comment 'user owning this token'*/ references "user" (id),
+    token char(32) not null /* comment 'token useable for logging in'*/,
+    created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created'*/,
+    modified timestamp /* comment 'date this record was modified'*/,
+
+    primary key (user_id)
+);
+
+DROP index fave_user_id_idx;
+CREATE index fave_user_id_idx on fave (user_id,modified);
+
+DROP index subscription_subscriber_idx;
+CREATE index subscription_subscriber_idx ON subscription (subscriber,created);
+
+DROP index subscription_subscribed_idx;
+CREATE index subscription_subscribed_idx ON subscription (subscribed,created);
+
+DROP index notice_profile_id_idx;
+CREATE index notice_profile_id_idx ON notice (profile_id,created,id);
+
diff --git a/db/location_namespace.sql b/db/location_namespace.sql
new file mode 100644
index 000000000..59b2ce67c
--- /dev/null
+++ b/db/location_namespace.sql
@@ -0,0 +1,5 @@
+insert into location_namespace
+    (id, description, created)
+values
+    (1, 'Geonames', now()),
+    (2, 'Where on Earth', now());
diff --git a/db/notice_source.sql b/db/notice_source.sql
index 2657763f4..5c5c939dd 100644
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -7,6 +7,7 @@ VALUES
     ('anyio', 'Any.IO', 'http://any.io/', now()),
     ('betwittered','BeTwittered','http://www.32hours.com/betwitteredinfo/', now()),
     ('bti','bti','http://gregkh.github.com/bti/', now()),
+    ('choqok', 'Choqok', 'http://choqok.gnufolks.org/', now()),
     ('cliqset', 'Cliqset', 'http://www.cliqset.com/', now()),
     ('deskbar','Deskbar-Applet','http://www.gnome.org/projects/deskbar-applet/', now()),
     ('Do','Gnome Do','http://do.davebsd.com/wiki/index.php?title=Microblog_Plugin', now()),
@@ -43,6 +44,7 @@ VALUES
     ('rygh.no','rygh.no','http://rygh.no/', now()),
     ('ryghsms','ryghsms','http://sms.rygh.no/', now()),
     ('smob','SMOB','http://smob.sioc-project.org/', now()),
+    ('socialoomphBfD4pMqz31', 'SocialOomph', 'http://www.socialoomph.com/', now()),
     ('spaz','Spaz','http://funkatron.com/spaz', now()),
     ('tarpipe','tarpipe','http://tarpipe.com/', now()),
     ('tjunar','Tjunar','http://nederflash.nl/boek/titels/tjunar-air', now()),
diff --git a/db/statusnet.sql b/db/statusnet.sql
index dfcddb643..18abcdfdb 100644
--- a/db/statusnet.sql
+++ b/db/statusnet.sql
@@ -1,6 +1,7 @@
 /* local and remote users have profiles */
 
 create table profile (
+
     id integer auto_increment primary key comment 'unique identifier',
     nickname varchar(64) not null comment 'nickname or username',
     fullname varchar(255) comment 'display name',
@@ -8,6 +9,11 @@ create table profile (
     homepage varchar(255) comment 'identifying URL',
     bio text comment 'descriptive biography',
     location varchar(255) comment 'physical location',
+    lat decimal(10,7) comment 'latitude',
+    lon decimal(10,7) comment 'longitude',
+    location_id integer comment 'location id if possible',
+    location_ns integer comment 'namespace for location',
+
     created datetime not null comment 'date this record was created',
     modified timestamp comment 'date this record was modified',
 
@@ -101,8 +107,8 @@ create table subscription (
     modified timestamp comment 'date this record was modified',
 
     constraint primary key (subscriber, subscribed),
-    index subscription_subscriber_idx (subscriber),
-    index subscription_subscribed_idx (subscribed),
+    index subscription_subscriber_idx (subscriber, created),
+    index subscription_subscribed_idx (subscribed, created),
     index subscription_token_idx (token)
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
 
@@ -119,8 +125,12 @@ create table notice (
     is_local tinyint default 0 comment 'notice was generated by a user',
     source varchar(32) comment 'source of comment, like "web", "im", or "clientname"',
     conversation integer comment 'id of root notice in this conversation' references notice (id),
+    lat decimal(10,7) comment 'latitude',
+    lon decimal(10,7) comment 'longitude',
+    location_id integer comment 'location id if possible',
+    location_ns integer comment 'namespace for location',
 
-    index notice_profile_id_idx (profile_id),
+    index notice_profile_id_idx (profile_id,created,id),
     index notice_conversation_idx (conversation),
     index notice_created_idx (created),
     index notice_replyto_idx (reply_to),
@@ -155,7 +165,7 @@ create table fave (
 
     constraint primary key (notice_id, user_id),
     index fave_notice_id_idx (notice_id),
-    index fave_user_id_idx (user_id),
+    index fave_user_id_idx (user_id,modified),
     index fave_modified_idx (modified)
 
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
@@ -547,12 +557,31 @@ create table config (
 
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
 
-create table user_role (
+create table profile_role (
 
-    user_id integer not null comment 'user having the role' references user (id),
+    profile_id integer not null comment 'account having the role' references profile (id),
     role    varchar(32) not null comment 'string representing the role',
     created datetime not null comment 'date the role was granted',
 
-    constraint primary key (user_id, role)
+    constraint primary key (profile_id, role)
+
+) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+
+create table location_namespace (
+
+    id integer primary key comment 'identity for this namespace',
+    description varchar(255) comment 'description of the namespace',
+    created datetime not null comment 'date the record was created',
+    modified timestamp comment 'date this record was modified'
 
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+
+create table login_token (
+    user_id integer not null comment 'user owning this token' references user (id),
+    token char(32) not null comment 'token useable for logging in',
+    created datetime not null comment 'date this record was created',
+    modified timestamp comment 'date this record was modified',
+
+    constraint primary key (user_id)
+) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+
diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql
index 672877ddf..7b0e5313c 100644
--- a/db/statusnet_pg.sql
+++ b/db/statusnet_pg.sql
@@ -115,8 +115,8 @@ create table subscription (
 
     primary key (subscriber, subscribed)
 );
-create index subscription_subscriber_idx on subscription using btree(subscriber);
-create index subscription_subscribed_idx on subscription using btree(subscribed);
+create index subscription_subscriber_idx on subscription using btree(subscriber,created);
+create index subscription_subscribed_idx on subscription using btree(subscribed,created);
 
 create sequence notice_seq;
 create table notice (
@@ -137,7 +137,7 @@ create table notice (
 
 /*    FULLTEXT(content) */
 );
-create index notice_profile_id_idx on notice using btree(profile_id);
+create index notice_profile_id_idx on notice using btree(profile_id,created,id);
 create index notice_created_idx on notice using btree(created);
 
 create table notice_source (
@@ -171,7 +171,7 @@ create table fave (
 
 );
 create index fave_notice_id_idx on fave using btree(notice_id);
-create index fave_user_id_idx on fave using btree(user_id);
+create index fave_user_id_idx on fave using btree(user_id,modified);
 create index fave_modified_idx on fave using btree(modified);
 
 /* tables for OAuth */
@@ -569,3 +569,13 @@ create table user_role (
     primary key (user_id, role)
 
 );
+
+create table login_token (
+    user_id integer not null /* comment 'user owning this token'*/ references user (id),
+    token char(32) not null /* comment 'token useable for logging in'*/,
+    created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created'*/,
+    modified timestamp /* comment 'date this record was modified'*/,
+
+    constraint primary key (user_id)
+);
+
diff --git a/doc-src/badge b/doc-src/badge
index 1c368eb69..5499e334c 100644
--- a/doc-src/badge
+++ b/doc-src/badge
@@ -1,4 +1,4 @@
-Install the %%site.name%% badge on you blog or web site to show the latest updates 
+Install the %%site.name%% badge on your blog or web site to show the latest updates 
 from you and your friends!
 
 <MTMarkdownOptions output='raw'>
diff --git a/doc-src/bookmarklet b/doc-src/bookmarklet
index e5ded7702..bab0ad445 100644
--- a/doc-src/bookmarklet
+++ b/doc-src/bookmarklet
@@ -2,4 +2,4 @@ A bookmarklet is a small piece of javascript code used as a bookmark. This one w
 
 Drag-and-drop the following link to your bookmarks bar or right-click it and add it to your browser favorites to keep it handy.
 
-<a href="javascript:var%20d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='http://%%site.server%%/%%site.path%%/index.php?action=newnotice',l=d.location,e=encodeURIComponent,g=f+'&amp;status_textarea=%22'+((e(s))?e(s):e(document.title))+'%22 from '+l.href;function%20a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=800,height=570')){l.href=g;}}a();void(0);">Post to %%site.name%%</a>
+<a href="javascript:(function(){var%20d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='http://%%site.server%%/%%site.path%%/index.php?action=bookmarklet',l=d.location,e=encodeURIComponent,g=f+'&status_textarea=%E2%80%9C'+((e(s))?e(s):e(document.title))+'%E2%80%9D%20%E2%80%94%20'+l.href;function%20a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=450,height=200')){l.href=g;}}a();})()">Post to %%site.name%%</a>
diff --git a/extlib/Auth/OpenID.php b/extlib/Auth/OpenID.php
index 6556b5b01..db6164256 100644
--- a/extlib/Auth/OpenID.php
+++ b/extlib/Auth/OpenID.php
@@ -20,7 +20,7 @@
 /**
  * The library version string
  */
-define('Auth_OpenID_VERSION', '2.1.2');
+define('Auth_OpenID_VERSION', '2.1.3');
 
 /**
  * Require the fetcher code.
diff --git a/extlib/Auth/OpenID/BigMath.php b/extlib/Auth/OpenID/BigMath.php
index b5fc627a0..45104947d 100644
--- a/extlib/Auth/OpenID/BigMath.php
+++ b/extlib/Auth/OpenID/BigMath.php
@@ -376,7 +376,7 @@ function Auth_OpenID_detectMathLibrary($exts)
         // Try to load dynamic modules.
         if (!$loaded) {
             foreach ($extension['modules'] as $module) {
-                if (function_exists('dl') && ini_get('enable_dl') && !ini_get('safe_mode') && @dl($module . "." . PHP_SHLIB_SUFFIX)) {
+                if (@dl($module . "." . PHP_SHLIB_SUFFIX)) {
                     $loaded = true;
                     break;
                 }
diff --git a/extlib/Auth/OpenID/Consumer.php b/extlib/Auth/OpenID/Consumer.php
index a72684c6b..500890b65 100644
--- a/extlib/Auth/OpenID/Consumer.php
+++ b/extlib/Auth/OpenID/Consumer.php
@@ -1295,7 +1295,8 @@ class Auth_OpenID_GenericConsumer {
             Auth_OpenID_OPENID2_NS => array_merge($basic_sig_fields,
                                                   array('response_nonce',
                                                         'claimed_id',
-                                                        'assoc_handle')),
+                                                        'assoc_handle',
+                                                        'op_endpoint')),
             Auth_OpenID_OPENID1_NS => array_merge($basic_sig_fields,
                                                   array('nonce'))
             );
diff --git a/extlib/Auth/OpenID/Message.php b/extlib/Auth/OpenID/Message.php
index fd23e67a3..5ab115a86 100644
--- a/extlib/Auth/OpenID/Message.php
+++ b/extlib/Auth/OpenID/Message.php
@@ -887,6 +887,11 @@ class Auth_OpenID_Message {
 
     function getAliasedArg($aliased_key, $default = null)
     {
+        if ($aliased_key == 'ns') {
+            // Return the namespace URI for the OpenID namespace
+            return $this->getOpenIDNamespace();
+        }
+
         $parts = explode('.', $aliased_key, 2);
 
         if (count($parts) != 2) {
diff --git a/extlib/Auth/Yadis/HTTPFetcher.php b/extlib/Auth/Yadis/HTTPFetcher.php
index a1825403d..963b9a49a 100644
--- a/extlib/Auth/Yadis/HTTPFetcher.php
+++ b/extlib/Auth/Yadis/HTTPFetcher.php
@@ -138,7 +138,7 @@ class Auth_Yadis_HTTPFetcher {
      * pass the URLHasAllowedScheme check or if the server's response
      * is malformed.
      */
-    function get($url, $headers)
+    function get($url, $headers = null)
     {
         trigger_error("not implemented", E_USER_ERROR);
     }
diff --git a/extlib/Auth/Yadis/ParanoidHTTPFetcher.php b/extlib/Auth/Yadis/ParanoidHTTPFetcher.php
index 8975d7f89..6a418260e 100644
--- a/extlib/Auth/Yadis/ParanoidHTTPFetcher.php
+++ b/extlib/Auth/Yadis/ParanoidHTTPFetcher.php
@@ -127,8 +127,6 @@ class Auth_Yadis_ParanoidHTTPFetcher extends Auth_Yadis_HTTPFetcher {
                         Auth_OpenID_USER_AGENT.' '.$curl_user_agent);
             curl_setopt($c, CURLOPT_TIMEOUT, $off);
             curl_setopt($c, CURLOPT_URL, $url);
-            curl_setopt($c, CURLOPT_RANGE, 
-                        "0-".(1024 * Auth_OpenID_FETCHER_MAX_RESPONSE_KB));
 
             curl_exec($c);
 
diff --git a/extlib/Auth/Yadis/PlainHTTPFetcher.php b/extlib/Auth/Yadis/PlainHTTPFetcher.php
index 8882e3cef..3e0ca2bb0 100644
--- a/extlib/Auth/Yadis/PlainHTTPFetcher.php
+++ b/extlib/Auth/Yadis/PlainHTTPFetcher.php
@@ -83,8 +83,6 @@ class Auth_Yadis_PlainHTTPFetcher extends Auth_Yadis_HTTPFetcher {
                              "User-Agent: $user_agent",
                              "Host: ".$parts['host'].
                                 ($specify_port ? ":".$parts['port'] : ""),
-                             "Range: 0-".
-                                (1024*Auth_OpenID_FETCHER_MAX_RESPONSE_KB),
                              "Port: ".$parts['port']);
 
             $errno = 0;
diff --git a/extlib/Auth/Yadis/XML.php b/extlib/Auth/Yadis/XML.php
index 7232d6cbd..81b2ce221 100644
--- a/extlib/Auth/Yadis/XML.php
+++ b/extlib/Auth/Yadis/XML.php
@@ -91,7 +91,7 @@ class Auth_Yadis_XMLParser {
      * @return array $node_list An array of matching opaque node
      * objects to be used with other methods of this parser class.
      */
-    function evalXPath($xpath, $node = null)
+    function &evalXPath($xpath, $node = null)
     {
         // Not implemented.
     }
@@ -349,7 +349,7 @@ function &Auth_Yadis_getXMLParser()
     foreach ($extensions as $name => $params) {
         if (!extension_loaded($name)) {
             foreach ($params['libname'] as $libname) {
-                if (function_exists('dl') && ini_get('enable_dl') && !ini_get('safe_mode') && @dl($libname)) {
+                if (@dl($libname)) {
                     $classname = $params['classname'];
                 }
             }
diff --git a/extlib/HTTP/Request2.php b/extlib/HTTP/Request2.php
new file mode 100644
index 000000000..e06bb86bc
--- /dev/null
+++ b/extlib/HTTP/Request2.php
@@ -0,0 +1,844 @@
+<?php

+/**

+ * Class representing a HTTP request

+ *

+ * PHP version 5

+ *

+ * LICENSE:

+ *

+ * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ *

+ *    * Redistributions of source code must retain the above copyright

+ *      notice, this list of conditions and the following disclaimer.

+ *    * Redistributions in binary form must reproduce the above copyright

+ *      notice, this list of conditions and the following disclaimer in the

+ *      documentation and/or other materials provided with the distribution.

+ *    * The names of the authors may not be used to endorse or promote products

+ *      derived from this software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS

+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR

+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ *

+ * @category   HTTP

+ * @package    HTTP_Request2

+ * @author     Alexey Borzov <avb@php.net>

+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License

+ * @version    CVS: $Id: Request2.php 278226 2009-04-03 21:32:48Z avb $

+ * @link       http://pear.php.net/package/HTTP_Request2

+ */

+

+/**

+ * A class representing an URL as per RFC 3986.

+ */

+require_once 'Net/URL2.php';

+

+/**

+ * Exception class for HTTP_Request2 package

+ */ 

+require_once 'HTTP/Request2/Exception.php';

+

+/**

+ * Class representing a HTTP request

+ *

+ * @category   HTTP

+ * @package    HTTP_Request2

+ * @author     Alexey Borzov <avb@php.net>

+ * @version    Release: 0.4.1

+ * @link       http://tools.ietf.org/html/rfc2616#section-5

+ */

+class HTTP_Request2 implements SplSubject

+{

+   /**#@+

+    * Constants for HTTP request methods

+    *

+    * @link http://tools.ietf.org/html/rfc2616#section-5.1.1

+    */

+    const METHOD_OPTIONS = 'OPTIONS';

+    const METHOD_GET     = 'GET';

+    const METHOD_HEAD    = 'HEAD';

+    const METHOD_POST    = 'POST';

+    const METHOD_PUT     = 'PUT';

+    const METHOD_DELETE  = 'DELETE';

+    const METHOD_TRACE   = 'TRACE';

+    const METHOD_CONNECT = 'CONNECT';

+   /**#@-*/

+

+   /**#@+

+    * Constants for HTTP authentication schemes 

+    *

+    * @link http://tools.ietf.org/html/rfc2617

+    */

+    const AUTH_BASIC  = 'basic';

+    const AUTH_DIGEST = 'digest';

+   /**#@-*/

+

+   /**

+    * Regular expression used to check for invalid symbols in RFC 2616 tokens

+    * @link http://pear.php.net/bugs/bug.php?id=15630

+    */

+    const REGEXP_INVALID_TOKEN = '![\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]!';

+

+   /**

+    * Regular expression used to check for invalid symbols in cookie strings

+    * @link http://pear.php.net/bugs/bug.php?id=15630

+    * @link http://cgi.netscape.com/newsref/std/cookie_spec.html

+    */

+    const REGEXP_INVALID_COOKIE = '/[\s,;]/';

+

+   /**

+    * Fileinfo magic database resource

+    * @var  resource

+    * @see  detectMimeType()

+    */

+    private static $_fileinfoDb;

+

+   /**

+    * Observers attached to the request (instances of SplObserver)

+    * @var  array

+    */

+    protected $observers = array();

+

+   /**

+    * Request URL

+    * @var  Net_URL2

+    */

+    protected $url;

+

+   /**

+    * Request method

+    * @var  string

+    */

+    protected $method = self::METHOD_GET;

+

+   /**

+    * Authentication data

+    * @var  array

+    * @see  getAuth()

+    */

+    protected $auth;

+

+   /**

+    * Request headers

+    * @var  array

+    */

+    protected $headers = array();

+

+   /**

+    * Configuration parameters

+    * @var  array

+    * @see  setConfig()

+    */

+    protected $config = array(

+        'adapter'           => 'HTTP_Request2_Adapter_Socket',

+        'connect_timeout'   => 10,

+        'timeout'           => 0,

+        'use_brackets'      => true,

+        'protocol_version'  => '1.1',

+        'buffer_size'       => 16384,

+        'store_body'        => true,

+

+        'proxy_host'        => '',

+        'proxy_port'        => '',

+        'proxy_user'        => '',

+        'proxy_password'    => '',

+        'proxy_auth_scheme' => self::AUTH_BASIC,

+

+        'ssl_verify_peer'   => true,

+        'ssl_verify_host'   => true,

+        'ssl_cafile'        => null,

+        'ssl_capath'        => null,

+        'ssl_local_cert'    => null,

+        'ssl_passphrase'    => null,

+

+        'digest_compat_ie'  => false

+    );

+

+   /**

+    * Last event in request / response handling, intended for observers

+    * @var  array

+    * @see  getLastEvent()

+    */

+    protected $lastEvent = array(

+        'name' => 'start',

+        'data' => null

+    );

+

+   /**

+    * Request body

+    * @var  string|resource

+    * @see  setBody()

+    */

+    protected $body = '';

+

+   /**

+    * Array of POST parameters

+    * @var  array

+    */

+    protected $postParams = array();

+

+   /**

+    * Array of file uploads (for multipart/form-data POST requests) 

+    * @var  array

+    */

+    protected $uploads = array();

+

+   /**

+    * Adapter used to perform actual HTTP request

+    * @var  HTTP_Request2_Adapter

+    */

+    protected $adapter;

+

+

+   /**

+    * Constructor. Can set request URL, method and configuration array.

+    *

+    * Also sets a default value for User-Agent header. 

+    *

+    * @param    string|Net_Url2     Request URL

+    * @param    string              Request method

+    * @param    array               Configuration for this Request instance

+    */

+    public function __construct($url = null, $method = self::METHOD_GET, array $config = array())

+    {

+        if (!empty($url)) {

+            $this->setUrl($url);

+        }

+        if (!empty($method)) {

+            $this->setMethod($method);

+        }

+        $this->setConfig($config);

+        $this->setHeader('user-agent', 'HTTP_Request2/0.4.1 ' .

+                         '(http://pear.php.net/package/http_request2) ' .

+                         'PHP/' . phpversion());

+    }

+

+   /**

+    * Sets the URL for this request

+    *

+    * If the URL has userinfo part (username & password) these will be removed

+    * and converted to auth data. If the URL does not have a path component,

+    * that will be set to '/'.

+    *

+    * @param    string|Net_URL2 Request URL

+    * @return   HTTP_Request2

+    * @throws   HTTP_Request2_Exception

+    */

+    public function setUrl($url)

+    {

+        if (is_string($url)) {

+            $url = new Net_URL2($url);

+        }

+        if (!$url instanceof Net_URL2) {

+            throw new HTTP_Request2_Exception('Parameter is not a valid HTTP URL');

+        }

+        // URL contains username / password?

+        if ($url->getUserinfo()) {

+            $username = $url->getUser();

+            $password = $url->getPassword();

+            $this->setAuth(rawurldecode($username), $password? rawurldecode($password): '');

+            $url->setUserinfo('');

+        }

+        if ('' == $url->getPath()) {

+            $url->setPath('/');

+        }

+        $this->url = $url;

+

+        return $this;

+    }

+

+   /**

+    * Returns the request URL

+    *

+    * @return   Net_URL2

+    */

+    public function getUrl()

+    {

+        return $this->url;

+    }

+

+   /**

+    * Sets the request method

+    *

+    * @param    string

+    * @return   HTTP_Request2

+    * @throws   HTTP_Request2_Exception if the method name is invalid

+    */

+    public function setMethod($method)

+    {

+        // Method name should be a token: http://tools.ietf.org/html/rfc2616#section-5.1.1

+        if (preg_match(self::REGEXP_INVALID_TOKEN, $method)) {

+            throw new HTTP_Request2_Exception("Invalid request method '{$method}'");

+        }

+        $this->method = $method;

+

+        return $this;

+    }

+

+   /**

+    * Returns the request method

+    *

+    * @return   string

+    */

+    public function getMethod()

+    {

+        return $this->method;

+    }

+

+   /**

+    * Sets the configuration parameter(s)

+    *

+    * The following parameters are available:

+    * <ul>

+    *   <li> 'adapter'           - adapter to use (string)</li>

+    *   <li> 'connect_timeout'   - Connection timeout in seconds (integer)</li>

+    *   <li> 'timeout'           - Total number of seconds a request can take.

+    *                              Use 0 for no limit, should be greater than 

+    *                              'connect_timeout' if set (integer)</li>

+    *   <li> 'use_brackets'      - Whether to append [] to array variable names (bool)</li>

+    *   <li> 'protocol_version'  - HTTP Version to use, '1.0' or '1.1' (string)</li>

+    *   <li> 'buffer_size'       - Buffer size to use for reading and writing (int)</li>

+    *   <li> 'store_body'        - Whether to store response body in response object.

+    *                              Set to false if receiving a huge response and

+    *                              using an Observer to save it (boolean)</li>

+    *   <li> 'proxy_host'        - Proxy server host (string)</li>

+    *   <li> 'proxy_port'        - Proxy server port (integer)</li>

+    *   <li> 'proxy_user'        - Proxy auth username (string)</li>

+    *   <li> 'proxy_password'    - Proxy auth password (string)</li>

+    *   <li> 'proxy_auth_scheme' - Proxy auth scheme, one of HTTP_Request2::AUTH_* constants (string)</li>

+    *   <li> 'ssl_verify_peer'   - Whether to verify peer's SSL certificate (bool)</li>

+    *   <li> 'ssl_verify_host'   - Whether to check that Common Name in SSL

+    *                              certificate matches host name (bool)</li>

+    *   <li> 'ssl_cafile'        - Cerificate Authority file to verify the peer

+    *                              with (use with 'ssl_verify_peer') (string)</li>

+    *   <li> 'ssl_capath'        - Directory holding multiple Certificate 

+    *                              Authority files (string)</li>

+    *   <li> 'ssl_local_cert'    - Name of a file containing local cerificate (string)</li>

+    *   <li> 'ssl_passphrase'    - Passphrase with which local certificate

+    *                              was encoded (string)</li>

+    *   <li> 'digest_compat_ie'  - Whether to imitate behaviour of MSIE 5 and 6

+    *                              in using URL without query string in digest

+    *                              authentication (boolean)</li>

+    * </ul>

+    *

+    * @param    string|array    configuration parameter name or array

+    *                           ('parameter name' => 'parameter value')

+    * @param    mixed           parameter value if $nameOrConfig is not an array

+    * @return   HTTP_Request2

+    * @throws   HTTP_Request2_Exception If the parameter is unknown

+    */

+    public function setConfig($nameOrConfig, $value = null)

+    {

+        if (is_array($nameOrConfig)) {

+            foreach ($nameOrConfig as $name => $value) {

+                $this->setConfig($name, $value);

+            }

+

+        } else {

+            if (!array_key_exists($nameOrConfig, $this->config)) {

+                throw new HTTP_Request2_Exception(

+                    "Unknown configuration parameter '{$nameOrConfig}'"

+                );

+            }

+            $this->config[$nameOrConfig] = $value;

+        }

+

+        return $this;

+    }

+

+   /**

+    * Returns the value(s) of the configuration parameter(s)

+    *

+    * @param    string  parameter name

+    * @return   mixed   value of $name parameter, array of all configuration 

+    *                   parameters if $name is not given

+    * @throws   HTTP_Request2_Exception If the parameter is unknown

+    */

+    public function getConfig($name = null)

+    {

+        if (null === $name) {

+            return $this->config;

+        } elseif (!array_key_exists($name, $this->config)) {

+            throw new HTTP_Request2_Exception(

+                "Unknown configuration parameter '{$name}'"

+            );

+        }

+        return $this->config[$name];

+    }

+

+   /**

+    * Sets the autentification data

+    *

+    * @param    string  user name

+    * @param    string  password

+    * @param    string  authentication scheme

+    * @return   HTTP_Request2

+    */ 

+    public function setAuth($user, $password = '', $scheme = self::AUTH_BASIC)

+    {

+        if (empty($user)) {

+            $this->auth = null;

+        } else {

+            $this->auth = array(

+                'user'     => (string)$user,

+                'password' => (string)$password,

+                'scheme'   => $scheme

+            );

+        }

+

+        return $this;

+    }

+

+   /**

+    * Returns the authentication data

+    *

+    * The array has the keys 'user', 'password' and 'scheme', where 'scheme'

+    * is one of the HTTP_Request2::AUTH_* constants.

+    *

+    * @return   array

+    */

+    public function getAuth()

+    {

+        return $this->auth;

+    }

+

+   /**

+    * Sets request header(s)

+    *

+    * The first parameter may be either a full header string 'header: value' or

+    * header name. In the former case $value parameter is ignored, in the latter 

+    * the header's value will either be set to $value or the header will be

+    * removed if $value is null. The first parameter can also be an array of

+    * headers, in that case method will be called recursively.

+    *

+    * Note that headers are treated case insensitively as per RFC 2616.

+    * 

+    * <code>

+    * $req->setHeader('Foo: Bar'); // sets the value of 'Foo' header to 'Bar'

+    * $req->setHeader('FoO', 'Baz'); // sets the value of 'Foo' header to 'Baz'

+    * $req->setHeader(array('foo' => 'Quux')); // sets the value of 'Foo' header to 'Quux'

+    * $req->setHeader('FOO'); // removes 'Foo' header from request

+    * </code>

+    *

+    * @param    string|array    header name, header string ('Header: value')

+    *                           or an array of headers

+    * @param    string|null     header value, header will be removed if null

+    * @return   HTTP_Request2

+    * @throws   HTTP_Request2_Exception

+    */

+    public function setHeader($name, $value = null)

+    {

+        if (is_array($name)) {

+            foreach ($name as $k => $v) {

+                if (is_string($k)) {

+                    $this->setHeader($k, $v);

+                } else {

+                    $this->setHeader($v);

+                }

+            }

+        } else {

+            if (null === $value && strpos($name, ':')) {

+                list($name, $value) = array_map('trim', explode(':', $name, 2));

+            }

+            // Header name should be a token: http://tools.ietf.org/html/rfc2616#section-4.2

+            if (preg_match(self::REGEXP_INVALID_TOKEN, $name)) {

+                throw new HTTP_Request2_Exception("Invalid header name '{$name}'");

+            }

+            // Header names are case insensitive anyway

+            $name = strtolower($name);

+            if (null === $value) {

+                unset($this->headers[$name]);

+            } else {

+                $this->headers[$name] = $value;

+            }

+        }

+        

+        return $this;

+    }

+

+   /**

+    * Returns the request headers

+    *

+    * The array is of the form ('header name' => 'header value'), header names

+    * are lowercased

+    *

+    * @return   array

+    */

+    public function getHeaders()

+    {

+        return $this->headers;

+    }

+

+   /**

+    * Appends a cookie to "Cookie:" header

+    *

+    * @param    string  cookie name

+    * @param    string  cookie value

+    * @return   HTTP_Request2

+    * @throws   HTTP_Request2_Exception

+    */

+    public function addCookie($name, $value)

+    {

+        $cookie = $name . '=' . $value;

+        if (preg_match(self::REGEXP_INVALID_COOKIE, $cookie)) {

+            throw new HTTP_Request2_Exception("Invalid cookie: '{$cookie}'");

+        }

+        $cookies = empty($this->headers['cookie'])? '': $this->headers['cookie'] . '; ';

+        $this->setHeader('cookie', $cookies . $cookie);

+

+        return $this;

+    }

+

+   /**

+    * Sets the request body

+    *

+    * @param    string  Either a string with the body or filename containing body

+    * @param    bool    Whether first parameter is a filename

+    * @return   HTTP_Request2

+    * @throws   HTTP_Request2_Exception

+    */

+    public function setBody($body, $isFilename = false)

+    {

+        if (!$isFilename) {

+            $this->body = (string)$body;

+        } else {

+            if (!($fp = @fopen($body, 'rb'))) {

+                throw new HTTP_Request2_Exception("Cannot open file {$body}");

+            }

+            $this->body = $fp;

+            if (empty($this->headers['content-type'])) {

+                $this->setHeader('content-type', self::detectMimeType($body));

+            }

+        }

+

+        return $this;

+    }

+

+   /**

+    * Returns the request body

+    *

+    * @return   string|resource|HTTP_Request2_MultipartBody

+    */

+    public function getBody()

+    {

+        if (self::METHOD_POST == $this->method && 

+            (!empty($this->postParams) || !empty($this->uploads))

+        ) {

+            if ('application/x-www-form-urlencoded' == $this->headers['content-type']) {

+                $body = http_build_query($this->postParams, '', '&');

+                if (!$this->getConfig('use_brackets')) {

+                    $body = preg_replace('/%5B\d+%5D=/', '=', $body);

+                }

+                // support RFC 3986 by not encoding '~' symbol (request #15368)

+                return str_replace('%7E', '~', $body);

+

+            } elseif ('multipart/form-data' == $this->headers['content-type']) {

+                require_once 'HTTP/Request2/MultipartBody.php';

+                return new HTTP_Request2_MultipartBody(

+                    $this->postParams, $this->uploads, $this->getConfig('use_brackets')

+                );

+            }

+        }

+        return $this->body;

+    }

+

+   /**

+    * Adds a file to form-based file upload

+    *

+    * Used to emulate file upload via a HTML form. The method also sets

+    * Content-Type of HTTP request to 'multipart/form-data'.

+    *

+    * If you just want to send the contents of a file as the body of HTTP

+    * request you should use setBody() method.

+    *

+    * @param    string  name of file-upload field

+    * @param    mixed   full name of local file

+    * @param    string  filename to send in the request 

+    * @param    string  content-type of file being uploaded

+    * @return   HTTP_Request2

+    * @throws   HTTP_Request2_Exception

+    */

+    public function addUpload($fieldName, $filename, $sendFilename = null,

+                              $contentType = null)

+    {

+        if (!is_array($filename)) {

+            if (!($fp = @fopen($filename, 'rb'))) {

+                throw new HTTP_Request2_Exception("Cannot open file {$filename}");

+            }

+            $this->uploads[$fieldName] = array(

+                'fp'        => $fp,

+                'filename'  => empty($sendFilename)? basename($filename): $sendFilename,

+                'size'      => filesize($filename),

+                'type'      => empty($contentType)? self::detectMimeType($filename): $contentType

+            );

+        } else {

+            $fps = $names = $sizes = $types = array();

+            foreach ($filename as $f) {

+                if (!is_array($f)) {

+                    $f = array($f);

+                }

+                if (!($fp = @fopen($f[0], 'rb'))) {

+                    throw new HTTP_Request2_Exception("Cannot open file {$f[0]}");

+                }

+                $fps[]   = $fp;

+                $names[] = empty($f[1])? basename($f[0]): $f[1];

+                $sizes[] = filesize($f[0]);

+                $types[] = empty($f[2])? self::detectMimeType($f[0]): $f[2];

+            }

+            $this->uploads[$fieldName] = array(

+                'fp' => $fps, 'filename' => $names, 'size' => $sizes, 'type' => $types

+            );

+        }

+        if (empty($this->headers['content-type']) ||

+            'application/x-www-form-urlencoded' == $this->headers['content-type']

+        ) {

+            $this->setHeader('content-type', 'multipart/form-data');

+        }

+

+        return $this;

+    }

+

+   /**

+    * Adds POST parameter(s) to the request.

+    *

+    * @param    string|array    parameter name or array ('name' => 'value')

+    * @param    mixed           parameter value (can be an array)

+    * @return   HTTP_Request2

+    */

+    public function addPostParameter($name, $value = null)

+    {

+        if (!is_array($name)) {

+            $this->postParams[$name] = $value;

+        } else {

+            foreach ($name as $k => $v) {

+                $this->addPostParameter($k, $v);

+            }

+        }

+        if (empty($this->headers['content-type'])) {

+            $this->setHeader('content-type', 'application/x-www-form-urlencoded');

+        }

+

+        return $this;

+    }

+

+   /**

+    * Attaches a new observer

+    *

+    * @param    SplObserver

+    */

+    public function attach(SplObserver $observer)

+    {

+        foreach ($this->observers as $attached) {

+            if ($attached === $observer) {

+                return;

+            }

+        }

+        $this->observers[] = $observer;

+    }

+

+   /**

+    * Detaches an existing observer

+    *

+    * @param    SplObserver

+    */

+    public function detach(SplObserver $observer)

+    {

+        foreach ($this->observers as $key => $attached) {

+            if ($attached === $observer) {

+                unset($this->observers[$key]);

+                return;

+            }

+        }

+    }

+

+   /**

+    * Notifies all observers

+    */

+    public function notify()

+    {

+        foreach ($this->observers as $observer) {

+            $observer->update($this);

+        }

+    }

+

+   /**

+    * Sets the last event

+    *

+    * Adapters should use this method to set the current state of the request

+    * and notify the observers.

+    *

+    * @param    string  event name

+    * @param    mixed   event data

+    */

+    public function setLastEvent($name, $data = null)

+    {

+        $this->lastEvent = array(

+            'name' => $name,

+            'data' => $data

+        );

+        $this->notify();

+    }

+

+   /**

+    * Returns the last event

+    *

+    * Observers should use this method to access the last change in request.

+    * The following event names are possible:

+    * <ul>

+    *   <li>'connect'                 - after connection to remote server,

+    *                                   data is the destination (string)</li>

+    *   <li>'disconnect'              - after disconnection from server</li>

+    *   <li>'sentHeaders'             - after sending the request headers,

+    *                                   data is the headers sent (string)</li>

+    *   <li>'sentBodyPart'            - after sending a part of the request body, 

+    *                                   data is the length of that part (int)</li>

+    *   <li>'receivedHeaders'         - after receiving the response headers,

+    *                                   data is HTTP_Request2_Response object</li>

+    *   <li>'receivedBodyPart'        - after receiving a part of the response

+    *                                   body, data is that part (string)</li>

+    *   <li>'receivedEncodedBodyPart' - as 'receivedBodyPart', but data is still

+    *                                   encoded by Content-Encoding</li>

+    *   <li>'receivedBody'            - after receiving the complete response

+    *                                   body, data is HTTP_Request2_Response object</li>

+    * </ul>

+    * Different adapters may not send all the event types. Mock adapter does

+    * not send any events to the observers.

+    *

+    * @return   array   The array has two keys: 'name' and 'data'

+    */

+    public function getLastEvent()

+    {

+        return $this->lastEvent;

+    }

+

+   /**

+    * Sets the adapter used to actually perform the request

+    *

+    * You can pass either an instance of a class implementing HTTP_Request2_Adapter

+    * or a class name. The method will only try to include a file if the class

+    * name starts with HTTP_Request2_Adapter_, it will also try to prepend this

+    * prefix to the class name if it doesn't contain any underscores, so that

+    * <code>

+    * $request->setAdapter('curl');

+    * </code>

+    * will work.

+    *

+    * @param    string|HTTP_Request2_Adapter

+    * @return   HTTP_Request2

+    * @throws   HTTP_Request2_Exception

+    */

+    public function setAdapter($adapter)

+    {

+        if (is_string($adapter)) {

+            if (!class_exists($adapter, false)) {

+                if (false === strpos($adapter, '_')) {

+                    $adapter = 'HTTP_Request2_Adapter_' . ucfirst($adapter);

+                }

+                if (preg_match('/^HTTP_Request2_Adapter_([a-zA-Z0-9]+)$/', $adapter)) {

+                    include_once str_replace('_', DIRECTORY_SEPARATOR, $adapter) . '.php';

+                }

+                if (!class_exists($adapter, false)) {

+                    throw new HTTP_Request2_Exception("Class {$adapter} not found");

+                }

+            }

+            $adapter = new $adapter;

+        }

+        if (!$adapter instanceof HTTP_Request2_Adapter) {

+            throw new HTTP_Request2_Exception('Parameter is not a HTTP request adapter');

+        }

+        $this->adapter = $adapter;

+

+        return $this;

+    }

+

+   /**

+    * Sends the request and returns the response

+    *

+    * @throws   HTTP_Request2_Exception

+    * @return   HTTP_Request2_Response

+    */

+    public function send()

+    {

+        // Sanity check for URL

+        if (!$this->url instanceof Net_URL2) {

+            throw new HTTP_Request2_Exception('No URL given');

+        } elseif (!$this->url->isAbsolute()) {

+            throw new HTTP_Request2_Exception('Absolute URL required');

+        } elseif (!in_array(strtolower($this->url->getScheme()), array('https', 'http'))) {

+            throw new HTTP_Request2_Exception('Not a HTTP URL');

+        }

+        if (empty($this->adapter)) {

+            $this->setAdapter($this->getConfig('adapter'));

+        }

+        // magic_quotes_runtime may break file uploads and chunked response

+        // processing; see bug #4543

+        if ($magicQuotes = ini_get('magic_quotes_runtime')) {

+            ini_set('magic_quotes_runtime', false);

+        }

+        // force using single byte encoding if mbstring extension overloads

+        // strlen() and substr(); see bug #1781, bug #10605

+        if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {

+            $oldEncoding = mb_internal_encoding();

+            mb_internal_encoding('iso-8859-1');

+        }

+

+        try {

+            $response = $this->adapter->sendRequest($this);

+        } catch (Exception $e) {

+        }

+        // cleanup in either case (poor man's "finally" clause)

+        if ($magicQuotes) {

+            ini_set('magic_quotes_runtime', true);

+        }

+        if (!empty($oldEncoding)) {

+            mb_internal_encoding($oldEncoding);

+        }

+        // rethrow the exception

+        if (!empty($e)) {

+            throw $e;

+        }

+        return $response;

+    }

+

+   /**

+    * Tries to detect MIME type of a file

+    *

+    * The method will try to use fileinfo extension if it is available,

+    * deprecated mime_content_type() function in the other case. If neither

+    * works, default 'application/octet-stream' MIME type is returned

+    *

+    * @param    string  filename

+    * @return   string  file MIME type

+    */

+    protected static function detectMimeType($filename)

+    {

+        // finfo extension from PECL available 

+        if (function_exists('finfo_open')) {

+            if (!isset(self::$_fileinfoDb)) {

+                self::$_fileinfoDb = @finfo_open(FILEINFO_MIME);

+            }

+            if (self::$_fileinfoDb) { 

+                $info = finfo_file(self::$_fileinfoDb, $filename);

+            }

+        }

+        // (deprecated) mime_content_type function available

+        if (empty($info) && function_exists('mime_content_type')) {

+            return mime_content_type($filename);

+        }

+        return empty($info)? 'application/octet-stream': $info;

+    }

+}

+?>
\ No newline at end of file
diff --git a/extlib/HTTP/Request2/Adapter.php b/extlib/HTTP/Request2/Adapter.php
new file mode 100644
index 000000000..39b092b34
--- /dev/null
+++ b/extlib/HTTP/Request2/Adapter.php
@@ -0,0 +1,152 @@
+<?php

+/**

+ * Base class for HTTP_Request2 adapters

+ *

+ * PHP version 5

+ *

+ * LICENSE:

+ *

+ * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ *

+ *    * Redistributions of source code must retain the above copyright

+ *      notice, this list of conditions and the following disclaimer.

+ *    * Redistributions in binary form must reproduce the above copyright

+ *      notice, this list of conditions and the following disclaimer in the

+ *      documentation and/or other materials provided with the distribution.

+ *    * The names of the authors may not be used to endorse or promote products

+ *      derived from this software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS

+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR

+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ *

+ * @category   HTTP

+ * @package    HTTP_Request2

+ * @author     Alexey Borzov <avb@php.net>

+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License

+ * @version    CVS: $Id: Adapter.php 274684 2009-01-26 23:07:27Z avb $

+ * @link       http://pear.php.net/package/HTTP_Request2

+ */

+

+/**

+ * Class representing a HTTP response

+ */

+require_once 'HTTP/Request2/Response.php';

+

+/**

+ * Base class for HTTP_Request2 adapters

+ *

+ * HTTP_Request2 class itself only defines methods for aggregating the request

+ * data, all actual work of sending the request to the remote server and 

+ * receiving its response is performed by adapters.

+ *

+ * @category   HTTP

+ * @package    HTTP_Request2

+ * @author     Alexey Borzov <avb@php.net>

+ * @version    Release: 0.4.1

+ */

+abstract class HTTP_Request2_Adapter

+{

+   /**

+    * A list of methods that MUST NOT have a request body, per RFC 2616

+    * @var  array

+    */

+    protected static $bodyDisallowed = array('TRACE');

+

+   /**

+    * Methods having defined semantics for request body

+    *

+    * Content-Length header (indicating that the body follows, section 4.3 of

+    * RFC 2616) will be sent for these methods even if no body was added

+    *

+    * @var  array

+    * @link http://pear.php.net/bugs/bug.php?id=12900

+    * @link http://pear.php.net/bugs/bug.php?id=14740

+    */

+    protected static $bodyRequired = array('POST', 'PUT');

+

+   /**

+    * Request being sent

+    * @var  HTTP_Request2

+    */

+    protected $request;

+

+   /**

+    * Request body

+    * @var  string|resource|HTTP_Request2_MultipartBody

+    * @see  HTTP_Request2::getBody()

+    */

+    protected $requestBody;

+

+   /**

+    * Length of the request body

+    * @var  integer

+    */

+    protected $contentLength;

+

+   /**

+    * Sends request to the remote server and returns its response

+    *

+    * @param    HTTP_Request2

+    * @return   HTTP_Request2_Response

+    * @throws   HTTP_Request2_Exception

+    */

+    abstract public function sendRequest(HTTP_Request2 $request);

+

+   /**

+    * Calculates length of the request body, adds proper headers

+    *

+    * @param    array   associative array of request headers, this method will 

+    *                   add proper 'Content-Length' and 'Content-Type' headers 

+    *                   to this array (or remove them if not needed)

+    */

+    protected function calculateRequestLength(&$headers)

+    {

+        $this->requestBody = $this->request->getBody();

+

+        if (is_string($this->requestBody)) {

+            $this->contentLength = strlen($this->requestBody);

+        } elseif (is_resource($this->requestBody)) {

+            $stat = fstat($this->requestBody);

+            $this->contentLength = $stat['size'];

+            rewind($this->requestBody);

+        } else {

+            $this->contentLength = $this->requestBody->getLength();

+            $headers['content-type'] = 'multipart/form-data; boundary=' .

+                                       $this->requestBody->getBoundary();

+            $this->requestBody->rewind();

+        }

+

+        if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||

+            0 == $this->contentLength

+        ) {

+            unset($headers['content-type']);

+            // No body: send a Content-Length header nonetheless (request #12900),

+            // but do that only for methods that require a body (bug #14740)

+            if (in_array($this->request->getMethod(), self::$bodyRequired)) {

+                $headers['content-length'] = 0;

+            } else {

+                unset($headers['content-length']);

+            }

+        } else {

+            if (empty($headers['content-type'])) {

+                $headers['content-type'] = 'application/x-www-form-urlencoded';

+            }

+            $headers['content-length'] = $this->contentLength;

+        }

+    }

+}

+?>

diff --git a/extlib/HTTP/Request2/Adapter/Curl.php b/extlib/HTTP/Request2/Adapter/Curl.php
new file mode 100644
index 000000000..4d4de0dcc
--- /dev/null
+++ b/extlib/HTTP/Request2/Adapter/Curl.php
@@ -0,0 +1,383 @@
+<?php

+/**

+ * Adapter for HTTP_Request2 wrapping around cURL extension

+ *

+ * PHP version 5

+ *

+ * LICENSE:

+ *

+ * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ *

+ *    * Redistributions of source code must retain the above copyright

+ *      notice, this list of conditions and the following disclaimer.

+ *    * Redistributions in binary form must reproduce the above copyright

+ *      notice, this list of conditions and the following disclaimer in the

+ *      documentation and/or other materials provided with the distribution.

+ *    * The names of the authors may not be used to endorse or promote products

+ *      derived from this software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS

+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR

+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ *

+ * @category   HTTP

+ * @package    HTTP_Request2

+ * @author     Alexey Borzov <avb@php.net>

+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License

+ * @version    CVS: $Id: Curl.php 278226 2009-04-03 21:32:48Z avb $

+ * @link       http://pear.php.net/package/HTTP_Request2

+ */

+

+/**

+ * Base class for HTTP_Request2 adapters

+ */

+require_once 'HTTP/Request2/Adapter.php';

+

+/**

+ * Adapter for HTTP_Request2 wrapping around cURL extension

+ *

+ * @category    HTTP

+ * @package     HTTP_Request2

+ * @author      Alexey Borzov <avb@php.net>

+ * @version     Release: 0.4.1

+ */

+class HTTP_Request2_Adapter_Curl extends HTTP_Request2_Adapter

+{

+   /**

+    * Mapping of header names to cURL options

+    * @var  array

+    */

+    protected static $headerMap = array(

+        'accept-encoding' => CURLOPT_ENCODING,

+        'cookie'          => CURLOPT_COOKIE,

+        'referer'         => CURLOPT_REFERER,

+        'user-agent'      => CURLOPT_USERAGENT

+    );

+

+   /**

+    * Mapping of SSL context options to cURL options

+    * @var  array

+    */

+    protected static $sslContextMap = array(

+        'ssl_verify_peer' => CURLOPT_SSL_VERIFYPEER,

+        'ssl_cafile'      => CURLOPT_CAINFO,

+        'ssl_capath'      => CURLOPT_CAPATH,

+        'ssl_local_cert'  => CURLOPT_SSLCERT,

+        'ssl_passphrase'  => CURLOPT_SSLCERTPASSWD

+   );

+

+   /**

+    * Response being received

+    * @var  HTTP_Request2_Response

+    */

+    protected $response;

+

+   /**

+    * Whether 'sentHeaders' event was sent to observers

+    * @var  boolean

+    */

+    protected $eventSentHeaders = false;

+

+   /**

+    * Whether 'receivedHeaders' event was sent to observers

+    * @var boolean

+    */

+    protected $eventReceivedHeaders = false;

+

+   /**

+    * Position within request body

+    * @var  integer

+    * @see  callbackReadBody()

+    */

+    protected $position = 0;

+

+   /**

+    * Information about last transfer, as returned by curl_getinfo()

+    * @var  array

+    */

+    protected $lastInfo;

+

+   /**

+    * Sends request to the remote server and returns its response

+    *

+    * @param    HTTP_Request2

+    * @return   HTTP_Request2_Response

+    * @throws   HTTP_Request2_Exception

+    */

+    public function sendRequest(HTTP_Request2 $request)

+    {

+        if (!extension_loaded('curl')) {

+            throw new HTTP_Request2_Exception('cURL extension not available');

+        }

+

+        $this->request              = $request;

+        $this->response             = null;

+        $this->position             = 0;

+        $this->eventSentHeaders     = false;

+        $this->eventReceivedHeaders = false;

+

+        try {

+            if (false === curl_exec($ch = $this->createCurlHandle())) {

+                $errorMessage = 'Error sending request: #' . curl_errno($ch) .

+                                                       ' ' . curl_error($ch);

+            }

+        } catch (Exception $e) {

+        }

+        $this->lastInfo = curl_getinfo($ch);

+        curl_close($ch);

+

+        if (!empty($e)) {

+            throw $e;

+        } elseif (!empty($errorMessage)) {

+            throw new HTTP_Request2_Exception($errorMessage);

+        }

+

+        if (0 < $this->lastInfo['size_download']) {

+            $this->request->setLastEvent('receivedBody', $this->response);

+        }

+        return $this->response;

+    }

+

+   /**

+    * Returns information about last transfer

+    *

+    * @return   array   associative array as returned by curl_getinfo()

+    */

+    public function getInfo()

+    {

+        return $this->lastInfo;

+    }

+

+   /**

+    * Creates a new cURL handle and populates it with data from the request

+    *

+    * @return   resource    a cURL handle, as created by curl_init()

+    * @throws   HTTP_Request2_Exception

+    */

+    protected function createCurlHandle()

+    {

+        $ch = curl_init();

+

+        curl_setopt_array($ch, array(

+            // setup callbacks

+            CURLOPT_READFUNCTION   => array($this, 'callbackReadBody'),

+            CURLOPT_HEADERFUNCTION => array($this, 'callbackWriteHeader'),

+            CURLOPT_WRITEFUNCTION  => array($this, 'callbackWriteBody'),

+            // disallow redirects

+            CURLOPT_FOLLOWLOCATION => false,

+            // buffer size

+            CURLOPT_BUFFERSIZE     => $this->request->getConfig('buffer_size'),

+            // connection timeout

+            CURLOPT_CONNECTTIMEOUT => $this->request->getConfig('connect_timeout'),

+            // save full outgoing headers, in case someone is interested

+            CURLINFO_HEADER_OUT    => true,

+            // request url

+            CURLOPT_URL            => $this->request->getUrl()->getUrl()

+        ));

+

+        // request timeout

+        if ($timeout = $this->request->getConfig('timeout')) {

+            curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);

+        }

+

+        // set HTTP version

+        switch ($this->request->getConfig('protocol_version')) {

+            case '1.0':

+                curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);

+                break;

+            case '1.1':

+                curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);

+        }

+

+        // set request method

+        switch ($this->request->getMethod()) {

+            case HTTP_Request2::METHOD_GET:

+                curl_setopt($ch, CURLOPT_HTTPGET, true);

+                break;

+            case HTTP_Request2::METHOD_POST:

+                curl_setopt($ch, CURLOPT_POST, true);

+                break;

+            default:

+                curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $this->request->getMethod());

+        }

+

+        // set proxy, if needed

+        if ($host = $this->request->getConfig('proxy_host')) {

+            if (!($port = $this->request->getConfig('proxy_port'))) {

+                throw new HTTP_Request2_Exception('Proxy port not provided');

+            }

+            curl_setopt($ch, CURLOPT_PROXY, $host . ':' . $port);

+            if ($user = $this->request->getConfig('proxy_user')) {

+                curl_setopt($ch, CURLOPT_PROXYUSERPWD, $user . ':' .

+                            $this->request->getConfig('proxy_password'));

+                switch ($this->request->getConfig('proxy_auth_scheme')) {

+                    case HTTP_Request2::AUTH_BASIC:

+                        curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_BASIC);

+                        break;

+                    case HTTP_Request2::AUTH_DIGEST:

+                        curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_DIGEST);

+                }

+            }

+        }

+

+        // set authentication data

+        if ($auth = $this->request->getAuth()) {

+            curl_setopt($ch, CURLOPT_USERPWD, $auth['user'] . ':' . $auth['password']);

+            switch ($auth['scheme']) {

+                case HTTP_Request2::AUTH_BASIC:

+                    curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);

+                    break;

+                case HTTP_Request2::AUTH_DIGEST:

+                    curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);

+            }

+        }

+

+        // set SSL options

+        if (0 == strcasecmp($this->request->getUrl()->getScheme(), 'https')) {

+            foreach ($this->request->getConfig() as $name => $value) {

+                if ('ssl_verify_host' == $name && null !== $value) {

+                    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $value? 2: 0);

+                } elseif (isset(self::$sslContextMap[$name]) && null !== $value) {

+                    curl_setopt($ch, self::$sslContextMap[$name], $value);

+                }

+            }

+        }

+

+        $headers = $this->request->getHeaders();

+        // make cURL automagically send proper header

+        if (!isset($headers['accept-encoding'])) {

+            $headers['accept-encoding'] = '';

+        }

+

+        // set headers having special cURL keys

+        foreach (self::$headerMap as $name => $option) {

+            if (isset($headers[$name])) {

+                curl_setopt($ch, $option, $headers[$name]);

+                unset($headers[$name]);

+            }

+        }

+

+        $this->calculateRequestLength($headers);

+

+        // set headers not having special keys

+        $headersFmt = array();

+        foreach ($headers as $name => $value) {

+            $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));

+            $headersFmt[]  = $canonicalName . ': ' . $value;

+        }

+        curl_setopt($ch, CURLOPT_HTTPHEADER, $headersFmt);

+

+        return $ch;

+    }

+

+   /**

+    * Callback function called by cURL for reading the request body

+    *

+    * @param    resource    cURL handle

+    * @param    resource    file descriptor (not used)

+    * @param    integer     maximum length of data to return

+    * @return   string      part of the request body, up to $length bytes 

+    */

+    protected function callbackReadBody($ch, $fd, $length)

+    {

+        if (!$this->eventSentHeaders) {

+            $this->request->setLastEvent(

+                'sentHeaders', curl_getinfo($ch, CURLINFO_HEADER_OUT)

+            );

+            $this->eventSentHeaders = true;

+        }

+        if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||

+            0 == $this->contentLength || $this->position >= $this->contentLength

+        ) {

+            return '';

+        }

+        if (is_string($this->requestBody)) {

+            $string = substr($this->requestBody, $this->position, $length);

+        } elseif (is_resource($this->requestBody)) {

+            $string = fread($this->requestBody, $length);

+        } else {

+            $string = $this->requestBody->read($length);

+        }

+        $this->request->setLastEvent('sentBodyPart', strlen($string));

+        $this->position += strlen($string);

+        return $string;

+    }

+

+   /**

+    * Callback function called by cURL for saving the response headers

+    *

+    * @param    resource    cURL handle

+    * @param    string      response header (with trailing CRLF)

+    * @return   integer     number of bytes saved

+    * @see      HTTP_Request2_Response::parseHeaderLine()

+    */

+    protected function callbackWriteHeader($ch, $string)

+    {

+        // we may receive a second set of headers if doing e.g. digest auth

+        if ($this->eventReceivedHeaders || !$this->eventSentHeaders) {

+            // don't bother with 100-Continue responses (bug #15785)

+            if (!$this->eventSentHeaders ||

+                $this->response->getStatus() >= 200

+            ) {

+                $this->request->setLastEvent(

+                    'sentHeaders', curl_getinfo($ch, CURLINFO_HEADER_OUT)

+                );

+            }

+            $this->eventSentHeaders = true;

+            // we'll need a new response object

+            if ($this->eventReceivedHeaders) {

+                $this->eventReceivedHeaders = false;

+                $this->response             = null;

+            }

+        }

+        if (empty($this->response)) {

+            $this->response = new HTTP_Request2_Response($string, false);

+        } else {

+            $this->response->parseHeaderLine($string);

+            if ('' == trim($string)) {

+                // don't bother with 100-Continue responses (bug #15785)

+                if (200 <= $this->response->getStatus()) {

+                    $this->request->setLastEvent('receivedHeaders', $this->response);

+                }

+                $this->eventReceivedHeaders = true;

+            }

+        }

+        return strlen($string);

+    }

+

+   /**

+    * Callback function called by cURL for saving the response body

+    *

+    * @param    resource    cURL handle (not used)

+    * @param    string      part of the response body

+    * @return   integer     number of bytes saved

+    * @see      HTTP_Request2_Response::appendBody()

+    */

+    protected function callbackWriteBody($ch, $string)

+    {

+        // cURL calls WRITEFUNCTION callback without calling HEADERFUNCTION if 

+        // response doesn't start with proper HTTP status line (see bug #15716)

+        if (empty($this->response)) {

+            throw new HTTP_Request2_Exception("Malformed response: {$string}");

+        }

+        if ($this->request->getConfig('store_body')) {

+            $this->response->appendBody($string);

+        }

+        $this->request->setLastEvent('receivedBodyPart', $string);

+        return strlen($string);

+    }

+}

+?>

diff --git a/extlib/HTTP/Request2/Adapter/Mock.php b/extlib/HTTP/Request2/Adapter/Mock.php
new file mode 100644
index 000000000..89688003b
--- /dev/null
+++ b/extlib/HTTP/Request2/Adapter/Mock.php
@@ -0,0 +1,171 @@
+<?php

+/**

+ * Mock adapter intended for testing

+ *

+ * PHP version 5

+ *

+ * LICENSE:

+ *

+ * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ *

+ *    * Redistributions of source code must retain the above copyright

+ *      notice, this list of conditions and the following disclaimer.

+ *    * Redistributions in binary form must reproduce the above copyright

+ *      notice, this list of conditions and the following disclaimer in the

+ *      documentation and/or other materials provided with the distribution.

+ *    * The names of the authors may not be used to endorse or promote products

+ *      derived from this software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS

+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR

+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ *

+ * @category   HTTP

+ * @package    HTTP_Request2

+ * @author     Alexey Borzov <avb@php.net>

+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License

+ * @version    CVS: $Id: Mock.php 274406 2009-01-23 18:01:57Z avb $

+ * @link       http://pear.php.net/package/HTTP_Request2

+ */

+

+/**

+ * Base class for HTTP_Request2 adapters

+ */

+require_once 'HTTP/Request2/Adapter.php';

+

+/**

+ * Mock adapter intended for testing

+ *

+ * Can be used to test applications depending on HTTP_Request2 package without

+ * actually performing any HTTP requests. This adapter will return responses

+ * previously added via addResponse()

+ * <code>

+ * $mock = new HTTP_Request2_Adapter_Mock();

+ * $mock->addResponse("HTTP/1.1 ... ");

+ * 

+ * $request = new HTTP_Request2();

+ * $request->setAdapter($mock);

+ * 

+ * // This will return the response set above

+ * $response = $req->send();

+ * </code> 

+ *

+ * @category   HTTP

+ * @package    HTTP_Request2

+ * @author     Alexey Borzov <avb@php.net>

+ * @version    Release: 0.4.1

+ */

+class HTTP_Request2_Adapter_Mock extends HTTP_Request2_Adapter

+{

+   /**

+    * A queue of responses to be returned by sendRequest()

+    * @var  array 

+    */

+    protected $responses = array();

+

+   /**

+    * Returns the next response from the queue built by addResponse()

+    *

+    * If the queue is empty will return default empty response with status 400,

+    * if an Exception object was added to the queue it will be thrown.

+    *

+    * @param    HTTP_Request2

+    * @return   HTTP_Request2_Response

+    * @throws   Exception

+    */

+    public function sendRequest(HTTP_Request2 $request)

+    {

+        if (count($this->responses) > 0) {

+            $response = array_shift($this->responses);

+            if ($response instanceof HTTP_Request2_Response) {

+                return $response;

+            } else {

+                // rethrow the exception,

+                $class   = get_class($response);

+                $message = $response->getMessage();

+                $code    = $response->getCode();

+                throw new $class($message, $code);

+            }

+        } else {

+            return self::createResponseFromString("HTTP/1.1 400 Bad Request\r\n\r\n");

+        }

+    }

+

+   /**

+    * Adds response to the queue

+    *

+    * @param    mixed   either a string, a pointer to an open file,

+    *                   a HTTP_Request2_Response or Exception object

+    * @throws   HTTP_Request2_Exception

+    */

+    public function addResponse($response)

+    {

+        if (is_string($response)) {

+            $response = self::createResponseFromString($response);

+        } elseif (is_resource($response)) {

+            $response = self::createResponseFromFile($response);

+        } elseif (!$response instanceof HTTP_Request2_Response &&

+                  !$response instanceof Exception

+        ) {

+            throw new HTTP_Request2_Exception('Parameter is not a valid response');

+        }

+        $this->responses[] = $response;

+    }

+

+   /**

+    * Creates a new HTTP_Request2_Response object from a string

+    *

+    * @param    string

+    * @return   HTTP_Request2_Response

+    * @throws   HTTP_Request2_Exception

+    */

+    public static function createResponseFromString($str)

+    {

+        $parts       = preg_split('!(\r?\n){2}!m', $str, 2);

+        $headerLines = explode("\n", $parts[0]); 

+        $response    = new HTTP_Request2_Response(array_shift($headerLines));

+        foreach ($headerLines as $headerLine) {

+            $response->parseHeaderLine($headerLine);

+        }

+        $response->parseHeaderLine('');

+        if (isset($parts[1])) {

+            $response->appendBody($parts[1]);

+        }

+        return $response;

+    }

+

+   /**

+    * Creates a new HTTP_Request2_Response object from a file

+    *

+    * @param    resource    file pointer returned by fopen()

+    * @return   HTTP_Request2_Response

+    * @throws   HTTP_Request2_Exception

+    */

+    public static function createResponseFromFile($fp)

+    {

+        $response = new HTTP_Request2_Response(fgets($fp));

+        do {

+            $headerLine = fgets($fp);

+            $response->parseHeaderLine($headerLine);

+        } while ('' != trim($headerLine));

+

+        while (!feof($fp)) {

+            $response->appendBody(fread($fp, 8192));

+        }

+        return $response;

+    }

+}

+?>
\ No newline at end of file
diff --git a/extlib/HTTP/Request2/Adapter/Socket.php b/extlib/HTTP/Request2/Adapter/Socket.php
new file mode 100644
index 000000000..ff44d4959
--- /dev/null
+++ b/extlib/HTTP/Request2/Adapter/Socket.php
@@ -0,0 +1,971 @@
+<?php

+/**

+ * Socket-based adapter for HTTP_Request2

+ *

+ * PHP version 5

+ *

+ * LICENSE:

+ *

+ * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ *

+ *    * Redistributions of source code must retain the above copyright

+ *      notice, this list of conditions and the following disclaimer.

+ *    * Redistributions in binary form must reproduce the above copyright

+ *      notice, this list of conditions and the following disclaimer in the

+ *      documentation and/or other materials provided with the distribution.

+ *    * The names of the authors may not be used to endorse or promote products

+ *      derived from this software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS

+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR

+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ *

+ * @category   HTTP

+ * @package    HTTP_Request2

+ * @author     Alexey Borzov <avb@php.net>

+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License

+ * @version    CVS: $Id: Socket.php 279760 2009-05-03 10:46:42Z avb $

+ * @link       http://pear.php.net/package/HTTP_Request2

+ */

+

+/**

+ * Base class for HTTP_Request2 adapters

+ */

+require_once 'HTTP/Request2/Adapter.php';

+

+/**

+ * Socket-based adapter for HTTP_Request2

+ *

+ * This adapter uses only PHP sockets and will work on almost any PHP

+ * environment. Code is based on original HTTP_Request PEAR package.

+ *

+ * @category    HTTP

+ * @package     HTTP_Request2

+ * @author      Alexey Borzov <avb@php.net>

+ * @version     Release: 0.4.1

+ */

+class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter

+{

+   /**

+    * Regular expression for 'token' rule from RFC 2616

+    */ 

+    const REGEXP_TOKEN = '[^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+';

+

+   /**

+    * Regular expression for 'quoted-string' rule from RFC 2616

+    */

+    const REGEXP_QUOTED_STRING = '"(?:\\\\.|[^\\\\"])*"';

+

+   /**

+    * Connected sockets, needed for Keep-Alive support

+    * @var  array

+    * @see  connect()

+    */

+    protected static $sockets = array();

+

+   /**

+    * Data for digest authentication scheme

+    *

+    * The keys for the array are URL prefixes. 

+    *

+    * The values are associative arrays with data (realm, nonce, nonce-count, 

+    * opaque...) needed for digest authentication. Stored here to prevent making 

+    * duplicate requests to digest-protected resources after we have already 

+    * received the challenge.

+    *

+    * @var  array

+    */

+    protected static $challenges = array();

+

+   /**

+    * Connected socket

+    * @var  resource

+    * @see  connect()

+    */

+    protected $socket;

+

+   /**

+    * Challenge used for server digest authentication

+    * @var  array

+    */

+    protected $serverChallenge;

+

+   /**

+    * Challenge used for proxy digest authentication

+    * @var  array

+    */

+    protected $proxyChallenge;

+

+   /**

+    * Global timeout, exception will be raised if request continues past this time

+    * @var  integer

+    */

+    protected $timeout = null;

+

+   /**

+    * Remaining length of the current chunk, when reading chunked response

+    * @var  integer

+    * @see  readChunked()

+    */ 

+    protected $chunkLength = 0;

+

+   /**

+    * Sends request to the remote server and returns its response

+    *

+    * @param    HTTP_Request2

+    * @return   HTTP_Request2_Response

+    * @throws   HTTP_Request2_Exception

+    */

+    public function sendRequest(HTTP_Request2 $request)

+    {

+        $this->request = $request;

+        $keepAlive     = $this->connect();

+        $headers       = $this->prepareHeaders();

+

+        // Use global request timeout if given, see feature requests #5735, #8964 

+        if ($timeout = $request->getConfig('timeout')) {

+            $this->timeout = time() + $timeout;

+        } else {

+            $this->timeout = null;

+        }

+

+        try {

+            if (false === @fwrite($this->socket, $headers, strlen($headers))) {

+                throw new HTTP_Request2_Exception('Error writing request');

+            }

+            // provide request headers to the observer, see request #7633

+            $this->request->setLastEvent('sentHeaders', $headers);

+            $this->writeBody();

+

+            if ($this->timeout && time() > $this->timeout) {

+                throw new HTTP_Request2_Exception(

+                    'Request timed out after ' . 

+                    $request->getConfig('timeout') . ' second(s)'

+                );

+            }

+

+            $response = $this->readResponse();

+

+            if (!$this->canKeepAlive($keepAlive, $response)) {

+                $this->disconnect();

+            }

+

+            if ($this->shouldUseProxyDigestAuth($response)) {

+                return $this->sendRequest($request);

+            }

+            if ($this->shouldUseServerDigestAuth($response)) {

+                return $this->sendRequest($request);

+            }

+            if ($authInfo = $response->getHeader('authentication-info')) {

+                $this->updateChallenge($this->serverChallenge, $authInfo);

+            }

+            if ($proxyInfo = $response->getHeader('proxy-authentication-info')) {

+                $this->updateChallenge($this->proxyChallenge, $proxyInfo);

+            }

+

+        } catch (Exception $e) {

+            $this->disconnect();

+            throw $e;

+        }

+

+        return $response;

+    }

+

+   /**

+    * Connects to the remote server

+    *

+    * @return   bool    whether the connection can be persistent

+    * @throws   HTTP_Request2_Exception

+    */

+    protected function connect()

+    {

+        $secure  = 0 == strcasecmp($this->request->getUrl()->getScheme(), 'https');

+        $tunnel  = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();

+        $headers = $this->request->getHeaders();

+        $reqHost = $this->request->getUrl()->getHost();

+        if (!($reqPort = $this->request->getUrl()->getPort())) {

+            $reqPort = $secure? 443: 80;

+        }

+

+        if ($host = $this->request->getConfig('proxy_host')) {

+            if (!($port = $this->request->getConfig('proxy_port'))) {

+                throw new HTTP_Request2_Exception('Proxy port not provided');

+            }

+            $proxy = true;

+        } else {

+            $host  = $reqHost;

+            $port  = $reqPort;

+            $proxy = false;

+        }

+

+        if ($tunnel && !$proxy) {

+            throw new HTTP_Request2_Exception(

+                "Trying to perform CONNECT request without proxy"

+            );

+        }

+        if ($secure && !in_array('ssl', stream_get_transports())) {

+            throw new HTTP_Request2_Exception(

+                'Need OpenSSL support for https:// requests'

+            );

+        }

+

+        // RFC 2068, section 19.7.1: A client MUST NOT send the Keep-Alive

+        // connection token to a proxy server...

+        if ($proxy && !$secure && 

+            !empty($headers['connection']) && 'Keep-Alive' == $headers['connection']

+        ) {

+            $this->request->setHeader('connection');

+        }

+

+        $keepAlive = ('1.1' == $this->request->getConfig('protocol_version') && 

+                      empty($headers['connection'])) ||

+                     (!empty($headers['connection']) &&

+                      'Keep-Alive' == $headers['connection']);

+        $host = ((!$secure || $proxy)? 'tcp://': 'ssl://') . $host;

+

+        $options = array();

+        if ($secure || $tunnel) {

+            foreach ($this->request->getConfig() as $name => $value) {

+                if ('ssl_' == substr($name, 0, 4) && null !== $value) {

+                    if ('ssl_verify_host' == $name) {

+                        if ($value) {

+                            $options['CN_match'] = $reqHost;

+                        }

+                    } else {

+                        $options[substr($name, 4)] = $value;

+                    }

+                }

+            }

+            ksort($options);

+        }

+

+        // Changing SSL context options after connection is established does *not*

+        // work, we need a new connection if options change

+        $remote    = $host . ':' . $port;

+        $socketKey = $remote . (($secure && $proxy)? "->{$reqHost}:{$reqPort}": '') .

+                     (empty($options)? '': ':' . serialize($options));

+        unset($this->socket);

+

+        // We use persistent connections and have a connected socket?

+        // Ensure that the socket is still connected, see bug #16149

+        if ($keepAlive && !empty(self::$sockets[$socketKey]) &&

+            !feof(self::$sockets[$socketKey])

+        ) {

+            $this->socket =& self::$sockets[$socketKey];

+

+        } elseif ($secure && $proxy && !$tunnel) {

+            $this->establishTunnel();

+            $this->request->setLastEvent(

+                'connect', "ssl://{$reqHost}:{$reqPort} via {$host}:{$port}"

+            );

+            self::$sockets[$socketKey] =& $this->socket;

+

+        } else {

+            // Set SSL context options if doing HTTPS request or creating a tunnel

+            $context = stream_context_create();

+            foreach ($options as $name => $value) {

+                if (!stream_context_set_option($context, 'ssl', $name, $value)) {

+                    throw new HTTP_Request2_Exception(

+                        "Error setting SSL context option '{$name}'"

+                    );

+                }

+            }

+            $this->socket = @stream_socket_client(

+                $remote, $errno, $errstr,

+                $this->request->getConfig('connect_timeout'),

+                STREAM_CLIENT_CONNECT, $context

+            );

+            if (!$this->socket) {

+                throw new HTTP_Request2_Exception(

+                    "Unable to connect to {$remote}. Error #{$errno}: {$errstr}"

+                );

+            }

+            $this->request->setLastEvent('connect', $remote);

+            self::$sockets[$socketKey] =& $this->socket;

+        }

+        return $keepAlive;

+    }

+

+   /**

+    * Establishes a tunnel to a secure remote server via HTTP CONNECT request

+    *

+    * This method will fail if 'ssl_verify_peer' is enabled. Probably because PHP

+    * sees that we are connected to a proxy server (duh!) rather than the server

+    * that presents its certificate.

+    *

+    * @link     http://tools.ietf.org/html/rfc2817#section-5.2

+    * @throws   HTTP_Request2_Exception

+    */

+    protected function establishTunnel()

+    {

+        $donor   = new self;

+        $connect = new HTTP_Request2(

+            $this->request->getUrl(), HTTP_Request2::METHOD_CONNECT,

+            array_merge($this->request->getConfig(),

+                        array('adapter' => $donor))

+        );

+        $response = $connect->send();

+        // Need any successful (2XX) response

+        if (200 > $response->getStatus() || 300 <= $response->getStatus()) {

+            throw new HTTP_Request2_Exception(

+                'Failed to connect via HTTPS proxy. Proxy response: ' .

+                $response->getStatus() . ' ' . $response->getReasonPhrase()

+            );

+        }

+        $this->socket = $donor->socket;

+

+        $modes = array(

+            STREAM_CRYPTO_METHOD_TLS_CLIENT, 

+            STREAM_CRYPTO_METHOD_SSLv3_CLIENT,

+            STREAM_CRYPTO_METHOD_SSLv23_CLIENT,

+            STREAM_CRYPTO_METHOD_SSLv2_CLIENT 

+        );

+

+        foreach ($modes as $mode) {

+            if (stream_socket_enable_crypto($this->socket, true, $mode)) {

+                return;

+            }

+        }

+        throw new HTTP_Request2_Exception(

+            'Failed to enable secure connection when connecting through proxy'

+        );

+    }

+

+   /**

+    * Checks whether current connection may be reused or should be closed

+    *

+    * @param    boolean                 whether connection could be persistent 

+    *                                   in the first place

+    * @param    HTTP_Request2_Response  response object to check

+    * @return   boolean

+    */

+    protected function canKeepAlive($requestKeepAlive, HTTP_Request2_Response $response)

+    {

+        // Do not close socket on successful CONNECT request

+        if (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() &&

+            200 <= $response->getStatus() && 300 > $response->getStatus()

+        ) {

+            return true;

+        }

+

+        $lengthKnown = 'chunked' == strtolower($response->getHeader('transfer-encoding')) ||

+                       null !== $response->getHeader('content-length');

+        $persistent  = 'keep-alive' == strtolower($response->getHeader('connection')) ||

+                       (null === $response->getHeader('connection') &&

+                        '1.1' == $response->getVersion());

+        return $requestKeepAlive && $lengthKnown && $persistent;

+    }

+

+   /**

+    * Disconnects from the remote server

+    */

+    protected function disconnect()

+    {

+        if (is_resource($this->socket)) {

+            fclose($this->socket);

+            $this->socket = null;

+            $this->request->setLastEvent('disconnect');

+        }

+    }

+

+   /**

+    * Checks whether another request should be performed with server digest auth

+    *

+    * Several conditions should be satisfied for it to return true:

+    *   - response status should be 401

+    *   - auth credentials should be set in the request object

+    *   - response should contain WWW-Authenticate header with digest challenge

+    *   - there is either no challenge stored for this URL or new challenge

+    *     contains stale=true parameter (in other case we probably just failed 

+    *     due to invalid username / password)

+    *

+    * The method stores challenge values in $challenges static property

+    *

+    * @param    HTTP_Request2_Response  response to check

+    * @return   boolean whether another request should be performed

+    * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters

+    */

+    protected function shouldUseServerDigestAuth(HTTP_Request2_Response $response)

+    {

+        // no sense repeating a request if we don't have credentials

+        if (401 != $response->getStatus() || !$this->request->getAuth()) {

+            return false;

+        }

+        if (!$challenge = $this->parseDigestChallenge($response->getHeader('www-authenticate'))) {

+            return false;

+        }

+

+        $url    = $this->request->getUrl();

+        $scheme = $url->getScheme();

+        $host   = $scheme . '://' . $url->getHost();

+        if ($port = $url->getPort()) {

+            if ((0 == strcasecmp($scheme, 'http') && 80 != $port) ||

+                (0 == strcasecmp($scheme, 'https') && 443 != $port)

+            ) {

+                $host .= ':' . $port;

+            }

+        }

+

+        if (!empty($challenge['domain'])) {

+            $prefixes = array();

+            foreach (preg_split('/\\s+/', $challenge['domain']) as $prefix) {

+                // don't bother with different servers

+                if ('/' == substr($prefix, 0, 1)) {

+                    $prefixes[] = $host . $prefix;

+                }

+            }

+        }

+        if (empty($prefixes)) {

+            $prefixes = array($host . '/');

+        }

+

+        $ret = true;

+        foreach ($prefixes as $prefix) {

+            if (!empty(self::$challenges[$prefix]) &&

+                (empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))

+            ) {

+                // probably credentials are invalid

+                $ret = false;

+            }

+            self::$challenges[$prefix] =& $challenge;

+        }

+        return $ret;

+    }

+

+   /**

+    * Checks whether another request should be performed with proxy digest auth

+    *

+    * Several conditions should be satisfied for it to return true:

+    *   - response status should be 407

+    *   - proxy auth credentials should be set in the request object

+    *   - response should contain Proxy-Authenticate header with digest challenge

+    *   - there is either no challenge stored for this proxy or new challenge

+    *     contains stale=true parameter (in other case we probably just failed 

+    *     due to invalid username / password)

+    *

+    * The method stores challenge values in $challenges static property

+    *

+    * @param    HTTP_Request2_Response  response to check

+    * @return   boolean whether another request should be performed

+    * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters

+    */

+    protected function shouldUseProxyDigestAuth(HTTP_Request2_Response $response)

+    {

+        if (407 != $response->getStatus() || !$this->request->getConfig('proxy_user')) {

+            return false;

+        }

+        if (!($challenge = $this->parseDigestChallenge($response->getHeader('proxy-authenticate')))) {

+            return false;

+        }

+

+        $key = 'proxy://' . $this->request->getConfig('proxy_host') .

+               ':' . $this->request->getConfig('proxy_port');

+

+        if (!empty(self::$challenges[$key]) &&

+            (empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))

+        ) {

+            $ret = false;

+        } else {

+            $ret = true;

+        }

+        self::$challenges[$key] = $challenge;

+        return $ret;

+    }

+

+   /**

+    * Extracts digest method challenge from (WWW|Proxy)-Authenticate header value

+    *

+    * There is a problem with implementation of RFC 2617: several of the parameters

+    * here are defined as quoted-string and thus may contain backslash escaped

+    * double quotes (RFC 2616, section 2.2). However, RFC 2617 defines unq(X) as

+    * just value of quoted-string X without surrounding quotes, it doesn't speak

+    * about removing backslash escaping.

+    *

+    * Now realm parameter is user-defined and human-readable, strange things

+    * happen when it contains quotes:

+    *   - Apache allows quotes in realm, but apparently uses realm value without

+    *     backslashes for digest computation

+    *   - Squid allows (manually escaped) quotes there, but it is impossible to

+    *     authorize with either escaped or unescaped quotes used in digest,

+    *     probably it can't parse the response (?)

+    *   - Both IE and Firefox display realm value with backslashes in 

+    *     the password popup and apparently use the same value for digest

+    *

+    * HTTP_Request2 follows IE and Firefox (and hopefully RFC 2617) in

+    * quoted-string handling, unfortunately that means failure to authorize 

+    * sometimes

+    *

+    * @param    string  value of WWW-Authenticate or Proxy-Authenticate header

+    * @return   mixed   associative array with challenge parameters, false if

+    *                   no challenge is present in header value

+    * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters

+    */

+    protected function parseDigestChallenge($headerValue)

+    {

+        $authParam   = '(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .

+                       self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')';

+        $challenge   = "!(?<=^|\\s|,)Digest ({$authParam}\\s*(,\\s*|$))+!";

+        if (!preg_match($challenge, $headerValue, $matches)) {

+            return false;

+        }

+

+        preg_match_all('!' . $authParam . '!', $matches[0], $params);

+        $paramsAry   = array();

+        $knownParams = array('realm', 'domain', 'nonce', 'opaque', 'stale',

+                             'algorithm', 'qop');

+        for ($i = 0; $i < count($params[0]); $i++) {

+            // section 3.2.1: Any unrecognized directive MUST be ignored.

+            if (in_array($params[1][$i], $knownParams)) {

+                if ('"' == substr($params[2][$i], 0, 1)) {

+                    $paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);

+                } else {

+                    $paramsAry[$params[1][$i]] = $params[2][$i];

+                }

+            }

+        }

+        // we only support qop=auth

+        if (!empty($paramsAry['qop']) && 

+            !in_array('auth', array_map('trim', explode(',', $paramsAry['qop'])))

+        ) {

+            throw new HTTP_Request2_Exception(

+                "Only 'auth' qop is currently supported in digest authentication, " .

+                "server requested '{$paramsAry['qop']}'"

+            );

+        }

+        // we only support algorithm=MD5

+        if (!empty($paramsAry['algorithm']) && 'MD5' != $paramsAry['algorithm']) {

+            throw new HTTP_Request2_Exception(

+                "Only 'MD5' algorithm is currently supported in digest authentication, " .

+                "server requested '{$paramsAry['algorithm']}'"

+            );

+        }

+

+        return $paramsAry; 

+    }

+

+   /**

+    * Parses [Proxy-]Authentication-Info header value and updates challenge

+    *

+    * @param    array   challenge to update

+    * @param    string  value of [Proxy-]Authentication-Info header

+    * @todo     validate server rspauth response

+    */ 

+    protected function updateChallenge(&$challenge, $headerValue)

+    {

+        $authParam   = '!(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .

+                       self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')!';

+        $paramsAry   = array();

+

+        preg_match_all($authParam, $headerValue, $params);

+        for ($i = 0; $i < count($params[0]); $i++) {

+            if ('"' == substr($params[2][$i], 0, 1)) {

+                $paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);

+            } else {

+                $paramsAry[$params[1][$i]] = $params[2][$i];

+            }

+        }

+        // for now, just update the nonce value

+        if (!empty($paramsAry['nextnonce'])) {

+            $challenge['nonce'] = $paramsAry['nextnonce'];

+            $challenge['nc']    = 1;

+        }

+    }

+

+   /**

+    * Creates a value for [Proxy-]Authorization header when using digest authentication

+    *

+    * @param    string  user name

+    * @param    string  password

+    * @param    string  request URL

+    * @param    array   digest challenge parameters

+    * @return   string  value of [Proxy-]Authorization request header

+    * @link     http://tools.ietf.org/html/rfc2617#section-3.2.2

+    */ 

+    protected function createDigestResponse($user, $password, $url, &$challenge)

+    {

+        if (false !== ($q = strpos($url, '?')) && 

+            $this->request->getConfig('digest_compat_ie')

+        ) {

+            $url = substr($url, 0, $q);

+        }

+

+        $a1 = md5($user . ':' . $challenge['realm'] . ':' . $password);

+        $a2 = md5($this->request->getMethod() . ':' . $url);

+

+        if (empty($challenge['qop'])) {

+            $digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $a2);

+        } else {

+            $challenge['cnonce'] = 'Req2.' . rand();

+            if (empty($challenge['nc'])) {

+                $challenge['nc'] = 1;

+            }

+            $nc     = sprintf('%08x', $challenge['nc']++);

+            $digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $nc . ':' .

+                          $challenge['cnonce'] . ':auth:' . $a2);

+        }

+        return 'Digest username="' . str_replace(array('\\', '"'), array('\\\\', '\\"'), $user) . '", ' .

+               'realm="' . $challenge['realm'] . '", ' .

+               'nonce="' . $challenge['nonce'] . '", ' .

+               'uri="' . $url . '", ' .

+               'response="' . $digest . '"' .

+               (!empty($challenge['opaque'])? 

+                ', opaque="' . $challenge['opaque'] . '"':

+                '') .

+               (!empty($challenge['qop'])?

+                ', qop="auth", nc=' . $nc . ', cnonce="' . $challenge['cnonce'] . '"':

+                '');

+    }

+

+   /**

+    * Adds 'Authorization' header (if needed) to request headers array

+    *

+    * @param    array   request headers

+    * @param    string  request host (needed for digest authentication)

+    * @param    string  request URL (needed for digest authentication)

+    * @throws   HTTP_Request2_Exception

+    */

+    protected function addAuthorizationHeader(&$headers, $requestHost, $requestUrl)

+    {

+        if (!($auth = $this->request->getAuth())) {

+            return;

+        }

+        switch ($auth['scheme']) {

+            case HTTP_Request2::AUTH_BASIC:

+                $headers['authorization'] = 

+                    'Basic ' . base64_encode($auth['user'] . ':' . $auth['password']);

+                break;

+

+            case HTTP_Request2::AUTH_DIGEST:

+                unset($this->serverChallenge);

+                $fullUrl = ('/' == $requestUrl[0])?

+                           $this->request->getUrl()->getScheme() . '://' .

+                            $requestHost . $requestUrl:

+                           $requestUrl;

+                foreach (array_keys(self::$challenges) as $key) {

+                    if ($key == substr($fullUrl, 0, strlen($key))) {

+                        $headers['authorization'] = $this->createDigestResponse(

+                            $auth['user'], $auth['password'], 

+                            $requestUrl, self::$challenges[$key]

+                        );

+                        $this->serverChallenge =& self::$challenges[$key];

+                        break;

+                    }

+                }

+                break;

+

+            default:

+                throw new HTTP_Request2_Exception(

+                    "Unknown HTTP authentication scheme '{$auth['scheme']}'"

+                );

+        }

+    }

+

+   /**

+    * Adds 'Proxy-Authorization' header (if needed) to request headers array

+    *

+    * @param    array   request headers

+    * @param    string  request URL (needed for digest authentication)

+    * @throws   HTTP_Request2_Exception

+    */

+    protected function addProxyAuthorizationHeader(&$headers, $requestUrl)

+    {

+        if (!$this->request->getConfig('proxy_host') ||

+            !($user = $this->request->getConfig('proxy_user')) ||

+            (0 == strcasecmp('https', $this->request->getUrl()->getScheme()) &&

+             HTTP_Request2::METHOD_CONNECT != $this->request->getMethod())

+        ) {

+            return;

+        }

+

+        $password = $this->request->getConfig('proxy_password');

+        switch ($this->request->getConfig('proxy_auth_scheme')) {

+            case HTTP_Request2::AUTH_BASIC:

+                $headers['proxy-authorization'] =

+                    'Basic ' . base64_encode($user . ':' . $password);

+                break;

+

+            case HTTP_Request2::AUTH_DIGEST:

+                unset($this->proxyChallenge);

+                $proxyUrl = 'proxy://' . $this->request->getConfig('proxy_host') .

+                            ':' . $this->request->getConfig('proxy_port');

+                if (!empty(self::$challenges[$proxyUrl])) {

+                    $headers['proxy-authorization'] = $this->createDigestResponse(

+                        $user, $password,

+                        $requestUrl, self::$challenges[$proxyUrl]

+                    );

+                    $this->proxyChallenge =& self::$challenges[$proxyUrl];

+                }

+                break;

+

+            default:

+                throw new HTTP_Request2_Exception(

+                    "Unknown HTTP authentication scheme '" .

+                    $this->request->getConfig('proxy_auth_scheme') . "'"

+                );

+        }

+    }

+

+

+   /**

+    * Creates the string with the Request-Line and request headers

+    *

+    * @return   string

+    * @throws   HTTP_Request2_Exception

+    */

+    protected function prepareHeaders()

+    {

+        $headers = $this->request->getHeaders();

+        $url     = $this->request->getUrl();

+        $connect = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();

+        $host    = $url->getHost();

+

+        $defaultPort = 0 == strcasecmp($url->getScheme(), 'https')? 443: 80;

+        if (($port = $url->getPort()) && $port != $defaultPort || $connect) {

+            $host .= ':' . (empty($port)? $defaultPort: $port);

+        }

+        // Do not overwrite explicitly set 'Host' header, see bug #16146

+        if (!isset($headers['host'])) {

+            $headers['host'] = $host;

+        }

+

+        if ($connect) {

+            $requestUrl = $host;

+

+        } else {

+            if (!$this->request->getConfig('proxy_host') ||

+                0 == strcasecmp($url->getScheme(), 'https')

+            ) {

+                $requestUrl = '';

+            } else {

+                $requestUrl = $url->getScheme() . '://' . $host;

+            }

+            $path        = $url->getPath();

+            $query       = $url->getQuery();

+            $requestUrl .= (empty($path)? '/': $path) . (empty($query)? '': '?' . $query);

+        }

+

+        if ('1.1' == $this->request->getConfig('protocol_version') &&

+            extension_loaded('zlib') && !isset($headers['accept-encoding'])

+        ) {

+            $headers['accept-encoding'] = 'gzip, deflate';

+        }

+

+        $this->addAuthorizationHeader($headers, $host, $requestUrl);

+        $this->addProxyAuthorizationHeader($headers, $requestUrl);

+        $this->calculateRequestLength($headers);

+

+        $headersStr = $this->request->getMethod() . ' ' . $requestUrl . ' HTTP/' .

+                      $this->request->getConfig('protocol_version') . "\r\n";

+        foreach ($headers as $name => $value) {

+            $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));

+            $headersStr   .= $canonicalName . ': ' . $value . "\r\n";

+        }

+        return $headersStr . "\r\n";

+    }

+

+   /**

+    * Sends the request body

+    *

+    * @throws   HTTP_Request2_Exception

+    */

+    protected function writeBody()

+    {

+        if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||

+            0 == $this->contentLength

+        ) {

+            return;

+        }

+

+        $position   = 0;

+        $bufferSize = $this->request->getConfig('buffer_size');

+        while ($position < $this->contentLength) {

+            if (is_string($this->requestBody)) {

+                $str = substr($this->requestBody, $position, $bufferSize);

+            } elseif (is_resource($this->requestBody)) {

+                $str = fread($this->requestBody, $bufferSize);

+            } else {

+                $str = $this->requestBody->read($bufferSize);

+            }

+            if (false === @fwrite($this->socket, $str, strlen($str))) {

+                throw new HTTP_Request2_Exception('Error writing request');

+            }

+            // Provide the length of written string to the observer, request #7630

+            $this->request->setLastEvent('sentBodyPart', strlen($str));

+            $position += strlen($str); 

+        }

+    }

+

+   /**

+    * Reads the remote server's response

+    *

+    * @return   HTTP_Request2_Response

+    * @throws   HTTP_Request2_Exception

+    */

+    protected function readResponse()

+    {

+        $bufferSize = $this->request->getConfig('buffer_size');

+

+        do {

+            $response = new HTTP_Request2_Response($this->readLine($bufferSize), true);

+            do {

+                $headerLine = $this->readLine($bufferSize);

+                $response->parseHeaderLine($headerLine);

+            } while ('' != $headerLine);

+        } while (in_array($response->getStatus(), array(100, 101)));

+

+        $this->request->setLastEvent('receivedHeaders', $response);

+

+        // No body possible in such responses

+        if (HTTP_Request2::METHOD_HEAD == $this->request->getMethod() ||

+            (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() &&

+             200 <= $response->getStatus() && 300 > $response->getStatus()) ||

+            in_array($response->getStatus(), array(204, 304))

+        ) {

+            return $response;

+        }

+

+        $chunked = 'chunked' == $response->getHeader('transfer-encoding');

+        $length  = $response->getHeader('content-length');

+        $hasBody = false;

+        if ($chunked || null === $length || 0 < intval($length)) {

+            // RFC 2616, section 4.4:

+            // 3. ... If a message is received with both a

+            // Transfer-Encoding header field and a Content-Length header field,

+            // the latter MUST be ignored.

+            $toRead = ($chunked || null === $length)? null: $length;

+            $this->chunkLength = 0;

+

+            while (!feof($this->socket) && (is_null($toRead) || 0 < $toRead)) {

+                if ($chunked) {

+                    $data = $this->readChunked($bufferSize);

+                } elseif (is_null($toRead)) {

+                    $data = $this->fread($bufferSize);

+                } else {

+                    $data    = $this->fread(min($toRead, $bufferSize));

+                    $toRead -= strlen($data);

+                }

+                if ('' == $data && (!$this->chunkLength || feof($this->socket))) {

+                    break;

+                }

+

+                $hasBody = true;

+                if ($this->request->getConfig('store_body')) {

+                    $response->appendBody($data);

+                }

+                if (!in_array($response->getHeader('content-encoding'), array('identity', null))) {

+                    $this->request->setLastEvent('receivedEncodedBodyPart', $data);

+                } else {

+                    $this->request->setLastEvent('receivedBodyPart', $data);

+                }

+            }

+        }

+

+        if ($hasBody) {

+            $this->request->setLastEvent('receivedBody', $response);

+        }

+        return $response;

+    }

+

+   /**

+    * Reads until either the end of the socket or a newline, whichever comes first 

+    *

+    * Strips the trailing newline from the returned data, handles global 

+    * request timeout. Method idea borrowed from Net_Socket PEAR package. 

+    *

+    * @param    int     buffer size to use for reading

+    * @return   Available data up to the newline (not including newline)

+    * @throws   HTTP_Request2_Exception     In case of timeout

+    */

+    protected function readLine($bufferSize)

+    {

+        $line = '';

+        while (!feof($this->socket)) {

+            if ($this->timeout) {

+                stream_set_timeout($this->socket, max($this->timeout - time(), 1));

+            }

+            $line .= @fgets($this->socket, $bufferSize);

+            $info  = stream_get_meta_data($this->socket);

+            if ($info['timed_out'] || $this->timeout && time() > $this->timeout) {

+                throw new HTTP_Request2_Exception(

+                    'Request timed out after ' . 

+                    $this->request->getConfig('timeout') . ' second(s)'

+                );

+            }

+            if (substr($line, -1) == "\n") {

+                return rtrim($line, "\r\n");

+            }

+        }

+        return $line;

+    }

+

+   /**

+    * Wrapper around fread(), handles global request timeout

+    *

+    * @param    int     Reads up to this number of bytes

+    * @return   Data read from socket

+    * @throws   HTTP_Request2_Exception     In case of timeout

+    */

+    protected function fread($length)

+    {

+        if ($this->timeout) {

+            stream_set_timeout($this->socket, max($this->timeout - time(), 1));

+        }

+        $data = fread($this->socket, $length);

+        $info = stream_get_meta_data($this->socket);

+        if ($info['timed_out'] || $this->timeout && time() > $this->timeout) {

+            throw new HTTP_Request2_Exception(

+                'Request timed out after ' . 

+                $this->request->getConfig('timeout') . ' second(s)'

+            );

+        }

+        return $data;

+    }

+

+   /**

+    * Reads a part of response body encoded with chunked Transfer-Encoding

+    *

+    * @param    int     buffer size to use for reading

+    * @return   string

+    * @throws   HTTP_Request2_Exception

+    */

+    protected function readChunked($bufferSize)

+    {

+        // at start of the next chunk?

+        if (0 == $this->chunkLength) {

+            $line = $this->readLine($bufferSize);

+            if (!preg_match('/^([0-9a-f]+)/i', $line, $matches)) {

+                throw new HTTP_Request2_Exception(

+                    "Cannot decode chunked response, invalid chunk length '{$line}'"

+                );

+            } else {

+                $this->chunkLength = hexdec($matches[1]);

+                // Chunk with zero length indicates the end

+                if (0 == $this->chunkLength) {

+                    $this->readLine($bufferSize);

+                    return '';

+                }

+            }

+        }

+        $data = $this->fread(min($this->chunkLength, $bufferSize));

+        $this->chunkLength -= strlen($data);

+        if (0 == $this->chunkLength) {

+            $this->readLine($bufferSize); // Trailing CRLF

+        }

+        return $data;

+    }

+}

+

+?>
\ No newline at end of file
diff --git a/extlib/HTTP/Request2/Exception.php b/extlib/HTTP/Request2/Exception.php
new file mode 100644
index 000000000..bfef7d6c2
--- /dev/null
+++ b/extlib/HTTP/Request2/Exception.php
@@ -0,0 +1,62 @@
+<?php

+/**

+ * Exception class for HTTP_Request2 package

+ *

+ * PHP version 5

+ *

+ * LICENSE:

+ *

+ * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ *

+ *    * Redistributions of source code must retain the above copyright

+ *      notice, this list of conditions and the following disclaimer.

+ *    * Redistributions in binary form must reproduce the above copyright

+ *      notice, this list of conditions and the following disclaimer in the

+ *      documentation and/or other materials provided with the distribution.

+ *    * The names of the authors may not be used to endorse or promote products

+ *      derived from this software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS

+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR

+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ *

+ * @category   HTTP

+ * @package    HTTP_Request2

+ * @author     Alexey Borzov <avb@php.net>

+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License

+ * @version    CVS: $Id: Exception.php 273003 2009-01-07 19:28:22Z avb $

+ * @link       http://pear.php.net/package/HTTP_Request2

+ */

+

+/**

+ * Base class for exceptions in PEAR

+ */

+require_once 'PEAR/Exception.php';

+

+/**

+ * Exception class for HTTP_Request2 package

+ *

+ * Such a class is required by the Exception RFC:

+ * http://pear.php.net/pepr/pepr-proposal-show.php?id=132

+ *

+ * @category   HTTP

+ * @package    HTTP_Request2

+ * @version    Release: 0.4.1

+ */

+class HTTP_Request2_Exception extends PEAR_Exception

+{

+}

+?>
\ No newline at end of file
diff --git a/extlib/HTTP/Request2/MultipartBody.php b/extlib/HTTP/Request2/MultipartBody.php
new file mode 100644
index 000000000..d8afd8344
--- /dev/null
+++ b/extlib/HTTP/Request2/MultipartBody.php
@@ -0,0 +1,274 @@
+<?php

+/**

+ * Helper class for building multipart/form-data request body

+ *

+ * PHP version 5

+ *

+ * LICENSE:

+ *

+ * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ *

+ *    * Redistributions of source code must retain the above copyright

+ *      notice, this list of conditions and the following disclaimer.

+ *    * Redistributions in binary form must reproduce the above copyright

+ *      notice, this list of conditions and the following disclaimer in the

+ *      documentation and/or other materials provided with the distribution.

+ *    * The names of the authors may not be used to endorse or promote products

+ *      derived from this software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS

+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR

+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ *

+ * @category   HTTP

+ * @package    HTTP_Request2

+ * @author     Alexey Borzov <avb@php.net>

+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License

+ * @version    CVS: $Id: MultipartBody.php 287306 2009-08-14 15:22:52Z avb $

+ * @link       http://pear.php.net/package/HTTP_Request2

+ */

+

+/**

+ * Class for building multipart/form-data request body

+ *

+ * The class helps to reduce memory consumption by streaming large file uploads

+ * from disk, it also allows monitoring of upload progress (see request #7630)

+ *

+ * @category   HTTP

+ * @package    HTTP_Request2

+ * @author     Alexey Borzov <avb@php.net>

+ * @version    Release: 0.4.1

+ * @link       http://tools.ietf.org/html/rfc1867

+ */

+class HTTP_Request2_MultipartBody

+{

+   /**

+    * MIME boundary

+    * @var  string

+    */

+    private $_boundary;

+

+   /**

+    * Form parameters added via {@link HTTP_Request2::addPostParameter()}

+    * @var  array

+    */

+    private $_params = array();

+

+   /**

+    * File uploads added via {@link HTTP_Request2::addUpload()}

+    * @var  array

+    */

+    private $_uploads = array();

+

+   /**

+    * Header for parts with parameters

+    * @var  string

+    */

+    private $_headerParam = "--%s\r\nContent-Disposition: form-data; name=\"%s\"\r\n\r\n";

+

+   /**

+    * Header for parts with uploads

+    * @var  string

+    */

+    private $_headerUpload = "--%s\r\nContent-Disposition: form-data; name=\"%s\"; filename=\"%s\"\r\nContent-Type: %s\r\n\r\n";

+

+   /**

+    * Current position in parameter and upload arrays

+    *

+    * First number is index of "current" part, second number is position within

+    * "current" part

+    *

+    * @var  array

+    */

+    private $_pos = array(0, 0);

+

+

+   /**

+    * Constructor. Sets the arrays with POST data.

+    *

+    * @param    array   values of form fields set via {@link HTTP_Request2::addPostParameter()}

+    * @param    array   file uploads set via {@link HTTP_Request2::addUpload()}

+    * @param    bool    whether to append brackets to array variable names

+    */

+    public function __construct(array $params, array $uploads, $useBrackets = true)

+    {

+        $this->_params = self::_flattenArray('', $params, $useBrackets);

+        foreach ($uploads as $fieldName => $f) {

+            if (!is_array($f['fp'])) {

+                $this->_uploads[] = $f + array('name' => $fieldName);

+            } else {

+                for ($i = 0; $i < count($f['fp']); $i++) {

+                    $upload = array(

+                        'name' => ($useBrackets? $fieldName . '[' . $i . ']': $fieldName)

+                    );

+                    foreach (array('fp', 'filename', 'size', 'type') as $key) {

+                        $upload[$key] = $f[$key][$i];

+                    }

+                    $this->_uploads[] = $upload;

+                }

+            }

+        }

+    }

+

+   /**

+    * Returns the length of the body to use in Content-Length header

+    *

+    * @return   integer

+    */

+    public function getLength()

+    {

+        $boundaryLength     = strlen($this->getBoundary());

+        $headerParamLength  = strlen($this->_headerParam) - 4 + $boundaryLength;

+        $headerUploadLength = strlen($this->_headerUpload) - 8 + $boundaryLength;

+        $length             = $boundaryLength + 6;

+        foreach ($this->_params as $p) {

+            $length += $headerParamLength + strlen($p[0]) + strlen($p[1]) + 2;

+        }

+        foreach ($this->_uploads as $u) {

+            $length += $headerUploadLength + strlen($u['name']) + strlen($u['type']) +

+                       strlen($u['filename']) + $u['size'] + 2;

+        }

+        return $length;

+    }

+

+   /**

+    * Returns the boundary to use in Content-Type header

+    *

+    * @return   string

+    */

+    public function getBoundary()

+    {

+        if (empty($this->_boundary)) {

+            $this->_boundary = '--' . md5('PEAR-HTTP_Request2-' . microtime());

+        }

+        return $this->_boundary;

+    }

+

+   /**

+    * Returns next chunk of request body

+    *

+    * @param    integer Amount of bytes to read

+    * @return   string  Up to $length bytes of data, empty string if at end

+    */

+    public function read($length)

+    {

+        $ret         = '';

+        $boundary    = $this->getBoundary();

+        $paramCount  = count($this->_params);

+        $uploadCount = count($this->_uploads);

+        while ($length > 0 && $this->_pos[0] <= $paramCount + $uploadCount) {

+            $oldLength = $length;

+            if ($this->_pos[0] < $paramCount) {

+                $param = sprintf($this->_headerParam, $boundary, 

+                                 $this->_params[$this->_pos[0]][0]) .

+                         $this->_params[$this->_pos[0]][1] . "\r\n";

+                $ret    .= substr($param, $this->_pos[1], $length);

+                $length -= min(strlen($param) - $this->_pos[1], $length);

+

+            } elseif ($this->_pos[0] < $paramCount + $uploadCount) {

+                $pos    = $this->_pos[0] - $paramCount;

+                $header = sprintf($this->_headerUpload, $boundary,

+                                  $this->_uploads[$pos]['name'],

+                                  $this->_uploads[$pos]['filename'],

+                                  $this->_uploads[$pos]['type']);

+                if ($this->_pos[1] < strlen($header)) {

+                    $ret    .= substr($header, $this->_pos[1], $length);

+                    $length -= min(strlen($header) - $this->_pos[1], $length);

+                }

+                $filePos  = max(0, $this->_pos[1] - strlen($header));

+                if ($length > 0 && $filePos < $this->_uploads[$pos]['size']) {

+                    $ret     .= fread($this->_uploads[$pos]['fp'], $length);

+                    $length  -= min($length, $this->_uploads[$pos]['size'] - $filePos);

+                }

+                if ($length > 0) {

+                    $start   = $this->_pos[1] + ($oldLength - $length) -

+                               strlen($header) - $this->_uploads[$pos]['size'];

+                    $ret    .= substr("\r\n", $start, $length);

+                    $length -= min(2 - $start, $length);

+                }

+

+            } else {

+                $closing  = '--' . $boundary . "--\r\n";

+                $ret     .= substr($closing, $this->_pos[1], $length);

+                $length  -= min(strlen($closing) - $this->_pos[1], $length);

+            }

+            if ($length > 0) {

+                $this->_pos     = array($this->_pos[0] + 1, 0);

+            } else {

+                $this->_pos[1] += $oldLength;

+            }

+        }

+        return $ret;

+    }

+

+   /**

+    * Sets the current position to the start of the body

+    *

+    * This allows reusing the same body in another request

+    */

+    public function rewind()

+    {

+        $this->_pos = array(0, 0);

+        foreach ($this->_uploads as $u) {

+            rewind($u['fp']);

+        }

+    }

+

+   /**

+    * Returns the body as string

+    *

+    * Note that it reads all file uploads into memory so it is a good idea not

+    * to use this method with large file uploads and rely on read() instead.

+    *

+    * @return   string

+    */

+    public function __toString()

+    {

+        $this->rewind();

+        return $this->read($this->getLength());

+    }

+

+

+   /**

+    * Helper function to change the (probably multidimensional) associative array

+    * into the simple one.

+    *

+    * @param    string  name for item

+    * @param    mixed   item's values

+    * @param    bool    whether to append [] to array variables' names

+    * @return   array   array with the following items: array('item name', 'item value');

+    */

+    private static function _flattenArray($name, $values, $useBrackets)

+    {

+        if (!is_array($values)) {

+            return array(array($name, $values));

+        } else {

+            $ret = array();

+            foreach ($values as $k => $v) {

+                if (empty($name)) {

+                    $newName = $k;

+                } elseif ($useBrackets) {

+                    $newName = $name . '[' . $k . ']';

+                } else {

+                    $newName = $name;

+                }

+                $ret = array_merge($ret, self::_flattenArray($newName, $v, $useBrackets));

+            }

+            return $ret;

+        }

+    }

+}

+?>

diff --git a/extlib/HTTP/Request2/Observer/Log.php b/extlib/HTTP/Request2/Observer/Log.php
new file mode 100644
index 000000000..b1a055278
--- /dev/null
+++ b/extlib/HTTP/Request2/Observer/Log.php
@@ -0,0 +1,215 @@
+<?php

+/**

+ * An observer useful for debugging / testing.

+ *

+ * PHP version 5

+ *

+ * LICENSE:

+ *

+ * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ *

+ *    * Redistributions of source code must retain the above copyright

+ *      notice, this list of conditions and the following disclaimer.

+ *    * Redistributions in binary form must reproduce the above copyright

+ *      notice, this list of conditions and the following disclaimer in the

+ *      documentation and/or other materials provided with the distribution.

+ *    * The names of the authors may not be used to endorse or promote products

+ *      derived from this software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS

+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR

+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ *

+ * @category HTTP

+ * @package  HTTP_Request2

+ * @author   David Jean Louis <izi@php.net>

+ * @author   Alexey Borzov <avb@php.net>

+ * @license  http://opensource.org/licenses/bsd-license.php New BSD License

+ * @version  CVS: $Id: Log.php 272593 2009-01-02 16:27:14Z avb $

+ * @link     http://pear.php.net/package/HTTP_Request2

+ */

+

+/**

+ * Exception class for HTTP_Request2 package

+ */ 

+require_once 'HTTP/Request2/Exception.php';

+

+/**

+ * A debug observer useful for debugging / testing.

+ *

+ * This observer logs to a log target data corresponding to the various request 

+ * and response events, it logs by default to php://output but can be configured

+ * to log to a file or via the PEAR Log package.

+ *

+ * A simple example:

+ * <code>

+ * require_once 'HTTP/Request2.php';

+ * require_once 'HTTP/Request2/Observer/Log.php';

+ *

+ * $request  = new HTTP_Request2('http://www.example.com');

+ * $observer = new HTTP_Request2_Observer_Log();

+ * $request->attach($observer);

+ * $request->send();

+ * </code>

+ *

+ * A more complex example with PEAR Log:

+ * <code>

+ * require_once 'HTTP/Request2.php';

+ * require_once 'HTTP/Request2/Observer/Log.php';

+ * require_once 'Log.php';

+ *

+ * $request  = new HTTP_Request2('http://www.example.com');

+ * // we want to log with PEAR log

+ * $observer = new HTTP_Request2_Observer_Log(Log::factory('console'));

+ *

+ * // we only want to log received headers

+ * $observer->events = array('receivedHeaders');

+ *

+ * $request->attach($observer);

+ * $request->send();

+ * </code>

+ *

+ * @category HTTP

+ * @package  HTTP_Request2

+ * @author   David Jean Louis <izi@php.net>

+ * @author   Alexey Borzov <avb@php.net>

+ * @license  http://opensource.org/licenses/bsd-license.php New BSD License

+ * @version  Release: 0.4.1

+ * @link     http://pear.php.net/package/HTTP_Request2

+ */

+class HTTP_Request2_Observer_Log implements SplObserver

+{

+    // properties {{{

+

+    /**

+     * The log target, it can be a a resource or a PEAR Log instance.

+     *

+     * @var resource|Log $target

+     */

+    protected $target = null;

+

+    /**

+     * The events to log.

+     *

+     * @var array $events

+     */

+    public $events = array(

+        'connect',

+        'sentHeaders',

+        'sentBodyPart',

+        'receivedHeaders',

+        'receivedBody',

+        'disconnect',

+    );

+

+    // }}}

+    // __construct() {{{

+

+    /**

+     * Constructor.

+     *

+     * @param mixed $target Can be a file path (default: php://output), a resource,

+     *                      or an instance of the PEAR Log class.

+     * @param array $events Array of events to listen to (default: all events)

+     *

+     * @return void

+     */

+    public function __construct($target = 'php://output', array $events = array())

+    {

+        if (!empty($events)) {

+            $this->events = $events;

+        }

+        if (is_resource($target) || $target instanceof Log) {

+            $this->target = $target;

+        } elseif (false === ($this->target = @fopen($target, 'w'))) {

+            throw new HTTP_Request2_Exception("Unable to open '{$target}'");

+        }

+    }

+

+    // }}}

+    // update() {{{

+

+    /**

+     * Called when the request notify us of an event.

+     *

+     * @param HTTP_Request2 $subject The HTTP_Request2 instance

+     *

+     * @return void

+     */

+    public function update(SplSubject $subject)

+    {

+        $event = $subject->getLastEvent();

+        if (!in_array($event['name'], $this->events)) {

+            return;

+        }

+

+        switch ($event['name']) {

+        case 'connect':

+            $this->log('* Connected to ' . $event['data']);

+            break;

+        case 'sentHeaders':

+            $headers = explode("\r\n", $event['data']);

+            array_pop($headers);

+            foreach ($headers as $header) {

+                $this->log('> ' . $header);

+            }

+            break;

+        case 'sentBodyPart':

+            $this->log('> ' . $event['data']);

+            break;

+        case 'receivedHeaders':

+            $this->log(sprintf('< HTTP/%s %s %s',

+                $event['data']->getVersion(),

+                $event['data']->getStatus(),

+                $event['data']->getReasonPhrase()));

+            $headers = $event['data']->getHeader();

+            foreach ($headers as $key => $val) {

+                $this->log('< ' . $key . ': ' . $val);

+            }

+            $this->log('< ');

+            break;

+        case 'receivedBody':

+            $this->log($event['data']->getBody());

+            break;

+        case 'disconnect':

+            $this->log('* Disconnected');

+            break;

+        }

+    }

+    

+    // }}}

+    // log() {{{

+

+    /**

+     * Log the given message to the configured target.

+     *

+     * @param string $message Message to display

+     *

+     * @return void

+     */

+    protected function log($message)

+    {

+        if ($this->target instanceof Log) {

+            $this->target->debug($message);

+        } elseif (is_resource($this->target)) {

+            fwrite($this->target, $message . "\r\n");

+        }

+    }

+

+    // }}}

+}

+

+?>
\ No newline at end of file
diff --git a/extlib/HTTP/Request2/Response.php b/extlib/HTTP/Request2/Response.php
new file mode 100644
index 000000000..c7c1021fb
--- /dev/null
+++ b/extlib/HTTP/Request2/Response.php
@@ -0,0 +1,549 @@
+<?php

+/**

+ * Class representing a HTTP response

+ *

+ * PHP version 5

+ *

+ * LICENSE:

+ *

+ * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ *

+ *    * Redistributions of source code must retain the above copyright

+ *      notice, this list of conditions and the following disclaimer.

+ *    * Redistributions in binary form must reproduce the above copyright

+ *      notice, this list of conditions and the following disclaimer in the

+ *      documentation and/or other materials provided with the distribution.

+ *    * The names of the authors may not be used to endorse or promote products

+ *      derived from this software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS

+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR

+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ *

+ * @category   HTTP

+ * @package    HTTP_Request2

+ * @author     Alexey Borzov <avb@php.net>

+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License

+ * @version    CVS: $Id: Response.php 287948 2009-09-01 17:12:18Z avb $

+ * @link       http://pear.php.net/package/HTTP_Request2

+ */

+

+/**

+ * Exception class for HTTP_Request2 package

+ */ 

+require_once 'HTTP/Request2/Exception.php';

+

+/**

+ * Class representing a HTTP response

+ *

+ * The class is designed to be used in "streaming" scenario, building the

+ * response as it is being received:

+ * <code>

+ * $statusLine = read_status_line();

+ * $response = new HTTP_Request2_Response($statusLine);

+ * do {

+ *     $headerLine = read_header_line();

+ *     $response->parseHeaderLine($headerLine);

+ * } while ($headerLine != '');

+ * 

+ * while ($chunk = read_body()) {

+ *     $response->appendBody($chunk);

+ * }

+ * 

+ * var_dump($response->getHeader(), $response->getCookies(), $response->getBody());

+ * </code>

+ *

+ *

+ * @category   HTTP

+ * @package    HTTP_Request2

+ * @author     Alexey Borzov <avb@php.net>

+ * @version    Release: 0.4.1

+ * @link       http://tools.ietf.org/html/rfc2616#section-6

+ */

+class HTTP_Request2_Response

+{

+   /**

+    * HTTP protocol version (e.g. 1.0, 1.1)

+    * @var  string

+    */

+    protected $version;

+

+   /**

+    * Status code

+    * @var  integer

+    * @link http://tools.ietf.org/html/rfc2616#section-6.1.1

+    */

+    protected $code;

+

+   /**

+    * Reason phrase

+    * @var  string

+    * @link http://tools.ietf.org/html/rfc2616#section-6.1.1

+    */

+    protected $reasonPhrase;

+

+   /**

+    * Associative array of response headers

+    * @var  array

+    */

+    protected $headers = array();

+

+   /**

+    * Cookies set in the response

+    * @var  array

+    */

+    protected $cookies = array();

+

+   /**

+    * Name of last header processed by parseHederLine()

+    *

+    * Used to handle the headers that span multiple lines

+    *

+    * @var  string

+    */

+    protected $lastHeader = null;

+

+   /**

+    * Response body

+    * @var  string

+    */

+    protected $body = '';

+

+   /**

+    * Whether the body is still encoded by Content-Encoding

+    *

+    * cURL provides the decoded body to the callback; if we are reading from

+    * socket the body is still gzipped / deflated

+    *

+    * @var  bool

+    */

+    protected $bodyEncoded;

+

+   /**

+    * Associative array of HTTP status code / reason phrase.

+    *

+    * @var  array

+    * @link http://tools.ietf.org/html/rfc2616#section-10

+    */

+    protected static $phrases = array(

+

+        // 1xx: Informational - Request received, continuing process

+        100 => 'Continue',

+        101 => 'Switching Protocols',

+

+        // 2xx: Success - The action was successfully received, understood and

+        // accepted

+        200 => 'OK',

+        201 => 'Created',

+        202 => 'Accepted',

+        203 => 'Non-Authoritative Information',

+        204 => 'No Content',

+        205 => 'Reset Content',

+        206 => 'Partial Content',

+

+        // 3xx: Redirection - Further action must be taken in order to complete

+        // the request

+        300 => 'Multiple Choices',

+        301 => 'Moved Permanently',

+        302 => 'Found',  // 1.1

+        303 => 'See Other',

+        304 => 'Not Modified',

+        305 => 'Use Proxy',

+        307 => 'Temporary Redirect',

+

+        // 4xx: Client Error - The request contains bad syntax or cannot be 

+        // fulfilled

+        400 => 'Bad Request',

+        401 => 'Unauthorized',

+        402 => 'Payment Required',

+        403 => 'Forbidden',

+        404 => 'Not Found',

+        405 => 'Method Not Allowed',

+        406 => 'Not Acceptable',

+        407 => 'Proxy Authentication Required',

+        408 => 'Request Timeout',

+        409 => 'Conflict',

+        410 => 'Gone',

+        411 => 'Length Required',

+        412 => 'Precondition Failed',

+        413 => 'Request Entity Too Large',

+        414 => 'Request-URI Too Long',

+        415 => 'Unsupported Media Type',

+        416 => 'Requested Range Not Satisfiable',

+        417 => 'Expectation Failed',

+

+        // 5xx: Server Error - The server failed to fulfill an apparently

+        // valid request

+        500 => 'Internal Server Error',

+        501 => 'Not Implemented',

+        502 => 'Bad Gateway',

+        503 => 'Service Unavailable',

+        504 => 'Gateway Timeout',

+        505 => 'HTTP Version Not Supported',

+        509 => 'Bandwidth Limit Exceeded',

+

+    );

+

+   /**

+    * Constructor, parses the response status line

+    *

+    * @param    string  Response status line (e.g. "HTTP/1.1 200 OK")

+    * @param    bool    Whether body is still encoded by Content-Encoding

+    * @throws   HTTP_Request2_Exception if status line is invalid according to spec

+    */

+    public function __construct($statusLine, $bodyEncoded = true)

+    {

+        if (!preg_match('!^HTTP/(\d\.\d) (\d{3})(?: (.+))?!', $statusLine, $m)) {

+            throw new HTTP_Request2_Exception("Malformed response: {$statusLine}");

+        }

+        $this->version = $m[1];

+        $this->code    = intval($m[2]);

+        if (!empty($m[3])) {

+            $this->reasonPhrase = trim($m[3]);

+        } elseif (!empty(self::$phrases[$this->code])) {

+            $this->reasonPhrase = self::$phrases[$this->code];

+        }

+        $this->bodyEncoded = (bool)$bodyEncoded;

+    }

+

+   /**

+    * Parses the line from HTTP response filling $headers array

+    *

+    * The method should be called after reading the line from socket or receiving 

+    * it into cURL callback. Passing an empty string here indicates the end of

+    * response headers and triggers additional processing, so be sure to pass an

+    * empty string in the end.

+    *

+    * @param    string  Line from HTTP response

+    */

+    public function parseHeaderLine($headerLine)

+    {

+        $headerLine = trim($headerLine, "\r\n");

+

+        // empty string signals the end of headers, process the received ones

+        if ('' == $headerLine) {

+            if (!empty($this->headers['set-cookie'])) {

+                $cookies = is_array($this->headers['set-cookie'])?

+                           $this->headers['set-cookie']:

+                           array($this->headers['set-cookie']);

+                foreach ($cookies as $cookieString) {

+                    $this->parseCookie($cookieString);

+                }

+                unset($this->headers['set-cookie']);

+            }

+            foreach (array_keys($this->headers) as $k) {

+                if (is_array($this->headers[$k])) {

+                    $this->headers[$k] = implode(', ', $this->headers[$k]);

+                }

+            }

+

+        // string of the form header-name: header value

+        } elseif (preg_match('!^([^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+):(.+)$!', $headerLine, $m)) {

+            $name  = strtolower($m[1]);

+            $value = trim($m[2]);

+            if (empty($this->headers[$name])) {

+                $this->headers[$name] = $value;

+            } else {

+                if (!is_array($this->headers[$name])) {

+                    $this->headers[$name] = array($this->headers[$name]);

+                }

+                $this->headers[$name][] = $value;

+            }

+            $this->lastHeader = $name;

+

+        // string 

+        } elseif (preg_match('!^\s+(.+)$!', $headerLine, $m) && $this->lastHeader) {

+            if (!is_array($this->headers[$this->lastHeader])) {

+                $this->headers[$this->lastHeader] .= ' ' . trim($m[1]);

+            } else {

+                $key = count($this->headers[$this->lastHeader]) - 1;

+                $this->headers[$this->lastHeader][$key] .= ' ' . trim($m[1]);

+            }

+        }

+    } 

+

+   /**

+    * Parses a Set-Cookie header to fill $cookies array

+    *

+    * @param    string    value of Set-Cookie header

+    * @link     http://cgi.netscape.com/newsref/std/cookie_spec.html

+    */

+    protected function parseCookie($cookieString)

+    {

+        $cookie = array(

+            'expires' => null,

+            'domain'  => null,

+            'path'    => null,

+            'secure'  => false

+        );

+

+        // Only a name=value pair

+        if (!strpos($cookieString, ';')) {

+            $pos = strpos($cookieString, '=');

+            $cookie['name']  = trim(substr($cookieString, 0, $pos));

+            $cookie['value'] = trim(substr($cookieString, $pos + 1));

+

+        // Some optional parameters are supplied

+        } else {

+            $elements = explode(';', $cookieString);

+            $pos = strpos($elements[0], '=');

+            $cookie['name']  = trim(substr($elements[0], 0, $pos));

+            $cookie['value'] = trim(substr($elements[0], $pos + 1));

+

+            for ($i = 1; $i < count($elements); $i++) {

+                if (false === strpos($elements[$i], '=')) {

+                    $elName  = trim($elements[$i]);

+                    $elValue = null;

+                } else {

+                    list ($elName, $elValue) = array_map('trim', explode('=', $elements[$i]));

+                }

+                $elName = strtolower($elName);

+                if ('secure' == $elName) {

+                    $cookie['secure'] = true;

+                } elseif ('expires' == $elName) {

+                    $cookie['expires'] = str_replace('"', '', $elValue);

+                } elseif ('path' == $elName || 'domain' == $elName) {

+                    $cookie[$elName] = urldecode($elValue);

+                } else {

+                    $cookie[$elName] = $elValue;

+                }

+            }

+        }

+        $this->cookies[] = $cookie;

+    }

+

+   /**

+    * Appends a string to the response body

+    * @param    string

+    */

+    public function appendBody($bodyChunk)

+    {

+        $this->body .= $bodyChunk;

+    }

+

+   /**

+    * Returns the status code

+    * @return   integer 

+    */

+    public function getStatus()

+    {

+        return $this->code;

+    }

+

+   /**

+    * Returns the reason phrase

+    * @return   string

+    */

+    public function getReasonPhrase()

+    {

+        return $this->reasonPhrase;

+    }

+

+   /**

+    * Returns either the named header or all response headers

+    *

+    * @param    string          Name of header to return

+    * @return   string|array    Value of $headerName header (null if header is

+    *                           not present), array of all response headers if

+    *                           $headerName is null

+    */

+    public function getHeader($headerName = null)

+    {

+        if (null === $headerName) {

+            return $this->headers;

+        } else {

+            $headerName = strtolower($headerName);

+            return isset($this->headers[$headerName])? $this->headers[$headerName]: null;

+        }

+    }

+

+   /**

+    * Returns cookies set in response

+    *

+    * @return   array

+    */

+    public function getCookies()

+    {

+        return $this->cookies;

+    }

+

+   /**

+    * Returns the body of the response

+    *

+    * @return   string

+    * @throws   HTTP_Request2_Exception if body cannot be decoded

+    */

+    public function getBody()

+    {

+        if (!$this->bodyEncoded ||

+            !in_array(strtolower($this->getHeader('content-encoding')), array('gzip', 'deflate'))

+        ) {

+            return $this->body;

+

+        } else {

+            if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {

+                $oldEncoding = mb_internal_encoding();

+                mb_internal_encoding('iso-8859-1');

+            }

+

+            try {

+                switch (strtolower($this->getHeader('content-encoding'))) {

+                    case 'gzip':

+                        $decoded = self::decodeGzip($this->body);

+                        break;

+                    case 'deflate':

+                        $decoded = self::decodeDeflate($this->body);

+                }

+            } catch (Exception $e) {

+            }

+

+            if (!empty($oldEncoding)) {

+                mb_internal_encoding($oldEncoding);

+            }

+            if (!empty($e)) {

+                throw $e;

+            }

+            return $decoded;

+        }

+    }

+

+   /**

+    * Get the HTTP version of the response

+    *

+    * @return   string

+    */ 

+    public function getVersion()

+    {

+        return $this->version;

+    }

+

+   /**

+    * Decodes the message-body encoded by gzip

+    *

+    * The real decoding work is done by gzinflate() built-in function, this

+    * method only parses the header and checks data for compliance with

+    * RFC 1952

+    *

+    * @param    string  gzip-encoded data

+    * @return   string  decoded data

+    * @throws   HTTP_Request2_Exception

+    * @link     http://tools.ietf.org/html/rfc1952

+    */

+    public static function decodeGzip($data)

+    {

+        $length = strlen($data);

+        // If it doesn't look like gzip-encoded data, don't bother

+        if (18 > $length || strcmp(substr($data, 0, 2), "\x1f\x8b")) {

+            return $data;

+        }

+        if (!function_exists('gzinflate')) {

+            throw new HTTP_Request2_Exception('Unable to decode body: gzip extension not available');

+        }

+        $method = ord(substr($data, 2, 1));

+        if (8 != $method) {

+            throw new HTTP_Request2_Exception('Error parsing gzip header: unknown compression method');

+        }

+        $flags = ord(substr($data, 3, 1));

+        if ($flags & 224) {

+            throw new HTTP_Request2_Exception('Error parsing gzip header: reserved bits are set');

+        }

+

+        // header is 10 bytes minimum. may be longer, though.

+        $headerLength = 10;

+        // extra fields, need to skip 'em

+        if ($flags & 4) {

+            if ($length - $headerLength - 2 < 8) {

+                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');

+            }

+            $extraLength = unpack('v', substr($data, 10, 2));

+            if ($length - $headerLength - 2 - $extraLength[1] < 8) {

+                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');

+            }

+            $headerLength += $extraLength[1] + 2;

+        }

+        // file name, need to skip that

+        if ($flags & 8) {

+            if ($length - $headerLength - 1 < 8) {

+                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');

+            }

+            $filenameLength = strpos(substr($data, $headerLength), chr(0));

+            if (false === $filenameLength || $length - $headerLength - $filenameLength - 1 < 8) {

+                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');

+            }

+            $headerLength += $filenameLength + 1;

+        }

+        // comment, need to skip that also

+        if ($flags & 16) {

+            if ($length - $headerLength - 1 < 8) {

+                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');

+            }

+            $commentLength = strpos(substr($data, $headerLength), chr(0));

+            if (false === $commentLength || $length - $headerLength - $commentLength - 1 < 8) {

+                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');

+            }

+            $headerLength += $commentLength + 1;

+        }

+        // have a CRC for header. let's check

+        if ($flags & 2) {

+            if ($length - $headerLength - 2 < 8) {

+                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');

+            }

+            $crcReal   = 0xffff & crc32(substr($data, 0, $headerLength));

+            $crcStored = unpack('v', substr($data, $headerLength, 2));

+            if ($crcReal != $crcStored[1]) {

+                throw new HTTP_Request2_Exception('Header CRC check failed');

+            }

+            $headerLength += 2;

+        }

+        // unpacked data CRC and size at the end of encoded data

+        $tmp = unpack('V2', substr($data, -8));

+        $dataCrc  = $tmp[1];

+        $dataSize = $tmp[2];

+

+        // finally, call the gzinflate() function

+        // don't pass $dataSize to gzinflate, see bugs #13135, #14370

+        $unpacked = gzinflate(substr($data, $headerLength, -8));

+        if (false === $unpacked) {

+            throw new HTTP_Request2_Exception('gzinflate() call failed');

+        } elseif ($dataSize != strlen($unpacked)) {

+            throw new HTTP_Request2_Exception('Data size check failed');

+        } elseif ((0xffffffff & $dataCrc) != (0xffffffff & crc32($unpacked))) {

+            throw new HTTP_Request2_Exception('Data CRC check failed');

+        }

+        return $unpacked;

+    }

+

+   /**

+    * Decodes the message-body encoded by deflate

+    *

+    * @param    string  deflate-encoded data

+    * @return   string  decoded data

+    * @throws   HTTP_Request2_Exception

+    */

+    public static function decodeDeflate($data)

+    {

+        if (!function_exists('gzuncompress')) {

+            throw new HTTP_Request2_Exception('Unable to decode body: gzip extension not available');

+        }

+        // RFC 2616 defines 'deflate' encoding as zlib format from RFC 1950,

+        // while many applications send raw deflate stream from RFC 1951.

+        // We should check for presence of zlib header and use gzuncompress() or

+        // gzinflate() as needed. See bug #15305

+        $header = unpack('n', substr($data, 0, 2));

+        return (0 == $header[1] % 31)? gzuncompress($data): gzinflate($data);

+    }

+}

+?>
\ No newline at end of file
diff --git a/extlib/Net/LDAP2.php b/extlib/Net/LDAP2.php
new file mode 100644
index 000000000..26f5e7560
--- /dev/null
+++ b/extlib/Net/LDAP2.php
@@ -0,0 +1,1791 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+/**
+* File containing the Net_LDAP2 interface class.
+*
+* PHP version 5
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Tarjej Huse <tarjei@bergfald.no>
+* @author    Jan Wagner <wagner@netsols.de>
+* @author    Del <del@babel.com.au>
+* @author    Benedikt Hallinger <beni@php.net>
+* @copyright 2003-2007 Tarjej Huse, Jan Wagner, Del Elson, Benedikt Hallinger
+* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
+* @version   SVN: $Id: LDAP2.php 286788 2009-08-04 06:05:49Z beni $
+* @link      http://pear.php.net/package/Net_LDAP2/
+*/
+
+/**
+* Package includes.
+*/
+require_once 'PEAR.php';
+require_once 'Net/LDAP2/RootDSE.php';
+require_once 'Net/LDAP2/Schema.php';
+require_once 'Net/LDAP2/Entry.php';
+require_once 'Net/LDAP2/Search.php';
+require_once 'Net/LDAP2/Util.php';
+require_once 'Net/LDAP2/Filter.php';
+require_once 'Net/LDAP2/LDIF.php';
+require_once 'Net/LDAP2/SchemaCache.interface.php';
+require_once 'Net/LDAP2/SimpleFileSchemaCache.php';
+
+/**
+*  Error constants for errors that are not LDAP errors.
+*/
+define('NET_LDAP2_ERROR', 1000);
+
+/**
+* Net_LDAP2 Version
+*/
+define('NET_LDAP2_VERSION', '2.0.7');
+
+/**
+* Net_LDAP2 - manipulate LDAP servers the right way!
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Tarjej Huse <tarjei@bergfald.no>
+* @author    Jan Wagner <wagner@netsols.de>
+* @author    Del <del@babel.com.au>
+* @author    Benedikt Hallinger <beni@php.net>
+* @copyright 2003-2007 Tarjej Huse, Jan Wagner, Del Elson, Benedikt Hallinger
+* @license   http://www.gnu.org/copyleft/lesser.html LGPL
+* @link      http://pear.php.net/package/Net_LDAP2/
+*/
+class Net_LDAP2 extends PEAR
+{
+    /**
+    * Class configuration array
+    *
+    * host     = the ldap host to connect to
+    *            (may be an array of several hosts to try)
+    * port     = the server port
+    * version  = ldap version (defaults to v 3)
+    * starttls = when set, ldap_start_tls() is run after connecting.
+    * bindpw   = no explanation needed
+    * binddn   = the DN to bind as.
+    * basedn   = ldap base
+    * options  = hash of ldap options to set (opt => val)
+    * filter   = default search filter
+    * scope    = default search scope
+    *
+    * Newly added in 2.0.0RC4, for auto-reconnect:
+    * auto_reconnect  = if set to true then the class will automatically
+    *                   attempt to reconnect to the LDAP server in certain
+    *                   failure conditionswhen attempting a search, or other
+    *                   LDAP operation.  Defaults to false.  Note that if you
+    *                   set this to true, calls to search() may block
+    *                   indefinitely if there is a catastrophic server failure.
+    * min_backoff     = minimum reconnection delay period (in seconds).
+    * current_backoff = initial reconnection delay period (in seconds).
+    * max_backoff     = maximum reconnection delay period (in seconds).
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_config = array('host'            => 'localhost',
+                               'port'            => 389,
+                               'version'         => 3,
+                               'starttls'        => false,
+                               'binddn'          => '',
+                               'bindpw'          => '',
+                               'basedn'          => '',
+                               'options'         => array(),
+                               'filter'          => '(objectClass=*)',
+                               'scope'           => 'sub',
+                               'auto_reconnect'  => false,
+                               'min_backoff'     => 1,
+                               'current_backoff' => 1,
+                               'max_backoff'     => 32);
+
+    /**
+    * List of hosts we try to establish a connection to
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_host_list = array();
+
+    /**
+    * List of hosts that are known to be down.
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_down_host_list = array();
+
+    /**
+    * LDAP resource link.
+    *
+    * @access protected
+    * @var resource
+    */
+    protected $_link = false;
+
+    /**
+    * Net_LDAP2_Schema object
+    *
+    * This gets set and returned by {@link schema()}
+    *
+    * @access protected
+    * @var object Net_LDAP2_Schema
+    */
+    protected $_schema = null;
+
+    /**
+    * Schema cacher function callback
+    *
+    * @see registerSchemaCache()
+    * @var string
+    */
+    protected $_schema_cache = null;
+
+    /**
+    * Cache for attribute encoding checks
+    *
+    * @access protected
+    * @var array Hash with attribute names as key and boolean value
+    *            to determine whether they should be utf8 encoded or not.
+    */
+    protected $_schemaAttrs = array();
+
+    /**
+    * Cache for rootDSE objects
+    *
+    * Hash with requested rootDSE attr names as key and rootDSE object as value
+    *
+    * Since the RootDSE object itself may request a rootDSE object,
+    * {@link rootDse()} caches successful requests.
+    * Internally, Net_LDAP2 needs several lookups to this object, so
+    * caching increases performance significally.
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_rootDSE_cache = array();
+
+    /**
+    * Returns the Net_LDAP2 Release version, may be called statically
+    *
+    * @static
+    * @return string Net_LDAP2 version
+    */
+    public static function getVersion()
+    {
+        return NET_LDAP2_VERSION;
+    }
+
+    /**
+    * Configure Net_LDAP2, connect and bind
+    *
+    * Use this method as starting point of using Net_LDAP2
+    * to establish a connection to your LDAP server.
+    *
+    * Static function that returns either an error object or the new Net_LDAP2
+    * object. Something like a factory. Takes a config array with the needed
+    * parameters.
+    *
+    * @param array $config Configuration array
+    *
+    * @access public
+    * @return Net_LDAP2_Error|Net_LDAP2   Net_LDAP2_Error or Net_LDAP2 object
+    */
+    public static function &connect($config = array())
+    {
+        $ldap_check = self::checkLDAPExtension();
+        if (self::iserror($ldap_check)) {
+            return $ldap_check;
+        }
+
+        @$obj = new Net_LDAP2($config);
+
+        // todo? better errorhandling for setConfig()?
+
+        // connect and bind with credentials in config
+        $err = $obj->bind();
+        if (self::isError($err)) {
+            return $err;
+        }
+
+        return $obj;
+    }
+
+    /**
+    * Net_LDAP2 constructor
+    *
+    * Sets the config array
+    *
+    * Please note that the usual way of getting Net_LDAP2 to work is
+    * to call something like:
+    * <code>$ldap = Net_LDAP2::connect($ldap_config);</code>
+    *
+    * @param array $config Configuration array
+    *
+    * @access protected
+    * @return void
+    * @see $_config
+    */
+    public function __construct($config = array())
+    {
+        $this->PEAR('Net_LDAP2_Error');
+        $this->setConfig($config);
+    }
+
+    /**
+    * Sets the internal configuration array
+    *
+    * @param array $config Configuration array
+    *
+    * @access protected
+    * @return void
+    */
+    protected function setConfig($config)
+    {
+        //
+        // Parameter check -- probably should raise an error here if config
+        // is not an array.
+        //
+        if (! is_array($config)) {
+            return;
+        }
+
+        foreach ($config as $k => $v) {
+            if (isset($this->_config[$k])) {
+                $this->_config[$k] = $v;
+            } else {
+                // map old (Net_LDAP2) parms to new ones
+                switch($k) {
+                case "dn":
+                    $this->_config["binddn"] = $v;
+                    break;
+                case "password":
+                    $this->_config["bindpw"] = $v;
+                    break;
+                case "tls":
+                    $this->_config["starttls"] = $v;
+                    break;
+                case "base":
+                    $this->_config["basedn"] = $v;
+                    break;
+                }
+            }
+        }
+
+        //
+        // Ensure the host list is an array.
+        //
+        if (is_array($this->_config['host'])) {
+            $this->_host_list = $this->_config['host'];
+        } else {
+            if (strlen($this->_config['host']) > 0) {
+                $this->_host_list = array($this->_config['host']);
+            } else {
+                $this->_host_list = array();
+                // ^ this will cause an error in performConnect(),
+                // so the user is notified about the failure
+            }
+        }
+
+        //
+        // Reset the down host list, which seems like a sensible thing to do
+        // if the config is being reset for some reason.
+        //
+        $this->_down_host_list = array();
+    }
+
+    /**
+    * Bind or rebind to the ldap-server
+    *
+    * This function binds with the given dn and password to the server. In case
+    * no connection has been made yet, it will be started and startTLS issued
+    * if appropiate.
+    *
+    * The internal bind configuration is not being updated, so if you call
+    * bind() without parameters, you can rebind with the credentials
+    * provided at first connecting to the server.
+    *
+    * @param string $dn       Distinguished name for binding
+    * @param string $password Password for binding
+    *
+    * @access public
+    * @return Net_LDAP2_Error|true    Net_LDAP2_Error object or true
+    */
+    public function bind($dn = null, $password = null)
+    {
+        // fetch current bind credentials
+        if (is_null($dn)) {
+            $dn = $this->_config["binddn"];
+        }
+        if (is_null($password)) {
+            $password = $this->_config["bindpw"];
+        }
+
+        // Connect first, if we haven't so far.
+        // This will also bind us to the server.
+        if ($this->_link === false) {
+            // store old credentials so we can revert them later
+            // then overwrite config with new bind credentials
+            $olddn = $this->_config["binddn"];
+            $oldpw = $this->_config["bindpw"];
+
+            // overwrite bind credentials in config
+            // so performConnect() knows about them
+            $this->_config["binddn"] = $dn;
+            $this->_config["bindpw"] = $password;
+
+            // try to connect with provided credentials
+            $msg = $this->performConnect();
+
+            // reset to previous config
+            $this->_config["binddn"] = $olddn;
+            $this->_config["bindpw"] = $oldpw;
+
+            // see if bind worked
+            if (self::isError($msg)) {
+                return $msg;
+            }
+        } else {
+            // do the requested bind as we are
+            // asked to bind manually
+            if (is_null($dn)) {
+                // anonymous bind
+                $msg = @ldap_bind($this->_link);
+            } else {
+                // privileged bind
+                $msg = @ldap_bind($this->_link, $dn, $password);
+            }
+            if (false === $msg) {
+                return PEAR::raiseError("Bind failed: " .
+                                        @ldap_error($this->_link),
+                                        @ldap_errno($this->_link));
+            }
+        }
+        return true;
+    }
+
+    /**
+    * Connect to the ldap-server
+    *
+    * This function connects to the LDAP server specified in
+    * the configuration, binds and set up the LDAP protocol as needed.
+    *
+    * @access protected
+    * @return Net_LDAP2_Error|true    Net_LDAP2_Error object or true
+    */
+    protected function performConnect()
+    {
+        // Note: Connecting is briefly described in RFC1777.
+        // Basicly it works like this:
+        //  1. set up TCP connection
+        //  2. secure that connection if neccessary
+        //  3a. setLDAPVersion to tell server which version we want to speak
+        //  3b. perform bind
+        //  3c. setLDAPVersion to tell server which version we want to speak
+        //      together with a test for supported versions
+        //  4. set additional protocol options
+
+        // Return true if we are already connected.
+        if ($this->_link !== false) {
+            return true;
+        }
+
+        // Connnect to the LDAP server if we are not connected.  Note that
+        // with some LDAP clients, ldapperformConnect returns a link value even
+        // if no connection is made.  We need to do at least one anonymous
+        // bind to ensure that a connection is actually valid.
+        //
+        // Ref: http://www.php.net/manual/en/function.ldap-connect.php
+
+        // Default error message in case all connection attempts
+        // fail but no message is set
+        $current_error = new PEAR_Error('Unknown connection error');
+
+        // Catch empty $_host_list arrays.
+        if (!is_array($this->_host_list) || count($this->_host_list) == 0) {
+            $current_error = PEAR::raiseError('No Servers configured! Please '.
+               'pass in an array of servers to Net_LDAP2');
+            return $current_error;
+        }
+
+        // Cycle through the host list.
+        foreach ($this->_host_list as $host) {
+
+            // Ensure we have a valid string for host name
+            if (is_array($host)) {
+                $current_error = PEAR::raiseError('No Servers configured! '.
+                   'Please pass in an one dimensional array of servers to '.
+                   'Net_LDAP2! (multidimensional array detected!)');
+                continue;
+            }
+
+            // Skip this host if it is known to be down.
+            if (in_array($host, $this->_down_host_list)) {
+                continue;
+            }
+
+            // Record the host that we are actually connecting to in case
+            // we need it later.
+            $this->_config['host'] = $host;
+
+            // Attempt a connection.
+            $this->_link = @ldap_connect($host, $this->_config['port']);
+            if (false === $this->_link) {
+                $current_error = PEAR::raiseError('Could not connect to ' .
+                    $host . ':' . $this->_config['port']);
+                $this->_down_host_list[] = $host;
+                continue;
+            }
+
+            // If we're supposed to use TLS, do so before we try to bind,
+            // as some strict servers only allow binding via secure connections
+            if ($this->_config["starttls"] === true) {
+                if (self::isError($msg = $this->startTLS())) {
+                    $current_error           = $msg;
+                    $this->_link             = false;
+                    $this->_down_host_list[] = $host;
+                    continue;
+                }
+            }
+
+            // Try to set the configured LDAP version on the connection if LDAP
+            // server needs that before binding (eg OpenLDAP).
+            // This could be necessary since rfc-1777 states that the protocol version
+            // has to be set at the bind request.
+            // We use force here which means that the test in the rootDSE is skipped;
+            // this is neccessary, because some strict LDAP servers only allow to
+            // read the LDAP rootDSE (which tells us the supported protocol versions)
+            // with authenticated clients.
+            // This may fail in which case we try again after binding.
+            // In this case, most probably the bind() or setLDAPVersion()-call
+            // below will also fail, providing error messages.
+            $version_set = false;
+            $ignored_err = $this->setLDAPVersion(0, true);
+            if (!self::isError($ignored_err)) {
+                $version_set = true;
+            }
+
+            // Attempt to bind to the server. If we have credentials configured,
+            // we try to use them, otherwise its an anonymous bind.
+            // As stated by RFC-1777, the bind request should be the first
+            // operation to be performed after the connection is established.
+            // This may give an protocol error if the server does not support
+            // V2 binds and the above call to setLDAPVersion() failed.
+            // In case the above call failed, we try an V2 bind here and set the
+            // version afterwards (with checking to the rootDSE).
+            $msg = $this->bind();
+            if (self::isError($msg)) {
+                // The bind failed, discard link and save error msg.
+                // Then record the host as down and try next one
+                if ($msg->getCode() == 0x02 && !$version_set) {
+                    // provide a finer grained error message
+                    // if protocol error arieses because of invalid version
+                    $msg = new Net_LDAP2_Error($msg->getMessage().
+                        " (could not set LDAP protocol version to ".
+                        $this->_config['version'].")",
+                        $msg->getCode());
+                }
+                $this->_link             = false;
+                $current_error           = $msg;
+                $this->_down_host_list[] = $host;
+                continue;
+            }
+
+            // Set desired LDAP version if not successfully set before.
+            // Here, a check against the rootDSE is performed, so we get a
+            // error message if the server does not support the version.
+            // The rootDSE entry should tell us which LDAP versions are
+            // supported. However, some strict LDAP servers only allow
+            // bound suers to read the rootDSE.
+            if (!$version_set) {
+                if (self::isError($msg = $this->setLDAPVersion())) {
+                    $current_error           = $msg;
+                    $this->_link             = false;
+                    $this->_down_host_list[] = $host;
+                    continue;
+                }
+            }
+
+            // Set LDAP parameters, now we know we have a valid connection.
+            if (isset($this->_config['options']) &&
+                is_array($this->_config['options']) &&
+                count($this->_config['options'])) {
+                foreach ($this->_config['options'] as $opt => $val) {
+                    $err = $this->setOption($opt, $val);
+                    if (self::isError($err)) {
+                        $current_error           = $err;
+                        $this->_link             = false;
+                        $this->_down_host_list[] = $host;
+                        continue 2;
+                    }
+                }
+            }
+
+            // At this stage we have connected, bound, and set up options,
+            // so we have a known good LDAP server.  Time to go home.
+            return true;
+        }
+
+
+        // All connection attempts have failed, return the last error.
+        return $current_error;
+    }
+
+    /**
+    * Reconnect to the ldap-server.
+    *
+    * In case the connection to the LDAP
+    * service has dropped out for some reason, this function will reconnect,
+    * and re-bind if a bind has been attempted in the past.  It is probably
+    * most useful when the server list provided to the new() or connect()
+    * function is an array rather than a single host name, because in that
+    * case it will be able to connect to a failover or secondary server in
+    * case the primary server goes down.
+    *
+    * This doesn't return anything, it just tries to re-establish
+    * the current connection.  It will sleep for the current backoff
+    * period (seconds) before attempting the connect, and if the
+    * connection fails it will double the backoff period, but not
+    * try again.  If you want to ensure a reconnection during a
+    * transient period of server downtime then you need to call this
+    * function in a loop.
+    *
+    * @access protected
+    * @return Net_LDAP2_Error|true    Net_LDAP2_Error object or true
+    */
+    protected function performReconnect()
+    {
+
+        // Return true if we are already connected.
+        if ($this->_link !== false) {
+            return true;
+        }
+
+        // Default error message in case all connection attempts
+        // fail but no message is set
+        $current_error = new PEAR_Error('Unknown connection error');
+
+        // Sleep for a backoff period in seconds.
+        sleep($this->_config['current_backoff']);
+
+        // Retry all available connections.
+        $this->_down_host_list = array();
+        $msg = $this->performConnect();
+
+        // Bail out if that fails.
+        if (self::isError($msg)) {
+            $this->_config['current_backoff'] =
+               $this->_config['current_backoff'] * 2;
+            if ($this->_config['current_backoff'] > $this->_config['max_backoff']) {
+                $this->_config['current_backoff'] = $this->_config['max_backoff'];
+            }
+            return $msg;
+        }
+
+        // Now we should be able to safely (re-)bind.
+        $msg = $this->bind();
+        if (self::isError($msg)) {
+            $this->_config['current_backoff'] = $this->_config['current_backoff'] * 2;
+            if ($this->_config['current_backoff'] > $this->_config['max_backoff']) {
+                $this->_config['current_backoff'] = $this->_config['max_backoff'];
+            }
+
+            // _config['host'] should have had the last connected host stored in it
+            // by performConnect().  Since we are unable to bind to that host we can safely
+            // assume that it is down or has some other problem.
+            $this->_down_host_list[] = $this->_config['host'];
+            return $msg;
+        }
+
+        // At this stage we have connected, bound, and set up options,
+        // so we have a known good LDAP server. Time to go home.
+        $this->_config['current_backoff'] = $this->_config['min_backoff'];
+        return true;
+    }
+
+    /**
+    * Starts an encrypted session
+    *
+    * @access public
+    * @return Net_LDAP2_Error|true    Net_LDAP2_Error object or true
+    */
+    public function startTLS()
+    {
+        // Test to see if the server supports TLS first.
+        // This is done via testing the extensions offered by the server.
+        // The OID 1.3.6.1.4.1.1466.20037 tells us, if TLS is supported.
+        $rootDSE = $this->rootDse();
+        if (self::isError($rootDSE)) {
+            return $this->raiseError("Unable to fetch rootDSE entry ".
+            "to see if TLS is supoported: ".$rootDSE->getMessage(), $rootDSE->getCode());
+        }
+
+        $supported_extensions = $rootDSE->getValue('supportedExtension');
+        if (self::isError($supported_extensions)) {
+            return $this->raiseError("Unable to fetch rootDSE attribute 'supportedExtension' ".
+            "to see if TLS is supoported: ".$supported_extensions->getMessage(), $supported_extensions->getCode());
+        }
+
+        if (in_array('1.3.6.1.4.1.1466.20037', $supported_extensions)) {
+            if (false === @ldap_start_tls($this->_link)) {
+                return $this->raiseError("TLS not started: " .
+                                        @ldap_error($this->_link),
+                                        @ldap_errno($this->_link));
+            }
+            return true;
+        } else {
+            return $this->raiseError("Server reports that it does not support TLS");
+        }
+    }
+
+    /**
+    * alias function of startTLS() for perl-ldap interface
+    *
+    * @return void
+    * @see startTLS()
+    */
+    public function start_tls()
+    {
+        $args = func_get_args();
+        return call_user_func_array(array( &$this, 'startTLS' ), $args);
+    }
+
+    /**
+    * Close LDAP connection.
+    *
+    * Closes the connection. Use this when the session is over.
+    *
+    * @return void
+    */
+    public function done()
+    {
+        $this->_Net_LDAP2();
+    }
+
+    /**
+    * Alias for {@link done()}
+    *
+    * @return void
+    * @see done()
+    */
+    public function disconnect()
+    {
+        $this->done();
+    }
+
+    /**
+    * Destructor
+    *
+    * @access protected
+    */
+    public function _Net_LDAP2()
+    {
+        @ldap_close($this->_link);
+    }
+
+    /**
+    * Add a new entryobject to a directory.
+    *
+    * Use add to add a new Net_LDAP2_Entry object to the directory.
+    * This also links the entry to the connection used for the add,
+    * if it was a fresh entry ({@link Net_LDAP2_Entry::createFresh()})
+    *
+    * @param Net_LDAP2_Entry &$entry Net_LDAP2_Entry
+    *
+    * @return Net_LDAP2_Error|true    Net_LDAP2_Error object or true
+    */
+    public function add(&$entry)
+    {
+        if (!$entry instanceof Net_LDAP2_Entry) {
+            return PEAR::raiseError('Parameter to Net_LDAP2::add() must be a Net_LDAP2_Entry object.');
+        }
+
+        // Continue attempting the add operation in a loop until we
+        // get a success, a definitive failure, or the world ends.
+        $foo = 0;
+        while (true) {
+            $link = $this->getLink();
+
+            if ($link === false) {
+                // We do not have a successful connection yet.  The call to
+                // getLink() would have kept trying if we wanted one.  Go
+                // home now.
+                return PEAR::raiseError("Could not add entry " . $entry->dn() .
+                       " no valid LDAP connection could be found.");
+            }
+
+            if (@ldap_add($link, $entry->dn(), $entry->getValues())) {
+                // entry successfully added, we should update its $ldap reference
+                // in case it is not set so far (fresh entry)
+                if (!$entry->getLDAP() instanceof Net_LDAP2) {
+                    $entry->setLDAP($this);
+                }
+                // store, that the entry is present inside the directory
+                $entry->markAsNew(false);
+                return true;
+            } else {
+                // We have a failure.  What type?  We may be able to reconnect
+                // and try again.
+                $error_code = @ldap_errno($link);
+                $error_name = $this->errorMessage($error_code);
+
+                if (($error_name === 'LDAP_OPERATIONS_ERROR') &&
+                    ($this->_config['auto_reconnect'])) {
+
+                    // The server has become disconnected before trying the
+                    // operation.  We should try again, possibly with a different
+                    // server.
+                    $this->_link = false;
+                    $this->performReconnect();
+                } else {
+                    // Errors other than the above catched are just passed
+                    // back to the user so he may react upon them.
+                    return PEAR::raiseError("Could not add entry " . $entry->dn() . " " .
+                                            $error_name,
+                                            $error_code);
+                }
+            }
+        }
+    }
+
+    /**
+    * Delete an entry from the directory
+    *
+    * The object may either be a string representing the dn or a Net_LDAP2_Entry
+    * object. When the boolean paramter recursive is set, all subentries of the
+    * entry will be deleted as well.
+    *
+    * @param string|Net_LDAP2_Entry $dn        DN-string or Net_LDAP2_Entry
+    * @param boolean                $recursive Should we delete all children recursive as well?
+    *
+    * @access public
+    * @return Net_LDAP2_Error|true    Net_LDAP2_Error object or true
+    */
+    public function delete($dn, $recursive = false)
+    {
+        if ($dn instanceof Net_LDAP2_Entry) {
+             $dn = $dn->dn();
+        }
+        if (false === is_string($dn)) {
+            return PEAR::raiseError("Parameter is not a string nor an entry object!");
+        }
+        // Recursive delete searches for children and calls delete for them
+        if ($recursive) {
+            $result = @ldap_list($this->_link, $dn, '(objectClass=*)', array(null), 0, 0);
+            if (@ldap_count_entries($this->_link, $result)) {
+                $subentry = @ldap_first_entry($this->_link, $result);
+                $this->delete(@ldap_get_dn($this->_link, $subentry), true);
+                while ($subentry = @ldap_next_entry($this->_link, $subentry)) {
+                    $this->delete(@ldap_get_dn($this->_link, $subentry), true);
+                }
+            }
+        }
+
+        // Continue attempting the delete operation in a loop until we
+        // get a success, a definitive failure, or the world ends.
+        while (true) {
+            $link = $this->getLink();
+
+            if ($link === false) {
+                // We do not have a successful connection yet.  The call to
+                // getLink() would have kept trying if we wanted one.  Go
+                // home now.
+                return PEAR::raiseError("Could not add entry " . $dn .
+                       " no valid LDAP connection could be found.");
+            }
+
+            if (@ldap_delete($link, $dn)) {
+                // entry successfully deleted.
+                return true;
+            } else {
+                // We have a failure.  What type?
+                // We may be able to reconnect and try again.
+                $error_code = @ldap_errno($link);
+                $error_name = $this->errorMessage($error_code);
+
+                if (($this->errorMessage($error_code) === 'LDAP_OPERATIONS_ERROR') &&
+                    ($this->_config['auto_reconnect'])) {
+                    // The server has become disconnected before trying the
+                    // operation.  We should try again, possibly with a 
+                    // different server.
+                    $this->_link = false;
+                    $this->performReconnect();
+
+                } elseif ($error_code == 66) {
+                    // Subentries present, server refused to delete.
+                    // Deleting subentries is the clients responsibility, but
+                    // since the user may not know of the subentries, we do not
+                    // force that here but instead notify the developer so he
+                    // may take actions himself.
+                    return PEAR::raiseError("Could not delete entry $dn because of subentries. Use the recursive parameter to delete them.");
+
+                } else {
+                    // Errors other than the above catched are just passed
+                    // back to the user so he may react upon them.
+                    return PEAR::raiseError("Could not delete entry " . $dn . " " .
+                                            $error_name,
+                                            $error_code);
+                }
+            }
+        }
+    }
+
+    /**
+    * Modify an ldapentry directly on the server
+    *
+    * This one takes the DN or a Net_LDAP2_Entry object and an array of actions.
+    * This array should be something like this:
+    *
+    * array('add' => array('attribute1' => array('val1', 'val2'),
+    *                      'attribute2' => array('val1')),
+    *       'delete' => array('attribute1'),
+    *       'replace' => array('attribute1' => array('val1')),
+    *       'changes' => array('add' => ...,
+    *                          'replace' => ...,
+    *                          'delete' => array('attribute1', 'attribute2' => array('val1')))
+    *
+    * The changes array is there so the order of operations can be influenced
+    * (the operations are done in order of appearance).
+    * The order of execution is as following:
+    *   1. adds from 'add' array
+    *   2. deletes from 'delete' array
+    *   3. replaces from 'replace' array
+    *   4. changes (add, replace, delete) in order of appearance
+    * All subarrays (add, replace, delete, changes) may be given at the same time.
+    *
+    * The function calls the corresponding functions of an Net_LDAP2_Entry
+    * object. A detailed description of array structures can be found there.
+    *
+    * Unlike the modification methods provided by the Net_LDAP2_Entry object,
+    * this method will instantly carry out an update() after each operation,
+    * thus modifying "directly" on the server.
+    *
+    * @param string|Net_LDAP2_Entry $entry DN-string or Net_LDAP2_Entry
+    * @param array                  $parms Array of changes
+    *
+    * @access public
+    * @return Net_LDAP2_Error|true Net_LDAP2_Error object or true
+    */
+    public function modify($entry, $parms = array())
+    {
+        if (is_string($entry)) {
+            $entry = $this->getEntry($entry);
+            if (self::isError($entry)) {
+                return $entry;
+            }
+        }
+        if (!$entry instanceof Net_LDAP2_Entry) {
+            return PEAR::raiseError("Parameter is not a string nor an entry object!");
+        }
+
+        // Perform changes mentioned separately
+        foreach (array('add', 'delete', 'replace') as $action) {
+            if (isset($parms[$action])) {
+                $msg = $entry->$action($parms[$action]);
+                if (self::isError($msg)) {
+                    return $msg;
+                }
+                $entry->setLDAP($this);
+
+                // Because the @ldap functions are called inside Net_LDAP2_Entry::update(),
+                // we have to trap the error codes issued from that if we want to support
+                // reconnection.
+                while (true) {
+                    $msg = $entry->update();
+
+                    if (self::isError($msg)) {
+                        // We have a failure.  What type?  We may be able to reconnect
+                        // and try again.
+                        $error_code = $msg->getCode();
+                        $error_name = $this->errorMessage($error_code);
+
+                        if (($this->errorMessage($error_code) === 'LDAP_OPERATIONS_ERROR') &&
+                            ($this->_config['auto_reconnect'])) {
+
+                            // The server has become disconnected before trying the
+                            // operation.  We should try again, possibly with a different
+                            // server.
+                            $this->_link = false;
+                            $this->performReconnect();
+
+                        } else {
+
+                            // Errors other than the above catched are just passed
+                            // back to the user so he may react upon them.
+                            return PEAR::raiseError("Could not modify entry: ".$msg->getMessage());
+                        }
+                    } else {
+                        // modification succeedet, evaluate next change
+                        break;
+                    }
+                }
+            }
+        }
+
+        // perform combined changes in 'changes' array
+        if (isset($parms['changes']) && is_array($parms['changes'])) {
+            foreach ($parms['changes'] as $action => $value) {
+
+                // Because the @ldap functions are called inside Net_LDAP2_Entry::update,
+                // we have to trap the error codes issued from that if we want to support
+                // reconnection.
+                while (true) {
+                    $msg = $this->modify($entry, array($action => $value));
+
+                    if (self::isError($msg)) {
+                        // We have a failure.  What type?  We may be able to reconnect
+                        // and try again.
+                        $error_code = $msg->getCode();
+                        $error_name = $this->errorMessage($error_code);
+
+                        if (($this->errorMessage($error_code) === 'LDAP_OPERATIONS_ERROR') &&
+                            ($this->_config['auto_reconnect'])) {
+
+                            // The server has become disconnected before trying the
+                            // operation.  We should try again, possibly with a different
+                            // server.
+                            $this->_link = false;
+                            $this->performReconnect();
+
+                        } else {
+                            // Errors other than the above catched are just passed
+                            // back to the user so he may react upon them.
+                            return $msg;
+                        }
+                    } else {
+                        // modification succeedet, evaluate next change
+                        break;
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
+    * Run a ldap search query
+    *
+    * Search is used to query the ldap-database.
+    * $base and $filter may be ommitted. The one from config will
+    * then be used. $base is either a DN-string or an Net_LDAP2_Entry
+    * object in which case its DN willb e used.
+    *
+    * Params may contain:
+    *
+    * scope: The scope which will be used for searching
+    *        base - Just one entry
+    *        sub  - The whole tree
+    *        one  - Immediately below $base
+    * sizelimit: Limit the number of entries returned (default: 0 = unlimited),
+    * timelimit: Limit the time spent for searching (default: 0 = unlimited),
+    * attrsonly: If true, the search will only return the attribute names,
+    * attributes: Array of attribute names, which the entry should contain.
+    *             It is good practice to limit this to just the ones you need.
+    * [NOT IMPLEMENTED]
+    * deref: By default aliases are dereferenced to locate the base object for the search, but not when
+    *        searching subordinates of the base object. This may be changed by specifying one of the
+    *        following values:
+    *
+    *        never  - Do not dereference aliases in searching or in locating the base object of the search.
+    *        search - Dereference aliases in subordinates of the base object in searching, but not in
+    *                locating the base object of the search.
+    *        find
+    *        always
+    *
+    * Please note, that you cannot override server side limitations to sizelimit
+    * and timelimit: You can always only lower a given limit.
+    *
+    * @param string|Net_LDAP2_Entry  $base   LDAP searchbase
+    * @param string|Net_LDAP2_Filter $filter LDAP search filter or a Net_LDAP2_Filter object
+    * @param array                   $params Array of options
+    *
+    * @access public
+    * @return Net_LDAP2_Search|Net_LDAP2_Error Net_LDAP2_Search object or Net_LDAP2_Error object
+    * @todo implement search controls (sorting etc)
+    */
+    public function search($base = null, $filter = null, $params = array())
+    {
+        if (is_null($base)) {
+            $base = $this->_config['basedn'];
+        }
+        if ($base instanceof Net_LDAP2_Entry) {
+            $base = $base->dn(); // fetch DN of entry, making searchbase relative to the entry
+        }
+        if (is_null($filter)) {
+            $filter = $this->_config['filter'];
+        }
+        if ($filter instanceof Net_LDAP2_Filter) {
+            $filter = $filter->asString(); // convert Net_LDAP2_Filter to string representation
+        }
+        if (PEAR::isError($filter)) {
+            return $filter;
+        }
+        if (PEAR::isError($base)) {
+            return $base;
+        }
+
+        /* setting searchparameters  */
+        (isset($params['sizelimit']))  ? $sizelimit  = $params['sizelimit']  : $sizelimit = 0;
+        (isset($params['timelimit']))  ? $timelimit  = $params['timelimit']  : $timelimit = 0;
+        (isset($params['attrsonly']))  ? $attrsonly  = $params['attrsonly']  : $attrsonly = 0;
+        (isset($params['attributes'])) ? $attributes = $params['attributes'] : $attributes = array();
+
+        // Ensure $attributes to be an array in case only one
+        // attribute name was given as string
+        if (!is_array($attributes)) {
+            $attributes = array($attributes);
+        }
+
+        // reorganize the $attributes array index keys
+        // sometimes there are problems with not consecutive indexes
+        $attributes = array_values($attributes);
+
+        // scoping makes searches faster!
+        $scope = (isset($params['scope']) ? $params['scope'] : $this->_config['scope']);
+
+        switch ($scope) {
+        case 'one':
+            $search_function = 'ldap_list';
+            break;
+        case 'base':
+            $search_function = 'ldap_read';
+            break;
+        default:
+            $search_function = 'ldap_search';
+        }
+
+        // Continue attempting the search operation until we get a success
+        // or a definitive failure.
+        while (true) {
+            $link = $this->getLink();
+            $search = @call_user_func($search_function,
+                                      $link,
+                                      $base,
+                                      $filter,
+                                      $attributes,
+                                      $attrsonly,
+                                      $sizelimit,
+                                      $timelimit);
+
+            if ($err = @ldap_errno($link)) {
+                if ($err == 32) {
+                    // Errorcode 32 = no such object, i.e. a nullresult.
+                    return $obj = new Net_LDAP2_Search ($search, $this, $attributes);
+                } elseif ($err == 4) {
+                    // Errorcode 4 = sizelimit exeeded.
+                    return $obj = new Net_LDAP2_Search ($search, $this, $attributes);
+                } elseif ($err == 87) {
+                    // bad search filter
+                    return $this->raiseError($this->errorMessage($err) . "($filter)", $err);
+                } elseif (($err == 1) && ($this->_config['auto_reconnect'])) {
+                    // Errorcode 1 = LDAP_OPERATIONS_ERROR but we can try a reconnect.
+                    $this->_link = false;
+                    $this->performReconnect();
+                } else {
+                    $msg = "\nParameters:\nBase: $base\nFilter: $filter\nScope: $scope";
+                    return $this->raiseError($this->errorMessage($err) . $msg, $err);
+                }
+            } else {
+                return $obj = new Net_LDAP2_Search($search, $this, $attributes);
+            }
+        }
+    }
+
+    /**
+    * Set an LDAP option
+    *
+    * @param string $option Option to set
+    * @param mixed  $value  Value to set Option to
+    *
+    * @access public
+    * @return Net_LDAP2_Error|true    Net_LDAP2_Error object or true
+    */
+    public function setOption($option, $value)
+    {
+        if ($this->_link) {
+            if (defined($option)) {
+                if (@ldap_set_option($this->_link, constant($option), $value)) {
+                    return true;
+                } else {
+                    $err = @ldap_errno($this->_link);
+                    if ($err) {
+                        $msg = @ldap_err2str($err);
+                    } else {
+                        $err = NET_LDAP2_ERROR;
+                        $msg = $this->errorMessage($err);
+                    }
+                    return $this->raiseError($msg, $err);
+                }
+            } else {
+                return $this->raiseError("Unkown Option requested");
+            }
+        } else {
+            return $this->raiseError("Could not set LDAP option: No LDAP connection");
+        }
+    }
+
+    /**
+    * Get an LDAP option value
+    *
+    * @param string $option Option to get
+    *
+    * @access public
+    * @return Net_LDAP2_Error|string Net_LDAP2_Error or option value
+    */
+    public function getOption($option)
+    {
+        if ($this->_link) {
+            if (defined($option)) {
+                if (@ldap_get_option($this->_link, constant($option), $value)) {
+                    return $value;
+                } else {
+                    $err = @ldap_errno($this->_link);
+                    if ($err) {
+                        $msg = @ldap_err2str($err);
+                    } else {
+                        $err = NET_LDAP2_ERROR;
+                        $msg = $this->errorMessage($err);
+                    }
+                    return $this->raiseError($msg, $err);
+                }
+            } else {
+                $this->raiseError("Unkown Option requested");
+            }
+        } else {
+            $this->raiseError("No LDAP connection");
+        }
+    }
+
+    /**
+    * Get the LDAP_PROTOCOL_VERSION that is used on the connection.
+    *
+    * A lot of ldap functionality is defined by what protocol version the ldap server speaks.
+    * This might be 2 or 3.
+    *
+    * @return int
+    */
+    public function getLDAPVersion()
+    {
+        if ($this->_link) {
+            $version = $this->getOption("LDAP_OPT_PROTOCOL_VERSION");
+        } else {
+            $version = $this->_config['version'];
+        }
+        return $version;
+    }
+
+    /**
+    * Set the LDAP_PROTOCOL_VERSION that is used on the connection.
+    *
+    * @param int     $version LDAP-version that should be used
+    * @param boolean $force   If set to true, the check against the rootDSE will be skipped
+    *
+    * @return Net_LDAP2_Error|true    Net_LDAP2_Error object or true
+    * @todo Checking via the rootDSE takes much time - why? fetching and instanciation is quick!
+    */
+    public function setLDAPVersion($version = 0, $force = false)
+    {
+        if (!$version) {
+            $version = $this->_config['version'];
+        }
+
+        //
+        // Check to see if the server supports this version first.
+        //
+        // Todo: Why is this so horribly slow?
+        // $this->rootDse() is very fast, as well as Net_LDAP2_RootDSE::fetch()
+        // seems like a problem at copiyng the object inside PHP??
+        // Additionally, this is not always reproducable...
+        //
+        if (!$force) {
+            $rootDSE = $this->rootDse();
+            if ($rootDSE instanceof Net_LDAP2_Error) {
+                return $rootDSE;
+            } else {
+                $supported_versions = $rootDSE->getValue('supportedLDAPVersion');
+                if (is_string($supported_versions)) {
+                    $supported_versions = array($supported_versions);
+                }
+                $check_ok = in_array($version, $supported_versions);
+            }
+        }
+
+        if ($force || $check_ok) {
+            return $this->setOption("LDAP_OPT_PROTOCOL_VERSION", $version);
+        } else {
+            return $this->raiseError("LDAP Server does not support protocol version " . $version);
+        }
+    }
+
+
+    /**
+    * Tells if a DN does exist in the directory
+    *
+    * @param string|Net_LDAP2_Entry $dn The DN of the object to test
+    *
+    * @return boolean|Net_LDAP2_Error
+    */
+    public function dnExists($dn)
+    {
+        if (PEAR::isError($dn)) {
+            return $dn;
+        }
+        if ($dn instanceof Net_LDAP2_Entry) {
+             $dn = $dn->dn();
+        }
+        if (false === is_string($dn)) {
+            return PEAR::raiseError('Parameter $dn is not a string nor an entry object!');
+        }
+
+        // make dn relative to parent
+        $base = Net_LDAP2_Util::ldap_explode_dn($dn, array('casefold' => 'none', 'reverse' => false, 'onlyvalues' => false));
+        if (self::isError($base)) {
+            return $base;
+        }
+        $entry_rdn = array_shift($base);
+        if (is_array($entry_rdn)) {
+            // maybe the dn consist of a multivalued RDN, we must build the dn in this case
+            // because the $entry_rdn is an array!
+            $filter_dn = Net_LDAP2_Util::canonical_dn($entry_rdn);
+        }
+        $base = Net_LDAP2_Util::canonical_dn($base);
+
+        $result = @ldap_list($this->_link, $base, $entry_rdn, array(), 1, 1);
+        if (@ldap_count_entries($this->_link, $result)) {
+            return true;
+        }
+        if (ldap_errno($this->_link) == 32) {
+            return false;
+        }
+        if (ldap_errno($this->_link) != 0) {
+            return PEAR::raiseError(ldap_error($this->_link), ldap_errno($this->_link));
+        }
+        return false;
+    }
+
+
+    /**
+    * Get a specific entry based on the DN
+    *
+    * @param string $dn   DN of the entry that should be fetched
+    * @param array  $attr Array of Attributes to select. If ommitted, all attributes are fetched.
+    *
+    * @return Net_LDAP2_Entry|Net_LDAP2_Error    Reference to a Net_LDAP2_Entry object or Net_LDAP2_Error object
+    * @todo Maybe check against the shema should be done to be sure the attribute type exists
+    */
+    public function &getEntry($dn, $attr = array())
+    {
+        if (!is_array($attr)) {
+            $attr = array($attr);
+        }
+        $result = $this->search($dn, '(objectClass=*)',
+                                array('scope' => 'base', 'attributes' => $attr));
+        if (self::isError($result)) {
+            return $result;
+        } elseif ($result->count() == 0) {
+            return PEAR::raiseError('Could not fetch entry '.$dn.': no entry found');
+        }
+        $entry = $result->shiftEntry();
+        if (false == $entry) {
+            return PEAR::raiseError('Could not fetch entry (error retrieving entry from search result)');
+        }
+        return $entry;
+    }
+
+    /**
+    * Rename or move an entry
+    *
+    * This method will instantly carry out an update() after the move,
+    * so the entry is moved instantly.
+    * You can pass an optional Net_LDAP2 object. In this case, a cross directory
+    * move will be performed which deletes the entry in the source (THIS) directory
+    * and adds it in the directory $target_ldap.
+    * A cross directory move will switch the Entrys internal LDAP reference so
+    * updates to the entry will go to the new directory.
+    *
+    * Note that if you want to do a cross directory move, you need to
+    * pass an Net_LDAP2_Entry object, otherwise the attributes will be empty.
+    *
+    * @param string|Net_LDAP2_Entry $entry       Entry DN or Entry object
+    * @param string                 $newdn       New location
+    * @param Net_LDAP2              $target_ldap (optional) Target directory for cross server move; should be passed via reference
+    *
+    * @return Net_LDAP2_Error|true
+    */
+    public function move($entry, $newdn, $target_ldap = null)
+    {
+        if (is_string($entry)) {
+            $entry_o = $this->getEntry($entry);
+        } else {
+            $entry_o =& $entry;
+        }
+        if (!$entry_o instanceof Net_LDAP2_Entry) {
+            return PEAR::raiseError('Parameter $entry is expected to be a Net_LDAP2_Entry object! (If DN was passed, conversion failed)');
+        }
+        if (null !== $target_ldap && !$target_ldap instanceof Net_LDAP2) {
+            return PEAR::raiseError('Parameter $target_ldap is expected to be a Net_LDAP2 object!');
+        }
+
+        if ($target_ldap && $target_ldap !== $this) {
+            // cross directory move
+            if (is_string($entry)) {
+                return PEAR::raiseError('Unable to perform cross directory move: operation requires a Net_LDAP2_Entry object');
+            }
+            if ($target_ldap->dnExists($newdn)) {
+                return PEAR::raiseError('Unable to perform cross directory move: entry does exist in target directory');
+            }
+            $entry_o->dn($newdn);
+            $res = $target_ldap->add($entry_o);
+            if (self::isError($res)) {
+                return PEAR::raiseError('Unable to perform cross directory move: '.$res->getMessage().' in target directory');
+            }
+            $res = $this->delete($entry_o->currentDN());
+            if (self::isError($res)) {
+                $res2 = $target_ldap->delete($entry_o); // undo add
+                if (self::isError($res2)) {
+                    $add_error_string = 'Additionally, the deletion (undo add) of $entry in target directory failed.';
+                }
+                return PEAR::raiseError('Unable to perform cross directory move: '.$res->getMessage().' in source directory. '.$add_error_string);
+            }
+            $entry_o->setLDAP($target_ldap);
+            return true;
+        } else {
+            // local move
+            $entry_o->dn($newdn);
+            $entry_o->setLDAP($this);
+            return $entry_o->update();
+        }
+    }
+
+    /**
+    * Copy an entry to a new location
+    *
+    * The entry will be immediately copied.
+    * Please note that only attributes you have
+    * selected will be copied.
+    *
+    * @param Net_LDAP2_Entry &$entry Entry object
+    * @param string          $newdn  New FQF-DN of the entry
+    *
+    * @return Net_LDAP2_Error|Net_LDAP2_Entry Error Message or reference to the copied entry
+    */
+    public function &copy(&$entry, $newdn)
+    {
+        if (!$entry instanceof Net_LDAP2_Entry) {
+            return PEAR::raiseError('Parameter $entry is expected to be a Net_LDAP2_Entry object!');
+        }
+
+        $newentry = Net_LDAP2_Entry::createFresh($newdn, $entry->getValues());
+        $result   = $this->add($newentry);
+
+        if ($result instanceof Net_LDAP2_Error) {
+            return $result;
+        } else {
+            return $newentry;
+        }
+    }
+
+
+    /**
+    * Returns the string for an ldap errorcode.
+    *
+    * Made to be able to make better errorhandling
+    * Function based on DB::errorMessage()
+    * Tip: The best description of the errorcodes is found here:
+    * http://www.directory-info.com/LDAP2/LDAPErrorCodes.html
+    *
+    * @param int $errorcode Error code
+    *
+    * @return string The errorstring for the error.
+    */
+    public function errorMessage($errorcode)
+    {
+        $errorMessages = array(
+                              0x00 => "LDAP_SUCCESS",
+                              0x01 => "LDAP_OPERATIONS_ERROR",
+                              0x02 => "LDAP_PROTOCOL_ERROR",
+                              0x03 => "LDAP_TIMELIMIT_EXCEEDED",
+                              0x04 => "LDAP_SIZELIMIT_EXCEEDED",
+                              0x05 => "LDAP_COMPARE_FALSE",
+                              0x06 => "LDAP_COMPARE_TRUE",
+                              0x07 => "LDAP_AUTH_METHOD_NOT_SUPPORTED",
+                              0x08 => "LDAP_STRONG_AUTH_REQUIRED",
+                              0x09 => "LDAP_PARTIAL_RESULTS",
+                              0x0a => "LDAP_REFERRAL",
+                              0x0b => "LDAP_ADMINLIMIT_EXCEEDED",
+                              0x0c => "LDAP_UNAVAILABLE_CRITICAL_EXTENSION",
+                              0x0d => "LDAP_CONFIDENTIALITY_REQUIRED",
+                              0x0e => "LDAP_SASL_BIND_INPROGRESS",
+                              0x10 => "LDAP_NO_SUCH_ATTRIBUTE",
+                              0x11 => "LDAP_UNDEFINED_TYPE",
+                              0x12 => "LDAP_INAPPROPRIATE_MATCHING",
+                              0x13 => "LDAP_CONSTRAINT_VIOLATION",
+                              0x14 => "LDAP_TYPE_OR_VALUE_EXISTS",
+                              0x15 => "LDAP_INVALID_SYNTAX",
+                              0x20 => "LDAP_NO_SUCH_OBJECT",
+                              0x21 => "LDAP_ALIAS_PROBLEM",
+                              0x22 => "LDAP_INVALID_DN_SYNTAX",
+                              0x23 => "LDAP_IS_LEAF",
+                              0x24 => "LDAP_ALIAS_DEREF_PROBLEM",
+                              0x30 => "LDAP_INAPPROPRIATE_AUTH",
+                              0x31 => "LDAP_INVALID_CREDENTIALS",
+                              0x32 => "LDAP_INSUFFICIENT_ACCESS",
+                              0x33 => "LDAP_BUSY",
+                              0x34 => "LDAP_UNAVAILABLE",
+                              0x35 => "LDAP_UNWILLING_TO_PERFORM",
+                              0x36 => "LDAP_LOOP_DETECT",
+                              0x3C => "LDAP_SORT_CONTROL_MISSING",
+                              0x3D => "LDAP_INDEX_RANGE_ERROR",
+                              0x40 => "LDAP_NAMING_VIOLATION",
+                              0x41 => "LDAP_OBJECT_CLASS_VIOLATION",
+                              0x42 => "LDAP_NOT_ALLOWED_ON_NONLEAF",
+                              0x43 => "LDAP_NOT_ALLOWED_ON_RDN",
+                              0x44 => "LDAP_ALREADY_EXISTS",
+                              0x45 => "LDAP_NO_OBJECT_CLASS_MODS",
+                              0x46 => "LDAP_RESULTS_TOO_LARGE",
+                              0x47 => "LDAP_AFFECTS_MULTIPLE_DSAS",
+                              0x50 => "LDAP_OTHER",
+                              0x51 => "LDAP_SERVER_DOWN",
+                              0x52 => "LDAP_LOCAL_ERROR",
+                              0x53 => "LDAP_ENCODING_ERROR",
+                              0x54 => "LDAP_DECODING_ERROR",
+                              0x55 => "LDAP_TIMEOUT",
+                              0x56 => "LDAP_AUTH_UNKNOWN",
+                              0x57 => "LDAP_FILTER_ERROR",
+                              0x58 => "LDAP_USER_CANCELLED",
+                              0x59 => "LDAP_PARAM_ERROR",
+                              0x5a => "LDAP_NO_MEMORY",
+                              0x5b => "LDAP_CONNECT_ERROR",
+                              0x5c => "LDAP_NOT_SUPPORTED",
+                              0x5d => "LDAP_CONTROL_NOT_FOUND",
+                              0x5e => "LDAP_NO_RESULTS_RETURNED",
+                              0x5f => "LDAP_MORE_RESULTS_TO_RETURN",
+                              0x60 => "LDAP_CLIENT_LOOP",
+                              0x61 => "LDAP_REFERRAL_LIMIT_EXCEEDED",
+                              1000 => "Unknown Net_LDAP2 Error"
+                              );
+
+         return isset($errorMessages[$errorcode]) ?
+            $errorMessages[$errorcode] :
+            $errorMessages[NET_LDAP2_ERROR] . ' (' . $errorcode . ')';
+    }
+
+    /**
+    * Gets a rootDSE object
+    *
+    * This either fetches a fresh rootDSE object or returns it from
+    * the internal cache for performance reasons, if possible.
+    *
+    * @param array $attrs Array of attributes to search for
+    *
+    * @access public
+    * @return Net_LDAP2_Error|Net_LDAP2_RootDSE Net_LDAP2_Error or Net_LDAP2_RootDSE object
+    */
+    public function &rootDse($attrs = null)
+    {
+        if ($attrs !== null && !is_array($attrs)) {
+            return PEAR::raiseError('Parameter $attr is expected to be an array!');
+        }
+
+        $attrs_signature = serialize($attrs);
+
+        // see if we need to fetch a fresh object, or if we already
+        // requested this object with the same attributes
+        if (true || !array_key_exists($attrs_signature, $this->_rootDSE_cache)) {
+            $rootdse =& Net_LDAP2_RootDSE::fetch($this, $attrs);
+            if ($rootdse instanceof Net_LDAP2_Error) {
+                return $rootdse;
+            }
+
+            // search was ok, store rootDSE in cache
+            $this->_rootDSE_cache[$attrs_signature] = $rootdse;
+        }
+        return $this->_rootDSE_cache[$attrs_signature];
+    }
+
+    /**
+    * Alias function of rootDse() for perl-ldap interface
+    *
+    * @access public
+    * @see rootDse()
+    * @return Net_LDAP2_Error|Net_LDAP2_RootDSE
+    */
+    public function &root_dse()
+    {
+        $args = func_get_args();
+        return call_user_func_array(array(&$this, 'rootDse'), $args);
+    }
+
+    /**
+    * Get a schema object
+    *
+    * @param string $dn (optional) Subschema entry dn
+    *
+    * @access public
+    * @return Net_LDAP2_Schema|Net_LDAP2_Error  Net_LDAP2_Schema or Net_LDAP2_Error object
+    */
+    public function &schema($dn = null)
+    {
+        // Schema caching by Knut-Olav Hoven
+        // If a schema caching object is registered, we use that to fetch
+        // a schema object.
+        // See registerSchemaCache() for more info on this.
+        if ($this->_schema === null) {
+            if ($this->_schema_cache) {
+               $cached_schema = $this->_schema_cache->loadSchema();
+               if ($cached_schema instanceof Net_LDAP2_Error) {
+                   return $cached_schema; // route error to client
+               } else {
+                   if ($cached_schema instanceof Net_LDAP2_Schema) {
+                       $this->_schema = $cached_schema;
+                   }
+               }
+            }
+        }
+
+        // Fetch schema, if not tried before and no cached version available.
+        // If we are already fetching the schema, we will skip fetching.
+        if ($this->_schema === null) {
+            // store a temporary error message so subsequent calls to schema() can
+            // detect, that we are fetching the schema already.
+            // Otherwise we will get an infinite loop at Net_LDAP2_Schema::fetch()
+            $this->_schema = new Net_LDAP2_Error('Schema not initialized');
+            $this->_schema = Net_LDAP2_Schema::fetch($this, $dn);
+
+            // If schema caching is active, advise the cache to store the schema
+            if ($this->_schema_cache) {
+                $caching_result = $this->_schema_cache->storeSchema($this->_schema);
+                if ($caching_result instanceof Net_LDAP2_Error) {
+                    return $caching_result; // route error to client
+                }
+            }
+        }
+        return $this->_schema;
+    }
+
+    /**
+    * Enable/disable persistent schema caching
+    *
+    * Sometimes it might be useful to allow your scripts to cache
+    * the schema information on disk, so the schema is not fetched
+    * every time the script runs which could make your scripts run
+    * faster.
+    *
+    * This method allows you to register a custom object that
+    * implements your schema cache. Please see the SchemaCache interface
+    * (SchemaCache.interface.php) for informations on how to implement this.
+    * To unregister the cache, pass null as $cache parameter.
+    *
+    * For ease of use, Net_LDAP2 provides a simple file based cache
+    * which is used in the example below. You may use this, for example,
+    * to store the schema in a linux tmpfs which results in the schema
+    * beeing cached inside the RAM which allows nearly instant access.
+    * <code>
+    *    // Create the simple file cache object that comes along with Net_LDAP2
+    *    $mySchemaCache_cfg = array(
+    *      'path'    =>  '/tmp/Net_LDAP2_Schema.cache',
+    *      'max_age' =>  86400   // max age is 24 hours (in seconds)
+    *    );
+    *    $mySchemaCache = new Net_LDAP2_SimpleFileSchemaCache($mySchemaCache_cfg);
+    *    $ldap = new Net_LDAP2::connect(...);
+    *    $ldap->registerSchemaCache($mySchemaCache); // enable caching
+    *    // now each call to $ldap->schema() will get the schema from disk!
+    * </code>
+    *
+    * @param Net_LDAP2_SchemaCache|null $cache Object implementing the Net_LDAP2_SchemaCache interface
+    *
+    * @return true|Net_LDAP2_Error
+    */
+    public function registerSchemaCache($cache) {
+        if (is_null($cache)
+        || (is_object($cache) && in_array('Net_LDAP2_SchemaCache', class_implements($cache))) ) {
+            $this->_schema_cache = $cache;
+            return true;
+        } else {
+            return new Net_LDAP2_Error('Custom schema caching object is either no '.
+                'valid object or does not implement the Net_LDAP2_SchemaCache interface!');
+        }
+    }
+
+
+    /**
+    * Checks if phps ldap-extension is loaded
+    *
+    * If it is not loaded, it tries to load it manually using PHPs dl().
+    * It knows both windows-dll and *nix-so.
+    *
+    * @static
+    * @return Net_LDAP2_Error|true
+    */
+    public static function checkLDAPExtension()
+    {
+        if (!extension_loaded('ldap') && !@dl('ldap.' . PHP_SHLIB_SUFFIX)) {
+            return new Net_LDAP2_Error("It seems that you do not have the ldap-extension installed. Please install it before using the Net_LDAP2 package.");
+        } else {
+            return true;
+        }
+    }
+
+    /**
+    * Encodes given attributes to UTF8 if needed by schema
+    *
+    * This function takes attributes in an array and then checks against the schema if they need
+    * UTF8 encoding. If that is so, they will be encoded. An encoded array will be returned and
+    * can be used for adding or modifying.
+    *
+    * $attributes is expected to be an array with keys describing
+    * the attribute names and the values as the value of this attribute:
+    * <code>$attributes = array('cn' => 'foo', 'attr2' => array('mv1', 'mv2'));</code>
+    *
+    * @param array $attributes Array of attributes
+    *
+    * @access public
+    * @return array|Net_LDAP2_Error Array of UTF8 encoded attributes or Error
+    */
+    public function utf8Encode($attributes)
+    {
+        return $this->utf8($attributes, 'utf8_encode');
+    }
+
+    /**
+    * Decodes the given attribute values if needed by schema
+    *
+    * $attributes is expected to be an array with keys describing
+    * the attribute names and the values as the value of this attribute:
+    * <code>$attributes = array('cn' => 'foo', 'attr2' => array('mv1', 'mv2'));</code>
+    *
+    * @param array $attributes Array of attributes
+    *
+    * @access public
+    * @see utf8Encode()
+    * @return array|Net_LDAP2_Error Array with decoded attribute values or Error
+    */
+    public function utf8Decode($attributes)
+    {
+        return $this->utf8($attributes, 'utf8_decode');
+    }
+
+    /**
+    * Encodes or decodes attribute values if needed
+    *
+    * @param array $attributes Array of attributes
+    * @param array $function   Function to apply to attribute values
+    *
+    * @access protected
+    * @return array|Net_LDAP2_Error Array of attributes with function applied to values or Error
+    */
+    protected function utf8($attributes, $function)
+    {
+        if (!is_array($attributes) || array_key_exists(0, $attributes)) {
+            return PEAR::raiseError('Parameter $attributes is expected to be an associative array');
+        }
+
+        if (!$this->_schema) {
+            $this->_schema = $this->schema();
+        }
+
+        if (!$this->_link || self::isError($this->_schema) || !function_exists($function)) {
+            return $attributes;
+        }
+
+        if (is_array($attributes) && count($attributes) > 0) {
+
+            foreach ($attributes as $k => $v) {
+
+                if (!isset($this->_schemaAttrs[$k])) {
+
+                    $attr = $this->_schema->get('attribute', $k);
+                    if (self::isError($attr)) {
+                        continue;
+                    }
+
+                    if (false !== strpos($attr['syntax'], '1.3.6.1.4.1.1466.115.121.1.15')) {
+                        $encode = true;
+                    } else {
+                        $encode = false;
+                    }
+                    $this->_schemaAttrs[$k] = $encode;
+
+                } else {
+                    $encode = $this->_schemaAttrs[$k];
+                }
+
+                if ($encode) {
+                    if (is_array($v)) {
+                        foreach ($v as $ak => $av) {
+                            $v[$ak] = call_user_func($function, $av);
+                        }
+                    } else {
+                        $v = call_user_func($function, $v);
+                    }
+                }
+                $attributes[$k] = $v;
+            }
+        }
+        return $attributes;
+    }
+
+    /**
+    * Get the LDAP link resource.  It will loop attempting to
+    * re-establish the connection if the connection attempt fails and
+    * auto_reconnect has been turned on (see the _config array documentation).
+    *
+    * @access public
+    * @return resource LDAP link
+    */
+    public function &getLink()
+    {
+        if ($this->_config['auto_reconnect']) {
+            while (true) {
+                //
+                // Return the link handle if we are already connected.  Otherwise
+                // try to reconnect.
+                //
+                if ($this->_link !== false) {
+                    return $this->_link;
+                } else {
+                    $this->performReconnect();
+                }
+            }
+        }
+        return $this->_link;
+    }
+}
+
+/**
+* Net_LDAP2_Error implements a class for reporting portable LDAP error messages.
+*
+* @category Net
+* @package  Net_LDAP2
+* @author   Tarjej Huse <tarjei@bergfald.no>
+* @license  http://www.gnu.org/copyleft/lesser.html LGPL
+* @link     http://pear.php.net/package/Net_LDAP22/
+*/
+class Net_LDAP2_Error extends PEAR_Error
+{
+    /**
+     * Net_LDAP2_Error constructor.
+     *
+     * @param string  $message   String with error message.
+     * @param integer $code      Net_LDAP2 error code
+     * @param integer $mode      what "error mode" to operate in
+     * @param mixed   $level     what error level to use for $mode & PEAR_ERROR_TRIGGER
+     * @param mixed   $debuginfo additional debug info, such as the last query
+     *
+     * @access public
+     * @see PEAR_Error
+     */
+    public function __construct($message = 'Net_LDAP2_Error', $code = NET_LDAP2_ERROR, $mode = PEAR_ERROR_RETURN,
+                         $level = E_USER_NOTICE, $debuginfo = null)
+    {
+        if (is_int($code)) {
+            $this->PEAR_Error($message . ': ' . Net_LDAP2::errorMessage($code), $code, $mode, $level, $debuginfo);
+        } else {
+            $this->PEAR_Error("$message: $code", NET_LDAP2_ERROR, $mode, $level, $debuginfo);
+        }
+    }
+}
+
+?>
diff --git a/extlib/Net/LDAP2/Entry.php b/extlib/Net/LDAP2/Entry.php
new file mode 100644
index 000000000..66de96678
--- /dev/null
+++ b/extlib/Net/LDAP2/Entry.php
@@ -0,0 +1,1055 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+/**
+* File containing the Net_LDAP2_Entry interface class.
+*
+* PHP version 5
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Jan Wagner <wagner@netsols.de>
+* @author    Tarjej Huse <tarjei@bergfald.no>
+* @author    Benedikt Hallinger <beni@php.net>
+* @copyright 2009 Tarjej Huse, Jan Wagner, Benedikt Hallinger
+* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
+* @version   SVN: $Id: Entry.php 286787 2009-08-04 06:03:12Z beni $
+* @link      http://pear.php.net/package/Net_LDAP2/
+*/
+
+/**
+* Includes
+*/
+require_once 'PEAR.php';
+require_once 'Util.php';
+
+/**
+* Object representation of a directory entry
+*
+* This class represents a directory entry. You can add, delete, replace
+* attributes and their values, rename the entry, delete the entry.
+*
+* @category Net
+* @package  Net_LDAP2
+* @author   Jan Wagner <wagner@netsols.de>
+* @author   Tarjej Huse <tarjei@bergfald.no>
+* @author   Benedikt Hallinger <beni@php.net>
+* @license  http://www.gnu.org/copyleft/lesser.html LGPL
+* @link     http://pear.php.net/package/Net_LDAP2/
+*/
+class Net_LDAP2_Entry extends PEAR
+{
+    /**
+    * Entry ressource identifier
+    *
+    * @access protected
+    * @var ressource
+    */
+    protected $_entry = null;
+
+    /**
+    * LDAP ressource identifier
+    *
+    * @access protected
+    * @var ressource
+    */
+    protected $_link = null;
+
+    /**
+    * Net_LDAP2 object
+    *
+    * This object will be used for updating and schema checking
+    *
+    * @access protected
+    * @var object Net_LDAP2
+    */
+    protected $_ldap = null;
+
+    /**
+    * Distinguished name of the entry
+    *
+    * @access protected
+    * @var string
+    */
+    protected $_dn = null;
+
+    /**
+    * Attributes
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_attributes = array();
+
+    /**
+    * Original attributes before any modification
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_original = array();
+
+
+    /**
+    * Map of attribute names
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_map = array();
+
+
+    /**
+    * Is this a new entry?
+    *
+    * @access protected
+    * @var boolean
+    */
+    protected $_new = true;
+
+    /**
+    * New distinguished name
+    *
+    * @access protected
+    * @var string
+    */
+    protected $_newdn = null;
+
+    /**
+    * Shall the entry be deleted?
+    *
+    * @access protected
+    * @var boolean
+    */
+    protected $_delete = false;
+
+    /**
+    * Map with changes to the entry
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_changes = array("add"     => array(),
+                                "delete"  => array(),
+                                "replace" => array()
+                               );
+    /**
+    * Internal Constructor
+    *
+    * Constructor of the entry. Sets up the distinguished name and the entries
+    * attributes.
+    * You should not call this method manually! Use {@link Net_LDAP2_Entry::createFresh()}
+    * or {@link Net_LDAP2_Entry::createConnected()} instead!
+    *
+    * @param Net_LDAP2|ressource|array &$ldap Net_LDAP2 object, ldap-link ressource or array of attributes
+    * @param string|ressource          $entry Either a DN or a LDAP-Entry ressource
+    *
+    * @access protected
+    * @return none
+    */
+    protected function __construct(&$ldap, $entry = null)
+    {
+        $this->PEAR('Net_LDAP2_Error');
+
+        // set up entry resource or DN
+        if (is_resource($entry)) {
+            $this->_entry = &$entry;
+        } else {
+            $this->_dn = $entry;
+        }
+
+        // set up LDAP link
+        if ($ldap instanceof Net_LDAP2) {
+            $this->_ldap = &$ldap;
+            $this->_link = $ldap->getLink();
+        } elseif (is_resource($ldap)) {
+            $this->_link = $ldap;
+        } elseif (is_array($ldap)) {
+            // Special case: here $ldap is an array of attributes,
+            // this means, we have no link. This is a "virtual" entry.
+            // We just set up the attributes so one can work with the object
+            // as expected, but an update() fails unless setLDAP() is called.
+            $this->setAttributes($ldap);
+        }
+
+        // if this is an entry existing in the directory,
+        // then set up as old and fetch attrs
+        if (is_resource($this->_entry) && is_resource($this->_link)) {
+            $this->_new = false;
+            $this->_dn  = @ldap_get_dn($this->_link, $this->_entry);
+            $this->setAttributes();  // fetch attributes from server
+        }
+    }
+
+    /**
+    * Creates a fresh entry that may be added to the directory later on
+    *
+    * Use this method, if you want to initialize a fresh entry.
+    *
+    * The method should be called statically: $entry = Net_LDAP2_Entry::createFresh();
+    * You should put a 'objectClass' attribute into the $attrs so the directory server
+    * knows which object you want to create. However, you may omit this in case you
+    * don't want to add this entry to a directory server.
+    *
+    * The attributes parameter is as following:
+    * <code>
+    * $attrs = array( 'attribute1' => array('value1', 'value2'),
+    *                 'attribute2' => 'single value'
+    *          );
+    * </code>
+    *
+    * @param string $dn    DN of the Entry
+    * @param array  $attrs Attributes of the entry
+    *
+    * @static
+    * @return Net_LDAP2_Entry|Net_LDAP2_Error
+    */
+    public static function createFresh($dn, $attrs = array())
+    {
+        if (!is_array($attrs)) {
+            return PEAR::raiseError("Unable to create fresh entry: Parameter \$attrs needs to be an array!");
+        }
+
+        $entry = new Net_LDAP2_Entry($attrs, $dn);
+        return $entry;
+    }
+
+    /**
+    * Creates a Net_LDAP2_Entry object out of an ldap entry resource
+    *
+    * Use this method, if you want to initialize an entry object that is
+    * already present in some directory and that you have read manually.
+    *
+    * Please note, that if you want to create an entry object that represents
+    * some already existing entry, you should use {@link createExisting()}.
+    *
+    * The method should be called statically: $entry = Net_LDAP2_Entry::createConnected();
+    *
+    * @param Net_LDAP2 $ldap  Net_LDA2 object
+    * @param resource  $entry PHP LDAP entry resource
+    *
+    * @static
+    * @return Net_LDAP2_Entry|Net_LDAP2_Error
+    */
+    public static function createConnected($ldap, $entry)
+    {
+        if (!$ldap instanceof Net_LDAP2) {
+            return PEAR::raiseError("Unable to create connected entry: Parameter \$ldap needs to be a Net_LDAP2 object!");
+        }
+        if (!is_resource($entry)) {
+            return PEAR::raiseError("Unable to create connected entry: Parameter \$entry needs to be a ldap entry resource!");
+        }
+
+        $entry = new Net_LDAP2_Entry($ldap, $entry);
+        return $entry;
+    }
+
+    /**
+    * Creates an Net_LDAP2_Entry object that is considered already existing
+    *
+    * Use this method, if you want to modify an already existing entry
+    * without fetching it first.
+    * In most cases however, it is better to fetch the entry via Net_LDAP2->getEntry()!
+    *
+    * Please note that you should take care if you construct entries manually with this
+    * because you may get weird synchronisation problems.
+    * The attributes and values as well as the entry itself are considered existent
+    * which may produce errors if you try to modify an entry which doesn't really exist
+    * or if you try to overwrite some attribute with an value already present.
+    *
+    * This method is equal to calling createFresh() and after that markAsNew(FALSE).
+    *
+    * The method should be called statically: $entry = Net_LDAP2_Entry::createExisting();
+    *
+    * The attributes parameter is as following:
+    * <code>
+    * $attrs = array( 'attribute1' => array('value1', 'value2'),
+    *                 'attribute2' => 'single value'
+    *          );
+    * </code>
+    *
+    * @param string $dn    DN of the Entry
+    * @param array  $attrs Attributes of the entry
+    *
+    * @static
+    * @return Net_LDAP2_Entry|Net_LDAP2_Error
+    */
+    public static function createExisting($dn, $attrs = array())
+    {
+        if (!is_array($attrs)) {
+            return PEAR::raiseError("Unable to create entry object: Parameter \$attrs needs to be an array!");
+        }
+
+        $entry = Net_LDAP2_Entry::createFresh($dn, $attrs);
+        if ($entry instanceof Net_LDAP2_Error) {
+            return $entry;
+        } else {
+            $entry->markAsNew(false);
+            return $entry;
+        }
+    }
+
+    /**
+    * Get or set the distinguished name of the entry
+    *
+    * If called without an argument the current (or the new DN if set) DN gets returned.
+    * If you provide an DN, this entry is moved to the new location specified if a DN existed.
+    * If the DN was not set, the DN gets initialized. Call {@link update()} to actually create
+    * the new Entry in the directory.
+    * To fetch the current active DN after setting a new DN but before an update(), you can use
+    * {@link currentDN()} to retrieve the DN that is currently active.
+    *
+    * Please note that special characters (eg german umlauts) should be encoded using utf8_encode().
+    * You may use {@link Net_LDAP2_Util::canonical_dn()} for properly encoding of the DN.
+    *
+    * @param string $dn New distinguished name
+    *
+    * @access public
+    * @return string|true Distinguished name (or true if a new DN was provided)
+    */
+    public function dn($dn = null)
+    {
+        if (false == is_null($dn)) {
+            if (is_null($this->_dn)) {
+                $this->_dn = $dn;
+            } else {
+                $this->_newdn = $dn;
+            }
+            return true;
+        }
+        return (isset($this->_newdn) ? $this->_newdn : $this->currentDN());
+    }
+
+    /**
+    * Renames or moves the entry
+    *
+    * This is just a convinience alias to {@link dn()}
+    * to make your code more meaningful.
+    *
+    * @param string $newdn The new DN
+    *
+    * @return true
+    */
+    public function move($newdn)
+    {
+        return $this->dn($newdn);
+    }
+
+    /**
+    * Sets the internal attributes array
+    *
+    * This fetches the values for the attributes from the server.
+    * The attribute Syntax will be checked so binary attributes will be returned
+    * as binary values.
+    *
+    * Attributes may be passed directly via the $attributes parameter to setup this
+    * entry manually. This overrides attribute fetching from the server.
+    *
+    * @param array $attributes Attributes to set for this entry
+    *
+    * @access protected
+    * @return void
+    */
+    protected function setAttributes($attributes = null)
+    {
+        /*
+        * fetch attributes from the server
+        */
+        if (is_null($attributes) && is_resource($this->_entry) && is_resource($this->_link)) {
+            // fetch schema
+            if ($this->_ldap instanceof Net_LDAP2) {
+                $schema =& $this->_ldap->schema();
+            }
+            // fetch attributes
+            $attributes = array();
+            do {
+                if (empty($attr)) {
+                    $ber  = null;
+                    $attr = @ldap_first_attribute($this->_link, $this->_entry, $ber);
+                } else {
+                    $attr = @ldap_next_attribute($this->_link, $this->_entry, $ber);
+                }
+                if ($attr) {
+                    $func = 'ldap_get_values'; // standard function to fetch value
+
+                    // Try to get binary values as binary data
+                    if ($schema instanceof Net_LDAP2_Schema) {
+                        if ($schema->isBinary($attr)) {
+                             $func = 'ldap_get_values_len';
+                        }
+                    }
+                    // fetch attribute value (needs error checking?)
+                    $attributes[$attr] = $func($this->_link, $this->_entry, $attr);
+                }
+            } while ($attr);
+        }
+
+        /*
+        * set attribute data directly, if passed
+        */
+        if (is_array($attributes) && count($attributes) > 0) {
+            if (isset($attributes["count"]) && is_numeric($attributes["count"])) {
+                unset($attributes["count"]);
+            }
+            foreach ($attributes as $k => $v) {
+                // attribute names should not be numeric
+                if (is_numeric($k)) {
+                    continue;
+                }
+                // map generic attribute name to real one
+                $this->_map[strtolower($k)] = $k;
+                // attribute values should be in an array
+                if (false == is_array($v)) {
+                    $v = array($v);
+                }
+                // remove the value count (comes from ldap server)
+                if (isset($v["count"])) {
+                    unset($v["count"]);
+                }
+                $this->_attributes[$k] = $v;
+            }
+        }
+
+        // save a copy for later use
+        $this->_original = $this->_attributes;
+    }
+
+    /**
+    * Get the values of all attributes in a hash
+    *
+    * The returned hash has the form
+    * <code>array('attributename' => 'single value',
+    *       'attributename' => array('value1', value2', value3'))</code>
+    *
+    * @access public
+    * @return array Hash of all attributes with their values
+    */
+    public function getValues()
+    {
+        $attrs = array();
+        foreach ($this->_attributes as $attr => $value) {
+            $attrs[$attr] = $this->getValue($attr);
+        }
+        return $attrs;
+    }
+
+    /**
+    * Get the value of a specific attribute
+    *
+    * The first parameter is the name of the attribute
+    * The second parameter influences the way the value is returned:
+    * 'single': only the first value is returned as string
+    * 'all': all values including the value count are returned in an
+    *               array
+    * 'default': in all other cases an attribute value with a single value is
+    *            returned as string, if it has multiple values it is returned
+    *            as an array (without value count)
+    *
+    * @param string $attr   Attribute name
+    * @param string $option Option
+    *
+    * @access public
+    * @return string|array|PEAR_Error string, array or PEAR_Error
+    */
+    public function getValue($attr, $option = null)
+    {
+        $attr = $this->getAttrName($attr);
+
+        if (false == array_key_exists($attr, $this->_attributes)) {
+            return PEAR::raiseError("Unknown attribute ($attr) requested");
+        }
+
+        $value = $this->_attributes[$attr];
+
+        if ($option == "single" || (count($value) == 1 && $option != 'all')) {
+            $value = array_shift($value);
+        }
+
+        return $value;
+    }
+
+    /**
+    * Alias function of getValue for perl-ldap interface
+    *
+    * @see getValue()
+    * @return string|array|PEAR_Error
+    */
+    public function get_value()
+    {
+        $args = func_get_args();
+        return call_user_func_array(array( &$this, 'getValue' ), $args);
+    }
+
+    /**
+    * Returns an array of attributes names
+    *
+    * @access public
+    * @return array Array of attribute names
+    */
+    public function attributes()
+    {
+        return array_keys($this->_attributes);
+    }
+
+    /**
+    * Returns whether an attribute exists or not
+    *
+    * @param string $attr Attribute name
+    *
+    * @access public
+    * @return boolean
+    */
+    public function exists($attr)
+    {
+        $attr = $this->getAttrName($attr);
+        return array_key_exists($attr, $this->_attributes);
+    }
+
+    /**
+    * Adds a new attribute or a new value to an existing attribute
+    *
+    * The paramter has to be an array of the form:
+    * array('attributename' => 'single value',
+    *       'attributename' => array('value1', 'value2))
+    * When the attribute already exists the values will be added, else the
+    * attribute will be created. These changes are local to the entry and do
+    * not affect the entry on the server until update() is called.
+    *
+    * Note, that you can add values of attributes that you haven't selected, but if
+    * you do so, {@link getValue()} and {@link getValues()} will only return the
+    * values you added, _NOT_ all values present on the server. To avoid this, just refetch
+    * the entry after calling {@link update()} or select the attribute.
+    *
+    * @param array $attr Attributes to add
+    *
+    * @access public
+    * @return true|Net_LDAP2_Error
+    */
+    public function add($attr = array())
+    {
+        if (false == is_array($attr)) {
+            return PEAR::raiseError("Parameter must be an array");
+        }
+        foreach ($attr as $k => $v) {
+            $k = $this->getAttrName($k);
+            if (false == is_array($v)) {
+                // Do not add empty values
+                if ($v == null) {
+                    continue;
+                } else {
+                    $v = array($v);
+                }
+            }
+            // add new values to existing attribute or add new attribute
+            if ($this->exists($k)) {
+                $this->_attributes[$k] = array_unique(array_merge($this->_attributes[$k], $v));
+            } else {
+                $this->_map[strtolower($k)] = $k;
+                $this->_attributes[$k]      = $v;
+            }
+            // save changes for update()
+            if (empty($this->_changes["add"][$k])) {
+                $this->_changes["add"][$k] = array();
+            }
+            $this->_changes["add"][$k] = array_unique(array_merge($this->_changes["add"][$k], $v));
+        }
+        $return = true;
+        return $return;
+    }
+
+    /**
+    * Deletes an whole attribute or a value or the whole entry
+    *
+    * The parameter can be one of the following:
+    *
+    * "attributename" - The attribute as a whole will be deleted
+    * array("attributename1", "attributename2) - All given attributes will be
+    *                                            deleted
+    * array("attributename" => "value") - The value will be deleted
+    * array("attributename" => array("value1", "value2") - The given values
+    *                                                      will be deleted
+    * If $attr is null or omitted , then the whole Entry will be deleted!
+    *
+    * These changes are local to the entry and do
+    * not affect the entry on the server until {@link update()} is called.
+    *
+    * Please note that you must select the attribute (at $ldap->search() for example)
+    * to be able to delete values of it, Otherwise {@link update()} will silently fail
+    * and remove nothing.
+    *
+    * @param string|array $attr Attributes to delete (NULL or missing to delete whole entry)
+    *
+    * @access public
+    * @return true
+    */
+    public function delete($attr = null)
+    {
+        if (is_null($attr)) {
+            $this->_delete = true;
+            return true;
+        }
+        if (is_string($attr)) {
+            $attr = array($attr);
+        }
+        // Make the assumption that attribute names cannot be numeric,
+        // therefore this has to be a simple list of attribute names to delete
+        if (is_numeric(key($attr))) {
+            foreach ($attr as $name) {
+                if (is_array($name)) {
+                    // someone mixed modes (list mode but specific values given!)
+                    $del_attr_name = array_search($name, $attr);
+                    $this->delete(array($del_attr_name => $name));
+                } else {
+                    // mark for update() if this attr was not marked before
+                    $name = $this->getAttrName($name);
+                    if ($this->exists($name)) {
+                        $this->_changes["delete"][$name] = null;
+                        unset($this->_attributes[$name]);
+                    }
+                }
+            }
+        } else {
+            // Here we have a hash with "attributename" => "value to delete"
+            foreach ($attr as $name => $values) {
+                if (is_int($name)) {
+                    // someone mixed modes and gave us just an attribute name
+                    $this->delete($values);
+                } else {
+                    // mark for update() if this attr was not marked before;
+                    // this time it must consider the selected values also
+                    $name = $this->getAttrName($name);
+                    if ($this->exists($name)) {
+                        if (false == is_array($values)) {
+                            $values = array($values);
+                        }
+                        // save values to be deleted
+                        if (empty($this->_changes["delete"][$name])) {
+                            $this->_changes["delete"][$name] = array();
+                        }
+                        $this->_changes["delete"][$name] =
+                            array_unique(array_merge($this->_changes["delete"][$name], $values));
+                        foreach ($values as $value) {
+                            // find the key for the value that should be deleted
+                            $key = array_search($value, $this->_attributes[$name]);
+                            if (false !== $key) {
+                                // delete the value
+                                unset($this->_attributes[$name][$key]);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        $return = true;
+        return $return;
+    }
+
+    /**
+    * Replaces attributes or its values
+    *
+    * The parameter has to an array of the following form:
+    * array("attributename" => "single value",
+    *       "attribute2name" => array("value1", "value2"),
+    *       "deleteme1" => null,
+    *       "deleteme2" => "")
+    * If the attribute does not yet exist it will be added instead (see also $force).
+    * If the attribue value is null, the attribute will de deleted.
+    *
+    * These changes are local to the entry and do
+    * not affect the entry on the server until {@link update()} is called.
+    *
+    * In some cases you are not allowed to read the attributes value (for
+    * example the ActiveDirectory attribute unicodePwd) but are allowed to
+    * replace the value. In this case replace() would assume that the attribute
+    * is not in the directory yet and tries to add it which will result in an
+    * LDAP_TYPE_OR_VALUE_EXISTS error.
+    * To force replace mode instead of add, you can set $force to true.
+    *
+    * @param array $attr  Attributes to replace
+    * @param bool  $force Force replacing mode in case we can't read the attr value but are allowed to replace it
+    *
+    * @access public
+    * @return true|Net_LDAP2_Error
+    */
+    public function replace($attr = array(), $force = false)
+    {
+        if (false == is_array($attr)) {
+            return PEAR::raiseError("Parameter must be an array");
+        }
+        foreach ($attr as $k => $v) {
+            $k = $this->getAttrName($k);
+            if (false == is_array($v)) {
+                // delete attributes with empty values; treat ints as string
+                if (is_int($v)) {
+                    $v = "$v";
+                }
+                if ($v == null) {
+                    $this->delete($k);
+                    continue;
+                } else {
+                    $v = array($v);
+                }
+            }
+            // existing attributes will get replaced
+            if ($this->exists($k) || $force) {
+                $this->_changes["replace"][$k] = $v;
+                $this->_attributes[$k]         = $v;
+            } else {
+                // new ones just get added
+                $this->add(array($k => $v));
+            }
+        }
+        $return = true;
+        return $return;
+    }
+
+    /**
+    * Update the entry on the directory server
+    *
+    * This will evaluate all changes made so far and send them
+    * to the directory server.
+    * Please note, that if you make changes to objectclasses wich
+    * have mandatory attributes set, update() will currently fail.
+    * Remove the entry from the server and readd it as new in such cases.
+    * This also will deal with problems with setting structural object classes.
+    *
+    * @param Net_LDAP2 $ldap If passed, a call to setLDAP() is issued prior update, thus switching the LDAP-server. This is for perl-ldap interface compliance
+    *
+    * @access public
+    * @return true|Net_LDAP2_Error
+    * @todo Entry rename with a DN containing special characters needs testing!
+    */
+    public function update($ldap = null)
+    {
+        if ($ldap) {
+            $msg = $this->setLDAP($ldap);
+            if (Net_LDAP2::isError($msg)) {
+                return PEAR::raiseError('You passed an invalid $ldap variable to update()');
+            }
+        }
+
+        // ensure we have a valid LDAP object
+        $ldap =& $this->getLDAP();
+        if (!$ldap instanceof Net_LDAP2) {
+            return PEAR::raiseError("The entries LDAP object is not valid");
+        }
+
+        // Get and check link
+        $link = $ldap->getLink();
+        if (!is_resource($link)) {
+            return PEAR::raiseError("Could not update entry: internal LDAP link is invalid");
+        }
+
+        /*
+        * Delete the entry
+        */
+        if (true === $this->_delete) {
+            return $ldap->delete($this);
+        }
+
+        /*
+        * New entry
+        */
+        if (true === $this->_new) {
+            $msg = $ldap->add($this);
+            if (Net_LDAP2::isError($msg)) {
+                return $msg;
+            }
+            $this->_new                = false;
+            $this->_changes['add']     = array();
+            $this->_changes['delete']  = array();
+            $this->_changes['replace'] = array();
+            $this->_original           = $this->_attributes;
+
+            $return = true;
+            return $return;
+        }
+
+        /*
+        * Rename/move entry
+        */
+        if (false == is_null($this->_newdn)) {
+            if ($ldap->getLDAPVersion() !== 3) {
+                return PEAR::raiseError("Renaming/Moving an entry is only supported in LDAPv3");
+            }
+            // make dn relative to parent (needed for ldap rename)
+            $parent = Net_LDAP2_Util::ldap_explode_dn($this->_newdn, array('casefolding' => 'none', 'reverse' => false, 'onlyvalues' => false));
+            if (Net_LDAP2::isError($parent)) {
+                return $parent;
+            }
+            $child = array_shift($parent);
+            // maybe the dn consist of a multivalued RDN, we must build the dn in this case
+            // because the $child-RDN is an array!
+            if (is_array($child)) {
+                $child = Net_LDAP2_Util::canonical_dn($child);
+            }
+            $parent = Net_LDAP2_Util::canonical_dn($parent);
+
+            // rename/move
+            if (false == @ldap_rename($link, $this->_dn, $child, $parent, true)) {
+                return PEAR::raiseError("Entry not renamed: " .
+                                        @ldap_error($link), @ldap_errno($link));
+            }
+            // reflect changes to local copy
+            $this->_dn    = $this->_newdn;
+            $this->_newdn = null;
+        }
+
+        /*
+        * Carry out modifications to the entry
+        */
+        // ADD
+        foreach ($this->_changes["add"] as $attr => $value) {
+            // if attribute exists, add new values
+            if ($this->exists($attr)) {
+                if (false === @ldap_mod_add($link, $this->dn(), array($attr => $value))) {
+                    return PEAR::raiseError("Could not add new values to attribute $attr: " .
+                                            @ldap_error($link), @ldap_errno($link));
+                }
+            } else {
+                // new attribute
+                if (false === @ldap_modify($link, $this->dn(), array($attr => $value))) {
+                    return PEAR::raiseError("Could not add new attribute $attr: " .
+                                            @ldap_error($link), @ldap_errno($link));
+                }
+            }
+            // all went well here, I guess
+            unset($this->_changes["add"][$attr]);
+        }
+
+        // DELETE
+        foreach ($this->_changes["delete"] as $attr => $value) {
+            // In LDAPv3 you need to specify the old values for deleting
+            if (is_null($value) && $ldap->getLDAPVersion() === 3) {
+                $value = $this->_original[$attr];
+            }
+            if (false === @ldap_mod_del($link, $this->dn(), array($attr => $value))) {
+                return PEAR::raiseError("Could not delete attribute $attr: " .
+                                        @ldap_error($link), @ldap_errno($link));
+            }
+            unset($this->_changes["delete"][$attr]);
+        }
+
+        // REPLACE
+        foreach ($this->_changes["replace"] as $attr => $value) {
+            if (false === @ldap_modify($link, $this->dn(), array($attr => $value))) {
+                return PEAR::raiseError("Could not replace attribute $attr values: " .
+                                        @ldap_error($link), @ldap_errno($link));
+            }
+            unset($this->_changes["replace"][$attr]);
+        }
+
+        // all went well, so _original (server) becomes _attributes (local copy)
+        $this->_original = $this->_attributes;
+
+        $return = true;
+        return $return;
+    }
+
+    /**
+    * Returns the right attribute name
+    *
+    * @param string $attr Name of attribute
+    *
+    * @access protected
+    * @return string The right name of the attribute
+    */
+    protected function getAttrName($attr)
+    {
+        $name = strtolower($attr);
+        if (array_key_exists($name, $this->_map)) {
+            $attr = $this->_map[$name];
+        }
+        return $attr;
+    }
+
+    /**
+    * Returns a reference to the LDAP-Object of this entry
+    *
+    * @access public
+    * @return Net_LDAP2|Net_LDAP2_Error   Reference to the Net_LDAP2 Object (the connection) or Net_LDAP2_Error
+    */
+    public function &getLDAP()
+    {
+        if (!$this->_ldap instanceof Net_LDAP2) {
+            $err = new PEAR_Error('LDAP is not a valid Net_LDAP2 object');
+            return $err;
+        } else {
+            return $this->_ldap;
+        }
+    }
+
+    /**
+    * Sets a reference to the LDAP-Object of this entry
+    *
+    * After setting a Net_LDAP2 object, calling update() will use that object for
+    * updating directory contents. Use this to dynamicly switch directorys.
+    *
+    * @param Net_LDAP2 &$ldap Net_LDAP2 object that this entry should be connected to
+    *
+    * @access public
+    * @return true|Net_LDAP2_Error
+    */
+    public function setLDAP(&$ldap)
+    {
+        if (!$ldap instanceof Net_LDAP2) {
+            return PEAR::raiseError("LDAP is not a valid Net_LDAP2 object");
+        } else {
+            $this->_ldap =& $ldap;
+            return true;
+        }
+    }
+
+    /**
+    * Marks the entry as new/existing.
+    *
+    * If an Entry is marked as new, it will be added to the directory
+    * when calling {@link update()}.
+    * If the entry is marked as old ($mark = false), then the entry is
+    * assumed to be present in the directory server wich results in
+    * modification when calling {@link update()}.
+    *
+    * @param boolean $mark Value to set, defaults to "true"
+    *
+    * @return void
+    */
+    public function markAsNew($mark = true)
+    {
+        $this->_new = ($mark)? true : false;
+    }
+
+    /**
+    * Applies a regular expression onto a single- or multivalued attribute (like preg_match())
+    *
+    * This method behaves like PHPs preg_match() but with some exceptions.
+    * If you want to retrieve match information, then you MUST pass the
+    * $matches parameter via reference! otherwise you will get no matches.
+    * Since it is possible to have multi valued attributes the $matches
+    * array will have a additionally numerical dimension (one for each value):
+    * <code>
+    * $matches = array(
+    *         0 => array (usual preg_match() returnarray),
+    *         1 => array (usual preg_match() returnarray)
+    *     )
+    * </code>
+    * Please note, that $matches will be initialized to an empty array inside.
+    *
+    * Usage example:
+    * <code>
+    * $result = $entry->preg_match('/089(\d+)/', 'telephoneNumber', &$matches);
+    * if ( $result === true ){
+    *     echo "First match: ".$matches[0][1];   // Match of value 1, content of first bracket
+    * } else {
+    *     if ( Net_LDAP2::isError($result) ) {
+    *         echo "Error: ".$result->getMessage();
+    *     } else {
+    *         echo "No match found.";
+    *     }
+    * }
+    * </code>
+    *
+    * Please note that it is important to test for an Net_LDAP2_Error, because objects are
+    * evaluating to true by default, thus if an error occured, and you only check using "==" then
+    * you get misleading results. Use the "identical" (===) operator to test for matches to
+    * avoid this as shown above.
+    *
+    * @param string $regex     The regular expression
+    * @param string $attr_name The attribute to search in
+    * @param array  $matches   (optional, PASS BY REFERENCE!) Array to store matches in
+    *
+    * @return boolean|Net_LDAP2_Error  TRUE, if we had a match in one of the values, otherwise false. Net_LDAP2_Error in case something went wrong
+    */
+    public function pregMatch($regex, $attr_name, $matches = array())
+    {
+        $matches = array();
+
+        // fetch attribute values
+        $attr = $this->getValue($attr_name, 'all');
+        if (Net_LDAP2::isError($attr)) {
+            return $attr;
+        } else {
+            unset($attr['count']);
+        }
+
+        // perform preg_match() on all values
+        $match = false;
+        foreach ($attr as $thisvalue) {
+            $matches_int = array();
+            if (preg_match($regex, $thisvalue, $matches_int)) {
+                $match = true;
+                array_push($matches, $matches_int); // store matches in reference
+            }
+        }
+        return $match;
+    }
+
+    /**
+    * Alias of {@link pregMatch()} for compatibility to Net_LDAP 1
+    *
+    * @see pregMatch()
+    * @return boolean|Net_LDAP2_Error
+    */
+    public function preg_match()
+    {
+        $args = func_get_args();
+        return call_user_func_array(array( &$this, 'pregMatch' ), $args);
+    }
+
+    /**
+    * Tells if the entry is consiedered as new (not present in the server)
+    *
+    * Please note, that this doesn't tell you if the entry is present on the server.
+    * Use {@link Net_LDAP2::dnExists()} to see if an entry is already there.
+    *
+    * @return boolean
+    */
+    public function isNew()
+    {
+        return $this->_new;
+    }
+
+
+    /**
+    * Is this entry going to be deleted once update() is called?
+    *
+    * @return boolean
+    */
+    public function willBeDeleted()
+    {
+        return $this->_delete;
+    }
+
+    /**
+    * Is this entry going to be moved once update() is called?
+    *
+    * @return boolean
+    */
+    public function willBeMoved()
+    {
+        return ($this->dn() !== $this->currentDN());
+    }
+
+    /**
+    * Returns always the original DN
+    *
+    * If an entry will be moved but {@link update()} was not called,
+    * {@link dn()} will return the new DN. This method however, returns
+    * always the current active DN.
+    *
+    * @return string
+    */
+    public function currentDN()
+    {
+        return $this->_dn;
+    }
+
+    /**
+    * Returns the attribute changes to be carried out once update() is called
+    *
+    * @return array
+    */
+    public function getChanges()
+    {
+        return $this->_changes;
+    }
+}
+?>
diff --git a/extlib/Net/LDAP2/Filter.php b/extlib/Net/LDAP2/Filter.php
new file mode 100644
index 000000000..0723edab2
--- /dev/null
+++ b/extlib/Net/LDAP2/Filter.php
@@ -0,0 +1,514 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+/**
+* File containing the Net_LDAP2_Filter interface class.
+*
+* PHP version 5
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Benedikt Hallinger <beni@php.net>
+* @copyright 2009 Benedikt Hallinger
+* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
+* @version   SVN: $Id: Filter.php 289978 2009-10-27 09:56:41Z beni $
+* @link      http://pear.php.net/package/Net_LDAP2/
+*/
+
+/**
+* Includes
+*/
+require_once 'PEAR.php';
+require_once 'Util.php';
+
+/**
+* Object representation of a part of a LDAP filter.
+*
+* This Class is not completely compatible to the PERL interface!
+*
+* The purpose of this class is, that users can easily build LDAP filters
+* without having to worry about right escaping etc.
+* A Filter is built using several independent filter objects
+* which are combined afterwards. This object works in two
+* modes, depending how the object is created.
+* If the object is created using the {@link create()} method, then this is a leaf-object.
+* If the object is created using the {@link combine()} method, then this is a container object.
+*
+* LDAP filters are defined in RFC-2254 and can be found under
+* {@link http://www.ietf.org/rfc/rfc2254.txt}
+*
+* Here a quick copy&paste example:
+* <code>
+* $filter0 = Net_LDAP2_Filter::create('stars', 'equals', '***');
+* $filter_not0 = Net_LDAP2_Filter::combine('not', $filter0);
+*
+* $filter1 = Net_LDAP2_Filter::create('gn', 'begins', 'bar');
+* $filter2 = Net_LDAP2_Filter::create('gn', 'ends', 'baz');
+* $filter_comp = Net_LDAP2_Filter::combine('or',array($filter_not0, $filter1, $filter2));
+*
+* echo $filter_comp->asString();
+* // This will output: (|(!(stars=\0x5c0x2a\0x5c0x2a\0x5c0x2a))(gn=bar*)(gn=*baz))
+* // The stars in $filter0 are treaten as real stars unless you disable escaping.
+* </code>
+*
+* @category Net
+* @package  Net_LDAP2
+* @author   Benedikt Hallinger <beni@php.net>
+* @license  http://www.gnu.org/copyleft/lesser.html LGPL
+* @link     http://pear.php.net/package/Net_LDAP2/
+*/
+class Net_LDAP2_Filter extends PEAR
+{
+    /**
+    * Storage for combination of filters
+    *
+    * This variable holds a array of filter objects
+    * that should be combined by this filter object.
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_subfilters = array();
+
+    /**
+    * Match of this filter
+    *
+    * If this is a leaf filter, then a matching rule is stored,
+    * if it is a container, then it is a logical operator
+    *
+    * @access protected
+    * @var string
+    */
+    protected $_match;
+
+    /**
+    * Single filter
+    *
+    * If we operate in leaf filter mode,
+    * then the constructing method stores
+    * the filter representation here
+    *
+    * @acces private
+    * @var string
+    */
+    protected $_filter;
+
+    /**
+    * Create a new Net_LDAP2_Filter object and parse $filter.
+    *
+    * This is for PERL Net::LDAP interface.
+    * Construction of Net_LDAP2_Filter objects should happen through either
+    * {@link create()} or {@link combine()} which give you more control.
+    * However, you may use the perl iterface if you already have generated filters.
+    *
+    * @param string $filter LDAP filter string
+    *
+    * @see parse()
+    */
+    public function __construct($filter = false)
+    {
+        // The optional parameter must remain here, because otherwise create() crashes
+        if (false !== $filter) {
+            $filter_o = self::parse($filter);
+            if (PEAR::isError($filter_o)) {
+                $this->_filter = $filter_o; // assign error, so asString() can report it
+            } else {
+                $this->_filter = $filter_o->asString();
+            }
+        }
+    }
+
+    /**
+    * Constructor of a new part of a LDAP filter.
+    *
+    * The following matching rules exists:
+    *    - equals:         One of the attributes values is exactly $value
+    *                      Please note that case sensitiviness is depends on the
+    *                      attributes syntax configured in the server.
+    *    - begins:         One of the attributes values must begin with $value
+    *    - ends:           One of the attributes values must end with $value
+    *    - contains:       One of the attributes values must contain $value
+    *    - present | any:  The attribute can contain any value but must be existent
+    *    - greater:        The attributes value is greater than $value
+    *    - less:           The attributes value is less than $value
+    *    - greaterOrEqual: The attributes value is greater or equal than $value
+    *    - lessOrEqual:    The attributes value is less or equal than $value
+    *    - approx:         One of the attributes values is similar to $value
+    *
+    * If $escape is set to true (default) then $value will be escaped
+    * properly. If it is set to false then $value will be treaten as raw filter value string.
+    * You should escape yourself using {@link Net_LDAP2_Util::escape_filter_value()}!
+    *
+    * Examples:
+    * <code>
+    *   // This will find entries that contain an attribute "sn" that ends with "foobar":
+    *   $filter = new Net_LDAP2_Filter('sn', 'ends', 'foobar');
+    *
+    *   // This will find entries that contain an attribute "sn" that has any value set:
+    *   $filter = new Net_LDAP2_Filter('sn', 'any');
+    * </code>
+    *
+    * @param string  $attr_name Name of the attribute the filter should apply to
+    * @param string  $match     Matching rule (equals, begins, ends, contains, greater, less, greaterOrEqual, lessOrEqual, approx, any)
+    * @param string  $value     (optional) if given, then this is used as a filter
+    * @param boolean $escape    Should $value be escaped? (default: yes, see {@link Net_LDAP2_Util::escape_filter_value()} for detailed information)
+    *
+    * @return Net_LDAP2_Filter|Net_LDAP2_Error
+    */
+    public static function &create($attr_name, $match, $value = '', $escape = true)
+    {
+        $leaf_filter = new Net_LDAP2_Filter();
+        if ($escape) {
+            $array = Net_LDAP2_Util::escape_filter_value(array($value));
+            $value = $array[0];
+        }
+        switch (strtolower($match)) {
+        case 'equals':
+            $leaf_filter->_filter = '(' . $attr_name . '=' . $value . ')';
+            break;
+        case 'begins':
+            $leaf_filter->_filter = '(' . $attr_name . '=' . $value . '*)';
+            break;
+        case 'ends':
+            $leaf_filter->_filter = '(' . $attr_name . '=*' . $value . ')';
+            break;
+        case 'contains':
+            $leaf_filter->_filter = '(' . $attr_name . '=*' . $value . '*)';
+            break;
+        case 'greater':
+            $leaf_filter->_filter = '(' . $attr_name . '>' . $value . ')';
+            break;
+        case 'less':
+            $leaf_filter->_filter = '(' . $attr_name . '<' . $value . ')';
+            break;
+        case 'greaterorequal':
+        case '>=':
+            $leaf_filter->_filter = '(' . $attr_name . '>=' . $value . ')';
+            break;
+        case 'lessorequal':
+        case '<=':
+            $leaf_filter->_filter = '(' . $attr_name . '<=' . $value . ')';
+            break;
+        case 'approx':
+        case '~=':
+            $leaf_filter->_filter = '(' . $attr_name . '~=' . $value . ')';
+            break;
+        case 'any':
+        case 'present': // alias that may improve user code readability
+            $leaf_filter->_filter = '(' . $attr_name . '=*)';
+            break;
+        default:
+            return PEAR::raiseError('Net_LDAP2_Filter create error: matching rule "' . $match . '" not known!');
+        }
+        return $leaf_filter;
+    }
+
+    /**
+    * Combine two or more filter objects using a logical operator
+    *
+    * This static method combines two or more filter objects and returns one single
+    * filter object that contains all the others.
+    * Call this method statically: $filter = Net_LDAP2_Filter('or', array($filter1, $filter2))
+    * If the array contains filter strings instead of filter objects, we will try to parse them.
+    *
+    * @param string                 $log_op  The locicall operator. May be "and", "or", "not" or the subsequent logical equivalents "&", "|", "!"
+    * @param array|Net_LDAP2_Filter $filters array with Net_LDAP2_Filter objects
+    *
+    * @return Net_LDAP2_Filter|Net_LDAP2_Error
+    * @static
+    */
+    public static function &combine($log_op, $filters)
+    {
+        if (PEAR::isError($filters)) {
+            return $filters;
+        }
+
+        // substitude named operators to logical operators
+        if ($log_op == 'and') $log_op = '&';
+        if ($log_op == 'or')  $log_op = '|';
+        if ($log_op == 'not') $log_op = '!';
+
+        // tests for sane operation
+        if ($log_op == '!') {
+            // Not-combination, here we only accept one filter object or filter string
+            if ($filters instanceof Net_LDAP2_Filter) {
+                $filters = array($filters); // force array
+            } elseif (is_string($filters)) {
+                $filter_o = self::parse($filters);
+                if (PEAR::isError($filter_o)) {
+                    $err = PEAR::raiseError('Net_LDAP2_Filter combine error: '.$filter_o->getMessage());
+                    return $err;
+                } else {
+                    $filters = array($filter_o);
+                }
+            } elseif (is_array($filters)) {
+                $err = PEAR::raiseError('Net_LDAP2_Filter combine error: operator is "not" but $filter is an array!');
+                return $err;
+            } else {
+                $err = PEAR::raiseError('Net_LDAP2_Filter combine error: operator is "not" but $filter is not a valid Net_LDAP2_Filter nor a filter string!');
+                return $err;
+            }
+        } elseif ($log_op == '&' || $log_op == '|') {
+            if (!is_array($filters) || count($filters) < 2) {
+                $err = PEAR::raiseError('Net_LDAP2_Filter combine error: parameter $filters is not an array or contains less than two Net_LDAP2_Filter objects!');
+                return $err;
+            }
+        } else {
+            $err = PEAR::raiseError('Net_LDAP2_Filter combine error: logical operator is not known!');
+            return $err;
+        }
+
+        $combined_filter = new Net_LDAP2_Filter();
+        foreach ($filters as $key => $testfilter) {     // check for errors
+            if (PEAR::isError($testfilter)) {
+                return $testfilter;
+            } elseif (is_string($testfilter)) {
+                // string found, try to parse into an filter object
+                $filter_o = self::parse($testfilter);
+                if (PEAR::isError($filter_o)) {
+                    return $filter_o;
+                } else {
+                    $filters[$key] = $filter_o;
+                }
+            } elseif (!$testfilter instanceof Net_LDAP2_Filter) {
+                $err = PEAR::raiseError('Net_LDAP2_Filter combine error: invalid object passed in array $filters!');
+                return $err;
+            }
+        }
+
+        $combined_filter->_subfilters = $filters;
+        $combined_filter->_match      = $log_op;
+        return $combined_filter;
+    }
+
+    /**
+    * Parse FILTER into a Net_LDAP2_Filter object
+    *
+    * This parses an filter string into Net_LDAP2_Filter objects.
+    *
+    * @param string $FILTER The filter string
+    *
+    * @access static
+    * @return Net_LDAP2_Filter|Net_LDAP2_Error
+    * @todo Leaf-mode: Do we need to escape at all? what about *-chars?check for the need of encoding values, tackle problems (see code comments)
+    */
+    public static function parse($FILTER)
+    {
+        if (preg_match('/^\((.+?)\)$/', $FILTER, $matches)) {
+            if (in_array(substr($matches[1], 0, 1), array('!', '|', '&'))) {
+                // Subfilter processing: pass subfilters to parse() and combine
+                // the objects using the logical operator detected
+                // we have now something like "&(...)(...)(...)" but at least one part ("!(...)").
+                // Each subfilter could be an arbitary complex subfilter.
+
+                // extract logical operator and filter arguments
+                $log_op              = substr($matches[1], 0, 1);
+                $remaining_component = substr($matches[1], 1);
+
+                // split $remaining_component into individual subfilters
+                // we cannot use split() for this, because we do not know the
+                // complexiness of the subfilter. Thus, we look trough the filter
+                // string and just recognize ending filters at the first level.
+                // We record the index number of the char and use that information
+                // later to split the string.
+                $sub_index_pos = array();
+                $prev_char     = ''; // previous character looked at
+                $level         = 0;  // denotes the current bracket level we are,
+                                     //   >1 is too deep, 1 is ok, 0 is outside any
+                                     //   subcomponent
+                for ($curpos = 0; $curpos < strlen($remaining_component); $curpos++) {
+                    $cur_char = substr($remaining_component, $curpos, 1);
+
+                    // rise/lower bracket level
+                    if ($cur_char == '(' && $prev_char != '\\') {
+                        $level++;
+                    } elseif  ($cur_char == ')' && $prev_char != '\\') {
+                        $level--;
+                    }
+
+                    if ($cur_char == '(' && $prev_char == ')' && $level == 1) {
+                        array_push($sub_index_pos, $curpos); // mark the position for splitting
+                    }
+                    $prev_char = $cur_char;
+                }
+
+                // now perform the splits. To get also the last part, we
+                // need to add the "END" index to the split array
+                array_push($sub_index_pos, strlen($remaining_component));
+                $subfilters = array();
+                $oldpos = 0;
+                foreach ($sub_index_pos as $s_pos) {
+                    $str_part = substr($remaining_component, $oldpos, $s_pos - $oldpos);
+                    array_push($subfilters, $str_part);
+                    $oldpos = $s_pos;
+                }
+
+                // some error checking...
+                if (count($subfilters) == 1) {
+                    // only one subfilter found
+                } elseif (count($subfilters) > 1) {
+                    // several subfilters found
+                    if ($log_op == "!") {
+                        return PEAR::raiseError("Filter parsing error: invalid filter syntax - NOT operator detected but several arguments given!");
+                    }
+                } else {
+                    // this should not happen unless the user specified a wrong filter
+                    return PEAR::raiseError("Filter parsing error: invalid filter syntax - got operator '$log_op' but no argument!");
+                }
+
+                // Now parse the subfilters into objects and combine them using the operator
+                $subfilters_o = array();
+                foreach ($subfilters as $s_s) {
+                    $o = self::parse($s_s);
+                    if (PEAR::isError($o)) {
+                        return $o;
+                    } else {
+                        array_push($subfilters_o, self::parse($s_s));
+                    }
+                }
+
+                $filter_o = self::combine($log_op, $subfilters_o);
+                return $filter_o;
+
+            } else {
+                // This is one leaf filter component, do some syntax checks, then escape and build filter_o
+                // $matches[1] should be now something like "foo=bar"
+
+                // detect multiple leaf components
+                // [TODO] Maybe this will make problems with filters containing brackets inside the value
+                if (stristr($matches[1], ')(')) {
+                    return PEAR::raiseError("Filter parsing error: invalid filter syntax - multiple leaf components detected!");
+                } else {
+                    $filter_parts = preg_split('/(?<!\\\\)(=|=~|>|<|>=|<=)/', $matches[1], 2, PREG_SPLIT_DELIM_CAPTURE);
+                    if (count($filter_parts) != 3) {
+                        return PEAR::raiseError("Filter parsing error: invalid filter syntax - unknown matching rule used");
+                    } else {
+                        $filter_o          = new Net_LDAP2_Filter();
+                        // [TODO]: Do we need to escape at all? what about *-chars user provide and that should remain special?
+                        //         I think, those prevent escaping! We need to check against PERL Net::LDAP!
+                        // $value_arr         = Net_LDAP2_Util::escape_filter_value(array($filter_parts[2]));
+                        // $value             = $value_arr[0];
+                        $value             = $filter_parts[2];
+                        $filter_o->_filter = '('.$filter_parts[0].$filter_parts[1].$value.')';
+                        return $filter_o;
+                    }
+                }
+            }
+        } else {
+               // ERROR: Filter components must be enclosed in round brackets
+               return PEAR::raiseError("Filter parsing error: invalid filter syntax - filter components must be enclosed in round brackets");
+        }
+    }
+
+    /**
+    * Get the string representation of this filter
+    *
+    * This method runs through all filter objects and creates
+    * the string representation of the filter. If this
+    * filter object is a leaf filter, then it will return
+    * the string representation of this filter.
+    *
+    * @return string|Net_LDAP2_Error
+    */
+    public function asString()
+    {
+        if ($this->isLeaf()) {
+            $return = $this->_filter;
+        } else {
+            $return = '';
+            foreach ($this->_subfilters as $filter) {
+                $return = $return.$filter->asString();
+            }
+            $return = '(' . $this->_match . $return . ')';
+        }
+        return $return;
+    }
+
+    /**
+    * Alias for perl interface as_string()
+    *
+    * @see asString()
+    * @return string|Net_LDAP2_Error
+    */
+    public function as_string()
+    {
+        return $this->asString();
+    }
+
+    /**
+    * Print the text representation of the filter to FH, or the currently selected output handle if FH is not given
+    *
+    * This method is only for compatibility to the perl interface.
+    * However, the original method was called "print" but due to PHP language restrictions,
+    * we can't have a print() method.
+    *
+    * @param resource $FH (optional) A filehandle resource
+    *
+    * @return true|Net_LDAP2_Error
+    */
+    public function printMe($FH = false)
+    {
+        if (!is_resource($FH)) {
+            if (PEAR::isError($FH)) {
+                return $FH;
+            }
+            $filter_str = $this->asString();
+            if (PEAR::isError($filter_str)) {
+                return $filter_str;
+            } else {
+                print($filter_str);
+            }
+        } else {
+            $filter_str = $this->asString();
+            if (PEAR::isError($filter_str)) {
+                return $filter_str;
+            } else {
+                $res = @fwrite($FH, $this->asString());
+                if ($res == false) {
+                    return PEAR::raiseError("Unable to write filter string to filehandle \$FH!");
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
+    * This can be used to escape a string to provide a valid LDAP-Filter.
+    *
+    * LDAP will only recognise certain characters as the
+    * character istself if they are properly escaped. This is
+    * what this method does.
+    * The method can be called statically, so you can use it outside
+    * for your own purposes (eg for escaping only parts of strings)
+    *
+    * In fact, this is just a shorthand to {@link Net_LDAP2_Util::escape_filter_value()}.
+    * For upward compatibiliy reasons you are strongly encouraged to use the escape
+    * methods provided by the Net_LDAP2_Util class.
+    *
+    * @param string $value Any string who should be escaped
+    *
+    * @static
+    * @return string         The string $string, but escaped
+    * @deprecated  Do not use this method anymore, instead use Net_LDAP2_Util::escape_filter_value() directly
+    */
+    public static function escape($value)
+    {
+        $return = Net_LDAP2_Util::escape_filter_value(array($value));
+        return $return[0];
+    }
+
+    /**
+    * Is this a container or a leaf filter object?
+    *
+    * @access protected
+    * @return boolean
+    */
+    protected function isLeaf()
+    {
+        if (count($this->_subfilters) > 0) {
+            return false; // Container!
+        } else {
+            return true; // Leaf!
+        }
+    }
+}
+?>
diff --git a/extlib/Net/LDAP2/LDIF.php b/extlib/Net/LDAP2/LDIF.php
new file mode 100644
index 000000000..34f3e75dd
--- /dev/null
+++ b/extlib/Net/LDAP2/LDIF.php
@@ -0,0 +1,922 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+/**
+* File containing the Net_LDAP2_LDIF interface class.
+*
+* PHP version 5
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Benedikt Hallinger <beni@php.net>
+* @copyright 2009 Benedikt Hallinger
+* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
+* @version   SVN: $Id: LDIF.php 286718 2009-08-03 07:30:49Z beni $
+* @link      http://pear.php.net/package/Net_LDAP2/
+*/
+
+/**
+* Includes
+*/
+require_once 'PEAR.php';
+require_once 'Net/LDAP2.php';
+require_once 'Net/LDAP2/Entry.php';
+require_once 'Net/LDAP2/Util.php';
+
+/**
+* LDIF capabilitys for Net_LDAP2, closely taken from PERLs Net::LDAP
+*
+* It provides a means to convert between Net_LDAP2_Entry objects and LDAP entries
+* represented in LDIF format files. Reading and writing are supported and may
+* manipulate single entries or lists of entries.
+*
+* Usage example:
+* <code>
+* // Read and parse an ldif-file into Net_LDAP2_Entry objects
+* // and print out the DNs. Store the entries for later use.
+* require 'Net/LDAP2/LDIF.php';
+* $options = array(
+*       'onerror' => 'die'
+* );
+* $entries = array();
+* $ldif = new Net_LDAP2_LDIF('test.ldif', 'r', $options);
+* do {
+*       $entry = $ldif->read_entry();
+*       $dn    = $entry->dn();
+*       echo " done building entry: $dn\n";
+*       array_push($entries, $entry);
+* } while (!$ldif->eof());
+* $ldif->done();
+*
+*
+* // write those entries to another file
+* $ldif = new Net_LDAP2_LDIF('test.out.ldif', 'w', $options);
+* $ldif->write_entry($entries);
+* $ldif->done();
+* </code>
+*
+* @category Net
+* @package  Net_LDAP2
+* @author   Benedikt Hallinger <beni@php.net>
+* @license  http://www.gnu.org/copyleft/lesser.html LGPL
+* @link     http://pear.php.net/package/Net_LDAP22/
+* @see      http://www.ietf.org/rfc/rfc2849.txt
+* @todo     Error handling should be PEARified
+* @todo     LDAPv3 controls are not implemented yet
+*/
+class Net_LDAP2_LDIF extends PEAR
+{
+    /**
+    * Options
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_options = array('encode'    => 'base64',
+                                'onerror'   => null,
+                                'change'    => 0,
+                                'lowercase' => 0,
+                                'sort'      => 0,
+                                'version'   => null,
+                                'wrap'      => 78,
+                                'raw'       => ''
+                               );
+
+    /**
+    * Errorcache
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_error = array('error' => null,
+                              'line'  => 0
+                             );
+
+    /**
+    * Filehandle for read/write
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_FH = null;
+
+    /**
+    * Says, if we opened the filehandle ourselves
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_FH_opened = false;
+
+    /**
+    * Linecounter for input file handle
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_input_line = 0;
+
+    /**
+    * counter for processed entries
+    *
+    * @access protected
+    * @var int
+    */
+    protected $_entrynum = 0;
+
+    /**
+    * Mode we are working in
+    *
+    * Either 'r', 'a' or 'w'
+    *
+    * @access protected
+    * @var string
+    */
+    protected $_mode = false;
+
+    /**
+    * Tells, if the LDIF version string was already written
+    *
+    * @access protected
+    * @var boolean
+    */
+    protected $_version_written = false;
+
+    /**
+    * Cache for lines that have build the current entry
+    *
+    * @access protected
+    * @var boolean
+    */
+    protected $_lines_cur = array();
+
+    /**
+    * Cache for lines that will build the next entry
+    *
+    * @access protected
+    * @var boolean
+    */
+    protected $_lines_next = array();
+
+    /**
+    * Open LDIF file for reading or for writing
+    *
+    * new (FILE):
+    * Open the file read-only. FILE may be the name of a file
+    * or an already open filehandle.
+    * If the file doesn't exist, it will be created if in write mode.
+    *
+    * new (FILE, MODE, OPTIONS):
+    *     Open the file with the given MODE (see PHPs fopen()), eg "w" or "a".
+    *     FILE may be the name of a file or an already open filehandle.
+    *     PERLs Net_LDAP2 "FILE|" mode does not work curently.
+    *
+    *     OPTIONS is an associative array and may contain:
+    *       encode => 'none' | 'canonical' | 'base64'
+    *         Some DN values in LDIF cannot be written verbatim and have to be encoded in some way:
+    *         'none'       No encoding.
+    *         'canonical'  See "canonical_dn()" in Net::LDAP::Util.
+    *         'base64'     Use base64. (default, this differs from the Perl interface.
+    *                                   The perl default is "none"!)
+    *
+    *       onerror => 'die' | 'warn' | NULL
+    *         Specify what happens when an error is detected.
+    *         'die'  Net_LDAP2_LDIF will croak with an appropriate message.
+    *         'warn' Net_LDAP2_LDIF will warn (echo) with an appropriate message.
+    *         NULL   Net_LDAP2_LDIF will not warn (default), use error().
+    *
+    *       change => 1
+    *         Write entry changes to the LDIF file instead of the entries itself. I.e. write LDAP
+    *         operations acting on the entries to the file instead of the entries contents.
+    *         This writes the changes usually carried out by an update() to the LDIF file.
+    *
+    *       lowercase => 1
+    *         Convert attribute names to lowercase when writing.
+    *
+    *       sort => 1
+    *         Sort attribute names when writing entries according to the rule:
+    *         objectclass first then all other attributes alphabetically sorted by attribute name
+    *
+    *       version => '1'
+    *         Set the LDIF version to write to the resulting LDIF file.
+    *         According to RFC 2849 currently the only legal value for this option is 1.
+    *         When this option is set Net_LDAP2_LDIF tries to adhere more strictly to
+    *         the LDIF specification in RFC2489 in a few places.
+    *         The default is NULL meaning no version information is written to the LDIF file.
+    *
+    *       wrap => 78
+    *         Number of columns where output line wrapping shall occur.
+    *         Default is 78. Setting it to 40 or lower inhibits wrapping.
+    *
+    *       raw => REGEX
+    *         Use REGEX to denote the names of attributes that are to be
+    *         considered binary in search results if writing entries.
+    *         Example: raw => "/(?i:^jpegPhoto|;binary)/i"
+    *
+    * @param string|ressource $file    Filename or filehandle
+    * @param string           $mode    Mode to open filename
+    * @param array            $options Options like described above
+    */
+    public function __construct($file, $mode = 'r', $options = array())
+    {
+        $this->PEAR('Net_LDAP2_Error'); // default error class
+
+        // First, parse options
+        // todo: maybe implement further checks on possible values
+        foreach ($options as $option => $value) {
+            if (!array_key_exists($option, $this->_options)) {
+                $this->dropError('Net_LDAP2_LDIF error: option '.$option.' not known!');
+                return;
+            } else {
+                $this->_options[$option] = strtolower($value);
+            }
+        }
+
+        // setup LDIF class
+        $this->version($this->_options['version']);
+
+        // setup file mode
+        if (!preg_match('/^[rwa]\+?$/', $mode)) {
+            $this->dropError('Net_LDAP2_LDIF error: file mode '.$mode.' not supported!');
+        } else {
+            $this->_mode = $mode;
+
+            // setup filehandle
+            if (is_resource($file)) {
+                // TODO: checks on mode possible?
+                $this->_FH =& $file;
+            } else {
+                $imode = substr($this->_mode, 0, 1);
+                if ($imode == 'r') {
+                    if (!file_exists($file)) {
+                        $this->dropError('Unable to open '.$file.' for read: file not found');
+                        $this->_mode = false;
+                    }
+                    if (!is_readable($file)) {
+                        $this->dropError('Unable to open '.$file.' for read: permission denied');
+                        $this->_mode = false;
+                    }
+                }
+
+                if (($imode == 'w' || $imode == 'a')) {
+                    if (file_exists($file)) {
+                        if (!is_writable($file)) {
+                            $this->dropError('Unable to open '.$file.' for write: permission denied');
+                            $this->_mode = false;
+                        }
+                    } else {
+                        if (!@touch($file)) {
+                            $this->dropError('Unable to create '.$file.' for write: permission denied');
+                            $this->_mode = false;
+                        }
+                    }
+                }
+
+                if ($this->_mode) {
+                    $this->_FH = @fopen($file, $this->_mode);
+                    if (false === $this->_FH) {
+                        // Fallback; should never be reached if tests above are good enough!
+                        $this->dropError('Net_LDAP2_LDIF error: Could not open file '.$file);
+                    } else {
+                        $this->_FH_opened = true;
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+    * Read one entry from the file and return it as a Net::LDAP::Entry object.
+    *
+    * @return Net_LDAP2_Entry
+    */
+    public function read_entry()
+    {
+        // read fresh lines, set them as current lines and create the entry
+        $attrs = $this->next_lines(true);
+        if (count($attrs) > 0) {
+            $this->_lines_cur = $attrs;
+        }
+        return $this->current_entry();
+    }
+
+    /**
+    * Returns true when the end of the file is reached.
+    *
+    * @return boolean
+    */
+    public function eof()
+    {
+        return feof($this->_FH);
+    }
+
+    /**
+    * Write the entry or entries to the LDIF file.
+    *
+    * If you want to build an LDIF file containing several entries AND
+    * you want to call write_entry() several times, you must open the filehandle
+    * in append mode ("a"), otherwise you will always get the last entry only.
+    *
+    * @param Net_LDAP2_Entry|array $entries Entry or array of entries
+    *
+    * @return void
+    * @todo implement operations on whole entries (adding a whole entry)
+    */
+    public function write_entry($entries)
+    {
+        if (!is_array($entries)) {
+            $entries = array($entries);
+        }
+
+        foreach ($entries as $entry) {
+            $this->_entrynum++;
+            if (!$entry instanceof Net_LDAP2_Entry) {
+                $this->dropError('Net_LDAP2_LDIF error: entry '.$this->_entrynum.' is not an Net_LDAP2_Entry object');
+            } else {
+                if ($this->_options['change']) {
+                    // LDIF change mode
+                    // fetch change information from entry
+                    $entry_attrs_changes = $entry->getChanges();
+                    $num_of_changes      = count($entry_attrs_changes['add'])
+                                           + count($entry_attrs_changes['replace'])
+                                           + count($entry_attrs_changes['delete']);
+
+                    $is_changed = ($num_of_changes > 0 || $entry->willBeDeleted() || $entry->willBeMoved());
+
+                    // write version if not done yet
+                    // also write DN of entry
+                    if ($is_changed) {
+                        if (!$this->_version_written) {
+                            $this->write_version();
+                        }
+                        $this->writeDN($entry->currentDN());
+                    }
+
+                    // process changes
+                    // TODO: consider DN add!
+                    if ($entry->willBeDeleted()) {
+                        $this->writeLine("changetype: delete".PHP_EOL);
+                    } elseif ($entry->willBeMoved()) {
+                        $this->writeLine("changetype: modrdn".PHP_EOL);
+                        $olddn     = Net_LDAP2_Util::ldap_explode_dn($entry->currentDN(), array('casefold' => 'none')); // maybe gives a bug if using multivalued RDNs
+                        $oldrdn    = array_shift($olddn);
+                        $oldparent = implode(',', $olddn);
+                        $newdn     = Net_LDAP2_Util::ldap_explode_dn($entry->dn(), array('casefold' => 'none')); // maybe gives a bug if using multivalued RDNs
+                        $rdn       = array_shift($newdn);
+                        $parent    = implode(',', $newdn);
+                        $this->writeLine("newrdn: ".$rdn.PHP_EOL);
+                        $this->writeLine("deleteoldrdn: 1".PHP_EOL);
+                        if ($parent !== $oldparent) {
+                            $this->writeLine("newsuperior: ".$parent.PHP_EOL);
+                        }
+                        // TODO: What if the entry has attribute changes as well?
+                        //       I think we should check for that and make a dummy
+                        //       entry with the changes that is written to the LDIF file
+                    } elseif ($num_of_changes > 0) {
+                        // write attribute change data
+                        $this->writeLine("changetype: modify".PHP_EOL);
+                        foreach ($entry_attrs_changes as $changetype => $entry_attrs) {
+                            foreach ($entry_attrs as $attr_name => $attr_values) {
+                                $this->writeLine("$changetype: $attr_name".PHP_EOL);
+                                if ($attr_values !== null) $this->writeAttribute($attr_name, $attr_values, $changetype);
+                                $this->writeLine("-".PHP_EOL);
+                            }
+                        }
+                    }
+
+                    // finish this entrys data if we had changes
+                    if ($is_changed) {
+                        $this->finishEntry();
+                    }
+                } else {
+                    // LDIF-content mode
+                    // fetch attributes for further processing
+                    $entry_attrs = $entry->getValues();
+
+                    // sort and put objectclass-attrs to first position
+                    if ($this->_options['sort']) {
+                        ksort($entry_attrs);
+                        if (array_key_exists('objectclass', $entry_attrs)) {
+                            $oc = $entry_attrs['objectclass'];
+                            unset($entry_attrs['objectclass']);
+                            $entry_attrs = array_merge(array('objectclass' => $oc), $entry_attrs);
+                        }
+                    }
+
+                    // write data
+                    if (!$this->_version_written) {
+                        $this->write_version();
+                    }
+                    $this->writeDN($entry->dn());
+                    foreach ($entry_attrs as $attr_name => $attr_values) {
+                        $this->writeAttribute($attr_name, $attr_values);
+                    }
+                    $this->finishEntry();
+                }
+            }
+        }
+    }
+
+    /**
+    * Write version to LDIF
+    *
+    * If the object's version is defined, this method allows to explicitely write the version before an entry is written.
+    * If not called explicitely, it gets called automatically when writing the first entry.
+    *
+    * @return void
+    */
+    public function write_version()
+    {
+        $this->_version_written = true;
+        if (!is_null($this->version())) {
+            return $this->writeLine('version: '.$this->version().PHP_EOL, 'Net_LDAP2_LDIF error: unable to write version');
+        }
+    }
+
+    /**
+    * Get or set LDIF version
+    *
+    * If called without arguments it returns the version of the LDIF file or NULL if no version has been set.
+    * If called with an argument it sets the LDIF version to VERSION.
+    * According to RFC 2849 currently the only legal value for VERSION is 1.
+    *
+    * @param int $version (optional) LDIF version to set
+    *
+    * @return int
+    */
+    public function version($version = null)
+    {
+        if ($version !== null) {
+            if ($version != 1) {
+                $this->dropError('Net_LDAP2_LDIF error: illegal LDIF version set');
+            } else {
+                $this->_options['version'] = $version;
+            }
+        }
+        return $this->_options['version'];
+    }
+
+    /**
+    * Returns the file handle the Net_LDAP2_LDIF object reads from or writes to.
+    *
+    * You can, for example, use this to fetch the content of the LDIF file yourself
+    *
+    * @return null|resource
+    */
+    public function &handle()
+    {
+        if (!is_resource($this->_FH)) {
+            $this->dropError('Net_LDAP2_LDIF error: invalid file resource');
+            $null = null;
+            return $null;
+        } else {
+            return $this->_FH;
+        }
+    }
+
+    /**
+    * Clean up
+    *
+    * This method signals that the LDIF object is no longer needed.
+    * You can use this to free up some memory and close the file handle.
+    * The file handle is only closed, if it was opened from Net_LDAP2_LDIF.
+    *
+    * @return void
+    */
+    public function done()
+    {
+        // close FH if we opened it
+        if ($this->_FH_opened) {
+            fclose($this->handle());
+        }
+
+        // free variables
+        foreach (get_object_vars($this) as $name => $value) {
+            unset($this->$name);
+        }
+    }
+
+    /**
+    * Returns last error message if error was found.
+    *
+    * Example:
+    * <code>
+    *  $ldif->someAction();
+    *  if ($ldif->error()) {
+    *     echo "Error: ".$ldif->error()." at input line: ".$ldif->error_lines();
+    *  }
+    * </code>
+    *
+    * @param boolean $as_string If set to true, only the message is returned
+    *
+    * @return false|Net_LDAP2_Error
+    */
+    public function error($as_string = false)
+    {
+        if (Net_LDAP2::isError($this->_error['error'])) {
+            return ($as_string)? $this->_error['error']->getMessage() : $this->_error['error'];
+        } else {
+            return false;
+        }
+    }
+
+    /**
+    * Returns lines that resulted in error.
+    *
+    * Perl returns an array of faulty lines in list context,
+    * but we always just return an int because of PHPs language.
+    *
+    * @return int
+    */
+    public function error_lines()
+    {
+        return $this->_error['line'];
+    }
+
+    /**
+    * Returns the current Net::LDAP::Entry object.
+    *
+    * @return Net_LDAP2_Entry|false
+    */
+    public function current_entry()
+    {
+        return $this->parseLines($this->current_lines());
+    }
+
+    /**
+    * Parse LDIF lines of one entry into an Net_LDAP2_Entry object
+    *
+    * @param array $lines LDIF lines for one entry
+    *
+    * @return Net_LDAP2_Entry|false Net_LDAP2_Entry object for those lines
+    * @todo what about file inclusions and urls? "jpegphoto:< file:///usr/local/directory/photos/fiona.jpg"
+    */
+    public function parseLines($lines)
+    {
+        // parse lines into an array of attributes and build the entry
+        $attributes = array();
+        $dn = false;
+        foreach ($lines as $line) {
+            if (preg_match('/^(\w+)(:|::|:<)\s(.+)$/', $line, $matches)) {
+                $attr  =& $matches[1];
+                $delim =& $matches[2];
+                $data  =& $matches[3];
+
+                if ($delim == ':') {
+                    // normal data
+                    $attributes[$attr][] = $data;
+                } elseif ($delim == '::') {
+                    // base64 data
+                    $attributes[$attr][] = base64_decode($data);
+                } elseif ($delim == ':<') {
+                    // file inclusion
+                    // TODO: Is this the job of the LDAP-client or the server?
+                    $this->dropError('File inclusions are currently not supported');
+                    //$attributes[$attr][] = ...;
+                } else {
+                    // since the pattern above, the delimeter cannot be something else.
+                    $this->dropError('Net_LDAP2_LDIF parsing error: invalid syntax at parsing entry line: '.$line);
+                    continue;
+                }
+
+                if (strtolower($attr) == 'dn') {
+                    // DN line detected
+                    $dn = $attributes[$attr][0];  // save possibly decoded DN
+                    unset($attributes[$attr]);    // remove wrongly added "dn: " attribute
+                }
+            } else {
+                // line not in "attr: value" format -> ignore
+                // maybe we should rise an error here, but this should be covered by
+                // next_lines() already. A problem arises, if users try to feed data of
+                // several entries to this method - the resulting entry will
+                // get wrong attributes. However, this is already mentioned in the
+                // methods documentation above.
+            }
+        }
+
+        if (false === $dn) {
+            $this->dropError('Net_LDAP2_LDIF parsing error: unable to detect DN for entry');
+            return false;
+        } else {
+            $newentry = Net_LDAP2_Entry::createFresh($dn, $attributes);
+            return $newentry;
+        }
+    }
+
+    /**
+    * Returns the lines that generated the current Net::LDAP::Entry object.
+    *
+    * Note that this returns an empty array if no lines have been read so far.
+    *
+    * @return array Array of lines
+    */
+    public function current_lines()
+    {
+        return $this->_lines_cur;
+    }
+
+    /**
+    * Returns the lines that will generate the next Net::LDAP::Entry object.
+    *
+    * If you set $force to TRUE then you can iterate over the lines that build
+    * up entries manually. Otherwise, iterating is done using {@link read_entry()}.
+    * Force will move the file pointer forward, thus returning the next entries lines.
+    *
+    * Wrapped lines will be unwrapped. Comments are stripped.
+    *
+    * @param boolean $force Set this to true if you want to iterate over the lines manually
+    *
+    * @return array
+    */
+    public function next_lines($force = false)
+    {
+        // if we already have those lines, just return them, otherwise read
+        if (count($this->_lines_next) == 0 || $force) {
+            $this->_lines_next = array(); // empty in case something was left (if used $force)
+            $entry_done        = false;
+            $fh                = &$this->handle();
+            $commentmode       = false; // if we are in an comment, for wrapping purposes
+            $datalines_read    = 0;     // how many lines with data we have read
+
+            while (!$entry_done && !$this->eof()) {
+                $this->_input_line++;
+                // Read line. Remove line endings, we want only data;
+                // this is okay since ending spaces should be encoded
+                $data = rtrim(fgets($fh));
+                if ($data === false) {
+                    // error only, if EOF not reached after fgets() call
+                    if (!$this->eof()) {
+                        $this->dropError('Net_LDAP2_LDIF error: error reading from file at input line '.$this->_input_line, $this->_input_line);
+                    }
+                    break;
+                } else {
+                    if (count($this->_lines_next) > 0 && preg_match('/^$/', $data)) {
+                        // Entry is finished if we have an empty line after we had data
+                        $entry_done = true;
+
+                        // Look ahead if the next EOF is nearby. Comments and empty
+                        // lines at the file end may cause problems otherwise
+                        $current_pos = ftell($fh);
+                        $data        = fgets($fh);
+                        while (!feof($fh)) {
+                            if (preg_match('/^\s*$/', $data) || preg_match('/^#/', $data)) {
+                                // only empty lines or comments, continue to seek
+                                // TODO: Known bug: Wrappings for comments are okay but are treaten as
+                                //       error, since we do not honor comment mode here.
+                                //       This should be a very theoretically case, however
+                                //       i am willing to fix this if really necessary.
+                                $this->_input_line++;
+                                $current_pos = ftell($fh);
+                                $data        = fgets($fh);
+                            } else {
+                                // Data found if non emtpy line and not a comment!!
+                                // Rewind to position prior last read and stop lookahead
+                                fseek($fh, $current_pos);
+                                break;
+                            }
+                        }
+                        // now we have either the file pointer at the beginning of
+                        // a new data position or at the end of file causing feof() to return true
+
+                    } else {
+                        // build lines
+                        if (preg_match('/^version:\s(.+)$/', $data, $match)) {
+                            // version statement, set version
+                            $this->version($match[1]);
+                        } elseif (preg_match('/^\w+::?\s.+$/', $data)) {
+                            // normal attribute: add line
+                            $commentmode         = false;
+                            $this->_lines_next[] = trim($data);
+                            $datalines_read++;
+                        } elseif (preg_match('/^\s(.+)$/', $data, $matches)) {
+                            // wrapped data: unwrap if not in comment mode
+                            if (!$commentmode) {
+                                if ($datalines_read == 0) {
+                                    // first line of entry: wrapped data is illegal
+                                    $this->dropError('Net_LDAP2_LDIF error: illegal wrapping at input line '.$this->_input_line, $this->_input_line);
+                                } else {
+                                    $last                = array_pop($this->_lines_next);
+                                    $last                = $last.trim($matches[1]);
+                                    $this->_lines_next[] = $last;
+                                    $datalines_read++;
+                                }
+                            }
+                        } elseif (preg_match('/^#/', $data)) {
+                            // LDIF comments
+                            $commentmode = true;
+                        } elseif (preg_match('/^\s*$/', $data)) {
+                            // empty line but we had no data for this
+                            // entry, so just ignore this line
+                            $commentmode = false;
+                        } else {
+                            $this->dropError('Net_LDAP2_LDIF error: invalid syntax at input line '.$this->_input_line, $this->_input_line);
+                            continue;
+                        }
+
+                    }
+                }
+            }
+        }
+        return $this->_lines_next;
+    }
+
+    /**
+    * Convert an attribute and value to LDIF string representation
+    *
+    * It honors correct encoding of values according to RFC 2849.
+    * Line wrapping will occur at the configured maximum but only if
+    * the value is greater than 40 chars.
+    *
+    * @param string $attr_name  Name of the attribute
+    * @param string $attr_value Value of the attribute
+    *
+    * @access protected
+    * @return string LDIF string for that attribute and value
+    */
+    protected function convertAttribute($attr_name, $attr_value)
+    {
+        // Handle empty attribute or process
+        if (strlen($attr_value) == 0) {
+            $attr_value = " ";
+        } else {
+            $base64 = false;
+            // ASCII-chars that are NOT safe for the
+            // start and for being inside the value.
+            // These are the int values of those chars.
+            $unsafe_init = array(0, 10, 13, 32, 58, 60);
+            $unsafe      = array(0, 10, 13);
+
+            // Test for illegal init char
+            $init_ord = ord(substr($attr_value, 0, 1));
+            if ($init_ord > 127 || in_array($init_ord, $unsafe_init)) {
+                $base64 = true;
+            }
+
+            // Test for illegal content char
+            for ($i = 0; $i < strlen($attr_value); $i++) {
+                $char_ord = ord(substr($attr_value, $i, 1));
+                if ($char_ord > 127 || in_array($char_ord, $unsafe)) {
+                    $base64 = true;
+                }
+            }
+
+            // Test for ending space
+            if (substr($attr_value, -1) == ' ') {
+                $base64 = true;
+            }
+
+            // If converting is needed, do it
+            // Either we have some special chars or a matching "raw" regex
+            if ($base64 || ($this->_options['raw'] && preg_match($this->_options['raw'], $attr_name))) {
+                $attr_name .= ':';
+                $attr_value = base64_encode($attr_value);
+            }
+
+            // Lowercase attr names if requested
+            if ($this->_options['lowercase']) $attr_name = strtolower($attr_name);
+
+            // Handle line wrapping
+            if ($this->_options['wrap'] > 40 && strlen($attr_value) > $this->_options['wrap']) {
+                $attr_value = wordwrap($attr_value, $this->_options['wrap'], PHP_EOL." ", true);
+            }
+        }
+
+        return $attr_name.': '.$attr_value;
+    }
+
+    /**
+    * Convert an entries DN to LDIF string representation
+    *
+    * It honors correct encoding of values according to RFC 2849.
+    *
+    * @param string $dn UTF8-Encoded DN
+    *
+    * @access protected
+    * @return string LDIF string for that DN
+    * @todo I am not sure, if the UTF8 stuff is correctly handled right now
+    */
+    protected function convertDN($dn)
+    {
+        $base64 = false;
+        // ASCII-chars that are NOT safe for the
+        // start and for being inside the dn.
+        // These are the int values of those chars.
+        $unsafe_init = array(0, 10, 13, 32, 58, 60);
+        $unsafe      = array(0, 10, 13);
+
+        // Test for illegal init char
+        $init_ord = ord(substr($dn, 0, 1));
+        if ($init_ord >= 127 || in_array($init_ord, $unsafe_init)) {
+            $base64 = true;
+        }
+
+        // Test for illegal content char
+        for ($i = 0; $i < strlen($dn); $i++) {
+            $char = substr($dn, $i, 1);
+            if (ord($char) >= 127 || in_array($init_ord, $unsafe)) {
+                $base64 = true;
+            }
+        }
+
+        // Test for ending space
+        if (substr($dn, -1) == ' ') {
+            $base64 = true;
+        }
+
+        // if converting is needed, do it
+        return ($base64)? 'dn:: '.base64_encode($dn) : 'dn: '.$dn;
+    }
+
+    /**
+    * Writes an attribute to the filehandle
+    *
+    * @param string       $attr_name   Name of the attribute
+    * @param string|array $attr_values Single attribute value or array with attribute values
+    *
+    * @access protected
+    * @return void
+    */
+    protected function writeAttribute($attr_name, $attr_values)
+    {
+        // write out attribute content
+        if (!is_array($attr_values)) {
+            $attr_values = array($attr_values);
+        }
+        foreach ($attr_values as $attr_val) {
+            $line = $this->convertAttribute($attr_name, $attr_val).PHP_EOL;
+            $this->writeLine($line, 'Net_LDAP2_LDIF error: unable to write attribute '.$attr_name.' of entry '.$this->_entrynum);
+        }
+    }
+
+    /**
+    * Writes a DN to the filehandle
+    *
+    * @param string $dn DN to write
+    *
+    * @access protected
+    * @return void
+    */
+    protected function writeDN($dn)
+    {
+        // prepare DN
+        if ($this->_options['encode'] == 'base64') {
+            $dn = $this->convertDN($dn).PHP_EOL;
+        } elseif ($this->_options['encode'] == 'canonical') {
+            $dn = Net_LDAP2_Util::canonical_dn($dn, array('casefold' => 'none')).PHP_EOL;
+        } else {
+            $dn = $dn.PHP_EOL;
+        }
+        $this->writeLine($dn, 'Net_LDAP2_LDIF error: unable to write DN of entry '.$this->_entrynum);
+    }
+
+    /**
+    * Finishes an LDIF entry
+    *
+    * @access protected
+    * @return void
+    */
+    protected function finishEntry()
+    {
+        $this->writeLine(PHP_EOL, 'Net_LDAP2_LDIF error: unable to close entry '.$this->_entrynum);
+    }
+
+    /**
+    * Just write an arbitary line to the filehandle
+    *
+    * @param string $line  Content to write
+    * @param string $error If error occurs, drop this message
+    *
+    * @access protected
+    * @return true|false
+    */
+    protected function writeLine($line, $error = 'Net_LDAP2_LDIF error: unable to write to filehandle')
+    {
+        if (is_resource($this->handle()) && fwrite($this->handle(), $line, strlen($line)) === false) {
+            $this->dropError($error);
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    /**
+    * Optionally raises an error and pushes the error on the error cache
+    *
+    * @param string $msg  Errortext
+    * @param int    $line Line in the LDIF that caused the error
+    *
+    * @access protected
+    * @return void
+    */
+    protected function dropError($msg, $line = null)
+    {
+        $this->_error['error'] = new Net_LDAP2_Error($msg);
+        if ($line !== null) $this->_error['line'] = $line;
+
+        if ($this->_options['onerror'] == 'die') {
+            die($msg.PHP_EOL);
+        } elseif ($this->_options['onerror'] == 'warn') {
+            echo $msg.PHP_EOL;
+        }
+    }
+}
+?>
diff --git a/extlib/Net/LDAP2/RootDSE.php b/extlib/Net/LDAP2/RootDSE.php
new file mode 100644
index 000000000..8dc81fd4f
--- /dev/null
+++ b/extlib/Net/LDAP2/RootDSE.php
@@ -0,0 +1,240 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+/**
+* File containing the Net_LDAP2_RootDSE interface class.
+*
+* PHP version 5
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Jan Wagner <wagner@netsols.de>
+* @copyright 2009 Jan Wagner
+* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
+* @version   SVN: $Id: RootDSE.php 286718 2009-08-03 07:30:49Z beni $
+* @link      http://pear.php.net/package/Net_LDAP2/
+*/
+
+/**
+* Includes
+*/
+require_once 'PEAR.php';
+
+/**
+* Getting the rootDSE entry of a LDAP server
+*
+* @category Net
+* @package  Net_LDAP2
+* @author   Jan Wagner <wagner@netsols.de>
+* @license  http://www.gnu.org/copyleft/lesser.html LGPL
+* @link     http://pear.php.net/package/Net_LDAP22/
+*/
+class Net_LDAP2_RootDSE extends PEAR
+{
+    /**
+    * @access protected
+    * @var object Net_LDAP2_Entry
+    **/
+    protected $_entry;
+
+    /**
+    * Class constructor
+    *
+    * @param Net_LDAP2_Entry &$entry Net_LDAP2_Entry object of the RootDSE
+    */
+    protected function __construct(&$entry)
+    {
+        $this->_entry = $entry;
+    }
+
+    /**
+    * Fetches a RootDSE object from an LDAP connection
+    *
+    * @param Net_LDAP2 $ldap  Directory from which the RootDSE should be fetched
+    * @param array     $attrs Array of attributes to search for
+    *
+    * @access static
+    * @return Net_LDAP2_RootDSE|Net_LDAP2_Error
+    */
+    public static function fetch($ldap, $attrs = null)
+    {
+        if (!$ldap instanceof Net_LDAP2) {
+            return PEAR::raiseError("Unable to fetch Schema: Parameter \$ldap must be a Net_LDAP2 object!");
+        }
+
+        if (is_array($attrs) && count($attrs) > 0 ) {
+            $attributes = $attrs;
+        } else {
+            $attributes = array('vendorName',
+                                'vendorVersion',
+                                'namingContexts',
+                                'altServer',
+                                'supportedExtension',
+                                'supportedControl',
+                                'supportedSASLMechanisms',
+                                'supportedLDAPVersion',
+                                'subschemaSubentry' );
+        }
+        $result = $ldap->search('', '(objectClass=*)', array('attributes' => $attributes, 'scope' => 'base'));
+        if (self::isError($result)) {
+            return $result;
+        }
+        $entry = $result->shiftEntry();
+        if (false === $entry) {
+            return PEAR::raiseError('Could not fetch RootDSE entry');
+        }
+        $ret = new Net_LDAP2_RootDSE($entry);
+        return $ret;
+    }
+
+    /**
+    * Gets the requested attribute value
+    *
+    * Same usuage as {@link Net_LDAP2_Entry::getValue()}
+    *
+    * @param string $attr    Attribute name
+    * @param array  $options Array of options
+    *
+    * @access public
+    * @return mixed Net_LDAP2_Error object or attribute values
+    * @see Net_LDAP2_Entry::get_value()
+    */
+    public function getValue($attr = '', $options = '')
+    {
+        return $this->_entry->get_value($attr, $options);
+    }
+
+    /**
+    * Alias function of getValue() for perl-ldap interface
+    *
+    * @see getValue()
+    * @return mixed
+    */
+    public function get_value()
+    {
+        $args = func_get_args();
+        return call_user_func_array(array( &$this, 'getValue' ), $args);
+    }
+
+    /**
+    * Determines if the extension is supported
+    *
+    * @param array $oids Array of oids to check
+    *
+    * @access public
+    * @return boolean
+    */
+    public function supportedExtension($oids)
+    {
+        return $this->checkAttr($oids, 'supportedExtension');
+    }
+
+    /**
+    * Alias function of supportedExtension() for perl-ldap interface
+    *
+    * @see supportedExtension()
+    * @return boolean
+    */
+    public function supported_extension()
+    {
+        $args = func_get_args();
+        return call_user_func_array(array( &$this, 'supportedExtension'), $args);
+    }
+
+    /**
+    * Determines if the version is supported
+    *
+    * @param array $versions Versions to check
+    *
+    * @access public
+    * @return boolean
+    */
+    public function supportedVersion($versions)
+    {
+        return $this->checkAttr($versions, 'supportedLDAPVersion');
+    }
+
+    /**
+    * Alias function of supportedVersion() for perl-ldap interface
+    *
+    * @see supportedVersion()
+    * @return boolean
+    */
+    public function supported_version()
+    {
+        $args = func_get_args();
+        return call_user_func_array(array(&$this, 'supportedVersion'), $args);
+    }
+
+    /**
+    * Determines if the control is supported
+    *
+    * @param array $oids Control oids to check
+    *
+    * @access public
+    * @return boolean
+    */
+    public function supportedControl($oids)
+    {
+        return $this->checkAttr($oids, 'supportedControl');
+    }
+
+    /**
+    * Alias function of supportedControl() for perl-ldap interface
+    *
+    * @see supportedControl()
+    * @return boolean
+    */
+    public function supported_control()
+    {
+        $args = func_get_args();
+        return call_user_func_array(array(&$this, 'supportedControl' ), $args);
+    }
+
+    /**
+    * Determines if the sasl mechanism is supported
+    *
+    * @param array $mechlist SASL mechanisms to check
+    *
+    * @access public
+    * @return boolean
+    */
+    public function supportedSASLMechanism($mechlist)
+    {
+        return $this->checkAttr($mechlist, 'supportedSASLMechanisms');
+    }
+
+    /**
+    * Alias function of supportedSASLMechanism() for perl-ldap interface
+    *
+    * @see supportedSASLMechanism()
+    * @return boolean
+    */
+    public function supported_sasl_mechanism()
+    {
+        $args = func_get_args();
+        return call_user_func_array(array(&$this, 'supportedSASLMechanism'), $args);
+    }
+
+    /**
+    * Checks for existance of value in attribute
+    *
+    * @param array  $values values to check
+    * @param string $attr   attribute name
+    *
+    * @access protected
+    * @return boolean
+    */
+    protected function checkAttr($values, $attr)
+    {
+        if (!is_array($values)) $values = array($values);
+
+        foreach ($values as $value) {
+            if (!@in_array($value, $this->get_value($attr, 'all'))) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
+
+?>
diff --git a/extlib/Net/LDAP2/Schema.php b/extlib/Net/LDAP2/Schema.php
new file mode 100644
index 000000000..b590eabc5
--- /dev/null
+++ b/extlib/Net/LDAP2/Schema.php
@@ -0,0 +1,516 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+/**
+* File containing the Net_LDAP2_Schema interface class.
+*
+* PHP version 5
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Jan Wagner <wagner@netsols.de>
+* @author    Benedikt Hallinger <beni@php.net>
+* @copyright 2009 Jan Wagner, Benedikt Hallinger
+* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
+* @version   SVN: $Id: Schema.php 286718 2009-08-03 07:30:49Z beni $
+* @link      http://pear.php.net/package/Net_LDAP2/
+* @todo see the comment at the end of the file
+*/
+
+/**
+* Includes
+*/
+require_once 'PEAR.php';
+
+/**
+* Syntax definitions
+*
+* Please don't forget to add binary attributes to isBinary() below
+* to support proper value fetching from Net_LDAP2_Entry
+*/
+define('NET_LDAP2_SYNTAX_BOOLEAN',            '1.3.6.1.4.1.1466.115.121.1.7');
+define('NET_LDAP2_SYNTAX_DIRECTORY_STRING',   '1.3.6.1.4.1.1466.115.121.1.15');
+define('NET_LDAP2_SYNTAX_DISTINGUISHED_NAME', '1.3.6.1.4.1.1466.115.121.1.12');
+define('NET_LDAP2_SYNTAX_INTEGER',            '1.3.6.1.4.1.1466.115.121.1.27');
+define('NET_LDAP2_SYNTAX_JPEG',               '1.3.6.1.4.1.1466.115.121.1.28');
+define('NET_LDAP2_SYNTAX_NUMERIC_STRING',     '1.3.6.1.4.1.1466.115.121.1.36');
+define('NET_LDAP2_SYNTAX_OID',                '1.3.6.1.4.1.1466.115.121.1.38');
+define('NET_LDAP2_SYNTAX_OCTET_STRING',       '1.3.6.1.4.1.1466.115.121.1.40');
+
+/**
+* Load an LDAP Schema and provide information
+*
+* This class takes a Subschema entry, parses this information
+* and makes it available in an array. Most of the code has been
+* inspired by perl-ldap( http://perl-ldap.sourceforge.net).
+* You will find portions of their implementation in here.
+*
+* @category Net
+* @package  Net_LDAP2
+* @author   Jan Wagner <wagner@netsols.de>
+* @author   Benedikt Hallinger <beni@php.net>
+* @license  http://www.gnu.org/copyleft/lesser.html LGPL
+* @link     http://pear.php.net/package/Net_LDAP22/
+*/
+class Net_LDAP2_Schema extends PEAR
+{
+    /**
+    * Map of entry types to ldap attributes of subschema entry
+    *
+    * @access public
+    * @var array
+    */
+    public $types = array(
+            'attribute'        => 'attributeTypes',
+            'ditcontentrule'   => 'dITContentRules',
+            'ditstructurerule' => 'dITStructureRules',
+            'matchingrule'     => 'matchingRules',
+            'matchingruleuse'  => 'matchingRuleUse',
+            'nameform'         => 'nameForms',
+            'objectclass'      => 'objectClasses',
+            'syntax'           => 'ldapSyntaxes'
+        );
+
+    /**
+    * Array of entries belonging to this type
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_attributeTypes    = array();
+    protected $_matchingRules     = array();
+    protected $_matchingRuleUse   = array();
+    protected $_ldapSyntaxes      = array();
+    protected $_objectClasses     = array();
+    protected $_dITContentRules   = array();
+    protected $_dITStructureRules = array();
+    protected $_nameForms         = array();
+
+
+    /**
+    * hash of all fetched oids
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_oids = array();
+
+    /**
+    * Tells if the schema is initialized
+    *
+    * @access protected
+    * @var boolean
+    * @see parse(), get()
+    */
+    protected $_initialized = false;
+
+
+    /**
+    * Constructor of the class
+    *
+    * @access protected
+    */
+    protected function __construct()
+    {
+        $this->PEAR('Net_LDAP2_Error'); // default error class
+    }
+
+    /**
+    * Fetch the Schema from an LDAP connection
+    *
+    * @param Net_LDAP2 $ldap LDAP connection
+    * @param string    $dn   (optional) Subschema entry dn
+    *
+    * @access public
+    * @return Net_LDAP2_Schema|NET_LDAP2_Error
+    */
+    public function fetch($ldap, $dn = null)
+    {
+        if (!$ldap instanceof Net_LDAP2) {
+            return PEAR::raiseError("Unable to fetch Schema: Parameter \$ldap must be a Net_LDAP2 object!");
+        }
+
+        $schema_o = new Net_LDAP2_Schema();
+
+        if (is_null($dn)) {
+            // get the subschema entry via root dse
+            $dse = $ldap->rootDSE(array('subschemaSubentry'));
+            if (false == Net_LDAP2::isError($dse)) {
+                $base = $dse->getValue('subschemaSubentry', 'single');
+                if (!Net_LDAP2::isError($base)) {
+                    $dn = $base;
+                }
+            }
+        }
+
+        // Support for buggy LDAP servers (e.g. Siemens DirX 6.x) that incorrectly
+        // call this entry subSchemaSubentry instead of subschemaSubentry.
+        // Note the correct case/spelling as per RFC 2251.
+        if (is_null($dn)) {
+            // get the subschema entry via root dse
+            $dse = $ldap->rootDSE(array('subSchemaSubentry'));
+            if (false == Net_LDAP2::isError($dse)) {
+                $base = $dse->getValue('subSchemaSubentry', 'single');
+                if (!Net_LDAP2::isError($base)) {
+                    $dn = $base;
+                }
+            }
+        }
+
+        // Final fallback case where there is no subschemaSubentry attribute
+        // in the root DSE (this is a bug for an LDAP v3 server so report this
+        // to your LDAP vendor if you get this far).
+        if (is_null($dn)) {
+            $dn = 'cn=Subschema';
+        }
+
+        // fetch the subschema entry
+        $result = $ldap->search($dn, '(objectClass=*)',
+                                array('attributes' => array_values($schema_o->types),
+                                        'scope' => 'base'));
+        if (Net_LDAP2::isError($result)) {
+            return $result;
+        }
+
+        $entry = $result->shiftEntry();
+        if (!$entry instanceof Net_LDAP2_Entry) {
+            return PEAR::raiseError('Could not fetch Subschema entry');
+        }
+
+        $schema_o->parse($entry);
+        return $schema_o;
+    }
+
+    /**
+    * Return a hash of entries for the given type
+    *
+    * Returns a hash of entry for th givene type. Types may be:
+    * objectclasses, attributes, ditcontentrules, ditstructurerules, matchingrules,
+    * matchingruleuses, nameforms, syntaxes
+    *
+    * @param string $type Type to fetch
+    *
+    * @access public
+    * @return array|Net_LDAP2_Error Array or Net_LDAP2_Error
+    */
+    public function &getAll($type)
+    {
+        $map = array('objectclasses'     => &$this->_objectClasses,
+                     'attributes'        => &$this->_attributeTypes,
+                     'ditcontentrules'   => &$this->_dITContentRules,
+                     'ditstructurerules' => &$this->_dITStructureRules,
+                     'matchingrules'     => &$this->_matchingRules,
+                     'matchingruleuses'  => &$this->_matchingRuleUse,
+                     'nameforms'         => &$this->_nameForms,
+                     'syntaxes'          => &$this->_ldapSyntaxes );
+
+        $key = strtolower($type);
+        $ret = ((key_exists($key, $map)) ? $map[$key] : PEAR::raiseError("Unknown type $type"));
+        return $ret;
+    }
+
+    /**
+    * Return a specific entry
+    *
+    * @param string $type Type of name
+    * @param string $name Name or OID to fetch
+    *
+    * @access public
+    * @return mixed Entry or Net_LDAP2_Error
+    */
+    public function &get($type, $name)
+    {
+        if ($this->_initialized) {
+            $type = strtolower($type);
+            if (false == key_exists($type, $this->types)) {
+                return PEAR::raiseError("No such type $type");
+            }
+
+            $name     = strtolower($name);
+            $type_var = &$this->{'_' . $this->types[$type]};
+
+            if (key_exists($name, $type_var)) {
+                return $type_var[$name];
+            } elseif (key_exists($name, $this->_oids) && $this->_oids[$name]['type'] == $type) {
+                return $this->_oids[$name];
+            } else {
+                return PEAR::raiseError("Could not find $type $name");
+            }
+        } else {
+            $return = null;
+            return $return;
+        }
+    }
+
+
+    /**
+    * Fetches attributes that MAY be present in the given objectclass
+    *
+    * @param string $oc Name or OID of objectclass
+    *
+    * @access public
+    * @return array|Net_LDAP2_Error Array with attributes or Net_LDAP2_Error
+    */
+    public function may($oc)
+    {
+        return $this->_getAttr($oc, 'may');
+    }
+
+    /**
+    * Fetches attributes that MUST be present in the given objectclass
+    *
+    * @param string $oc Name or OID of objectclass
+    *
+    * @access public
+    * @return array|Net_LDAP2_Error Array with attributes or Net_LDAP2_Error
+    */
+    public function must($oc)
+    {
+        return $this->_getAttr($oc, 'must');
+    }
+
+    /**
+    * Fetches the given attribute from the given objectclass
+    *
+    * @param string $oc   Name or OID of objectclass
+    * @param string $attr Name of attribute to fetch
+    *
+    * @access protected
+    * @return array|Net_LDAP2_Error The attribute or Net_LDAP2_Error
+    */
+    protected function _getAttr($oc, $attr)
+    {
+        $oc = strtolower($oc);
+        if (key_exists($oc, $this->_objectClasses) && key_exists($attr, $this->_objectClasses[$oc])) {
+            return $this->_objectClasses[$oc][$attr];
+        } elseif (key_exists($oc, $this->_oids) &&
+                $this->_oids[$oc]['type'] == 'objectclass' &&
+                key_exists($attr, $this->_oids[$oc])) {
+            return $this->_oids[$oc][$attr];
+        } else {
+            return PEAR::raiseError("Could not find $attr attributes for $oc ");
+        }
+    }
+
+    /**
+    * Returns the name(s) of the immediate superclass(es)
+    *
+    * @param string $oc Name or OID of objectclass
+    *
+    * @access public
+    * @return array|Net_LDAP2_Error  Array of names or Net_LDAP2_Error
+    */
+    public function superclass($oc)
+    {
+        $o = $this->get('objectclass', $oc);
+        if (Net_LDAP2::isError($o)) {
+            return $o;
+        }
+        return (key_exists('sup', $o) ? $o['sup'] : array());
+    }
+
+    /**
+    * Parses the schema of the given Subschema entry
+    *
+    * @param Net_LDAP2_Entry &$entry Subschema entry
+    *
+    * @access public
+    * @return void
+    */
+    public function parse(&$entry)
+    {
+        foreach ($this->types as $type => $attr) {
+            // initialize map type to entry
+            $type_var          = '_' . $attr;
+            $this->{$type_var} = array();
+
+            // get values for this type
+            if ($entry->exists($attr)) {
+                $values = $entry->getValue($attr);
+                if (is_array($values)) {
+                    foreach ($values as $value) {
+
+                        unset($schema_entry); // this was a real mess without it
+
+                        // get the schema entry
+                        $schema_entry = $this->_parse_entry($value);
+
+                        // set the type
+                        $schema_entry['type'] = $type;
+
+                        // save a ref in $_oids
+                        $this->_oids[$schema_entry['oid']] = &$schema_entry;
+
+                        // save refs for all names in type map
+                        $names = $schema_entry['aliases'];
+                        array_push($names, $schema_entry['name']);
+                        foreach ($names as $name) {
+                            $this->{$type_var}[strtolower($name)] = &$schema_entry;
+                        }
+                    }
+                }
+            }
+        }
+        $this->_initialized = true;
+    }
+
+    /**
+    * Parses an attribute value into a schema entry
+    *
+    * @param string $value Attribute value
+    *
+    * @access protected
+    * @return array|false Schema entry array or false
+    */
+    protected function &_parse_entry($value)
+    {
+        // tokens that have no value associated
+        $noValue = array('single-value',
+                         'obsolete',
+                         'collective',
+                         'no-user-modification',
+                         'abstract',
+                         'structural',
+                         'auxiliary');
+
+        // tokens that can have multiple values
+        $multiValue = array('must', 'may', 'sup');
+
+        $schema_entry = array('aliases' => array()); // initilization
+
+        $tokens = $this->_tokenize($value); // get an array of tokens
+
+        // remove surrounding brackets
+        if ($tokens[0] == '(') array_shift($tokens);
+        if ($tokens[count($tokens) - 1] == ')') array_pop($tokens); // -1 doesnt work on arrays :-(
+
+        $schema_entry['oid'] = array_shift($tokens); // first token is the oid
+
+        // cycle over the tokens until none are left
+        while (count($tokens) > 0) {
+            $token = strtolower(array_shift($tokens));
+            if (in_array($token, $noValue)) {
+                $schema_entry[$token] = 1; // single value token
+            } else {
+                // this one follows a string or a list if it is multivalued
+                if (($schema_entry[$token] = array_shift($tokens)) == '(') {
+                    // this creates the list of values and cycles through the tokens
+                    // until the end of the list is reached ')'
+                    $schema_entry[$token] = array();
+                    while ($tmp = array_shift($tokens)) {
+                        if ($tmp == ')') break;
+                        if ($tmp != '$') array_push($schema_entry[$token], $tmp);
+                    }
+                }
+                // create a array if the value should be multivalued but was not
+                if (in_array($token, $multiValue) && !is_array($schema_entry[$token])) {
+                    $schema_entry[$token] = array($schema_entry[$token]);
+                }
+            }
+        }
+        // get max length from syntax
+        if (key_exists('syntax', $schema_entry)) {
+            if (preg_match('/{(\d+)}/', $schema_entry['syntax'], $matches)) {
+                $schema_entry['max_length'] = $matches[1];
+            }
+        }
+        // force a name
+        if (empty($schema_entry['name'])) {
+            $schema_entry['name'] = $schema_entry['oid'];
+        }
+        // make one name the default and put the other ones into aliases
+        if (is_array($schema_entry['name'])) {
+            $aliases                 = $schema_entry['name'];
+            $schema_entry['name']    = array_shift($aliases);
+            $schema_entry['aliases'] = $aliases;
+        }
+        return $schema_entry;
+    }
+
+    /**
+    * Tokenizes the given value into an array of tokens
+    *
+    * @param string $value String to parse
+    *
+    * @access protected
+    * @return array Array of tokens
+    */
+    protected function _tokenize($value)
+    {
+        $tokens  = array();       // array of tokens
+        $matches = array();       // matches[0] full pattern match, [1,2,3] subpatterns
+
+        // this one is taken from perl-ldap, modified for php
+        $pattern = "/\s* (?:([()]) | ([^'\s()]+) | '((?:[^']+|'[^\s)])*)') \s*/x";
+
+        /**
+         * This one matches one big pattern wherin only one of the three subpatterns matched
+         * We are interested in the subpatterns that matched. If it matched its value will be
+         * non-empty and so it is a token. Tokens may be round brackets, a string, or a string
+         * enclosed by '
+         */
+        preg_match_all($pattern, $value, $matches);
+
+        for ($i = 0; $i < count($matches[0]); $i++) {     // number of tokens (full pattern match)
+            for ($j = 1; $j < 4; $j++) {                  // each subpattern
+                if (null != trim($matches[$j][$i])) {     // pattern match in this subpattern
+                    $tokens[$i] = trim($matches[$j][$i]); // this is the token
+                }
+            }
+        }
+        return $tokens;
+    }
+
+    /**
+    * Returns wether a attribute syntax is binary or not
+    *
+    * This method gets used by Net_LDAP2_Entry to decide which
+    * PHP function needs to be used to fetch the value in the
+    * proper format (e.g. binary or string)
+    *
+    * @param string $attribute The name of the attribute (eg.: 'sn')
+    *
+    * @access public
+    * @return boolean
+    */
+    public function isBinary($attribute)
+    {
+        $return = false; // default to false
+
+        // This list contains all syntax that should be treaten as
+        // containing binary values
+        // The Syntax Definitons go into constants at the top of this page
+        $syntax_binary = array(
+                           NET_LDAP2_SYNTAX_OCTET_STRING,
+                           NET_LDAP2_SYNTAX_JPEG
+                         );
+
+        // Check Syntax
+        $attr_s = $this->get('attribute', $attribute);
+        if (Net_LDAP2::isError($attr_s)) {
+            // Attribute not found in schema
+            $return = false; // consider attr not binary
+        } elseif (isset($attr_s['syntax']) && in_array($attr_s['syntax'], $syntax_binary)) {
+            // Syntax is defined as binary in schema
+            $return = true;
+        } else {
+            // Syntax not defined as binary, or not found
+            // if attribute is a subtype, check superior attribute syntaxes
+            if (isset($attr_s['sup'])) {
+                foreach ($attr_s['sup'] as $superattr) {
+                    $return = $this->isBinary($superattr);
+                    if ($return) {
+                        break; // stop checking parents since we are binary
+                    }
+                }
+            }
+        }
+
+        return $return;
+    }
+
+    // [TODO] add method that allows us to see to which objectclasses a certain attribute belongs to
+    // it should return the result structured, e.g. sorted in "may" and "must". Optionally it should
+    // be able to return it just "flat", e.g. array_merge()d.
+    // We could use get_all() to achieve this easily, i think
+}
+?>
diff --git a/extlib/Net/LDAP2/SchemaCache.interface.php b/extlib/Net/LDAP2/SchemaCache.interface.php
new file mode 100644
index 000000000..e0c3094c4
--- /dev/null
+++ b/extlib/Net/LDAP2/SchemaCache.interface.php
@@ -0,0 +1,59 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+/**
+* File containing the Net_LDAP2_SchemaCache interface class.
+*
+* PHP version 5
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Benedikt Hallinger <beni@php.net>
+* @copyright 2009 Benedikt Hallinger
+* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
+* @version   SVN: $Id: SchemaCache.interface.php 286718 2009-08-03 07:30:49Z beni $
+* @link      http://pear.php.net/package/Net_LDAP2/
+*/
+
+/**
+* Interface describing a custom schema cache object
+*
+* To implement a custom schema cache, one must implement this interface and
+* pass the instanciated object to Net_LDAP2s registerSchemaCache() method.
+*/
+interface Net_LDAP2_SchemaCache
+{
+    /**
+    * Return the schema object from the cache
+    *
+    * Net_LDAP2 will consider anything returned invalid, except
+    * a valid Net_LDAP2_Schema object.
+    * In case you return a Net_LDAP2_Error, this error will be routed
+    * to the return of the $ldap->schema() call.
+    * If you return something else, Net_LDAP2 will
+    * fetch a fresh Schema object from the LDAP server.
+    *
+    * You may want to implement a cache aging mechanism here too.
+    *
+    * @return Net_LDAP2_Schema|Net_LDAP2_Error|false
+    */
+    public function loadSchema();
+
+    /**
+    * Store a schema object in the cache
+    *
+    * This method will be called, if Net_LDAP2 has fetched a fresh
+    * schema object from LDAP and wants to init or refresh the cache.
+    *
+    * In case of errors you may return a Net_LDAP2_Error which will
+    * be routet to the client.
+    * Note that doing this prevents, that the schema object fetched from LDAP
+    * will be given back to the client, so only return errors if storing
+    * of the cache is something crucial (e.g. for doing something else with it).
+    * Normaly you dont want to give back errors in which case Net_LDAP2 needs to
+    * fetch the schema once per script run and instead use the error
+    * returned from loadSchema().
+    *
+    * @return true|Net_LDAP2_Error
+    */
+    public function storeSchema($schema);
+}
diff --git a/extlib/Net/LDAP2/Search.php b/extlib/Net/LDAP2/Search.php
new file mode 100644
index 000000000..de4fde122
--- /dev/null
+++ b/extlib/Net/LDAP2/Search.php
@@ -0,0 +1,614 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+/**
+* File containing the Net_LDAP2_Search interface class.
+*
+* PHP version 5
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Tarjej Huse <tarjei@bergfald.no>
+* @author    Benedikt Hallinger <beni@php.net>
+* @copyright 2009 Tarjej Huse, Benedikt Hallinger
+* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
+* @version   SVN: $Id: Search.php 286718 2009-08-03 07:30:49Z beni $
+* @link      http://pear.php.net/package/Net_LDAP2/
+*/
+
+/**
+* Includes
+*/
+require_once 'PEAR.php';
+
+/**
+* Result set of an LDAP search
+*
+* @category Net
+* @package  Net_LDAP2
+* @author   Tarjej Huse <tarjei@bergfald.no>
+* @author   Benedikt Hallinger <beni@php.net>
+* @license  http://www.gnu.org/copyleft/lesser.html LGPL
+* @link     http://pear.php.net/package/Net_LDAP22/
+*/
+class Net_LDAP2_Search extends PEAR implements Iterator
+{
+    /**
+    * Search result identifier
+    *
+    * @access protected
+    * @var resource
+    */
+    protected $_search;
+
+    /**
+    * LDAP resource link
+    *
+    * @access protected
+    * @var resource
+    */
+    protected $_link;
+
+    /**
+    * Net_LDAP2 object
+    *
+    * A reference of the Net_LDAP2 object for passing to Net_LDAP2_Entry
+    *
+    * @access protected
+    * @var object Net_LDAP2
+    */
+    protected $_ldap;
+
+    /**
+    * Result entry identifier
+    *
+    * @access protected
+    * @var resource
+    */
+    protected $_entry = null;
+
+    /**
+    * The errorcode the search got
+    *
+    * Some errorcodes might be of interest, but might not be best handled as errors.
+    * examples: 4 - LDAP_SIZELIMIT_EXCEEDED - indicates a huge search.
+    *               Incomplete results are returned. If you just want to check if there's anything in the search.
+    *               than this is a point to handle.
+    *           32 - no such object - search here returns a count of 0.
+    *
+    * @access protected
+    * @var int
+    */
+    protected $_errorCode = 0; // if not set - sucess!
+
+    /**
+    * Cache for all entries already fetched from iterator interface
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_iteratorCache = array();
+
+    /**
+    * What attributes we searched for
+    *
+    * The $attributes array contains the names of the searched attributes and gets
+    * passed from $Net_LDAP2->search() so the Net_LDAP2_Search object can tell
+    * what attributes was searched for ({@link searchedAttrs())
+    *
+    * This variable gets set from the constructor and returned
+    * from {@link searchedAttrs()}
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_searchedAttrs = array();
+
+    /**
+    * Cache variable for storing entries fetched internally
+    *
+    * This currently is only used by {@link pop_entry()}
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_entry_cache = false;
+
+    /**
+    * Constructor
+    *
+    * @param resource           &$search    Search result identifier
+    * @param Net_LDAP2|resource &$ldap      Net_LDAP2 object or just a LDAP-Link resource
+    * @param array              $attributes (optional) Array with searched attribute names. (see {@link $_searchedAttrs})
+    *
+    * @access public
+    */
+    public function __construct(&$search, &$ldap, $attributes = array())
+    {
+        $this->PEAR('Net_LDAP2_Error');
+
+        $this->setSearch($search);
+
+        if ($ldap instanceof Net_LDAP2) {
+            $this->_ldap =& $ldap;
+            $this->setLink($this->_ldap->getLink());
+        } else {
+            $this->setLink($ldap);
+        }
+
+        $this->_errorCode = @ldap_errno($this->_link);
+
+        if (is_array($attributes) && !empty($attributes)) {
+            $this->_searchedAttrs = $attributes;
+        }
+    }
+
+    /**
+    * Returns an array of entry objects
+    *
+    * @return array Array of entry objects.
+    */
+    public function entries()
+    {
+        $entries = array();
+
+        while ($entry = $this->shiftEntry()) {
+            $entries[] = $entry;
+        }
+
+        return $entries;
+    }
+
+    /**
+    * Get the next entry in the searchresult.
+    *
+    * This will return a valid Net_LDAP2_Entry object or false, so
+    * you can use this method to easily iterate over the entries inside
+    * a while loop.
+    *
+    * @return Net_LDAP2_Entry|false  Reference to Net_LDAP2_Entry object or false
+    */
+    public function &shiftEntry()
+    {
+        if ($this->count() == 0 ) {
+            $false = false;
+            return $false;
+        }
+
+        if (is_null($this->_entry)) {
+            $this->_entry = @ldap_first_entry($this->_link, $this->_search);
+            $entry = Net_LDAP2_Entry::createConnected($this->_ldap, $this->_entry);
+            if ($entry instanceof Net_LDAP2_Error) $entry = false;
+        } else {
+            if (!$this->_entry = @ldap_next_entry($this->_link, $this->_entry)) {
+                $false = false;
+                return $false;
+            }
+            $entry = Net_LDAP2_Entry::createConnected($this->_ldap, $this->_entry);
+            if ($entry instanceof Net_LDAP2_Error) $entry = false;
+        }
+        return $entry;
+    }
+
+    /**
+    * Alias function of shiftEntry() for perl-ldap interface
+    *
+    * @see shiftEntry()
+    * @return Net_LDAP2_Entry|false
+    */
+    public function shift_entry()
+    {
+        $args = func_get_args();
+        return call_user_func_array(array( &$this, 'shiftEntry' ), $args);
+    }
+
+    /**
+    * Retrieve the next entry in the searchresult, but starting from last entry
+    *
+    * This is the opposite to {@link shiftEntry()} and is also very useful
+    * to be used inside a while loop.
+    *
+    * @return Net_LDAP2_Entry|false
+    */
+    public function popEntry()
+    {
+        if (false === $this->_entry_cache) {
+            // fetch entries into cache if not done so far
+            $this->_entry_cache = $this->entries();
+        }
+
+        $return = array_pop($this->_entry_cache);
+        return (null === $return)? false : $return;
+    }
+
+    /**
+    * Alias function of popEntry() for perl-ldap interface
+    *
+    * @see popEntry()
+    * @return Net_LDAP2_Entry|false
+    */
+    public function pop_entry()
+    {
+        $args = func_get_args();
+        return call_user_func_array(array( &$this, 'popEntry' ), $args);
+    }
+
+    /**
+    * Return entries sorted as array
+    *
+    * This returns a array with sorted entries and the values.
+    * Sorting is done with PHPs {@link array_multisort()}.
+    * This method relies on {@link as_struct()} to fetch the raw data of the entries.
+    *
+    * Please note that attribute names are case sensitive!
+    *
+    * Usage example:
+    * <code>
+    *   // to sort entries first by location, then by surename, but descending:
+    *   $entries = $search->sorted_as_struct(array('locality','sn'), SORT_DESC);
+    * </code>
+    *
+    * @param array $attrs Array of attribute names to sort; order from left to right.
+    * @param int   $order Ordering direction, either constant SORT_ASC or SORT_DESC
+    *
+    * @return array|Net_LDAP2_Error   Array with sorted entries or error
+    * @todo what about server side sorting as specified in http://www.ietf.org/rfc/rfc2891.txt?
+    */
+    public function sorted_as_struct($attrs = array('cn'), $order = SORT_ASC)
+    {
+        /*
+        * Old Code, suitable and fast for single valued sorting
+        * This code should be used if we know that single valued sorting is desired,
+        * but we need some method to get that knowledge...
+        */
+        /*
+        $attrs = array_reverse($attrs);
+        foreach ($attrs as $attribute) {
+            if (!ldap_sort($this->_link, $this->_search, $attribute)){
+                $this->raiseError("Sorting failed for Attribute " . $attribute);
+            }
+        }
+
+        $results = ldap_get_entries($this->_link, $this->_search);
+
+        unset($results['count']); //for tidier output
+        if ($order) {
+            return array_reverse($results);
+        } else {
+            return $results;
+        }*/
+
+        /*
+        * New code: complete "client side" sorting
+        */
+        // first some parameterchecks
+        if (!is_array($attrs)) {
+            return PEAR::raiseError("Sorting failed: Parameterlist must be an array!");
+        }
+        if ($order != SORT_ASC && $order != SORT_DESC) {
+            return PEAR::raiseError("Sorting failed: sorting direction not understood! (neither constant SORT_ASC nor SORT_DESC)");
+        }
+
+        // fetch the entries data
+        $entries = $this->as_struct();
+
+        // now sort each entries attribute values
+        // this is neccessary because later we can only sort by one value,
+        // so we need the highest or lowest attribute now, depending on the
+        // selected ordering for that specific attribute
+        foreach ($entries as $dn => $entry) {
+            foreach ($entry as $attr_name => $attr_values) {
+                sort($entries[$dn][$attr_name]);
+                if ($order == SORT_DESC) {
+                    array_reverse($entries[$dn][$attr_name]);
+                }
+            }
+        }
+
+        // reformat entrys array for later use with array_multisort()
+        $to_sort = array(); // <- will be a numeric array similar to ldap_get_entries
+        foreach ($entries as $dn => $entry_attr) {
+            $row       = array();
+            $row['dn'] = $dn;
+            foreach ($entry_attr as $attr_name => $attr_values) {
+                $row[$attr_name] = $attr_values;
+            }
+            $to_sort[] = $row;
+        }
+
+        // Build columns for array_multisort()
+        // each requested attribute is one row
+        $columns = array();
+        foreach ($attrs as $attr_name) {
+            foreach ($to_sort as $key => $row) {
+                $columns[$attr_name][$key] =& $to_sort[$key][$attr_name][0];
+            }
+        }
+
+        // sort the colums with array_multisort, if there is something
+        // to sort and if we have requested sort columns
+        if (!empty($to_sort) && !empty($columns)) {
+            $sort_params = '';
+            foreach ($attrs as $attr_name) {
+                $sort_params .= '$columns[\''.$attr_name.'\'], '.$order.', ';
+            }
+            eval("array_multisort($sort_params \$to_sort);"); // perform sorting
+        }
+
+        return $to_sort;
+    }
+
+    /**
+    * Return entries sorted as objects
+    *
+    * This returns a array with sorted Net_LDAP2_Entry objects.
+    * The sorting is actually done with {@link sorted_as_struct()}.
+    *
+    * Please note that attribute names are case sensitive!
+    * Also note, that it is (depending on server capabilitys) possible to let
+    * the server sort your results. This happens through search controls
+    * and is described in detail at {@link http://www.ietf.org/rfc/rfc2891.txt}
+    *
+    * Usage example:
+    * <code>
+    *   // to sort entries first by location, then by surename, but descending:
+    *   $entries = $search->sorted(array('locality','sn'), SORT_DESC);
+    * </code>
+    *
+    * @param array $attrs Array of sort attributes to sort; order from left to right.
+    * @param int   $order Ordering direction, either constant SORT_ASC or SORT_DESC
+    *
+    * @return array|Net_LDAP2_Error   Array with sorted Net_LDAP2_Entries or error
+    * @todo Entry object construction could be faster. Maybe we could use one of the factorys instead of fetching the entry again
+    */
+    public function sorted($attrs = array('cn'), $order = SORT_ASC)
+    {
+        $return = array();
+        $sorted = $this->sorted_as_struct($attrs, $order);
+        if (PEAR::isError($sorted)) {
+            return $sorted;
+        }
+        foreach ($sorted as $key => $row) {
+            $entry = $this->_ldap->getEntry($row['dn'], $this->searchedAttrs());
+            if (!PEAR::isError($entry)) {
+                array_push($return, $entry);
+            } else {
+                return $entry;
+            }
+        }
+        return $return;
+    }
+
+    /**
+    * Return entries as array
+    *
+    * This method returns the entries and the selected attributes values as
+    * array.
+    * The first array level contains all found entries where the keys are the
+    * DNs of the entries. The second level arrays contian the entries attributes
+    * such that the keys is the lowercased name of the attribute and the values
+    * are stored in another indexed array. Note that the attribute values are stored
+    * in an array even if there is no or just one value.
+    *
+    * The array has the following structure:
+    * <code>
+    * $return = array(
+    *           'cn=foo,dc=example,dc=com' => array(
+    *                                                'sn'       => array('foo'),
+    *                                                'multival' => array('val1', 'val2', 'valN')
+    *                                             )
+    *           'cn=bar,dc=example,dc=com' => array(
+    *                                                'sn'       => array('bar'),
+    *                                                'multival' => array('val1', 'valN')
+    *                                             )
+    *           )
+    * </code>
+    *
+    * @return array      associative result array as described above
+    */
+    public function as_struct()
+    {
+        $return  = array();
+        $entries = $this->entries();
+        foreach ($entries as $entry) {
+            $attrs            = array();
+            $entry_attributes = $entry->attributes();
+            foreach ($entry_attributes as $attr_name) {
+                $attr_values = $entry->getValue($attr_name, 'all');
+                if (!is_array($attr_values)) {
+                    $attr_values = array($attr_values);
+                }
+                $attrs[$attr_name] = $attr_values;
+            }
+            $return[$entry->dn()] = $attrs;
+        }
+        return $return;
+    }
+
+    /**
+    * Set the search objects resource link
+    *
+    * @param resource &$search Search result identifier
+    *
+    * @access public
+    * @return void
+    */
+    public function setSearch(&$search)
+    {
+        $this->_search = $search;
+    }
+
+    /**
+    * Set the ldap ressource link
+    *
+    * @param resource &$link Link identifier
+    *
+    * @access public
+    * @return void
+    */
+    public function setLink(&$link)
+    {
+        $this->_link = $link;
+    }
+
+    /**
+    * Returns the number of entries in the searchresult
+    *
+    * @return int Number of entries in search.
+    */
+    public function count()
+    {
+        // this catches the situation where OL returned errno 32 = no such object!
+        if (!$this->_search) {
+            return 0;
+        }
+        return @ldap_count_entries($this->_link, $this->_search);
+    }
+
+    /**
+    * Get the errorcode the object got in its search.
+    *
+    * @return int The ldap error number.
+    */
+    public function getErrorCode()
+    {
+        return $this->_errorCode;
+    }
+
+    /**
+    * Destructor
+    *
+    * @access protected
+    */
+    public function _Net_LDAP2_Search()
+    {
+        @ldap_free_result($this->_search);
+    }
+
+    /**
+    * Closes search result
+    *
+    * @return void
+    */
+    public function done()
+    {
+        $this->_Net_LDAP2_Search();
+    }
+
+    /**
+    * Return the attribute names this search selected
+    *
+    * @return array
+    * @see $_searchedAttrs
+    * @access protected
+    */
+    protected function searchedAttrs()
+    {
+        return $this->_searchedAttrs;
+    }
+
+    /**
+    * Tells if this search exceeds a sizelimit
+    *
+    * @return boolean
+    */
+    public function sizeLimitExceeded()
+    {
+        return ($this->getErrorCode() == 4);
+    }
+
+
+    /*
+    * SPL Iterator interface methods.
+    * This interface allows to use Net_LDAP2_Search
+    * objects directly inside a foreach loop!
+    */
+    /**
+    * SPL Iterator interface: Return the current element.
+    *
+    * The SPL Iterator interface allows you to fetch entries inside
+    * a foreach() loop: <code>foreach ($search as $dn => $entry) { ...</code>
+    *
+    * Of course, you may call {@link current()}, {@link key()}, {@link next()},
+    * {@link rewind()} and {@link valid()} yourself.
+    *
+    * If the search throwed an error, it returns false.
+    * False is also returned, if the end is reached
+    * In case no call to next() was made, we will issue one,
+    * thus returning the first entry.
+    *
+    * @return Net_LDAP2_Entry|false
+    */
+    public function current()
+    {
+        if (count($this->_iteratorCache) == 0) {
+            $this->next();
+            reset($this->_iteratorCache);
+        }
+        $entry = current($this->_iteratorCache);
+        return ($entry instanceof Net_LDAP2_Entry)? $entry : false;
+    }
+
+    /**
+    * SPL Iterator interface: Return the identifying key (DN) of the current entry.
+    *
+    * @see current()
+    * @return string|false DN of the current entry; false in case no entry is returned by current()
+    */
+    public function key()
+    {
+        $entry = $this->current();
+        return ($entry instanceof Net_LDAP2_Entry)? $entry->dn() :false;
+    }
+
+    /**
+    * SPL Iterator interface: Move forward to next entry.
+    *
+    * After a call to {@link next()}, {@link current()} will return
+    * the next entry in the result set.
+    *
+    * @see current()
+    * @return void
+    */
+    public function next()
+    {
+        // fetch next entry.
+        // if we have no entrys anymore, we add false (which is
+        // returned by shiftEntry()) so current() will complain.
+        if (count($this->_iteratorCache) - 1 <= $this->count()) {
+            $this->_iteratorCache[] = $this->shiftEntry();
+        }
+
+        // move on array pointer to current element.
+        // even if we have added all entries, this will
+        // ensure proper operation in case we rewind()
+        next($this->_iteratorCache);
+    }
+
+    /**
+    * SPL Iterator interface:  Check if there is a current element after calls to {@link rewind()} or {@link next()}.
+    *
+    * Used to check if we've iterated to the end of the collection.
+    *
+    * @see current()
+    * @return boolean FALSE if there's nothing more to iterate over
+    */
+    public function valid()
+    {
+        return ($this->current() instanceof Net_LDAP2_Entry);
+    }
+
+    /**
+    * SPL Iterator interface: Rewind the Iterator to the first element.
+    *
+    * After rewinding, {@link current()} will return the first entry in the result set.
+    *
+    * @see current()
+    * @return void
+    */
+    public function rewind()
+    {
+        reset($this->_iteratorCache);
+    }
+}
+
+?>
diff --git a/extlib/Net/LDAP2/SimpleFileSchemaCache.php b/extlib/Net/LDAP2/SimpleFileSchemaCache.php
new file mode 100644
index 000000000..8019654ac
--- /dev/null
+++ b/extlib/Net/LDAP2/SimpleFileSchemaCache.php
@@ -0,0 +1,97 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+/**
+* File containing the example simple file based Schema Caching class.
+*
+* PHP version 5
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Benedikt Hallinger <beni@php.net>
+* @copyright 2009 Benedikt Hallinger
+* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
+* @version   SVN: $Id: SimpleFileSchemaCache.php 286718 2009-08-03 07:30:49Z beni $
+* @link      http://pear.php.net/package/Net_LDAP2/
+*/
+
+/**
+* A simple file based schema cacher with cache aging.
+*
+* Once the cache is too old, the loadSchema() method will return false, so
+* Net_LDAP2 will fetch a fresh object from the LDAP server that will
+* overwrite the current (outdated) old cache.
+*/
+class Net_LDAP2_SimpleFileSchemaCache implements Net_LDAP2_SchemaCache
+{
+    /**
+    * Internal config of this cache
+    *
+    * @see Net_LDAP2_SimpleFileSchemaCache()
+    * @var array
+    */
+    protected $config = array(
+        'path'    => '/tmp/Net_LDAP_Schema.cache',
+        'max_age' => 1200
+    );
+
+    /**
+    * Initialize the simple cache
+    *
+    * Config is as following:
+    *  path     Complete path to the cache file.
+    *  max_age  Maximum age of cache in seconds, 0 means "endlessly".
+    *
+    * @param array $cfg Config array
+    */
+    public function Net_LDAP2_SimpleFileSchemaCache($cfg)
+    {
+    	foreach ($cfg as $key => $value) {
+			if (array_key_exists($key, $this->config)) {
+				if (gettype($this->config[$key]) != gettype($value)) {
+					$this->getCore()->dropFatalError(__CLASS__.": Could not set config! Key $key does not match type ".gettype($this->config[$key])."!");
+				}
+				$this->config[$key] = $value;
+			} else {
+				$this->getCore()->dropFatalError(__CLASS__.": Could not set config! Key $key is not defined!");
+			}
+		}
+    }
+
+    /**
+    * Return the schema object from the cache
+    *
+    * If file is existent and cache has not expired yet,
+    * then the cache is deserialized and returned.
+    *
+    * @return Net_LDAP2_Schema|Net_LDAP2_Error|false
+    */
+    public function loadSchema()
+    {
+         $return = false; // Net_LDAP2 will load schema from LDAP
+         if (file_exists($this->config['path'])) {
+             $cache_maxage = filemtime($this->config['path']) + $this->config['max_age'];
+             if (time() <= $cache_maxage || $this->config['max_age'] == 0) {
+                 $return = unserialize(file_get_contents($this->config['path']));
+             }
+         }
+         return $return;
+    }
+
+    /**
+    * Store a schema object in the cache
+    *
+    * This method will be called, if Net_LDAP2 has fetched a fresh
+    * schema object from LDAP and wants to init or refresh the cache.
+    *
+    * To invalidate the cache and cause Net_LDAP2 to refresh the cache,
+    * you can call this method with null or false as value.
+    * The next call to $ldap->schema() will then refresh the caches object.
+    *
+    * @param mixed $schema The object that should be cached
+    * @return true|Net_LDAP2_Error|false
+    */
+    public function storeSchema($schema) {
+        file_put_contents($this->config['path'], serialize($schema));
+        return true;
+    }
+}
diff --git a/extlib/Net/LDAP2/Util.php b/extlib/Net/LDAP2/Util.php
new file mode 100644
index 000000000..48b03f9f9
--- /dev/null
+++ b/extlib/Net/LDAP2/Util.php
@@ -0,0 +1,572 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+/**
+* File containing the Net_LDAP2_Util interface class.
+*
+* PHP version 5
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Benedikt Hallinger <beni@php.net>
+* @copyright 2009 Benedikt Hallinger
+* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
+* @version   SVN: $Id: Util.php 286718 2009-08-03 07:30:49Z beni $
+* @link      http://pear.php.net/package/Net_LDAP2/
+*/
+
+/**
+* Includes
+*/
+require_once 'PEAR.php';
+
+/**
+* Utility Class for Net_LDAP2
+*
+* This class servers some functionality to the other classes of Net_LDAP2 but most of
+* the methods can be used separately as well.
+*
+* @category Net
+* @package  Net_LDAP2
+* @author   Benedikt Hallinger <beni@php.net>
+* @license  http://www.gnu.org/copyleft/lesser.html LGPL
+* @link     http://pear.php.net/package/Net_LDAP22/
+*/
+class Net_LDAP2_Util extends PEAR
+{
+    /**
+     * Constructor
+     *
+     * @access public
+     */
+    public function __construct()
+    {
+         // We do nothing here, since all methods can be called statically.
+         // In Net_LDAP <= 0.7, we needed a instance of Util, because
+         // it was possible to do utf8 encoding and decoding, but this
+         // has been moved to the LDAP class. The constructor remains only
+         // here to document the downward compatibility of creating an instance.
+    }
+
+    /**
+    * Explodes the given DN into its elements
+    *
+    * {@link http://www.ietf.org/rfc/rfc2253.txt RFC 2253} says, a Distinguished Name is a sequence
+    * of Relative Distinguished Names (RDNs), which themselves
+    * are sets of Attributes. For each RDN a array is constructed where the RDN part is stored.
+    *
+    * For example, the DN 'OU=Sales+CN=J. Smith,DC=example,DC=net' is exploded to:
+    * <kbd>array( [0] => array([0] => 'OU=Sales', [1] => 'CN=J. Smith'), [2] => 'DC=example', [3] => 'DC=net' )</kbd>
+    *
+    * [NOT IMPLEMENTED] DNs might also contain values, which are the bytes of the BER encoding of
+    * the X.500 AttributeValue rather than some LDAP string syntax. These values are hex-encoded
+    * and prefixed with a #. To distinguish such BER values, ldap_explode_dn uses references to
+    * the actual values, e.g. '1.3.6.1.4.1.1466.0=#04024869,DC=example,DC=com' is exploded to:
+    * [ { '1.3.6.1.4.1.1466.0' => "\004\002Hi" }, { 'DC' => 'example' }, { 'DC' => 'com' } ];
+    * See {@link http://www.vijaymukhi.com/vmis/berldap.htm} for more information on BER.
+    *
+    *  It also performs the following operations on the given DN:
+    *   - Unescape "\" followed by ",", "+", """, "\", "<", ">", ";", "#", "=", " ", or a hexpair
+    *     and strings beginning with "#".
+    *   - Removes the leading 'OID.' characters if the type is an OID instead of a name.
+    *   - If an RDN contains multiple parts, the parts are re-ordered so that the attribute type names are in alphabetical order.
+    *
+    * OPTIONS is a list of name/value pairs, valid options are:
+    *   casefold    Controls case folding of attribute types names.
+    *               Attribute values are not affected by this option.
+    *               The default is to uppercase. Valid values are:
+    *               lower        Lowercase attribute types names.
+    *               upper        Uppercase attribute type names. This is the default.
+    *               none         Do not change attribute type names.
+    *   reverse     If TRUE, the RDN sequence is reversed.
+    *   onlyvalues  If TRUE, then only attributes values are returned ('foo' instead of 'cn=foo')
+    *
+
+    * @param string $dn      The DN that should be exploded
+    * @param array  $options Options to use
+    *
+    * @static
+    * @return array   Parts of the exploded DN
+    * @todo implement BER
+    */
+    public static function ldap_explode_dn($dn, $options = array('casefold' => 'upper'))
+    {
+        if (!isset($options['onlyvalues'])) $options['onlyvalues']  = false;
+        if (!isset($options['reverse']))    $options['reverse']     = false;
+        if (!isset($options['casefold']))   $options['casefold']    = 'upper';
+
+        // Escaping of DN and stripping of "OID."
+        $dn = self::canonical_dn($dn, array('casefold' => $options['casefold']));
+
+        // splitting the DN
+        $dn_array = preg_split('/(?<=[^\\\\]),/', $dn);
+
+        // clear wrong splitting (possibly we have split too much)
+        // /!\ Not clear, if this is neccessary here
+        //$dn_array = self::correct_dn_splitting($dn_array, ',');
+
+        // construct subarrays for multivalued RDNs and unescape DN value
+        // also convert to output format and apply casefolding
+        foreach ($dn_array as $key => $value) {
+            $value_u = self::unescape_dn_value($value);
+            $rdns    = self::split_rdn_multival($value_u[0]);
+            if (count($rdns) > 1) {
+                // MV RDN!
+                foreach ($rdns as $subrdn_k => $subrdn_v) {
+                    // Casefolding
+                    if ($options['casefold'] == 'upper') $subrdn_v = preg_replace("/^(\w+=)/e", "''.strtoupper('\\1').''", $subrdn_v);
+                    if ($options['casefold'] == 'lower') $subrdn_v = preg_replace("/^(\w+=)/e", "''.strtolower('\\1').''", $subrdn_v);
+
+                    if ($options['onlyvalues']) {
+                        preg_match('/(.+?)(?<!\\\\)=(.+)/', $subrdn_v, $matches);
+                        $rdn_ocl         = $matches[1];
+                        $rdn_val         = $matches[2];
+                        $unescaped       = self::unescape_dn_value($rdn_val);
+                        $rdns[$subrdn_k] = $unescaped[0];
+                    } else {
+                        $unescaped = self::unescape_dn_value($subrdn_v);
+                        $rdns[$subrdn_k] = $unescaped[0];
+                    }
+                }
+
+                $dn_array[$key] = $rdns;
+            } else {
+                // normal RDN
+
+                // Casefolding
+                if ($options['casefold'] == 'upper') $value = preg_replace("/^(\w+=)/e", "''.strtoupper('\\1').''", $value);
+                if ($options['casefold'] == 'lower') $value = preg_replace("/^(\w+=)/e", "''.strtolower('\\1').''", $value);
+
+                if ($options['onlyvalues']) {
+                    preg_match('/(.+?)(?<!\\\\)=(.+)/', $value, $matches);
+                    $dn_ocl         = $matches[1];
+                    $dn_val         = $matches[2];
+                    $unescaped      = self::unescape_dn_value($dn_val);
+                    $dn_array[$key] = $unescaped[0];
+                } else {
+                    $unescaped = self::unescape_dn_value($value);
+                    $dn_array[$key] = $unescaped[0];
+                }
+            }
+        }
+
+        if ($options['reverse']) {
+            return array_reverse($dn_array);
+        } else {
+            return $dn_array;
+        }
+    }
+
+    /**
+    * Escapes a DN value according to RFC 2253
+    *
+    * Escapes the given VALUES according to RFC 2253 so that they can be safely used in LDAP DNs.
+    * The characters ",", "+", """, "\", "<", ">", ";", "#", "=" with a special meaning in RFC 2252
+    * are preceeded by ba backslash. Control characters with an ASCII code < 32 are represented as \hexpair.
+    * Finally all leading and trailing spaces are converted to sequences of \20.
+    *
+    * @param array $values An array containing the DN values that should be escaped
+    *
+    * @static
+    * @return array The array $values, but escaped
+    */
+    public static function escape_dn_value($values = array())
+    {
+        // Parameter validation
+        if (!is_array($values)) {
+            $values = array($values);
+        }
+
+        foreach ($values as $key => $val) {
+            // Escaping of filter meta characters
+            $val = str_replace('\\', '\\\\', $val);
+            $val = str_replace(',',    '\,', $val);
+            $val = str_replace('+',    '\+', $val);
+            $val = str_replace('"',    '\"', $val);
+            $val = str_replace('<',    '\<', $val);
+            $val = str_replace('>',    '\>', $val);
+            $val = str_replace(';',    '\;', $val);
+            $val = str_replace('#',    '\#', $val);
+            $val = str_replace('=',    '\=', $val);
+
+            // ASCII < 32 escaping
+            $val = self::asc2hex32($val);
+
+            // Convert all leading and trailing spaces to sequences of \20.
+            if (preg_match('/^(\s*)(.+?)(\s*)$/', $val, $matches)) {
+                $val = $matches[2];
+                for ($i = 0; $i < strlen($matches[1]); $i++) {
+                    $val = '\20'.$val;
+                }
+                for ($i = 0; $i < strlen($matches[3]); $i++) {
+                    $val = $val.'\20';
+                }
+            }
+
+            if (null === $val) $val = '\0';  // apply escaped "null" if string is empty
+
+            $values[$key] = $val;
+        }
+
+        return $values;
+    }
+
+    /**
+    * Undoes the conversion done by escape_dn_value().
+    *
+    * Any escape sequence starting with a baskslash - hexpair or special character -
+    * will be transformed back to the corresponding character.
+    *
+    * @param array $values Array of DN Values
+    *
+    * @return array Same as $values, but unescaped
+    * @static
+    */
+    public static function unescape_dn_value($values = array())
+    {
+        // Parameter validation
+        if (!is_array($values)) {
+            $values = array($values);
+        }
+
+        foreach ($values as $key => $val) {
+            // strip slashes from special chars
+            $val = str_replace('\\\\', '\\', $val);
+            $val = str_replace('\,',    ',', $val);
+            $val = str_replace('\+',    '+', $val);
+            $val = str_replace('\"',    '"', $val);
+            $val = str_replace('\<',    '<', $val);
+            $val = str_replace('\>',    '>', $val);
+            $val = str_replace('\;',    ';', $val);
+            $val = str_replace('\#',    '#', $val);
+            $val = str_replace('\=',    '=', $val);
+
+            // Translate hex code into ascii
+            $values[$key] = self::hex2asc($val);
+        }
+
+        return $values;
+    }
+
+    /**
+    * Returns the given DN in a canonical form
+    *
+    * Returns false if DN is not a valid Distinguished Name.
+    * DN can either be a string or an array
+    * as returned by ldap_explode_dn, which is useful when constructing a DN.
+    * The DN array may have be indexed (each array value is a OCL=VALUE pair)
+    * or associative (array key is OCL and value is VALUE).
+    *
+    * It performs the following operations on the given DN:
+    *     - Removes the leading 'OID.' characters if the type is an OID instead of a name.
+    *     - Escapes all RFC 2253 special characters (",", "+", """, "\", "<", ">", ";", "#", "="), slashes ("/"), and any other character where the ASCII code is < 32 as \hexpair.
+    *     - Converts all leading and trailing spaces in values to be \20.
+    *     - If an RDN contains multiple parts, the parts are re-ordered so that the attribute type names are in alphabetical order.
+    *
+    * OPTIONS is a list of name/value pairs, valid options are:
+    *     casefold    Controls case folding of attribute type names.
+    *                 Attribute values are not affected by this option. The default is to uppercase.
+    *                 Valid values are:
+    *                 lower        Lowercase attribute type names.
+    *                 upper        Uppercase attribute type names. This is the default.
+    *                 none         Do not change attribute type names.
+    *     [NOT IMPLEMENTED] mbcescape   If TRUE, characters that are encoded as a multi-octet UTF-8 sequence will be escaped as \(hexpair){2,*}.
+    *     reverse     If TRUE, the RDN sequence is reversed.
+    *     separator   Separator to use between RDNs. Defaults to comma (',').
+    *
+    * Note: The empty string "" is a valid DN, so be sure not to do a "$can_dn == false" test,
+    *       because an empty string evaluates to false. Use the "===" operator instead.
+    *
+    * @param array|string $dn      The DN
+    * @param array        $options Options to use
+    *
+    * @static
+    * @return false|string The canonical DN or FALSE
+    * @todo implement option mbcescape
+    */
+    public static function canonical_dn($dn, $options = array('casefold' => 'upper', 'separator' => ','))
+    {
+        if ($dn === '') return $dn;  // empty DN is valid!
+
+        // options check
+        if (!isset($options['reverse'])) {
+            $options['reverse'] = false;
+        } else {
+            $options['reverse'] = true;
+        }
+        if (!isset($options['casefold']))  $options['casefold'] = 'upper';
+        if (!isset($options['separator'])) $options['separator'] = ',';
+
+
+        if (!is_array($dn)) {
+            // It is not clear to me if the perl implementation splits by the user defined
+            // separator or if it just uses this separator to construct the new DN
+            $dn = preg_split('/(?<=[^\\\\])'.$options['separator'].'/', $dn);
+
+            // clear wrong splitting (possibly we have split too much)
+            $dn = self::correct_dn_splitting($dn, $options['separator']);
+        } else {
+            // Is array, check, if the array is indexed or associative
+            $assoc = false;
+            foreach ($dn as $dn_key => $dn_part) {
+                if (!is_int($dn_key)) {
+                    $assoc = true;
+                }
+            }
+            // convert to indexed, if associative array detected
+            if ($assoc) {
+                $newdn = array();
+                foreach ($dn as $dn_key => $dn_part) {
+                    if (is_array($dn_part)) {
+                        ksort($dn_part, SORT_STRING); // we assume here, that the rdn parts are also associative
+                        $newdn[] = $dn_part;  // copy array as-is, so we can resolve it later
+                    } else {
+                        $newdn[] = $dn_key.'='.$dn_part;
+                    }
+                }
+                $dn =& $newdn;
+            }
+        }
+
+        // Escaping and casefolding
+        foreach ($dn as $pos => $dnval) {
+            if (is_array($dnval)) {
+                // subarray detected, this means very surely, that we had
+                // a multivalued dn part, which must be resolved
+                $dnval_new = '';
+                foreach ($dnval as $subkey => $subval) {
+                    // build RDN part
+                    if (!is_int($subkey)) {
+                        $subval = $subkey.'='.$subval;
+                    }
+                    $subval_processed = self::canonical_dn($subval);
+                    if (false === $subval_processed) return false;
+                    $dnval_new .= $subval_processed.'+';
+                }
+                $dn[$pos] = substr($dnval_new, 0, -1); // store RDN part, strip last plus
+            } else {
+                // try to split multivalued RDNS into array
+                $rdns = self::split_rdn_multival($dnval);
+                if (count($rdns) > 1) {
+                    // Multivalued RDN was detected!
+                    // The RDN value is expected to be correctly split by split_rdn_multival().
+                    // It's time to sort the RDN and build the DN!
+                    $rdn_string = '';
+                    sort($rdns, SORT_STRING); // Sort RDN keys alphabetically
+                    foreach ($rdns as $rdn) {
+                        $subval_processed = self::canonical_dn($rdn);
+                        if (false === $subval_processed) return false;
+                        $rdn_string .= $subval_processed.'+';
+                    }
+
+                    $dn[$pos] = substr($rdn_string, 0, -1); // store RDN part, strip last plus
+
+                } else {
+                    // no multivalued RDN!
+                    // split at first unescaped "="
+                    $dn_comp = preg_split('/(?<=[^\\\\])=/', $rdns[0], 2);
+                    $ocl     = ltrim($dn_comp[0]);  // trim left whitespaces 'cause of "cn=foo, l=bar" syntax (whitespace after comma)
+                    $val     = $dn_comp[1];
+
+                    // strip 'OID.', otherwise apply casefolding and escaping
+                    if (substr(strtolower($ocl), 0, 4) == 'oid.') {
+                        $ocl = substr($ocl, 4);
+                    } else {
+                        if ($options['casefold'] == 'upper') $ocl = strtoupper($ocl);
+                        if ($options['casefold'] == 'lower') $ocl = strtolower($ocl);
+                        $ocl = self::escape_dn_value(array($ocl));
+                        $ocl = $ocl[0];
+                    }
+
+                    // escaping of dn-value
+                    $val = self::escape_dn_value(array($val));
+                    $val = str_replace('/', '\/', $val[0]);
+
+                    $dn[$pos] = $ocl.'='.$val;
+                }
+            }
+        }
+
+        if ($options['reverse']) $dn = array_reverse($dn);
+        return implode($options['separator'], $dn);
+    }
+
+    /**
+    * Escapes the given VALUES according to RFC 2254 so that they can be safely used in LDAP filters.
+    *
+    * Any control characters with an ACII code < 32 as well as the characters with special meaning in
+    * LDAP filters "*", "(", ")", and "\" (the backslash) are converted into the representation of a
+    * backslash followed by two hex digits representing the hexadecimal value of the character.
+    *
+    * @param array $values Array of values to escape
+    *
+    * @static
+    * @return array Array $values, but escaped
+    */
+    public static function escape_filter_value($values = array())
+    {
+        // Parameter validation
+        if (!is_array($values)) {
+            $values = array($values);
+        }
+
+        foreach ($values as $key => $val) {
+            // Escaping of filter meta characters
+            $val = str_replace('\\', '\5c', $val);
+            $val = str_replace('*',  '\2a', $val);
+            $val = str_replace('(',  '\28', $val);
+            $val = str_replace(')',  '\29', $val);
+
+            // ASCII < 32 escaping
+            $val = self::asc2hex32($val);
+
+            if (null === $val) $val = '\0';  // apply escaped "null" if string is empty
+
+            $values[$key] = $val;
+        }
+
+        return $values;
+    }
+
+    /**
+    * Undoes the conversion done by {@link escape_filter_value()}.
+    *
+    * Converts any sequences of a backslash followed by two hex digits into the corresponding character.
+    *
+    * @param array $values Array of values to escape
+    *
+    * @static
+    * @return array Array $values, but unescaped
+    */
+    public static function unescape_filter_value($values = array())
+    {
+        // Parameter validation
+        if (!is_array($values)) {
+            $values = array($values);
+        }
+
+        foreach ($values as $key => $value) {
+            // Translate hex code into ascii
+            $values[$key] = self::hex2asc($value);
+        }
+
+        return $values;
+    }
+
+    /**
+    * Converts all ASCII chars < 32 to "\HEX"
+    *
+    * @param string $string String to convert
+    *
+    * @static
+    * @return string
+    */
+    public static function asc2hex32($string)
+    {
+        for ($i = 0; $i < strlen($string); $i++) {
+            $char = substr($string, $i, 1);
+            if (ord($char) < 32) {
+                $hex = dechex(ord($char));
+                if (strlen($hex) == 1) $hex = '0'.$hex;
+                $string = str_replace($char, '\\'.$hex, $string);
+            }
+        }
+        return $string;
+    }
+
+    /**
+    * Converts all Hex expressions ("\HEX") to their original ASCII characters
+    *
+    * @param string $string String to convert
+    *
+    * @static
+    * @author beni@php.net, heavily based on work from DavidSmith@byu.net
+    * @return string
+    */
+    public static function hex2asc($string)
+    {
+        $string = preg_replace("/\\\([0-9A-Fa-f]{2})/e", "''.chr(hexdec('\\1')).''", $string);
+        return $string;
+    }
+
+    /**
+    * Split an multivalued RDN value into an Array
+    *
+    * A RDN can contain multiple values, spearated by a plus sign.
+    * This function returns each separate ocl=value pair of the RDN part.
+    *
+    * If no multivalued RDN is detected, an array containing only
+    * the original rdn part is returned.
+    *
+    * For example, the multivalued RDN 'OU=Sales+CN=J. Smith' is exploded to:
+    * <kbd>array([0] => 'OU=Sales', [1] => 'CN=J. Smith')</kbd>
+    *
+    * The method trys to be smart if it encounters unescaped "+" characters, but may fail,
+    * so ensure escaped "+"es in attr names and attr values.
+    *
+    * [BUG] If you have a multivalued RDN with unescaped plus characters
+    *       and there is a unescaped plus sign at the end of an value followed by an
+    *       attribute name containing an unescaped plus, then you will get wrong splitting:
+    *         $rdn = 'OU=Sales+C+N=J. Smith';
+    *       returns:
+    *         array('OU=Sales+C', 'N=J. Smith');
+    *       The "C+" is treaten as value of the first pair instead as attr name of the second pair.
+    *       To prevent this, escape correctly.
+    *
+    * @param string $rdn Part of an (multivalued) escaped RDN (eg. ou=foo OR ou=foo+cn=bar)
+    *
+    * @static
+    * @return array Array with the components of the multivalued RDN or Error
+    */
+    public static function split_rdn_multival($rdn)
+    {
+        $rdns = preg_split('/(?<!\\\\)\+/', $rdn);
+        $rdns = self::correct_dn_splitting($rdns, '+');
+        return array_values($rdns);
+    }
+
+    /**
+    * Splits a attribute=value syntax into an array
+    *
+    * The split will occur at the first unescaped '=' character.
+    *
+    * @param string $attr Attribute and Value Syntax
+    *
+    * @return array Indexed array: 0=attribute name, 1=attribute value
+    */
+    public static function split_attribute_string($attr)
+    {
+        return preg_split('/(?<!\\\\)=/', $attr, 2);
+    }
+
+    /**
+    * Corrects splitting of dn parts
+    *
+    * @param array $dn        Raw DN array
+    * @param array $separator Separator that was used when splitting
+    *
+    * @return array Corrected array
+    * @access protected
+    */
+    protected static function correct_dn_splitting($dn = array(), $separator = ',')
+    {
+        foreach ($dn as $key => $dn_value) {
+            $dn_value = $dn[$key]; // refresh value (foreach caches!)
+            // if the dn_value is not in attr=value format, then we had an
+            // unescaped separator character inside the attr name or the value.
+            // We assume, that it was the attribute value.
+            // [TODO] To solve this, we might ask the schema. Keep in mind, that UTIL class
+            //        must remain independent from the other classes or connections.
+            if (!preg_match('/.+(?<!\\\\)=.+/', $dn_value)) {
+                unset($dn[$key]);
+                if (array_key_exists($key-1, $dn)) {
+                    $dn[$key-1] = $dn[$key-1].$separator.$dn_value; // append to previous attr value
+                } else {
+                    $dn[$key+1] = $dn_value.$separator.$dn[$key+1]; // first element: prepend to next attr name
+                }
+            }
+        }
+        return array_values($dn);
+    }
+}
+
+?>
diff --git a/extlib/Net/URL2.php b/extlib/Net/URL2.php
index 7a654aed8..f7fbcd9ce 100644
--- a/extlib/Net/URL2.php
+++ b/extlib/Net/URL2.php
@@ -1,44 +1,58 @@
 <?php
-// +-----------------------------------------------------------------------+
-// | Copyright (c) 2007-2008, Christian Schmidt, Peytz & Co. A/S           |
-// | All rights reserved.                                                  |
-// |                                                                       |
-// | Redistribution and use in source and binary forms, with or without    |
-// | modification, are permitted provided that the following conditions    |
-// | are met:                                                              |
-// |                                                                       |
-// | o Redistributions of source code must retain the above copyright      |
-// |   notice, this list of conditions and the following disclaimer.       |
-// | o Redistributions in binary form must reproduce the above copyright   |
-// |   notice, this list of conditions and the following disclaimer in the |
-// |   documentation and/or other materials provided with the distribution.|
-// | o The names of the authors may not be used to endorse or promote      |
-// |   products derived from this software without specific prior written  |
-// |   permission.                                                         |
-// |                                                                       |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
-// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  |
-// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
-// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      |
-// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
-// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
-// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   |
-// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
-// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  |
-// |                                                                       |
-// +-----------------------------------------------------------------------+
-// | Author: Christian Schmidt <schmidt at php dot net>                    |
-// +-----------------------------------------------------------------------+
-//
-// $Id: URL2.php,v 1.10 2008/04/26 21:57:08 schmidt Exp $
-//
-// Net_URL2 Class (PHP5 Only)
-
-// This code is released under the BSD License - http://www.opensource.org/licenses/bsd-license.php
 /**
- * @license BSD License
+ * Net_URL2, a class representing a URL as per RFC 3986.
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2007-2009, Peytz & Co. A/S
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the distribution.
+ *   * Neither the name of the PHP_LexerGenerator nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category  Networking
+ * @package   Net_URL2
+ * @author    Christian Schmidt <chsc@peytz.dk>
+ * @copyright 2007-2008 Peytz & Co. A/S
+ * @license   http://www.opensource.org/licenses/bsd-license.php New BSD License
+ * @version   CVS: $Id: URL2.php 286661 2009-08-02 12:50:54Z schmidt $
+ * @link      http://www.rfc-editor.org/rfc/rfc3986.txt
+ */
+
+/**
+ * Represents a URL as per RFC 3986.
+ *
+ * @category  Networking
+ * @package   Net_URL2
+ * @author    Christian Schmidt <chsc@peytz.dk>
+ * @copyright 2007-2008 Peytz & Co. ApS
+ * @license   http://www.opensource.org/licenses/bsd-license.php New BSD License
+ * @version   Release: @package_version@
+ * @link      http://pear.php.net/package/Net_URL2
  */
 class Net_URL2
 {
@@ -46,24 +60,24 @@ class Net_URL2
      * Do strict parsing in resolve() (see RFC 3986, section 5.2.2). Default
      * is true.
      */
-    const OPTION_STRICT           = 'strict';
+    const OPTION_STRICT = 'strict';
 
     /**
      * Represent arrays in query using PHP's [] notation. Default is true.
      */
-    const OPTION_USE_BRACKETS     = 'use_brackets';
+    const OPTION_USE_BRACKETS = 'use_brackets';
 
     /**
      * URL-encode query variable keys. Default is true.
      */
-    const OPTION_ENCODE_KEYS      = 'encode_keys';
+    const OPTION_ENCODE_KEYS = 'encode_keys';
 
     /**
      * Query variable separators when parsing the query string. Every character
      * is considered a separator. Default is specified by the
      * arg_separator.input php.ini setting (this defaults to "&").
      */
-    const OPTION_SEPARATOR_INPUT  = 'input_separator';
+    const OPTION_SEPARATOR_INPUT = 'input_separator';
 
     /**
      * Query variable separator used when generating the query string. Default
@@ -75,7 +89,7 @@ class Net_URL2
     /**
      * Default options corresponds to how PHP handles $_GET.
      */
-    private $options = array(
+    private $_options = array(
         self::OPTION_STRICT           => true,
         self::OPTION_USE_BRACKETS     => true,
         self::OPTION_ENCODE_KEYS      => true,
@@ -86,41 +100,43 @@ class Net_URL2
     /**
      * @var  string|bool
      */
-    private $scheme = false;
+    private $_scheme = false;
 
     /**
      * @var  string|bool
      */
-    private $userinfo = false;
+    private $_userinfo = false;
 
     /**
      * @var  string|bool
      */
-    private $host = false;
+    private $_host = false;
 
     /**
      * @var  int|bool
      */
-    private $port = false;
+    private $_port = false;
 
     /**
      * @var  string
      */
-    private $path = '';
+    private $_path = '';
 
     /**
      * @var  string|bool
      */
-    private $query = false;
+    private $_query = false;
 
     /**
      * @var  string|bool
      */
-    private $fragment = false;
+    private $_fragment = false;
 
     /**
+     * Constructor.
+     *
      * @param string $url     an absolute or relative URL
-     * @param array  $options
+     * @param array  $options an array of OPTION_xxx constants
      */
     public function __construct($url, $options = null)
     {
@@ -130,12 +146,12 @@ class Net_URL2
                          ini_get('arg_separator.output'));
         if (is_array($options)) {
             foreach ($options as $optionName => $value) {
-                $this->setOption($optionName);
+                $this->setOption($optionName, $value);
             }
         }
 
         if (preg_match('@^([a-z][a-z0-9.+-]*):@i', $url, $reg)) {
-            $this->scheme = $reg[1];
+            $this->_scheme = $reg[1];
             $url = substr($url, strlen($reg[0]));
         }
 
@@ -145,20 +161,59 @@ class Net_URL2
         }
 
         $i = strcspn($url, '?#');
-        $this->path = substr($url, 0, $i);
+        $this->_path = substr($url, 0, $i);
         $url = substr($url, $i);
 
         if (preg_match('@^\?([^#]*)@', $url, $reg)) {
-            $this->query = $reg[1];
+            $this->_query = $reg[1];
             $url = substr($url, strlen($reg[0]));
         }
 
         if ($url) {
-            $this->fragment = substr($url, 1);
+            $this->_fragment = substr($url, 1);
         }
     }
 
     /**
+     * Magic Setter.
+     *
+     * This method will magically set the value of a private variable ($var)
+     * with the value passed as the args
+     *
+     * @param  string $var      The private variable to set.
+     * @param  mixed  $arg      An argument of any type.
+     * @return void
+     */
+    public function __set($var, $arg)
+    {
+        $method = 'set' . $var;
+        if (method_exists($this, $method)) {
+            $this->$method($arg);
+        }
+    }
+    
+    /**
+     * Magic Getter.
+     *
+     * This is the magic get method to retrieve the private variable 
+     * that was set by either __set() or it's setter...
+     * 
+     * @param  string $var         The property name to retrieve.
+     * @return mixed  $this->$var  Either a boolean false if the
+     *                             property is not set or the value
+     *                             of the private property.
+     */
+    public function __get($var)
+    {
+        $method = 'get' . $var;
+        if (method_exists($this, $method)) {
+            return $this->$method();
+        }
+        
+        return false;
+    }
+    
+    /**
      * Returns the scheme, e.g. "http" or "urn", or false if there is no
      * scheme specified, i.e. if this is a relative URL.
      *
@@ -166,18 +221,23 @@ class Net_URL2
      */
     public function getScheme()
     {
-        return $this->scheme;
+        return $this->_scheme;
     }
 
     /**
-     * @param string|bool $scheme
+     * Sets the scheme, e.g. "http" or "urn". Specify false if there is no
+     * scheme specified, i.e. if this is a relative URL.
+     *
+     * @param string|bool $scheme e.g. "http" or "urn", or false if there is no
+     *                            scheme specified, i.e. if this is a relative
+     *                            URL
      *
      * @return void
      * @see    getScheme()
      */
     public function setScheme($scheme)
     {
-        $this->scheme = $scheme;
+        $this->_scheme = $scheme;
     }
 
     /**
@@ -188,7 +248,9 @@ class Net_URL2
      */
     public function getUser()
     {
-        return $this->userinfo !== false ? preg_replace('@:.*$@', '', $this->userinfo) : false;
+        return $this->_userinfo !== false
+            ? preg_replace('@:.*$@', '', $this->_userinfo)
+            : false;
     }
 
     /**
@@ -201,7 +263,9 @@ class Net_URL2
      */
     public function getPassword()
     {
-        return $this->userinfo !== false ? substr(strstr($this->userinfo, ':'), 1) : false;
+        return $this->_userinfo !== false
+            ? substr(strstr($this->_userinfo, ':'), 1)
+            : false;
     }
 
     /**
@@ -212,7 +276,7 @@ class Net_URL2
      */
     public function getUserinfo()
     {
-        return $this->userinfo;
+        return $this->_userinfo;
     }
 
     /**
@@ -220,15 +284,15 @@ class Net_URL2
      * in the userinfo part as username ":" password.
      *
      * @param string|bool $userinfo userinfo or username
-     * @param string|bool $password
+     * @param string|bool $password optional password, or false
      *
      * @return void
      */
     public function setUserinfo($userinfo, $password = false)
     {
-        $this->userinfo = $userinfo;
+        $this->_userinfo = $userinfo;
         if ($password !== false) {
-            $this->userinfo .= ':' . $password;
+            $this->_userinfo .= ':' . $password;
         }
     }
 
@@ -236,21 +300,24 @@ class Net_URL2
      * Returns the host part, or false if there is no authority part, e.g.
      * relative URLs.
      *
-     * @return  string|bool
+     * @return  string|bool a hostname, an IP address, or false
      */
     public function getHost()
     {
-        return $this->host;
+        return $this->_host;
     }
 
     /**
-     * @param string|bool $host
+     * Sets the host part. Specify false if there is no authority part, e.g.
+     * relative URLs.
+     *
+     * @param string|bool $host a hostname, an IP address, or false
      *
      * @return void
      */
     public function setHost($host)
     {
-        $this->host = $host;
+        $this->_host = $host;
     }
 
     /**
@@ -261,65 +328,72 @@ class Net_URL2
      */
     public function getPort()
     {
-        return $this->port;
+        return $this->_port;
     }
 
     /**
-     * @param int|bool $port
+     * Sets the port number. Specify false if there is no port number specified,
+     * i.e. if the default port is to be used.
+     *
+     * @param int|bool $port a port number, or false
      *
      * @return void
      */
     public function setPort($port)
     {
-        $this->port = intval($port);
+        $this->_port = intval($port);
     }
 
     /**
      * Returns the authority part, i.e. [ userinfo "@" ] host [ ":" port ], or
-     * false if there is no authority none.
+     * false if there is no authority.
      *
      * @return string|bool
      */
     public function getAuthority()
     {
-        if (!$this->host) {
+        if (!$this->_host) {
             return false;
         }
 
         $authority = '';
 
-        if ($this->userinfo !== false) {
-            $authority .= $this->userinfo . '@';
+        if ($this->_userinfo !== false) {
+            $authority .= $this->_userinfo . '@';
         }
 
-        $authority .= $this->host;
+        $authority .= $this->_host;
 
-        if ($this->port !== false) {
-            $authority .= ':' . $this->port;
+        if ($this->_port !== false) {
+            $authority .= ':' . $this->_port;
         }
 
         return $authority;
     }
 
     /**
-     * @param string|false $authority
+     * Sets the authority part, i.e. [ userinfo "@" ] host [ ":" port ]. Specify
+     * false if there is no authority.
+     *
+     * @param string|false $authority a hostname or an IP addresse, possibly
+     *                                with userinfo prefixed and port number
+     *                                appended, e.g. "foo:bar@example.org:81".
      *
      * @return void
      */
     public function setAuthority($authority)
     {
-        $this->user = false;
-        $this->pass = false;
-        $this->host = false;
-        $this->port = false;
-        if (preg_match('@^(([^\@]+)\@)?([^:]+)(:(\d*))?$@', $authority, $reg)) {
+        $this->_userinfo = false;
+        $this->_host     = false;
+        $this->_port     = false;
+        if (preg_match('@^(([^\@]*)\@)?([^:]+)(:(\d*))?$@', $authority, $reg)) {
             if ($reg[1]) {
-                $this->userinfo = $reg[2];
+                $this->_userinfo = $reg[2];
             }
 
-            $this->host = $reg[3];
+            $this->_host = $reg[3];
             if (isset($reg[5])) {
-                $this->port = intval($reg[5]);
+                $this->_port = intval($reg[5]);
             }
         }
     }
@@ -331,65 +405,74 @@ class Net_URL2
      */
     public function getPath()
     {
-        return $this->path;
+        return $this->_path;
     }
 
     /**
-     * @param string $path
+     * Sets the path part (possibly an empty string).
+     *
+     * @param string $path a path
      *
      * @return void
      */
     public function setPath($path)
     {
-        $this->path = $path;
+        $this->_path = $path;
     }
 
     /**
      * Returns the query string (excluding the leading "?"), or false if "?"
-     * isn't present in the URL.
+     * is not present in the URL.
      *
      * @return  string|bool
      * @see     self::getQueryVariables()
      */
     public function getQuery()
     {
-        return $this->query;
+        return $this->_query;
     }
 
     /**
-     * @param string|bool $query
+     * Sets the query string (excluding the leading "?"). Specify false if "?"
+     * is not present in the URL.
+     *
+     * @param string|bool $query a query string, e.g. "foo=1&bar=2"
      *
      * @return void
      * @see   self::setQueryVariables()
      */
     public function setQuery($query)
     {
-        $this->query = $query;
+        $this->_query = $query;
     }
 
     /**
-     * Returns the fragment name, or false if "#" isn't present in the URL.
+     * Returns the fragment name, or false if "#" is not present in the URL.
      *
      * @return  string|bool
      */
     public function getFragment()
     {
-        return $this->fragment;
+        return $this->_fragment;
     }
 
     /**
-     * @param string|bool $fragment
+     * Sets the fragment name. Specify false if "#" is not present in the URL.
+     *
+     * @param string|bool $fragment a fragment excluding the leading "#", or
+     *                              false
      *
      * @return void
      */
     public function setFragment($fragment)
     {
-        $this->fragment = $fragment;
+        $this->_fragment = $fragment;
     }
 
     /**
      * Returns the query string like an array as the variables would appear in
-     * $_GET in a PHP script.
+     * $_GET in a PHP script. If the URL does not contain a "?", an empty array
+     * is returned.
      *
      * @return  array
      */
@@ -398,7 +481,7 @@ class Net_URL2
         $pattern = '/[' .
                    preg_quote($this->getOption(self::OPTION_SEPARATOR_INPUT), '/') .
                    ']/';
-        $parts   = preg_split($pattern, $this->query, -1, PREG_SPLIT_NO_EMPTY);
+        $parts   = preg_split($pattern, $this->_query, -1, PREG_SPLIT_NO_EMPTY);
         $return  = array();
 
         foreach ($parts as $part) {
@@ -445,6 +528,8 @@ class Net_URL2
     }
 
     /**
+     * Sets the query string to the specified variable in the query string.
+     *
      * @param array $array (name => value) array
      *
      * @return void
@@ -452,11 +537,11 @@ class Net_URL2
     public function setQueryVariables(array $array)
     {
         if (!$array) {
-            $this->query = false;
+            $this->_query = false;
         } else {
             foreach ($array as $name => $value) {
                 if ($this->getOption(self::OPTION_ENCODE_KEYS)) {
-                    $name = rawurlencode($name);
+                    $name = self::urlencode($name);
                 }
 
                 if (is_array($value)) {
@@ -466,19 +551,21 @@ class Net_URL2
                             : ($name . '=' . $v);
                     }
                 } elseif (!is_null($value)) {
-                    $parts[] = $name . '=' . $value;
+                    $parts[] = $name . '=' . self::urlencode($value);
                 } else {
                     $parts[] = $name;
                 }
             }
-            $this->query = implode($this->getOption(self::OPTION_SEPARATOR_OUTPUT),
-                                   $parts);
+            $this->_query = implode($this->getOption(self::OPTION_SEPARATOR_OUTPUT),
+                                    $parts);
         }
     }
 
     /**
-     * @param string $name
-     * @param mixed  $value
+     * Sets the specified variable in the query string.
+     *
+     * @param string $name  variable name
+     * @param mixed  $value variable value
      *
      * @return  array
      */
@@ -490,7 +577,9 @@ class Net_URL2
     }
 
     /**
-     * @param string $name
+     * Removes the specifed variable from the query string.
+     *
+     * @param string $name a query string variable, e.g. "foo" in "?foo=1"
      *
      * @return void
      */
@@ -511,27 +600,38 @@ class Net_URL2
         // See RFC 3986, section 5.3
         $url = "";
 
-        if ($this->scheme !== false) {
-            $url .= $this->scheme . ':';
+        if ($this->_scheme !== false) {
+            $url .= $this->_scheme . ':';
         }
 
         $authority = $this->getAuthority();
         if ($authority !== false) {
             $url .= '//' . $authority;
         }
-        $url .= $this->path;
+        $url .= $this->_path;
 
-        if ($this->query !== false) {
-            $url .= '?' . $this->query;
+        if ($this->_query !== false) {
+            $url .= '?' . $this->_query;
         }
 
-        if ($this->fragment !== false) {
-            $url .= '#' . $this->fragment;
+        if ($this->_fragment !== false) {
+            $url .= '#' . $this->_fragment;
         }
     
         return $url;
     }
 
+    /**
+     * Returns a string representation of this URL.
+     *
+     * @return  string
+     * @see toString()
+     */
+    public function __toString()
+    {
+        return $this->getURL();
+    }
+
     /** 
      * Returns a normalized string representation of this URL. This is useful
      * for comparison of URLs.
@@ -555,36 +655,38 @@ class Net_URL2
         // See RFC 3886, section 6
 
         // Schemes are case-insensitive
-        if ($this->scheme) {
-            $this->scheme = strtolower($this->scheme);
+        if ($this->_scheme) {
+            $this->_scheme = strtolower($this->_scheme);
         }
 
         // Hostnames are case-insensitive
-        if ($this->host) {
-            $this->host = strtolower($this->host);
+        if ($this->_host) {
+            $this->_host = strtolower($this->_host);
         }
 
         // Remove default port number for known schemes (RFC 3986, section 6.2.3)
-        if ($this->port &&
-            $this->scheme &&
-            $this->port == getservbyname($this->scheme, 'tcp')) {
+        if ($this->_port &&
+            $this->_scheme &&
+            $this->_port == getservbyname($this->_scheme, 'tcp')) {
 
-            $this->port = false;
+            $this->_port = false;
         }
 
         // Normalize case of %XX percentage-encodings (RFC 3986, section 6.2.2.1)
-        foreach (array('userinfo', 'host', 'path') as $part) {
+        foreach (array('_userinfo', '_host', '_path') as $part) {
             if ($this->$part) {
-                $this->$part  = preg_replace('/%[0-9a-f]{2}/ie', 'strtoupper("\0")', $this->$part);
+                $this->$part = preg_replace('/%[0-9a-f]{2}/ie',
+                                            'strtoupper("\0")',
+                                            $this->$part);
             }
         }
 
         // Path segment normalization (RFC 3986, section 6.2.2.3)
-        $this->path = self::removeDotSegments($this->path);
+        $this->_path = self::removeDotSegments($this->_path);
 
         // Scheme based normalization (RFC 3986, section 6.2.3)
-        if ($this->host && !$this->path) {
-            $this->path = '/';
+        if ($this->_host && !$this->_path) {
+            $this->_path = '/';
         }
     }
 
@@ -595,7 +697,7 @@ class Net_URL2
      */
     public function isAbsolute()
     {
-        return (bool) $this->scheme;
+        return (bool) $this->_scheme;
     }
 
     /**
@@ -608,7 +710,7 @@ class Net_URL2
      */
     public function resolve($reference)
     {
-        if (is_string($reference)) {
+        if (!$reference instanceof Net_URL2) {
             $reference = new self($reference);
         }
         if (!$this->isAbsolute()) {
@@ -617,54 +719,54 @@ class Net_URL2
 
         // A non-strict parser may ignore a scheme in the reference if it is
         // identical to the base URI's scheme.
-        if (!$this->getOption(self::OPTION_STRICT) && $reference->scheme == $this->scheme) {
-            $reference->scheme = false;
+        if (!$this->getOption(self::OPTION_STRICT) && $reference->_scheme == $this->_scheme) {
+            $reference->_scheme = false;
         }
 
         $target = new self('');
-        if ($reference->scheme !== false) {
-            $target->scheme = $reference->scheme;
+        if ($reference->_scheme !== false) {
+            $target->_scheme = $reference->_scheme;
             $target->setAuthority($reference->getAuthority());
-            $target->path  = self::removeDotSegments($reference->path);
-            $target->query = $reference->query;
+            $target->_path  = self::removeDotSegments($reference->_path);
+            $target->_query = $reference->_query;
         } else {
             $authority = $reference->getAuthority();
             if ($authority !== false) {
                 $target->setAuthority($authority);
-                $target->path  = self::removeDotSegments($reference->path);
-                $target->query = $reference->query;
+                $target->_path  = self::removeDotSegments($reference->_path);
+                $target->_query = $reference->_query;
             } else {
-                if ($reference->path == '') {
-                    $target->path = $this->path;
-                    if ($reference->query !== false) {
-                        $target->query = $reference->query;
+                if ($reference->_path == '') {
+                    $target->_path = $this->_path;
+                    if ($reference->_query !== false) {
+                        $target->_query = $reference->_query;
                     } else {
-                        $target->query = $this->query;
+                        $target->_query = $this->_query;
                     }
                 } else {
-                    if (substr($reference->path, 0, 1) == '/') {
-                        $target->path = self::removeDotSegments($reference->path);
+                    if (substr($reference->_path, 0, 1) == '/') {
+                        $target->_path = self::removeDotSegments($reference->_path);
                     } else {
                         // Merge paths (RFC 3986, section 5.2.3)
-                        if ($this->host !== false && $this->path == '') {
-                            $target->path = '/' . $this->path;
+                        if ($this->_host !== false && $this->_path == '') {
+                            $target->_path = '/' . $this->_path;
                         } else {
-                            $i = strrpos($this->path, '/');
+                            $i = strrpos($this->_path, '/');
                             if ($i !== false) {
-                                $target->path = substr($this->path, 0, $i + 1);
+                                $target->_path = substr($this->_path, 0, $i + 1);
                             }
-                            $target->path .= $reference->path;
+                            $target->_path .= $reference->_path;
                         }
-                        $target->path = self::removeDotSegments($target->path);
+                        $target->_path = self::removeDotSegments($target->_path);
                     }
-                    $target->query = $reference->query;
+                    $target->_query = $reference->_query;
                 }
                 $target->setAuthority($this->getAuthority());
             }
-            $target->scheme = $this->scheme;
+            $target->_scheme = $this->_scheme;
         }
 
-        $target->fragment = $reference->fragment;
+        $target->_fragment = $reference->_fragment;
 
         return $target;
     }
@@ -677,7 +779,7 @@ class Net_URL2
      *
      * @return string a path
      */
-    private static function removeDotSegments($path)
+    public static function removeDotSegments($path)
     {
         $output = '';
 
@@ -685,28 +787,25 @@ class Net_URL2
         // method
         $j = 0; 
         while ($path && $j++ < 100) {
-            // Step A
             if (substr($path, 0, 2) == './') {
+                // Step 2.A
                 $path = substr($path, 2);
             } elseif (substr($path, 0, 3) == '../') {
+                // Step 2.A
                 $path = substr($path, 3);
-
-            // Step B
             } elseif (substr($path, 0, 3) == '/./' || $path == '/.') {
+                // Step 2.B
                 $path = '/' . substr($path, 3);
-
-            // Step C
             } elseif (substr($path, 0, 4) == '/../' || $path == '/..') {
-                $path = '/' . substr($path, 4);
-                $i = strrpos($output, '/');
+                // Step 2.C
+                $path   = '/' . substr($path, 4);
+                $i      = strrpos($output, '/');
                 $output = $i === false ? '' : substr($output, 0, $i);
-
-            // Step D
             } elseif ($path == '.' || $path == '..') {
+                // Step 2.D
                 $path = '';
-
-            // Step E
             } else {
+                // Step 2.E
                 $i = strpos($path, '/');
                 if ($i === 0) {
                     $i = strpos($path, '/', 1);
@@ -723,6 +822,22 @@ class Net_URL2
     }
 
     /**
+     * Percent-encodes all non-alphanumeric characters except these: _ . - ~
+     * Similar to PHP's rawurlencode(), except that it also encodes ~ in PHP
+     * 5.2.x and earlier.
+     *
+     * @param  $raw the string to encode
+     * @return string
+     */
+    public static function urlencode($string)
+    {
+    	$encoded = rawurlencode($string);
+	// This is only necessary in PHP < 5.3.
+	$encoded = str_replace('%7E', '~', $encoded);
+	return $encoded;
+    }
+
+    /**
      * Returns a Net_URL2 instance representing the canonical URL of the
      * currently executing PHP script.
      * 
@@ -737,13 +852,13 @@ class Net_URL2
 
         // Begin with a relative URL
         $url = new self($_SERVER['PHP_SELF']);
-        $url->scheme = isset($_SERVER['HTTPS']) ? 'https' : 'http';
-        $url->host = $_SERVER['SERVER_NAME'];
+        $url->_scheme = isset($_SERVER['HTTPS']) ? 'https' : 'http';
+        $url->_host   = $_SERVER['SERVER_NAME'];
         $port = intval($_SERVER['SERVER_PORT']);
-        if ($url->scheme == 'http' && $port != 80 ||
-            $url->scheme == 'https' && $port != 443) {
+        if ($url->_scheme == 'http' && $port != 80 ||
+            $url->_scheme == 'https' && $port != 443) {
 
-            $url->port = $port;
+            $url->_port = $port;
         }
         return $url;
     }
@@ -773,7 +888,7 @@ class Net_URL2
 
         // Begin with a relative URL
         $url = new self($_SERVER['REQUEST_URI']);
-        $url->scheme = isset($_SERVER['HTTPS']) ? 'https' : 'http';
+        $url->_scheme = isset($_SERVER['HTTPS']) ? 'https' : 'http';
         // Set host and possibly port
         $url->setAuthority($_SERVER['HTTP_HOST']);
         return $url;
@@ -792,10 +907,10 @@ class Net_URL2
      */
     function setOption($optionName, $value)
     {
-        if (!array_key_exists($optionName, $this->options)) {
+        if (!array_key_exists($optionName, $this->_options)) {
             return false;
         }
-        $this->options[$optionName] = $value;
+        $this->_options[$optionName] = $value;
     }
 
     /**
@@ -807,7 +922,7 @@ class Net_URL2
      */
     function getOption($optionName)
     {
-        return isset($this->options[$optionName])
-            ? $this->options[$optionName] : false;
+        return isset($this->_options[$optionName])
+            ? $this->_options[$optionName] : false;
     }
 }
diff --git a/extlib/PEAR.php b/extlib/PEAR.php
index fcefa964a..4c24c6006 100644
--- a/extlib/PEAR.php
+++ b/extlib/PEAR.php
@@ -746,7 +746,7 @@ class PEAR
     {
         if (!extension_loaded($ext)) {
             // if either returns true dl() will produce a FATAL error, stop that
-            if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1) || !function_exists('dl')) {
+            if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1)) {
                 return false;
             }
             if (OS_WINDOWS) {
diff --git a/extlib/README b/extlib/README
new file mode 100644
index 000000000..cfc2f9c8c
--- /dev/null
+++ b/extlib/README
@@ -0,0 +1,58 @@
+DO NOT "FIX" CODE IN THIS DIRECTORY.
+
+ONLY UPSTREAM VERSIONS OF SOFTWARE GO IN THIS DIRECTORY.
+
+This directory is provided as a courtesy to our users who might be
+unable or unwilling to find and install libraries we depend on.
+
+If we "fix" software in this directory, we hamstring users who do the
+right thing and keep a single version of upstream libraries in a
+system-wide library. We introduce subtle and maddening bugs where
+our code is "accidentally" using the "wrong" library version. We may
+unwittingly interfere with other software that depends on the
+canonical release versions of those same libraries!
+
+Forking upstream software for trivial reasons makes us bad citizens in
+the Open Source community and adds unnecessary heartache for our
+users. Don't make us "that" project.
+
+FAQ:
+
+Q: What should we do when we find a bug in upstream software?
+
+A: First and foremost, REPORT THE BUG, and if possible send in a patch.
+
+   Watch for a release of the upstream software and integrate with it
+   when it's released.
+
+   In the meantime, work around the bug, if at all possible. Usually,
+   it's quite possible, if slightly harder or less efficient.
+
+Q: What if the bug can't be worked around?
+
+A: If the upstream developers have accepted a bug patch, it's
+   undesirable but acceptable to apply that patch to the library in
+   the extlib dir. Ideally, use a release version for upstream or a
+   version control system snapshot.
+
+   Note that this is a last resort.
+
+Q: What if upstream is unresponsive or won't accept a patch?
+
+A: Try again.
+
+Q: I tried again, and upstream is still unresponsive and nobody's
+   checked on my patch. Now what?
+
+A: If the upstream project is moribund and there's a way to adopt it,
+   propose having the StatusNet dev team adopt the project. Or, adopt
+   it yourself.
+
+Q: What if there's no upstream authority and it can't be adopted?
+
+A: Then we fork it. Make a new name and a new version. Include it in
+   lib/ instead of extlib/, and use the StatusNet_* prefix to change
+   the namespace to avoid collisions.
+
+   This is a last resort; consult with the rest of the dev group
+   before taking this radical step.
diff --git a/extlib/Stomp.php b/extlib/Stomp.php
index abd9cba62..b55a4aa6d 100644
--- a/extlib/Stomp.php
+++ b/extlib/Stomp.php
@@ -66,12 +66,13 @@ class Stomp
     protected $_sessionId;
     protected $_read_timeout_seconds = 60;
     protected $_read_timeout_milliseconds = 0;
+    protected $_connect_timeout_seconds = 60;
     
     /**
      * Constructor
      *
      * @param string $brokerUri Broker URL
-     * @throws Stomp_Exception
+     * @throws StompException
      */
     public function __construct ($brokerUri)
     {
@@ -81,7 +82,7 @@ class Stomp
     /**
      * Initialize connection
      *
-     * @throws Stomp_Exception
+     * @throws StompException
      */
     protected function _init ()
     {
@@ -103,14 +104,14 @@ class Stomp
             }
         } else {
             require_once 'Stomp/Exception.php';
-            throw new Stomp_Exception("Bad Broker URL {$this->_brokerUri}");
+            throw new StompException("Bad Broker URL {$this->_brokerUri}");
         }
     }
     /**
      * Process broker URL
      *
      * @param string $url Broker URL
-     * @throws Stomp_Exception
+     * @throws StompException
      * @return boolean
      */
     protected function _processUrl ($url)
@@ -120,19 +121,19 @@ class Stomp
             array_push($this->_hosts, array($parsed['host'] , $parsed['port'] , $parsed['scheme']));
         } else {
             require_once 'Stomp/Exception.php';
-            throw new Stomp_Exception("Bad Broker URL $url");
+            throw new StompException("Bad Broker URL $url");
         }
     }
     /**
      * Make socket connection to the server
      *
-     * @throws Stomp_Exception
+     * @throws StompException
      */
     protected function _makeConnection ()
     {
         if (count($this->_hosts) == 0) {
             require_once 'Stomp/Exception.php';
-            throw new Stomp_Exception("No broker defined");
+            throw new StompException("No broker defined");
         }
         
         // force disconnect, if previous established connection exists
@@ -141,6 +142,9 @@ class Stomp
         $i = $this->_currentHost;
         $att = 0;
         $connected = false;
+        $connect_errno = null;
+        $connect_errstr = null;
+        
         while (! $connected && $att ++ < $this->_attempts) {
             if (isset($this->_params['randomize']) && $this->_params['randomize'] == 'true') {
                 $i = rand(0, count($this->_hosts) - 1);
@@ -158,10 +162,10 @@ class Stomp
                 fclose($this->_socket);
                 $this->_socket = null;
             }
-            $this->_socket = @fsockopen($scheme . '://' . $host, $port);
+            $this->_socket = @fsockopen($scheme . '://' . $host, $port, $connect_errno, $connect_errstr, $this->_connect_timeout_seconds);
             if (!is_resource($this->_socket) && $att >= $this->_attempts && !array_key_exists($i + 1, $this->_hosts)) {
                 require_once 'Stomp/Exception.php';
-                throw new Stomp_Exception("Could not connect to $host:$port ($att/{$this->_attempts})");
+                throw new StompException("Could not connect to $host:$port ($att/{$this->_attempts})");
             } else if (is_resource($this->_socket)) {
                 $connected = true;
                 $this->_currentHost = $i;
@@ -170,7 +174,7 @@ class Stomp
         }
         if (! $connected) {
             require_once 'Stomp/Exception.php';
-            throw new Stomp_Exception("Could not connect to a broker");
+            throw new StompException("Could not connect to a broker");
         }
     }
     /**
@@ -179,7 +183,7 @@ class Stomp
      * @param string $username
      * @param string $password
      * @return boolean
-     * @throws Stomp_Exception
+     * @throws StompException
      */
     public function connect ($username = '', $password = '')
     {
@@ -194,18 +198,18 @@ class Stomp
 		if ($this->clientId != null) {
 			$headers["client-id"] = $this->clientId;
 		}
-		$frame = new Stomp_Frame("CONNECT", $headers);
+		$frame = new StompFrame("CONNECT", $headers);
         $this->_writeFrame($frame);
         $frame = $this->readFrame();
-        if ($frame instanceof Stomp_Frame && $frame->command == 'CONNECTED') {
+        if ($frame instanceof StompFrame && $frame->command == 'CONNECTED') {
             $this->_sessionId = $frame->headers["session"];
             return true;
         } else {
             require_once 'Stomp/Exception.php';
-            if ($frame instanceof Stomp_Frame) {
-                throw new Stomp_Exception("Unexpected command: {$frame->command}", 0, $frame->body);
+            if ($frame instanceof StompFrame) {
+                throw new StompException("Unexpected command: {$frame->command}", 0, $frame->body);
             } else {
-                throw new Stomp_Exception("Connection not acknowledged");
+                throw new StompException("Connection not acknowledged");
             }
         }
     }
@@ -232,21 +236,21 @@ class Stomp
      * Send a message to a destination in the messaging system 
      *
      * @param string $destination Destination queue
-     * @param string|Stomp_Frame $msg Message
+     * @param string|StompFrame $msg Message
      * @param array $properties
      * @param boolean $sync Perform request synchronously
      * @return boolean
      */
-    public function send ($destination, $msg, $properties = null, $sync = null)
+    public function send ($destination, $msg, $properties = array(), $sync = null)
     {
-        if ($msg instanceof Stomp_Frame) {
+        if ($msg instanceof StompFrame) {
             $msg->headers['destination'] = $destination;
-            $msg->headers = array_merge($msg->headers, $properties);
+            if (is_array($properties)) $msg->headers = array_merge($msg->headers, $properties);
             $frame = $msg;
         } else {
             $headers = $properties;
             $headers['destination'] = $destination;
-            $frame = new Stomp_Frame('SEND', $headers, $msg);
+            $frame = new StompFrame('SEND', $headers, $msg);
         }
         $this->_prepareReceipt($frame, $sync);
         $this->_writeFrame($frame);
@@ -255,10 +259,10 @@ class Stomp
     /**
      * Prepair frame receipt
      *
-     * @param Stomp_Frame $frame
+     * @param StompFrame $frame
      * @param boolean $sync
      */
-    protected function _prepareReceipt (Stomp_Frame $frame, $sync)
+    protected function _prepareReceipt (StompFrame $frame, $sync)
     {
         $receive = $this->sync;
         if ($sync !== null) {
@@ -271,12 +275,12 @@ class Stomp
     /**
      * Wait for receipt
      *
-     * @param Stomp_Frame $frame
+     * @param StompFrame $frame
      * @param boolean $sync
      * @return boolean
-     * @throws Stomp_Exception
+     * @throws StompException
      */
-    protected function _waitForReceipt (Stomp_Frame $frame, $sync)
+    protected function _waitForReceipt (StompFrame $frame, $sync)
     {
 
         $receive = $this->sync;
@@ -289,19 +293,19 @@ class Stomp
                 return true;
             }
             $frame = $this->readFrame();
-            if ($frame instanceof Stomp_Frame && $frame->command == 'RECEIPT') {
+            if ($frame instanceof StompFrame && $frame->command == 'RECEIPT') {
                 if ($frame->headers['receipt-id'] == $id) {
                     return true;
                 } else {
                     require_once 'Stomp/Exception.php';
-                    throw new Stomp_Exception("Unexpected receipt id {$frame->headers['receipt-id']}", 0, $frame->body);
+                    throw new StompException("Unexpected receipt id {$frame->headers['receipt-id']}", 0, $frame->body);
                 }
             } else {
                 require_once 'Stomp/Exception.php';
-                if ($frame instanceof Stomp_Frame) {
-                    throw new Stomp_Exception("Unexpected command {$frame->command}", 0, $frame->body);
+                if ($frame instanceof StompFrame) {
+                    throw new StompException("Unexpected command {$frame->command}", 0, $frame->body);
                 } else {
-                    throw new Stomp_Exception("Receipt not received");
+                    throw new StompException("Receipt not received");
                 }
             }
         }
@@ -314,7 +318,7 @@ class Stomp
      * @param array $properties
      * @param boolean $sync Perform request synchronously
      * @return boolean
-     * @throws Stomp_Exception
+     * @throws StompException
      */
     public function subscribe ($destination, $properties = null, $sync = null)
     {
@@ -329,7 +333,7 @@ class Stomp
             }
         }
         $headers['destination'] = $destination;
-        $frame = new Stomp_Frame('SUBSCRIBE', $headers);
+        $frame = new StompFrame('SUBSCRIBE', $headers);
         $this->_prepareReceipt($frame, $sync);
         $this->_writeFrame($frame);
         if ($this->_waitForReceipt($frame, $sync) == true) {
@@ -346,7 +350,7 @@ class Stomp
      * @param array $properties
      * @param boolean $sync Perform request synchronously
      * @return boolean
-     * @throws Stomp_Exception
+     * @throws StompException
      */
     public function unsubscribe ($destination, $properties = null, $sync = null)
     {
@@ -357,7 +361,7 @@ class Stomp
             }
         }
         $headers['destination'] = $destination;
-        $frame = new Stomp_Frame('UNSUBSCRIBE', $headers);
+        $frame = new StompFrame('UNSUBSCRIBE', $headers);
         $this->_prepareReceipt($frame, $sync);
         $this->_writeFrame($frame);
         if ($this->_waitForReceipt($frame, $sync) == true) {
@@ -373,7 +377,7 @@ class Stomp
      * @param string $transactionId
      * @param boolean $sync Perform request synchronously
      * @return boolean
-     * @throws Stomp_Exception
+     * @throws StompException
      */
     public function begin ($transactionId = null, $sync = null)
     {
@@ -381,7 +385,7 @@ class Stomp
         if (isset($transactionId)) {
             $headers['transaction'] = $transactionId;
         }
-        $frame = new Stomp_Frame('BEGIN', $headers);
+        $frame = new StompFrame('BEGIN', $headers);
         $this->_prepareReceipt($frame, $sync);
         $this->_writeFrame($frame);
         return $this->_waitForReceipt($frame, $sync);
@@ -392,7 +396,7 @@ class Stomp
      * @param string $transactionId
      * @param boolean $sync Perform request synchronously
      * @return boolean
-     * @throws Stomp_Exception
+     * @throws StompException
      */
     public function commit ($transactionId = null, $sync = null)
     {
@@ -400,7 +404,7 @@ class Stomp
         if (isset($transactionId)) {
             $headers['transaction'] = $transactionId;
         }
-        $frame = new Stomp_Frame('COMMIT', $headers);
+        $frame = new StompFrame('COMMIT', $headers);
         $this->_prepareReceipt($frame, $sync);
         $this->_writeFrame($frame);
         return $this->_waitForReceipt($frame, $sync);
@@ -417,7 +421,7 @@ class Stomp
         if (isset($transactionId)) {
             $headers['transaction'] = $transactionId;
         }
-        $frame = new Stomp_Frame('ABORT', $headers);
+        $frame = new StompFrame('ABORT', $headers);
         $this->_prepareReceipt($frame, $sync);
         $this->_writeFrame($frame);
         return $this->_waitForReceipt($frame, $sync);
@@ -426,15 +430,19 @@ class Stomp
      * Acknowledge consumption of a message from a subscription
 	 * Note: This operation is always asynchronous
      *
-     * @param string|Stomp_Frame $messageMessage ID
+     * @param string|StompFrame $messageMessage ID
      * @param string $transactionId
      * @return boolean
-     * @throws Stomp_Exception
+     * @throws StompException
      */
     public function ack ($message, $transactionId = null)
     {
-        if ($message instanceof Stomp_Frame) {
-            $frame = new Stomp_Frame('ACK', $message->headers);
+        if ($message instanceof StompFrame) {
+            $headers = $message->headers;
+            if (isset($transactionId)) {
+                $headers['transaction'] = $transactionId;
+            }			
+            $frame = new StompFrame('ACK', $headers);
             $this->_writeFrame($frame);
             return true;
         } else {
@@ -443,7 +451,7 @@ class Stomp
                 $headers['transaction'] = $transactionId;
             }
             $headers['message-id'] = $message;
-            $frame = new Stomp_Frame('ACK', $headers);
+            $frame = new StompFrame('ACK', $headers);
             $this->_writeFrame($frame);
             return true;
         }
@@ -461,7 +469,7 @@ class Stomp
 		}
 
         if (is_resource($this->_socket)) {
-            $this->_writeFrame(new Stomp_Frame('DISCONNECT', $headers));
+            $this->_writeFrame(new StompFrame('DISCONNECT', $headers));
             fclose($this->_socket);
         }
         $this->_socket = null;
@@ -474,13 +482,13 @@ class Stomp
     /**
      * Write frame to server
      *
-     * @param Stomp_Frame $stompFrame
+     * @param StompFrame $stompFrame
      */
-    protected function _writeFrame (Stomp_Frame $stompFrame)
+    protected function _writeFrame (StompFrame $stompFrame)
     {
         if (!is_resource($this->_socket)) {
             require_once 'Stomp/Exception.php';
-            throw new Stomp_Exception('Socket connection hasn\'t been established');
+            throw new StompException('Socket connection hasn\'t been established');
         }
 
         $data = $stompFrame->__toString();
@@ -504,9 +512,9 @@ class Stomp
     }
     
     /**
-     * Read responce frame from server
+     * Read response frame from server
      *
-     * @return Stomp_Frame|Stomp_Message_Map|boolean False when no frame to read
+     * @return StompFrame False when no frame to read
      */
     public function readFrame ()
     {
@@ -516,15 +524,21 @@ class Stomp
         
         $rb = 1024;
         $data = '';
+        $end = false;
+        
         do {
-            $read = fgets($this->_socket, $rb);
+            $read = fread($this->_socket, $rb);
             if ($read === false) {
                 $this->_reconnect();
                 return $this->readFrame();
             }
             $data .= $read;
+            if (strpos($data, "\x00") !== false) {
+                $end = true;
+                $data = rtrim($data, "\n");
+            }
             $len = strlen($data);
-        } while (($len < 2 || ! ($data[$len - 2] == "\x00" && $data[$len - 1] == "\n")));
+        } while ($len < 2 || $end == false);
         
         list ($header, $body) = explode("\n\n", $data, 2);
         $header = explode("\n", $header);
@@ -538,13 +552,14 @@ class Stomp
                 $command = $v;
             }
         }
-        $frame = new Stomp_Frame($command, $headers, trim($body));
-        if (isset($frame->headers['amq-msg-type']) && $frame->headers['amq-msg-type'] == 'MapMessage') {
+        $frame = new StompFrame($command, $headers, trim($body));
+        if (isset($frame->headers['transformation']) && $frame->headers['transformation'] == 'jms-map-json') {
             require_once 'Stomp/Message/Map.php';
-            return new Stomp_Message_Map($frame);
+            return new StompMessageMap($frame);
         } else {
             return $frame;
         }
+        return $frame;
     }
     
     /**
@@ -558,10 +573,14 @@ class Stomp
         $write = null;
         $except = null;
         
-        $has_frame_to_read = stream_select($read, $write, $except, $this->_read_timeout_seconds, $this->_read_timeout_milliseconds);
+        $has_frame_to_read = @stream_select($read, $write, $except, $this->_read_timeout_seconds, $this->_read_timeout_milliseconds);
+        
+        if ($has_frame_to_read !== false)
+            $has_frame_to_read = count($read);
+
 
         if ($has_frame_to_read === false) {
-            throw new Stomp_Exception('Check failed to determin if the socket is readable');
+            throw new StompException('Check failed to determine if the socket is readable');
         } else if ($has_frame_to_read > 0) {
             return true;
         } else {
diff --git a/extlib/Stomp/Exception.php b/extlib/Stomp/Exception.php
index e6870bc15..8c479de24 100644
--- a/extlib/Stomp/Exception.php
+++ b/extlib/Stomp/Exception.php
@@ -23,10 +23,8 @@
  *
  *
  * @package Stomp
- * @author Michael Caplan <mcaplan@labnet.net>
- * @version $Revision: 23 $
- */

-class Stomp_Exception extends Exception

+ */
+class StompException extends Exception
 {
     protected $_details;
     
@@ -53,5 +51,5 @@ class Stomp_Exception extends Exception
     {
         return $this->_details;
     }
-}

+}
 ?>
\ No newline at end of file
diff --git a/extlib/Stomp/Frame.php b/extlib/Stomp/Frame.php
index dc59c1cb7..195e3b627 100644
--- a/extlib/Stomp/Frame.php
+++ b/extlib/Stomp/Frame.php
@@ -1,33 +1,29 @@
-<?php
-/**
- *
- * Copyright 2005-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* vim: set expandtab tabstop=3 shiftwidth=3: */
+<?php

+/**

+ *

+ * Copyright 2005-2006 The Apache Software Foundation

+ *

+ * Licensed under the Apache License, Version 2.0 (the "License");

+ * you may not use this file except in compliance with the License.

+ * You may obtain a copy of the License at

+ *

+ * http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing, software

+ * distributed under the License is distributed on an "AS IS" BASIS,

+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ */

+

+/* vim: set expandtab tabstop=3 shiftwidth=3: */

 

 /**

- * Stomp Frames are messages that are sent and received on a StompConnection.

+ * Stomp Frames are messages that are sent and received on a stomp connection.

  *

  * @package Stomp

- * @author Hiram Chirino <hiram@hiramchirino.com>

- * @author Dejan Bosanac <dejan@nighttale.net>

- * @author Michael Caplan <mcaplan@labnet.net>

- * @version $Revision: 36 $

  */

-class Stomp_Frame

+class StompFrame

 {

     public $command;

     public $headers = array();

@@ -54,27 +50,27 @@ class Stomp_Frame
         $this->body = $body;

         

         if ($this->command == 'ERROR') {

-            require_once 'Stomp/Exception.php';

-            throw new Stomp_Exception($this->headers['message'], 0, $this->body);

+            require_once 'Exception.php';

+            throw new StompException($this->headers['message'], 0, $this->body);

+        }

+    }

+    

+    /**

+     * Convert frame to transportable string

+     *

+     * @return string

+     */

+    public function __toString()

+    {

+        $data = $this->command . "\n";

+        

+        foreach ($this->headers as $name => $value) {

+            $data .= $name . ": " . $value . "\n";

         }

-    }
-    
-    /**
-     * Convert frame to transportable string
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        $data = $this->command . "\n";
-        
-        foreach ($this->headers as $name => $value) {
-            $data .= $name . ": " . $value . "\n";
-        }
-        
-        $data .= "\n";
-        $data .= $this->body;
-        return $data .= "\x00\n";
+        

+        $data .= "\n";

+        $data .= $this->body;

+        return $data .= "\x00";

     }

 }

 ?>
\ No newline at end of file
diff --git a/extlib/Stomp/Message.php b/extlib/Stomp/Message.php
index 6bcad3efd..5a064090c 100644
--- a/extlib/Stomp/Message.php
+++ b/extlib/Stomp/Message.php
@@ -24,10 +24,8 @@ require_once 'Stomp/Frame.php';
  * Basic text stomp message
  *
  * @package Stomp
- * @author Dejan Bosanac <dejan@nighttale.net>
- * @version $Revision: 23 $
  */
-class Stomp_Message extends Stomp_Frame
+class StompMessage extends StompFrame
 {
     public function __construct ($body, $headers = null)
     {
diff --git a/extlib/Stomp/Message/Map.php b/extlib/Stomp/Message/Map.php
index 288456a84..38a32c56c 100644
--- a/extlib/Stomp/Message/Map.php
+++ b/extlib/Stomp/Message/Map.php
@@ -24,30 +24,28 @@ require_once 'Stomp/Message.php';
  * Message that contains a set of name-value pairs
  *
  * @package Stomp
- * @author Dejan Bosanac <dejan@nighttale.net>
- * @version $Revision: 23 $
  */
-class Stomp_Message_Map extends Stomp_Message
+class StompMessageMap extends StompMessage
 {
     public $map;
     
     /**
      * Constructor
      *
-     * @param Stomp_Frame|string $msg
+     * @param StompFrame|string $msg
      * @param array $headers
      */
     function __construct ($msg, $headers = null)
     {
-        if ($msg instanceof Stomp_Frame) {
+        if ($msg instanceof StompFrame) {
             $this->_init($msg->command, $msg->headers, $msg->body);
-            $this->map = json_decode($msg->body);
+            $this->map = json_decode($msg->body, true);
         } else {
             $this->_init("SEND", $headers, $msg);
             if ($this->headers == null) {
                 $this->headers = array();
             }
-            $this->headers['amq-msg-type'] = 'MapMessage';
+            $this->headers['transformation'] = 'jms-map-json';
             $this->body = json_encode($msg);
         }
     }
diff --git a/htaccess.sample b/htaccess.sample
index 37eb8e01e..91ae9da9b 100644
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -5,6 +5,14 @@
 
   RewriteBase /mublog/
 
+  # If your site is private and want to only allow logged-in users to
+  # be able to download file attachments, uncomment this rule.
+  #
+  # If you have a custom attachment path
+  # ($config['attachments']['path']), change "file/" to match.
+  #
+  #RewriteRule ^file/(.*) getfile/$1
+
   RewriteCond %{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_FILENAME} !-d
   RewriteRule (.*) index.php?p=$1 [L,QSA]
diff --git a/index.php b/index.php
index 644812bd5..997ee6197 100644
--- a/index.php
+++ b/index.php
@@ -76,11 +76,16 @@ function handleError($error)
     if (common_config('site', 'logdebug')) {
         $logmsg .= " : ". $error->getDebugInfo();
     }
+    // DB queries often end up with a lot of newlines; merge to a single line
+    // for easier grepability...
+    $logmsg = str_replace("\n", " ", $logmsg);
     common_log(LOG_ERR, $logmsg);
+
+    // @fixme backtrace output should be consistent with exception handling
     if (common_config('site', 'logdebug')) {
         $bt = $error->getBacktrace();
-        foreach ($bt as $line) {
-            common_log(LOG_ERR, $line);
+        foreach ($bt as $n => $line) {
+            common_log(LOG_ERR, formatBacktraceLine($n, $line));
         }
     }
     if ($error instanceof DB_DataObject_Error
@@ -109,6 +114,38 @@ function handleError($error)
     exit(-1);
 }
 
+/**
+ * Format a backtrace line for debug output roughly like debug_print_backtrace() does.
+ * Exceptions already have this built in, but PEAR error objects just give us the array.
+ *
+ * @param int $n line number
+ * @param array $line per-frame array item from debug_backtrace()
+ * @return string
+ */
+function formatBacktraceLine($n, $line)
+{
+    $out = "#$n ";
+    if (isset($line['class'])) $out .= $line['class'];
+    if (isset($line['type'])) $out .= $line['type'];
+    if (isset($line['function'])) $out .= $line['function'];
+    $out .= '(';
+    if (isset($line['args'])) {
+        $args = array();
+        foreach ($line['args'] as $arg) {
+            // debug_print_backtrace seems to use var_export
+            // but this gets *very* verbose!
+            $args[] = gettype($arg);
+        }
+        $out .= implode(',', $args);
+    }
+    $out .= ')';
+    $out .= ' called at [';
+    if (isset($line['file'])) $out .= $line['file'];
+    if (isset($line['line'])) $out .= ':' . $line['line'];
+    $out .= ']';
+    return $out;
+}
+
 function checkMirror($action_obj, $args)
 {
     global $config;
@@ -143,7 +180,7 @@ function checkMirror($action_obj, $args)
 
 function isLoginAction($action)
 {
-    static $loginActions =  array('login', 'recoverpassword', 'api', 'doc', 'register');
+    static $loginActions =  array('login', 'recoverpassword', 'api', 'doc', 'register', 'publicxrds');
 
     $login = null;
 
@@ -239,6 +276,7 @@ function main()
     if (!$user && common_config('site', 'private')
         && !isLoginAction($action)
         && !preg_match('/rss$/', $action)
+        && !preg_match('/^Api/', $action)
     ) {
         common_redirect(common_local_url('login'));
         return;
diff --git a/install.php b/install.php
index 319c261e4..e7f7cf318 100644
--- a/install.php
+++ b/install.php
@@ -94,6 +94,13 @@ $external_libraries=array(
         'check_class'=>'HTTP_Request'
     ),
     array(
+        'name'=>'HTTP_Request2',
+        'pear'=>'HTTP_Request2',
+        'url'=>'http://pear.php.net/package/HTTP_Request2',
+        'include'=>'HTTP/Request2.php',
+        'check_class'=>'HTTP_Request2'
+    ),
+    array(
         'name'=>'Mail',
         'pear'=>'Mail',
         'url'=>'http://pear.php.net/package/Mail',
@@ -124,6 +131,14 @@ $external_libraries=array(
         'check_class'=>'Net_URL_Mapper'
     ),
     array(
+        'name'=>'Net_LDAP2',
+        'pear'=>'Net_LDAP2',
+        'url'=>'http://pear.php.net/package/Net_LDAP2',
+        'deb'=>'php-net-ldap2',
+        'include'=>'Net/LDAP2.php',
+        'check_class'=>'Net_LDAP2'
+    ),
+    array(
         'name'=>'Net_Socket',
         'pear'=>'Net_Socket',
         'url'=>'http://pear.php.net/package/Net_Socket',
@@ -692,9 +707,7 @@ function writeConf($sitename, $server, $path, $fancy, $db)
             // database
             "\$config['db']['database'] = '{$db['database']}';\n\n".
             ($db['type'] == 'pgsql' ? "\$config['db']['quote_identifiers'] = true;\n\n":'').
-            "\$config['db']['type'] = '{$db['type']}';\n\n".
-
-            "?>";
+            "\$config['db']['type'] = '{$db['type']}';\n\n";
     // write configuration file out to install directory
     $res = file_put_contents(INSTALLDIR.'/config.php', $cfg);
 
diff --git a/js/identica-badge.js b/js/identica-badge.js
index 49c42b70c..8276f22a1 100644
--- a/js/identica-badge.js
+++ b/js/identica-badge.js
@@ -1,8 +1,71 @@
 // identica badge -- updated to work with the native API, 12-4-2008
 // Modified to point to Identi.ca, 2-20-2009 by Zach
+// Modified for XHTML, 27-9-2009 by Will Daniels
+// (see http://willdaniels.co.uk/blog/tech-stuff/26-identica-badge-xhtml)
 // copyright Kent Brewster 2008
 // see http://kentbrewster.com/identica-badge for info
-( function() { 
+
+function createHTMLElement(tagName) {
+   if(document.createElementNS)
+      var elem = document.createElementNS("http://www.w3.org/1999/xhtml", tagName);
+   else
+      var elem = document.createElement(tagName);
+
+   return elem;
+}
+
+function isNumeric(value) {
+  if (value == null || !value.toString().match(/^[-]?\d*\.?\d*$/)) return false;
+  return true;
+}
+
+function markupPost(raw, server) {
+  var start = 0; var p = createHTMLElement('p');
+
+  raw.replace(/((http|https):\/\/|\!|@|#)(([\w_]+)?[^\s]*)/g,
+    function(sub, type, scheme, url, word, offset, full)
+    {
+      if(!scheme && !word) return; // just punctuation
+      var label = ''; var href = '';
+      var pretext = full.substr(start, offset - start);
+
+      moniker = word.split('_'); // behaviour with underscores differs
+      if(type == '#') moniker = moniker.join('');
+      else word = moniker = moniker[0].toLowerCase();
+
+      switch(type) {
+        case 'http://': case 'https://': // html links
+          href = scheme + '://' + url; break;
+        case '@': // link users
+          href = 'http://' + server + '/' + moniker; break;
+        case '!': // link groups
+          href = 'http://' + server + '/group/' + moniker; break;
+        case '#': // link tags
+          href = 'http://' + server + '/tag/' + moniker; break;
+        default: // bad call (just reset position for text)
+          start = offset;
+      }
+      if(scheme) { // only urls will have scheme
+        label = sub; start = offset + sub.length;
+      } else {
+        label = word; pretext += type;
+        start = offset + word.length + type.length;
+      }
+      p.appendChild(document.createTextNode(pretext));
+
+      var link = createHTMLElement('a');
+      link.appendChild(document.createTextNode(label));
+      link.href = href; link.target = '_statusnet';
+      p.appendChild(link);
+    });
+
+  if(start != raw.length) {
+    endtext = raw.substr(start);
+    p.appendChild(document.createTextNode(endtext));
+  }
+  return p;
+}
+(function() {
    var trueName = '';
    for (var i = 0; i < 16; i++) { 
       trueName += String.fromCharCode(Math.floor(Math.random() * 26) + 97); 
@@ -13,7 +76,7 @@
       return { 
          runFunction : [],
          init : function(target) {
-            var theScripts = document.getElementsByTagName('SCRIPT');
+            var theScripts = document.getElementsByTagName('script');
             for (var i = 0; i < theScripts.length; i++) {
                if (theScripts[i].src.match(target)) {
                   $.a = {};
@@ -66,9 +129,17 @@
                "server" : "identi.ca"
             };
             for (var k in $.d) { if ($.a[k] === undefined) { $.a[k] = $.d[k]; } }
+            // fix inout units
+            if(isNumeric($.a.width)) {
+               $.a.innerWidth = ($.a.width - 22) + 'px'; $.a.width += 'px';
+            } else {
+               $.a.innerWidth = 'auto';
+            }
+            if(isNumeric($.a.height)) $.a.height += 'px';
          },
-          buildPresentation : function () {
-            var ns = document.createElement('style');
+         buildPresentation : function () {
+            var setZoom = ''; if(navigator.appName == 'Microsoft Internet Explorer') setZoom = 'zoom:1;';
+            var ns = createHTMLElement('style');
             document.getElementsByTagName('head')[0].appendChild(ns);
             if (!window.createPopup) {
                ns.appendChild(document.createTextNode(''));
@@ -76,36 +147,37 @@
             }
             var s = document.styleSheets[document.styleSheets.length - 1];
             var rules = {
-               "" : "{zoom:1;margin:0;padding:0;width:" + $.a.width + "px;background:" + $.a.background + ";border:" + $.a.border + ";font:13px/1.2em tahoma, veranda, arial, helvetica, clean, sans-serif;*font-size:small;*font:x-small;}",
+               "" : "{margin:0px;padding:0px;width:" + $.a.width + ";background:" + $.a.background + ";border:" + $.a.border + ";font:87%/1.2em tahoma, veranda, arial, helvetica, clean, sans-serif;}",
                "a" : "{cursor:pointer;text-decoration:none;}",
                "a:hover" : "{text-decoration:underline;}",
-               "cite" : "{font-weight:bold;margin:0 0 0 4px;padding:0;display:block;font-style:normal;line-height:" + ($.a.thumbnailSize/2) + "px;}",
-               "cite a" : "{color:#C15D42;}",
-               "date":"{font-size:87%;margin:0 0 0 4px;padding:0;display:block;font-style:normal;line-height:" + ($.a.thumbnailSize/2) + "px;}",
-               "date:after" : "{clear:both; content:\".\"; display:block; height:0; visibility:hidden; }",
-               "date a" : "{color:#676;}",
-               "h3" : "{margin:0;padding:" + $.a.padding + "px;font-weight:bold;background:" + $.a.headerBackground + " url('http://" + $.a.server + "/favicon.ico') " + $.a.padding + "px 50% no-repeat;text-indent:" + ($.a.padding + 16) + "px;}",
+               ".cite" : "{" + setZoom + "font-weight:bold;margin:0px 0px 0px 4px;padding:0px;display:block;font-style:normal;line-height:" + ($.a.thumbnailSize/2) + "px;vertical-align:middle;}",
+               ".cite a" : "{color:#C15D42;}",
+               ".date":"{margin:0px 0px 0px 4px;padding:0px;display:block;font-style:normal;line-height:" + ($.a.thumbnailSize/2) + "px;vertical-align:middle;}",
+               ".date:after" : "{clear:both;content:\".\"; display:block;height:0px;visibility:hidden;}",
+               ".date a" : "{color:#676;}",
+               "h3" : "{margin:0px;padding:" + $.a.padding + "px;font-weight:bold;background:" + $.a.headerBackground + " url('http://" + $.a.server + "/favicon.ico') " + $.a.padding + "px 50% no-repeat;padding-left:" + ($.a.padding + 20) + "px;}",
                "h3.loading" : "{background-image:url('http://l.yimg.com/us.yimg.com/i/us/my/mw/anim_loading_sm.gif');}",
                "h3 a" : "{font-size:92%; color:" + $.a.headerColor + ";}",
-               "h4" : "{font-weight:normal; background:" + $.a.headerBackground + ";text-align:right;margin:0;padding:" + $.a.padding + "px;}",
+               "h4" : "{font-weight:normal;background:" + $.a.headerBackground + ";text-align:right;margin:0px;padding:" + $.a.padding + "px;}",
                "h4 a" : "{font-size:92%; color:" + $.a.headerColor + ";}",
-               "img":"{float:left; height:" + $.a.thumbnailSize + "px;width:" + $.a.thumbnailSize + "px;border:" + $.a.thumbnailBorder + ";margin-right:" + $.a.padding + "px;}",
-               "p" : "{margin:0; padding:0;width:" + ($.a.width - 22) + "px;overflow:hidden;font-size:87%;}",
+               "img":"{float:left;height:" + $.a.thumbnailSize + "px;width:" + $.a.thumbnailSize + "px;border:" + $.a.thumbnailBorder + ";margin-right:" + $.a.padding + "px;}",
+               "p" : "{margin:2px 0px 0px 0px;padding:0px;width:" + $.a.innerWidth + ";overflow:hidden;line-height:normal;}",
                "p a" : "{color:#C15D42;}",
-               "ul":"{margin:0; padding:0; height:" + $.a.height + "px;width:" + $.a.width + "px;overflow:auto;}",
-               "ul li":"{background:" + $.a.evenBackground + ";margin:0;padding:" + $.a.padding + "px;list-style:none;width:" + ($.a.width - 22) + "px;overflow:hidden;border-bottom:1px solid #D8E2D7;}",
+               "ul":"{margin:0px; padding:0px; height:" + $.a.height + ";width:" + $.a.innerWidth + ";overflow:auto;}",
+               "ul li":"{background:" + $.a.evenBackground + ";margin:0px;padding:" + $.a.padding + "px;list-style:none;width:auto;overflow:hidden;border-bottom:1px solid #D8E2D7;}",
                "ul li:hover":"{background:#f3f8ea;}"
             };
             var ieRules = "";
             // brute-force each and every style rule here to !important
             // sometimes you have to take off and nuke the site from orbit; it's the only way to be sure
             for (var z in rules) {
-               var selector = '.' + trueName + ' ' + z;
+               if(z.charAt(0)=='.') var selector = '.' + trueName + '-' + z.substring(1);
+               else var selector = '.' + trueName + ' ' + z;
                var rule = rules[z];
                if (typeof rule === 'string') {
                   var important = rule.replace(/;/gi, '!important;');
                   if (!window.createPopup) {
-                     var theRule = document.createTextNode(selector + important);
+                     var theRule = document.createTextNode(selector + important + '\n');
                      ns.appendChild(theRule);
                   } else {
                      ieRules += selector + important;
@@ -115,17 +187,17 @@
             if (window.createPopup) { s.cssText = ieRules; }
          },
          buildStructure : function() {
-            $.s = document.createElement('DIV');
+            $.s = createHTMLElement('div');
             $.s.className = trueName;         
-            $.s.h = document.createElement('H3');
-            $.s.h.a = document.createElement('A');
+            $.s.h = createHTMLElement('h3');
+            $.s.h.a = createHTMLElement('a');
             $.s.h.a.target = '_statusnet';
             $.s.h.appendChild($.s.h.a);
             $.s.appendChild($.s.h);
-            $.s.r = document.createElement('UL');
+            $.s.r = createHTMLElement('ul');
             $.s.appendChild($.s.r);
-            $.s.f = document.createElement('H4');
-            var a = document.createElement('A');
+            $.s.f = createHTMLElement('h4');
+            var a = createHTMLElement('a');
             a.innerHTML = 'get this';
             a.target = '_blank';
             a.href = 'http://identi.ca/doc/badge';
@@ -139,7 +211,7 @@
             var id = trueName + '.f.runFunction[' + n + ']';
             $.f.runFunction[n] = function(r) {
                delete($.f.runFunction[n]);
-               var a = document.createElement('A');
+               var a = createHTMLElement('a');
                a.rel = $.a.user;
                a.rev = r.name; 
                a.id = r.screen_name;
@@ -178,10 +250,11 @@
                }
             }
             r = $.f.sortArray(r, "status_id", true);
-            $.s.h.className = '';
+            $.s.h.className = ''; // for IE6
+            $.s.h.removeAttribute('class');
             for (var i = 0; i < r.length; i++) {
-               var li = document.createElement('LI');
-               var icon = document.createElement('A');
+               var li = createHTMLElement('li');
+               var icon = createHTMLElement('a');
                if (r[i] && r[i].url) {
                   icon.href = r[i].url;
                   icon.target = '_statusnet'; 
@@ -192,17 +265,19 @@
                   icon.title = 'Visit ' + r[i].screen_name + ' at http://' + $.a.server + '/' + r[i].screen_name;
                }
 
-               var img = document.createElement('IMG');
+               var img = createHTMLElement('img');
+               img.alt = 'profile image for ' + r[i].screen_name;
                img.src = r[i].profile_image_url;
                icon.appendChild(img);
-               li.appendChild(icon); 
+               li.appendChild(icon);
                
-               var user = document.createElement('CITE');
-               var a = document.createElement('A');
+               var user = createHTMLElement('span');
+               user.className = trueName + '-cite';
+               var a = createHTMLElement('a');
                a.rel = r[i].id;
                a.rev = r[i].name;
                a.id = r[i].screen_name;
-               a.innerHTML = r[i].name; 
+               a.innerHTML = r[i].name;
                a.href = 'http://' + $.a.server + '/' + r[i].screen_name;
                a.onclick = function() {
                   $.f.changeUserTo(this);
@@ -210,16 +285,17 @@
                };
                user.appendChild(a);
                li.appendChild(user);
-               var updated = document.createElement('DATE');
+               var updated = createHTMLElement('span');
+               updated.className = trueName + '-date';
                if (r[i].status && r[i].status.created_at) {
-                  var date_link = document.createElement('A');
+                  var date_link = createHTMLElement('a');
                   date_link.innerHTML = r[i].status.created_at.split(/\+/)[0];
                   date_link.href = 'http://' + $.a.server + '/notice/' + r[i].status.id;
                   date_link.target = '_statusnet';
                   updated.appendChild(date_link);
                   if (r[i].status.in_reply_to_status_id) {
                      updated.appendChild(document.createTextNode(' in reply to '));
-                     var in_reply_to = document.createElement('A');
+                     var in_reply_to = createHTMLElement('a');
                      in_reply_to.innerHTML = r[i].status.in_reply_to_status_id;
                      in_reply_to.href = 'http://' + $.a.server + '/notice/' + r[i].status.in_reply_to_status_id;
                      in_reply_to.target = '_statusnet';
@@ -229,20 +305,16 @@
                   updated.innerHTML = 'has not updated yet';
                }
                li.appendChild(updated);
-               var p = document.createElement('P');
+               var p = createHTMLElement('p');
                if (r[i].status && r[i].status.text) {
                   var raw = r[i].status.text;
-                  var cooked = raw;
-                  cooked = cooked.replace(/http:\/\/([^ ]+)/g, "<a href=\"http://$1\" target=\"_statusnet\">http://$1</a>");
-                  cooked = cooked.replace(/@([\w*]+)/g, '@<a href="http://' + $.a.server + '/$1" target=\"_statusnet\">$1</a>');
-                  cooked = cooked.replace(/#([\w*]+)/g, '#<a href="http://' + $.a.server + '/tag/$1" target="_statusnet">$1</a>');
-                  p.innerHTML = cooked;
+                  p = markupPost(raw, $.a.server);
                }
                li.appendChild(p);
-               var a = p.getElementsByTagName('A');
+               var a = p.getElementsByTagName('a');
                for (var j = 0; j < a.length; j++) {
                   if (a[j].className == 'changeUserTo') {
-                     a[j].className = '';
+                     a[j].removeAttribute('class');
                      a[j].href = 'http://' + $.a.server + '/' + a[j].innerHTML;
                      a[j].rel = a[j].innerHTML;
                      a[j].onclick = function() { 
@@ -269,7 +341,7 @@
             return r;
          },         
          runScript : function(url, id) {
-            var s = document.createElement('script');
+            var s = createHTMLElement('script');
             s.id = id;
             s.type ='text/javascript';
             s.src = url;
@@ -292,3 +364,4 @@
    }
 } )();
 
+
diff --git a/js/util.js b/js/util.js
index 0a943512f..c59c63910 100644
--- a/js/util.js
+++ b/js/util.js
@@ -14,370 +14,415 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  UI interaction
+ * @package   StatusNet
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
  */
 
-$(document).ready(function(){
-	var counterBlackout = false;
-	
-	// count character on keyup
-	function counter(event){
-         if (maxLength <= 0) {
-              return;
-         }
-		var currentLength = $("#notice_data-text").val().length;
-		var remaining = maxLength - currentLength;
-		var counter = $("#notice_text-count");
-		
-		if (remaining.toString() != counter.text()) {
-		    if (!counterBlackout || remaining == 0) {
-                        if (counter.text() != String(remaining)) {
-                            counter.text(remaining);
-		        }
-
-                        if (remaining < 0) {
-                            $("#form_notice").addClass("warning");
-                        } else {
-                            $("#form_notice").removeClass("warning");
+var SN = { // StatusNet
+    C: { // Config
+        I: { // Init
+            CounterBlackout: false,
+            MaxLength: 140,
+            PatternUsername: /^[0-9a-zA-Z\-_.]*$/,
+            HTTP20x30x: [200, 201, 202, 203, 204, 205, 206, 300, 301, 302, 303, 304, 305, 306, 307]
+        },
+
+        S: { // Selector
+            Disabled: 'disabled',
+            Warning: 'warning',
+            Error: 'error',
+            Success: 'success',
+            Processing: 'processing',
+            CommandResult: 'command_result',
+            FormNotice: 'form_notice',
+            NoticeDataText: 'notice_data-text',
+            NoticeTextCount: 'notice_text-count',
+            NoticeInReplyTo: 'notice_in-reply-to',
+            NoticeDataAttach: 'notice_data-attach',
+            NoticeDataAttachSelected: 'notice_data-attach_selected',
+            NoticeActionSubmit: 'notice_action-submit'
+        }
+    },
+
+    U: { // Utils
+        FormNoticeEnhancements: function(form) {
+            form_id = form.attr('id');
+            $('#'+form_id+' #'+SN.C.S.NoticeDataText).unbind('keyup');
+            $('#'+form_id+' #'+SN.C.S.NoticeDataText).unbind('keydown');
+            if (maxLength > 0) {
+                $('#'+form_id+' #'+SN.C.S.NoticeDataText).bind('keyup', function(e) {
+                    SN.U.Counter(form);
+                });
+                // run once in case there's something in there
+                SN.U.Counter(form);
+            }
+
+            $('#'+form_id+' #'+SN.C.S.NoticeDataText).bind('keydown', function(e) {
+                SN.U.SubmitOnReturn(e, form);
+            });
+
+            if($('body')[0].id != 'conversation') {
+                $('#'+form_id+' textarea').focus();
+            }
+        },
+
+        SubmitOnReturn: function(event, el) {
+            if (event.keyCode == 13 || event.keyCode == 10) {
+                el.submit();
+                event.preventDefault();
+                event.stopPropagation();
+                $('#'+el[0].id+' #'+SN.C.S.NoticeDataText).blur();
+                $('body').focus();
+                return false;
+            }
+            return true;
+        },
+
+        Counter: function(form) {
+            SN.C.I.FormNoticeCurrent = form;
+            form_id = form.attr('id');
+            if (typeof(maxLength) == "undefined") {
+                 maxLength = SN.C.I.MaxLength;
+            }
+
+            if (maxLength <= 0) {
+                return;
+            }
+
+            var remaining = maxLength - $('#'+form_id+' #'+SN.C.S.NoticeDataText).val().length;
+            var counter = $('#'+form_id+' #'+SN.C.S.NoticeTextCount);
+
+            if (remaining.toString() != counter.text()) {
+                if (!SN.C.I.CounterBlackout || remaining === 0) {
+                    if (counter.text() != String(remaining)) {
+                        counter.text(remaining);
+                    }
+                    if (remaining < 0) {
+                        form.addClass(SN.C.S.Warning);
+                    } else {
+                        form.removeClass(SN.C.S.Warning);
+                    }
+                    // Skip updates for the next 500ms.
+                    // On slower hardware, updating on every keypress is unpleasant.
+                    if (!SN.C.I.CounterBlackout) {
+                        SN.C.I.CounterBlackout = true;
+                        SN.C.I.FormNoticeCurrent = form;
+                        window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);", 500);
+                    }
+                }
+            }
+        },
+
+        ClearCounterBlackout: function(form) {
+            // Allow keyup events to poke the counter again
+            SN.C.I.CounterBlackout = false;
+            // Check if the string changed since we last looked
+            SN.U.Counter(form);
+        },
+
+        FormXHR: function(f) {
+            f.bind('submit', function(e) {
+                form_id = $(this)[0].id;
+                $.ajax({
+                    type: 'POST',
+                    dataType: 'xml',
+                    url: $(this)[0].action,
+                    data: $(this).serialize() + '&ajax=1',
+                    beforeSend: function(xhr) {
+                        $('#'+form_id).addClass(SN.C.S.Processing);
+                        $('#'+form_id+' .submit').addClass(SN.C.S.Disabled);
+                        $('#'+form_id+' .submit').attr(SN.C.S.Disabled, SN.C.S.Disabled);
+                    },
+                    error: function (xhr, textStatus, errorThrown) {
+                        alert(errorThrown || textStatus);
+                    },
+                    success: function(data, textStatus) {
+                        if (typeof($('form', data)[0]) != 'undefined') {
+                            form_new = document._importNode($('form', data)[0], true);
+                            $('#'+form_id).replaceWith(form_new);
+                            $('#'+form_new.id).each(function() { SN.U.FormXHR($(this)); });
                         }
-                        // Skip updates for the next 500ms.
-                        // On slower hardware, updating on every keypress is unpleasant.
-                        if (!counterBlackout) {
-                            counterBlackout = true;
-                            window.setTimeout(clearCounterBlackout, 500);
+                        else {
+                            $('#'+form_id).replaceWith(document._importNode($('p', data)[0], true));
                         }
                     }
+                });
+                return false;
+            });
+        },
+
+        FormNoticeXHR: function(form) {
+            form_id = form.attr('id');
+            form.append('<input type="hidden" name="ajax" value="1"/>');
+            form.ajaxForm({
+                dataType: 'xml',
+                timeout: '60000',
+                beforeSend: function(xhr) {
+                    if ($('#'+form_id+' #'+SN.C.S.NoticeDataText)[0].value.length === 0) {
+                        form.addClass(SN.C.S.Warning);
+                        return false;
+                    }
+                    form.addClass(SN.C.S.Processing);
+                    $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled);
+                    $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).attr(SN.C.S.Disabled, SN.C.S.Disabled);
+                    return true;
+                },
+                error: function (xhr, textStatus, errorThrown) {
+                    form.removeClass(SN.C.S.Processing);
+                    $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled);
+                    $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled, SN.C.S.Disabled);
+                    if (textStatus == 'timeout') {
+                        alert ('Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists');
+                    }
+                    else {
+                        if ($('.'+SN.C.S.Error, xhr.responseXML).length > 0) {
+                            form.append(document._importNode($('.'+SN.C.S.Error, xhr.responseXML)[0], true));
+                        }
+                        else {
+                            if(jQuery.inArray(parseInt(xhr.status), SN.C.I.HTTP20x30x) < 0) {
+                                alert('Sorry! We had trouble sending your notice ('+xhr.status+' '+xhr.statusText+'). Please report the problem to the site administrator if this happens again.');
+                            }
+                            else {
+                                $('#'+form_id+' #'+SN.C.S.NoticeDataText).val('');
+                                SN.U.FormNoticeEnhancements($('#'+form_id));
+                            }
+                        }
+                    }
+                },
+                success: function(data, textStatus) {
+                    var result;
+                    if ($('#'+SN.C.S.Error, data).length > 0) {
+                        result = document._importNode($('p', data)[0], true);
+                        alert(result.textContent || result.innerHTML);
+                    }
+                    else {
+                        if($('body')[0].id == 'bookmarklet') {
+                            self.close();
+                        }
+
+                        if ($('#'+SN.C.S.CommandResult, data).length > 0) {
+                            result = document._importNode($('p', data)[0], true);
+                            alert(result.textContent || result.innerHTML);
+                        }
+                        else {
+                             notice = document._importNode($('li', data)[0], true);
+                             if ($('#'+notice.id).length === 0) {
+                                var notice_irt_value = $('#'+SN.C.S.NoticeInReplyTo).val();
+                                var notice_irt = '#notices_primary #notice-'+notice_irt_value;
+                                if($('body')[0].id == 'conversation') {
+                                    if(notice_irt_value.length > 0 && $(notice_irt+' .notices').length < 1) {
+                                        $(notice_irt).append('<ul class="notices"></ul>');
+                                    }
+                                    $($(notice_irt+' .notices')[0]).append(notice);
+                                }
+                                else {
+                                    $("#notices_primary .notices").prepend(notice);
+                                }
+                                $('#'+notice.id).css({display:'none'});
+                                $('#'+notice.id).fadeIn(2500);
+                                SN.U.NoticeAttachments();
+                                SN.U.NoticeReply();
+                                SN.U.NoticeFavor();
+                             }
+                        }
+                        $('#'+form_id+' #'+SN.C.S.NoticeDataText).val('');
+                        $('#'+form_id+' #'+SN.C.S.NoticeDataAttach).val('');
+                        $('#'+form_id+' #'+SN.C.S.NoticeInReplyTo).val('');
+                        $('#'+form_id+' #'+SN.C.S.NoticeDataAttachSelected).remove();
+                        SN.U.FormNoticeEnhancements($('#'+form_id));
+                    }
+                },
+                complete: function(xhr, textStatus) {
+                    form.removeClass(SN.C.S.Processing);
+                    $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled);
+                    $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled);
                 }
-	}
-	
-	function clearCounterBlackout() {
-		// Allow keyup events to poke the counter again
-		counterBlackout = false;
-		// Check if the string changed since we last looked
-		counter(null);
-	}
-
-	function submitonreturn(event) {
-		if (event.keyCode == 13 || event.keyCode == 10) {
-			// iPhone sends \n not \r for 'return'
-			$("#form_notice").submit();
-			event.preventDefault();
-			event.stopPropagation();
-			$("#notice_data-text").blur();
-			$("body").focus();
-			return false;
-		}
-		return true;
-	}
-
-     // define maxLength if it wasn't defined already
-
-    if (typeof(maxLength) == "undefined") {
-         maxLength = 140;
-    }
+            });
+        },
 
-	if ($("#notice_data-text").length) {
-         if (maxLength > 0) {
-              $("#notice_data-text").bind("keyup", counter);
-              // run once in case there's something in there
-              counter();
-         }
+        NoticeReply: function() {
+            if ($('#'+SN.C.S.NoticeDataText).length > 0 && $('#content .notice_reply').length > 0) {
+                $('#content .notice').each(function() {
+                    var notice = $(this)[0];
+                    $($('.notice_reply', notice)[0]).click(function() {
+                        var nickname = ($('.author .nickname', notice).length > 0) ? $($('.author .nickname', notice)[0]) : $('.author .nickname.uid');
+                        SN.U.NoticeReplySet(nickname.text(), $($('.notice_id', notice)[0]).text());
+                        return false;
+                    });
+                });
+            }
+        },
 
-		$("#notice_data-text").bind("keydown", submitonreturn);
+        NoticeReplySet: function(nick,id) {
+            if (nick.match(SN.C.I.PatternUsername)) {
+                var text = $('#'+SN.C.S.NoticeDataText);
+                if (text.length) {
+                    replyto = '@' + nick + ' ';
+                    text.val(replyto + text.val().replace(RegExp(replyto, 'i'), ''));
+                    $('#'+SN.C.S.FormNotice+' input#'+SN.C.S.NoticeInReplyTo).val(id);
+                    if (text[0].setSelectionRange) {
+                        var len = text.val().length;
+                        text[0].setSelectionRange(len,len);
+                        text[0].focus();
+                    }
+                    return false;
+                }
+            }
+            return true;
+        },
 
-        if($('body')[0].id != 'conversation') {
-            $("#notice_data-text").focus();
-        }
-	}
-
-	// XXX: refactor this code
-
-	var favoptions = { dataType: 'xml',
-					   beforeSubmit: function(data, target, options) {
-					   							$(target).addClass('processing');
-												return true;
-											  },
-					   success: function(xml) { var new_form = document._importNode($('form', xml).get(0), true);
-												var dis = new_form.id;
-												var fav = dis.replace('disfavor', 'favor');
-												$('form#'+fav).replaceWith(new_form);
-												$('form#'+dis).ajaxForm(disoptions).each(addAjaxHidden);
-											  }
-					 };
-
-	var disoptions = { dataType: 'xml',
-					   beforeSubmit: function(data, target, options) {
-					   							$(target).addClass('processing');
-												return true;
-											  },
-					   success: function(xml) { var new_form = document._importNode($('form', xml).get(0), true);
-												var fav = new_form.id;
-												var dis = fav.replace('favor', 'disfavor');
-												$('form#'+dis).replaceWith(new_form);
-												$('form#'+fav).ajaxForm(favoptions).each(addAjaxHidden);
-											  }
-					 };
-
-	var joinoptions = { dataType: 'xml',
-					   success: function(xml) { var new_form = document._importNode($('form', xml).get(0), true);
-												var leave = new_form.id;
-												var join = leave.replace('leave', 'join');
-												$('form#'+join).replaceWith(new_form);
-												$('form#'+leave).ajaxForm(leaveoptions).each(addAjaxHidden);
-											  }
-					 };
-
-	var leaveoptions = { dataType: 'xml',
-					   success: function(xml) { var new_form = document._importNode($('form', xml).get(0), true);
-												var join = new_form.id;
-												var leave = join.replace('join', 'leave');
-												$('form#'+leave).replaceWith(new_form);
-												$('form#'+join).ajaxForm(joinoptions).each(addAjaxHidden);
-											  }
-					 };
-
-	function addAjaxHidden() {
-		var ajax = document.createElement('input');
-		ajax.setAttribute('type', 'hidden');
-		ajax.setAttribute('name', 'ajax');
-		ajax.setAttribute('value', 1);
-		this.appendChild(ajax);
-	}
-
-	$("form.form_favor").ajaxForm(favoptions);
-	$("form.form_disfavor").ajaxForm(disoptions);
-	$("form.form_group_join").ajaxForm(joinoptions);
-	$("form.form_group_leave").ajaxForm(leaveoptions);
-	$("form.form_favor").each(addAjaxHidden);
-	$("form.form_disfavor").each(addAjaxHidden);
-	$("form.form_group_join").each(addAjaxHidden);
-	$("form.form_group_leave").each(addAjaxHidden);
-
-	$("#form_user_nudge").ajaxForm ({ dataType: 'xml',
-		beforeSubmit: function(xml) { $("#form_user_nudge input[type=submit]").attr("disabled", "disabled");
-									  $("#form_user_nudge input[type=submit]").addClass("disabled");
-									},
-		success: function(xml) { $("#form_user_nudge").replaceWith(document._importNode($("#nudge_response", xml).get(0),true));
-							     $("#form_user_nudge input[type=submit]").removeAttr("disabled");
-							     $("#form_user_nudge input[type=submit]").removeClass("disabled");
-							   }
-	 });
-	$("#form_user_nudge").each(addAjaxHidden);
-
-	var Subscribe = { dataType: 'xml',
-					  beforeSubmit: function(formData, jqForm, options) { $(".form_user_subscribe input[type=submit]").attr("disabled", "disabled");
-																	      $(".form_user_subscribe input[type=submit]").addClass("disabled");
-																	    },
-					  success: function(xml) { var form_unsubscribe = document._importNode($('form', xml).get(0), true);
-										  	   var form_unsubscribe_id = form_unsubscribe.id;
-											   var form_subscribe_id = form_unsubscribe_id.replace('unsubscribe', 'subscribe');
-											   $("form#"+form_subscribe_id).replaceWith(form_unsubscribe);
-											   $("form#"+form_unsubscribe_id).ajaxForm(UnSubscribe).each(addAjaxHidden);
-											   $("dd.subscribers").text(parseInt($("dd.subscribers").text())+1);
-											   $(".form_user_subscribe input[type=submit]").removeAttr("disabled");
-											   $(".form_user_subscribe input[type=submit]").removeClass("disabled");
-										     }
-					};
-
-	var UnSubscribe = { dataType: 'xml',
-						beforeSubmit: function(formData, jqForm, options) { $(".form_user_unsubscribe input[type=submit]").attr("disabled", "disabled");
-																		    $(".form_user_unsubscribe input[type=submit]").addClass("disabled");
-																		  },
-					    success: function(xml) { var form_subscribe = document._importNode($('form', xml).get(0), true);
-										  		 var form_subscribe_id = form_subscribe.id;
-												 var form_unsubscribe_id = form_subscribe_id.replace('subscribe', 'unsubscribe');
-												 $("form#"+form_unsubscribe_id).replaceWith(form_subscribe);
-												 $("form#"+form_subscribe_id).ajaxForm(Subscribe).each(addAjaxHidden);
-												 $("#profile_send_a_new_message").remove();
-												 $("#profile_nudge").remove();
-											     $("dd.subscribers").text(parseInt($("dd.subscribers").text())-1);
-												 $(".form_user_unsubscribe input[type=submit]").removeAttr("disabled");
-												 $(".form_user_unsubscribe input[type=submit]").removeClass("disabled");
-											   }
-					  };
-
-	$(".form_user_subscribe").ajaxForm(Subscribe);
-	$(".form_user_unsubscribe").ajaxForm(UnSubscribe);
-	$(".form_user_subscribe").each(addAjaxHidden);
-	$(".form_user_unsubscribe").each(addAjaxHidden);
-
-	var PostNotice = { dataType: 'xml',
-					   beforeSubmit: function(formData, jqForm, options) { if ($("#notice_data-text").get(0).value.length == 0) {
-																				$("#form_notice").addClass("warning");
-																				return false;
-																		   }
-																		   $("#form_notice").addClass("processing");
-																		   $("#notice_action-submit").attr("disabled", "disabled");
-																		   $("#notice_action-submit").addClass("disabled");
-																		   return true;
-												 						 },
-					   timeout: '60000',
-					   error: function (xhr, textStatus, errorThrown) {	$("#form_notice").removeClass("processing");
-																		$("#notice_action-submit").removeAttr("disabled");
-																		$("#notice_action-submit").removeClass("disabled");
-																		if (textStatus == "timeout") {
-																			alert ("Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists");
-																		}
-																		else {
-																			if ($(".error", xhr.responseXML).length > 0) {
-																				$('#form_notice').append(document._importNode($(".error", xhr.responseXML).get(0), true));
-																			}
-																			else {
-																				var HTTP20x30x = [200, 201, 202, 203, 204, 205, 206, 300, 301, 302, 303, 304, 305, 306, 307];
-																				if(jQuery.inArray(parseInt(xhr.status), HTTP20x30x) < 0) {
-																					alert("Sorry! We had trouble sending your notice ("+xhr.status+" "+xhr.statusText+"). Please report the problem to the site administrator if this happens again.");
-																				}
-																				else {
-																					$("#notice_data-text").val("");
-                                                                                     if (maxLength > 0) {
-                                                                                          counter();
-                                                                                     }
-																				}
-																			}
-																		}
-																	  },
-					   success: function(xml) {	if ($("#error", xml).length > 0) {
-													var result = document._importNode($("p", xml).get(0), true);
-													result = result.textContent || result.innerHTML;
-													alert(result);
-												}
-												else {
-												    if ($("#command_result", xml).length > 0) {
-													    var result = document._importNode($("p", xml).get(0), true);
-													    result = result.textContent || result.innerHTML;
-													    alert(result);
-                                                    }
-                                                    else {
-                                                         li = $("li", xml).get(0);
-                                                         if ($("#"+li.id).length == 0) {
-                                                            var notice_irt_value = $('#notice_in-reply-to').val();
-                                                            var notice_irt = '#notices_primary #notice-'+notice_irt_value;
-                                                            if($('body')[0].id == 'conversation') {
-                                                                if(notice_irt_value.length > 0 && $(notice_irt+' .notices').length < 1) {
-                                                                    $(notice_irt).append('<ul class="notices"></ul>');
-                                                                }
-                                                                $($(notice_irt+' .notices')[0]).append(document._importNode(li, true));
-                                                            }
-                                                            else {
-                                                                $("#notices_primary .notices").prepend(document._importNode(li, true));
-                                                            }
-                                                            $('#'+li.id).css({display:'none'});
-                                                            $('#'+li.id).fadeIn(2500);
-                                                            NoticeReply();
-                                                            NoticeAttachments();
-                                                         }
-													}
-													$("#notice_data-text").val("");
-    												$("#notice_data-attach").val("");
-    												$("#notice_in-reply-to").val("");
-                                                    $('#notice_data-attach_selected').remove();
-                                                     if (maxLength > 0) {
-                                                          counter();
-                                                     }
-												}
-												$("#form_notice").removeClass("processing");
-												$("#notice_action-submit").removeAttr("disabled");
-												$("#notice_action-submit").removeClass("disabled");
-											 }
-					   };
-	$("#form_notice").ajaxForm(PostNotice);
-	$("#form_notice").each(addAjaxHidden);
-    NoticeReply();
-    NoticeAttachments();
-    NoticeDataAttach();
-});
+        NoticeFavor: function() {
+            $('.form_favor').each(function() { SN.U.FormXHR($(this)); });
+            $('.form_disfavor').each(function() { SN.U.FormXHR($(this)); });
+        },
 
-function NoticeReply() {
-    if ($('#notice_data-text').length > 0 && $('#content .notice_reply').length > 0) {
-        $('#content .notice').each(function() {
-            var notice = $(this)[0];
-            $($('.notice_reply', notice)[0]).click(function() {
-                var nickname = ($('.author .nickname', notice).length > 0) ? $($('.author .nickname', notice)[0]) : $('.author .nickname.uid');
-                NoticeReplySet(nickname.text(), $($('.notice_id', notice)[0]).text());
+        NoticeAttachments: function() {
+            $.fn.jOverlay.options = {
+                method : 'GET',
+                data : '',
+                url : '',
+                color : '#000',
+                opacity : '0.6',
+                zIndex : 99,
+                center : false,
+                imgLoading : $('address .url')[0].href+'theme/base/images/illustrations/illu_progress_loading-01.gif',
+                bgClickToClose : true,
+                success : function() {
+                    $('#jOverlayContent').append('<button class="close">&#215;</button>');
+                    $('#jOverlayContent button').click($.closeOverlay);
+                },
+                timeout : 0,
+                autoHide : true,
+                css : {'max-width':'542px', 'top':'5%', 'left':'32.5%'}
+            };
+
+            $('#content .notice a.attachment').click(function() {
+                $().jOverlay({url: $('address .url')[0].href+'attachment/' + ($(this).attr('id').substring('attachment'.length + 1)) + '/ajax'});
                 return false;
             });
-        });
-    }
-}
-
-function NoticeReplySet(nick,id) {
-	rgx_username = /^[0-9a-zA-Z\-_.]*$/;
-	if (nick.match(rgx_username)) {
-		var text = $("#notice_data-text");
-		if (text.length) {
-			replyto = "@" + nick + " ";
-			text.val(replyto + text.val().replace(RegExp(replyto, 'i'), ''));
-			$("#form_notice input#notice_in-reply-to").val(id);
-			if (text.get(0).setSelectionRange) {
-				var len = text.val().length;
-				text.get(0).setSelectionRange(len,len);
-				text.get(0).focus();
-			}
-			return false;
-		}
-	}
-	return true;
-}
-
-function NoticeAttachments() {
-    $.fn.jOverlay.options = {
-        method : 'GET',
-        data : '',
-        url : '',
-        color : '#000',
-        opacity : '0.6',
-        zIndex : 99,
-        center : false,
-        imgLoading : $('address .url')[0].href+'theme/base/images/illustrations/illu_progress_loading-01.gif',
-        bgClickToClose : true,
-        success : function() {
-            $('#jOverlayContent').append('<button>&#215;</button>');
-            $('#jOverlayContent button').click($.closeOverlay);
+
+            var t;
+            $("body:not(#shownotice) #content .notice a.thumbnail").hover(
+                function() {
+                    var anchor = $(this);
+                    $("a.thumbnail").children('img').hide();
+                    anchor.closest(".entry-title").addClass('ov');
+
+                    if (anchor.children('img').length === 0) {
+                        t = setTimeout(function() {
+                            $.get($('address .url')[0].href+'attachment/' + (anchor.attr('id').substring('attachment'.length + 1)) + '/thumbnail', null, function(data) {
+                                anchor.append(data);
+                            });
+                        }, 500);
+                    }
+                    else {
+                        anchor.children('img').show();
+                    }
+                },
+                function() {
+                    clearTimeout(t);
+                    $("a.thumbnail").children('img').hide();
+                    $(this).closest(".entry-title").removeClass('ov');
+                }
+            );
+        },
+
+        NoticeDataAttach: function() {
+            NDA = $('#'+SN.C.S.NoticeDataAttach);
+            NDA.change(function() {
+                S = '<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+$(this).val()+'</code> <button class="close">&#215;</button></div>';
+                NDAS = $('#'+SN.C.S.NoticeDataAttachSelected);
+                if (NDAS.length > 0) {
+                    NDAS.replaceWith(S);
+                }
+                else {
+                    $('#'+SN.C.S.FormNotice).append(S);
+                }
+                $('#'+SN.C.S.NoticeDataAttachSelected+' button').click(function(){
+                    $('#'+SN.C.S.NoticeDataAttachSelected).remove();
+                    NDA.val('');
+                });
+            });
         },
-        timeout : 0,
-        autoHide : true,
-        css : {'max-width':'542px', 'top':'5%', 'left':'32.5%'}
-    };
-
-    $('#content .notice a.attachment').click(function() {
-        $().jOverlay({url: $('address .url')[0].href+'attachment/' + ($(this).attr('id').substring('attachment'.length + 1)) + '/ajax'});
-        return false;
-    });
-
-    var t;
-    $("body:not(#shownotice) #content .notice a.thumbnail").hover(
-        function() {
-            var anchor = $(this);
-            $("a.thumbnail").children('img').hide();
-            anchor.closest(".entry-title").addClass('ov');
-
-            if (anchor.children('img').length == 0) {
-                t = setTimeout(function() {
-                    $.get($('address .url')[0].href+'attachment/' + (anchor.attr('id').substring('attachment'.length + 1)) + '/thumbnail', null, function(data) {
-                        anchor.append(data);
+
+        NewDirectMessage: function() {
+            NDM = $('.entity_send-a-message a');
+            NDM.attr({'href':NDM.attr('href')+'&ajax=1'});
+            NDM.click(function() {
+                var NDMF = $('.entity_send-a-message form');
+                if (NDMF.length === 0) {
+                    $.get(NDM.attr('href'), null, function(data) {
+                        $('.entity_send-a-message').append(document._importNode($('form', data)[0], true));
+                        NDMF = $('.entity_send-a-message .form_notice');
+                        SN.U.FormNoticeXHR(NDMF);
+                        SN.U.FormNoticeEnhancements(NDMF);
+                        NDMF.append('<button class="close">&#215;</button>');
+                        $('.entity_send-a-message button').click(function(){
+                            NDMF.hide();
+                            return false;
+                        });
                     });
-                }, 500);
+                }
+                else {
+                    NDMF.show();
+                    $('.entity_send-a-message textarea').focus();
+                }
+                return false;
+            });
+        }
+    },
+
+    Init: {
+        NoticeForm: function() {
+            if ($('body.user_in').length > 0) {
+                $('.'+SN.C.S.FormNotice).each(function() {
+                    SN.U.FormNoticeXHR($(this));
+                    SN.U.FormNoticeEnhancements($(this));
+                });
+
+                SN.U.NoticeDataAttach();
             }
-            else {
-                anchor.children('img').show();
+        },
+
+        Notices: function() {
+            if ($('body.user_in').length > 0) {
+                SN.U.NoticeFavor();
+
+                SN.U.NoticeReply();
             }
+
+            SN.U.NoticeAttachments();
         },
-        function() {
-            clearTimeout(t);
-            $("a.thumbnail").children('img').hide();
-            $(this).closest(".entry-title").removeClass('ov');
+
+        EntityActions: function() {
+            if ($('body.user_in').length > 0) {
+                $('.form_user_subscribe').each(function() { SN.U.FormXHR($(this)); });
+                $('.form_user_unsubscribe').each(function() { SN.U.FormXHR($(this)); });
+                $('.form_group_join').each(function() { SN.U.FormXHR($(this)); });
+                $('.form_group_leave').each(function() { SN.U.FormXHR($(this)); });
+                $('.form_user_nudge').each(function() { SN.U.FormXHR($(this)); });
+
+                SN.U.NewDirectMessage();
+            }
         }
-    );
-}
-
-function NoticeDataAttach() {
-    NDA = $('#notice_data-attach');
-    NDA.change(function() {
-        S = '<div id="notice_data-attach_selected" class="success"><code>'+$(this).val()+'</code> <button>&#215;</button></div>';
-        NDAS = $('#notice_data-attach_selected');
-        (NDAS.length > 0) ? NDAS.replaceWith(S) : $('#form_notice').append(S);
-        $('#notice_data-attach_selected button').click(function(){
-            $('#notice_data-attach_selected').remove();
-            NDA.val('');
-        });
-    });
-}
+    }
+};
+
+$(document).ready(function(){
+    if ($('.'+SN.C.S.FormNotice).length > 0) {
+        SN.Init.NoticeForm();
+    }
+    if ($('#content .notices').length > 0) {
+        SN.Init.Notices();
+    }
+    if ($('#content .entity_actions').length > 0) {
+        SN.Init.EntityActions();
+    }
+});
+
diff --git a/lib/Shorturl_api.php b/lib/Shorturl_api.php
deleted file mode 100644
index 18ae7719b..000000000
--- a/lib/Shorturl_api.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/*
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
-
-abstract class ShortUrlApi
-{
-    protected $service_url;
-    protected $long_limit = 27;
-
-    function __construct($service_url)
-    {
-        $this->service_url = $service_url;
-    }
-
-    function shorten($url)
-    {
-        if ($this->is_long($url)) return $this->shorten_imp($url);
-        return $url;
-    }
-
-    protected  abstract function shorten_imp($url);
-
-    protected function is_long($url) {
-        return strlen($url) >= common_config('site', 'shorturllength');
-    }
-
-    protected function http_post($data) {
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $this->service_url);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($ch, CURLOPT_POST, 1);
-        curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
-        $response = curl_exec($ch);
-        $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        curl_close($ch);
-        if (($code < 200) || ($code >= 400)) return false;
-        return $response;
-    }
-
-    protected function http_get($url) {
-        $encoded_url = urlencode($url);
-        return file_get_contents("{$this->service_url}$encoded_url");
-    }
-
-    protected function tidy($response) {
-        $response = str_replace('&nbsp;', ' ', $response);
-        $config = array('output-xhtml' => true);
-        $tidy = new tidy;
-        $tidy->parseString($response, $config, 'utf8');
-        $tidy->cleanRepair();
-        return (string)$tidy;
-    }
-}
-
diff --git a/lib/accountsettingsaction.php b/lib/accountsettingsaction.php
index a004a3ed9..c79a1f5d7 100644
--- a/lib/accountsettingsaction.php
+++ b/lib/accountsettingsaction.php
@@ -102,32 +102,31 @@ class AccountSettingsNav extends Widget
         $this->action->elementStart('ul', array('class' => 'nav'));
 
         if (Event::handle('StartAccountSettingsNav', array(&$this->action))) {
+            $user = common_current_user();
 
-            $menu =
-              array('profilesettings' =>
-                    array(_('Profile'),
-                          _('Change your profile settings')),
-                    'avatarsettings' =>
-                    array(_('Avatar'),
-                          _('Upload an avatar')),
-                    'passwordsettings' =>
-                    array(_('Password'),
-                          _('Change your password')),
-                    'emailsettings' =>
-                    array(_('Email'),
-                          _('Change email handling')),
-                    'userdesignsettings' =>
-                    array(_('Design'),
-                          _('Design your profile')),
-                    'othersettings' =>
-                    array(_('Other'),
-                          _('Other options')));
-
-            foreach ($menu as $menuaction => $menudesc) {
-                $this->action->menuItem(common_local_url($menuaction),
-                                        $menudesc[0],
-                                        $menudesc[1],
-                                        $action_name === $menuaction);
+            if(Event::handle('StartAccountSettingsProfileMenuItem', array($this, &$menu))){
+                $this->showMenuItem('profilesettings',_('Profile'),_('Change your profile settings'));
+                Event::handle('EndAccountSettingsProfileMenuItem', array($this, &$menu));
+            }
+            if(Event::handle('StartAccountSettingsAvatarMenuItem', array($this, &$menu))){
+                $this->showMenuItem('avatarsettings',_('Avatar'),_('Upload an avatar'));
+                Event::handle('EndAccountSettingsAvatarMenuItem', array($this, &$menu));
+            }
+            if(Event::handle('StartAccountSettingsPasswordMenuItem', array($this, &$menu))){
+                $this->showMenuItem('passwordsettings',_('Password'),_('Change your password'));
+                Event::handle('EndAccountSettingsPasswordMenuItem', array($this, &$menu));
+            }
+            if(Event::handle('StartAccountSettingsEmailMenuItem', array($this, &$menu))){
+                $this->showMenuItem('emailsettings',_('Email'),_('Change email handling'));
+                Event::handle('EndAccountSettingsEmailMenuItem', array($this, &$menu));
+            }
+            if(Event::handle('StartAccountSettingsDesignMenuItem', array($this, &$menu))){
+                $this->showMenuItem('userdesignsettings',_('Design'),_('Design your profile'));
+                Event::handle('EndAccountSettingsDesignMenuItem', array($this, &$menu));
+            }
+            if(Event::handle('StartAccountSettingsOtherMenuItem', array($this, &$menu))){
+                $this->showMenuItem('othersettings',_('Other'),_('Other options'));
+                Event::handle('EndAccountSettingsOtherMenuItem', array($this, &$menu));
             }
 
             Event::handle('EndAccountSettingsNav', array(&$this->action));
@@ -135,4 +134,13 @@ class AccountSettingsNav extends Widget
 
         $this->action->elementEnd('ul');
     }
+
+    function showMenuItem($menuaction, $desc1, $desc2)
+    {
+        $action_name = $this->action->trimmed('action');
+        $this->action->menuItem(common_local_url($menuaction),
+            $desc1,
+            $desc2,
+            $action_name === $menuaction);
+    }
 }
diff --git a/lib/action.php b/lib/action.php
index 1b2f73752..9c7060bba 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -168,7 +168,7 @@ class Action extends HTMLOutputter // lawsuit
     {
         if (is_readable(INSTALLDIR . '/theme/' . common_config('site', 'theme') . '/favicon.ico')) {
             $this->element('link', array('rel' => 'shortcut icon',
-                                         'href' => theme_path('favicon.ico')));
+                                         'href' => Theme::path('favicon.ico')));
         } else {
             $this->element('link', array('rel' => 'shortcut icon',
                                          'href' => common_path('favicon.ico')));
@@ -177,7 +177,7 @@ class Action extends HTMLOutputter // lawsuit
         if (common_config('site', 'mobile')) {
             if (is_readable(INSTALLDIR . '/theme/' . common_config('site', 'theme') . '/apple-touch-icon.png')) {
                 $this->element('link', array('rel' => 'apple-touch-icon',
-                                             'href' => theme_path('apple-touch-icon.png')));
+                                             'href' => Theme::path('apple-touch-icon.png')));
             } else {
                 $this->element('link', array('rel' => 'apple-touch-icon',
                                              'href' => common_path('apple-touch-icon.png')));
@@ -210,16 +210,16 @@ class Action extends HTMLOutputter // lawsuit
 
             if (Event::handle('StartShowUAStyles', array($this))) {
                 $this->comment('[if IE]><link rel="stylesheet" type="text/css" '.
-                               'href="'.theme_path('css/ie.css', 'base').'?version='.STATUSNET_VERSION.'" /><![endif]');
+                               'href="'.Theme::path('css/ie.css', 'base').'?version='.STATUSNET_VERSION.'" /><![endif]');
                 foreach (array(6,7) as $ver) {
-                    if (file_exists(theme_file('css/ie'.$ver.'.css', 'base'))) {
+                    if (file_exists(Theme::file('css/ie'.$ver.'.css', 'base'))) {
                         // Yes, IE people should be put in jail.
                         $this->comment('[if lte IE '.$ver.']><link rel="stylesheet" type="text/css" '.
-                                       'href="'.theme_path('css/ie'.$ver.'.css', 'base').'?version='.STATUSNET_VERSION.'" /><![endif]');
+                                       'href="'.Theme::path('css/ie'.$ver.'.css', 'base').'?version='.STATUSNET_VERSION.'" /><![endif]');
                     }
                 }
                 $this->comment('[if IE]><link rel="stylesheet" type="text/css" '.
-                               'href="'.theme_path('css/ie.css', null).'?version='.STATUSNET_VERSION.'" /><![endif]');
+                               'href="'.Theme::path('css/ie.css', null).'?version='.STATUSNET_VERSION.'" /><![endif]');
                 Event::handle('EndShowUAStyles', array($this));
             }
 
@@ -391,9 +391,9 @@ class Action extends HTMLOutputter // lawsuit
         if (Event::handle('StartAddressData', array($this))) {
             $this->elementStart('a', array('class' => 'url home bookmark',
                                            'href' => common_local_url('public')));
-            if (common_config('site', 'logo') || file_exists(theme_file('logo.png'))) {
+            if (common_config('site', 'logo') || file_exists(Theme::file('logo.png'))) {
                 $this->element('img', array('class' => 'logo photo',
-                                            'src' => (common_config('site', 'logo')) ? common_config('site', 'logo') : theme_path('logo.png'),
+                                            'src' => (common_config('site', 'logo')) ? common_config('site', 'logo') : Theme::path('logo.png'),
                                             'alt' => common_config('site', 'name')));
             }
             $this->element('span', array('class' => 'fn org'), common_config('site', 'name'));
@@ -434,6 +434,10 @@ class Action extends HTMLOutputter // lawsuit
                     $this->menuItem(common_local_url($connect),
                                     _('Connect'), _('Connect to services'), false, 'nav_connect');
                 }
+                if ($user->hasRight(Right::CONFIGURESITE)) {
+                    $this->menuItem(common_local_url('siteadminpanel'),
+                                    _('Admin'), _('Change site configuration'), false, 'nav_admin');
+                }
                 if (common_config('invite', 'enabled')) {
                     $this->menuItem(common_local_url('invite'),
                                     _('Invite'),
@@ -986,6 +990,18 @@ class Action extends HTMLOutputter // lawsuit
 
     function selfUrl()
     {
+        list($action, $args) = $this->returnToArgs();
+        return common_local_url($action, $args);
+    }
+
+    /**
+     * Returns arguments sufficient for re-constructing URL
+     *
+     * @return array two elements: action, other args
+     */
+
+    function returnToArgs()
+    {
         $action = $this->trimmed('action');
         $args   = $this->args;
         unset($args['action']);
@@ -998,8 +1014,7 @@ class Action extends HTMLOutputter // lawsuit
         foreach (array_keys($_COOKIE) as $cookie) {
             unset($args[$cookie]);
         }
-
-        return common_local_url($action, $args);
+        return array($action, $args);
     }
 
     /**
@@ -1048,8 +1063,7 @@ class Action extends HTMLOutputter // lawsuit
     {
         // Does a little before-after block for next/prev page
         if ($have_before || $have_after) {
-            $this->elementStart('div', array('class' => 'pagination'));
-            $this->elementStart('dl', null);
+            $this->elementStart('dl', 'pagination');
             $this->element('dt', null, _('Pagination'));
             $this->elementStart('dd', null);
             $this->elementStart('ul', array('class' => 'nav'));
@@ -1074,7 +1088,6 @@ class Action extends HTMLOutputter // lawsuit
             $this->elementEnd('ul');
             $this->elementEnd('dd');
             $this->elementEnd('dl');
-            $this->elementEnd('div');
         }
     }
 
@@ -1101,4 +1114,22 @@ class Action extends HTMLOutputter // lawsuit
     {
         return Design::siteDesign();
     }
+
+    /**
+     * Check the session token.
+     *
+     * Checks that the current form has the correct session token,
+     * and throw an exception if it does not.
+     *
+     * @return void
+     */
+
+    function checkSessionToken()
+    {
+        // CSRF protection
+        $token = $this->trimmed('token');
+        if (empty($token) || $token != common_session_token()) {
+            $this->clientError(_('There was a problem with your session token.'));
+        }
+    }
 }
diff --git a/lib/adminpanelaction.php b/lib/adminpanelaction.php
new file mode 100644
index 000000000..33b210da3
--- /dev/null
+++ b/lib/adminpanelaction.php
@@ -0,0 +1,282 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Superclass for admin panel actions
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  UI
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * superclass for admin panel actions
+ *
+ * Common code for all admin panel actions.
+ *
+ * @category UI
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ *
+ * @todo Find some commonalities with SettingsAction and combine
+ */
+
+class AdminPanelAction extends Action
+{
+    var $success = true;
+    var $msg     = null;
+
+    /**
+     * Prepare for the action
+     *
+     * We check to see that the user is logged in, has
+     * authenticated in this session, and has the right
+     * to configure the site.
+     *
+     * @param array $args Array of arguments from Web driver
+     *
+     * @return boolean success flag
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        // User must be logged in.
+
+        if (!common_logged_in()) {
+            $this->clientError(_('Not logged in.'));
+            return;
+        }
+
+        $user = common_current_user();
+
+        // ...because they're logged in
+
+        assert(!empty($user));
+
+        // It must be a "real" login, not saved cookie login
+
+        if (!common_is_real_login()) {
+            // Cookie theft is too easy; we require automatic
+            // logins to re-authenticate before admining the site
+            common_set_returnto($this->selfUrl());
+            if (Event::handle('RedirectToLogin', array($this, $user))) {
+                common_redirect(common_local_url('login'), 303);
+            }
+        }
+
+        // User must have the right to change admin settings
+
+        if (!$user->hasRight(Right::CONFIGURESITE)) {
+            $this->clientError(_('You cannot make changes to this site.'));
+            return;
+        }
+
+        return true;
+    }
+
+    /**
+     * handle the action
+     *
+     * Check session token and try to save the settings if this is a
+     * POST. Otherwise, show the form.
+     *
+     * @param array $args unused.
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+            $this->checkSessionToken();
+            try {
+                $this->saveSettings();
+
+                // Reload settings
+
+                Config::loadSettings();
+
+                $this->success = true;
+                $this->msg     = _('Settings saved.');
+            } catch (Exception $e) {
+                $this->success = false;
+                $this->msg     = $e->getMessage();
+            }
+        }
+        $this->showPage();
+    }
+
+    /**
+     * Show tabset for this page
+     *
+     * Uses the AdminPanelNav widget
+     *
+     * @return void
+     * @see AdminPanelNav
+     */
+
+    function showLocalNav()
+    {
+        $nav = new AdminPanelNav($this);
+        $nav->show();
+    }
+
+    /**
+     * Show the content section of the page
+     *
+     * Here, we show the admin panel's form.
+     *
+     * @return void.
+     */
+
+    function showContent()
+    {
+        $this->showForm();
+    }
+
+    /**
+     * show human-readable instructions for the page, or
+     * a success/failure on save.
+     *
+     * @return void
+     */
+
+    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');
+        }
+    }
+
+    /**
+     * Show the admin panel form
+     *
+     * Sub-classes should overload this.
+     *
+     * @return void
+     */
+
+    function showForm()
+    {
+        $this->clientError(_('showForm() not implemented.'));
+        return;
+    }
+
+    /**
+     * Instructions for using this form.
+     *
+     * String with instructions for using the form.
+     *
+     * Subclasses should overload this.
+     *
+     * @return void
+     */
+
+    function getInstructions()
+    {
+        return '';
+    }
+
+    /**
+     * Save settings from the form
+     *
+     * Validate and save the settings from the user.
+     *
+     * @return void
+     */
+
+    function saveSettings()
+    {
+        $this->clientError(_('saveSettings() not implemented.'));
+        return;
+    }
+}
+
+/**
+ * Menu for public group of actions
+ *
+ * @category Output
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ *
+ * @see      Widget
+ */
+
+class AdminPanelNav extends Widget
+{
+    var $action = null;
+
+    /**
+     * Construction
+     *
+     * @param Action $action current action, used for output
+     */
+
+    function __construct($action=null)
+    {
+        parent::__construct($action);
+        $this->action = $action;
+    }
+
+    /**
+     * Show the menu
+     *
+     * @return void
+     */
+
+    function show()
+    {
+        $action_name = $this->action->trimmed('action');
+
+        $this->action->elementStart('ul', array('class' => 'nav'));
+
+        if (Event::handle('StartAdminPanelNav', array($this))) {
+
+            $this->out->menuItem(common_local_url('siteadminpanel'), _('Site'),
+                _('Basic site configuration'), $action_name == 'siteadminpanel', 'nav_site_admin_panel');
+
+            $this->out->menuItem(common_local_url('designadminpanel'), _('Design'),
+                _('Design configuration'), $action_name == 'designadminpanel', 'nav_design_admin_panel');
+
+            Event::handle('EndAdminPanelNav', array($this));
+        }
+        $this->action->elementEnd('ul');
+    }
+}
diff --git a/lib/api.php b/lib/api.php
index 9bd2083de..e2ea87b43 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -60,7 +60,7 @@ class ApiAction extends Action
      var $max_id   = null;
      var $since_id = null;
      var $since    = null;
-     
+
     /**
      * Initialization.
      *
@@ -72,14 +72,14 @@ class ApiAction extends Action
     function prepare($args)
     {
         parent::prepare($args);
-        
+
         $this->format   = $this->arg('format');
         $this->page     = (int)$this->arg('page', 1);
         $this->count    = (int)$this->arg('count', 20);
         $this->max_id   = (int)$this->arg('max_id', 0);
         $this->since_id = (int)$this->arg('since_id', 0);
         $this->since    = $this->arg('since');
-        
+
         return true;
     }
 
@@ -134,11 +134,20 @@ class ApiAction extends Action
         $twitter_user['protected'] = false; # not supported by StatusNet yet
         $twitter_user['followers_count'] = $profile->subscriberCount();
 
-        // Need to pull up the user for some of this
-        $user = $profile->getUser();
-        $design = $user->getDesign();
         $defaultDesign = Design::siteDesign();
-        if (!$design) $design = $defaultDesign;
+        $design        = null;
+        $user          = $profile->getUser();
+
+        // Note: some profiles don't have an associated user
+
+        if (!empty($user)) {
+            $design = $user->getDesign();
+        }
+
+        if (empty($design)) {
+            $design = $defaultDesign;
+        }
+
         $color = Design::toWebColor(empty($design->backgroundcolor) ? $defaultDesign->backgroundcolor : $design->backgroundcolor);
         $twitter_user['profile_background_color'] = ($color == null) ? '' : '#'.$color->hexValue();
         $color = Design::toWebColor(empty($design->textcolor) ? $defaultDesign->textcolor : $design->textcolor);
@@ -155,7 +164,6 @@ class ApiAction extends Action
 
         $twitter_user['favourites_count'] = $profile->faveCount(); // British spelling!
 
-
         $timezone = 'UTC';
 
         if ($user->timezone) {
@@ -168,9 +176,14 @@ class ApiAction extends Action
         $twitter_user['utc_offset'] = $t->format('Z');
         $twitter_user['time_zone'] = $timezone;
 
-        // To be supported some day, perhaps
-        $twitter_user['profile_background_image_url'] = '';
-        $twitter_user['profile_background_tile'] = false;
+        $twitter_user['profile_background_image_url']
+            = empty($design->backgroundimage)
+            ? '' : ($design->disposition & BACKGROUND_ON)
+            ? Design::url($design->backgroundimage) : '';
+
+        $twitter_user['profile_background_tile']
+            = empty($design->disposition)
+            ? '' : ($design->disposition & BACKGROUND_TILE) ? 'true' : 'false';
 
         $twitter_user['statuses_count'] = $profile->noticeCount();
 
@@ -229,6 +242,15 @@ class ApiAction extends Action
         $twitter_status['in_reply_to_screen_name'] =
             ($replier_profile) ? $replier_profile->nickname : null;
 
+        if (isset($notice->lat) && isset($notice->lon)) {
+            // This is the format that GeoJSON expects stuff to be in
+            $twitter_status['geo'] = array('type' => 'Point',
+                                           'coordinates' => array((float) $notice->lat,
+                                                                  (float) $notice->lon));
+        } else {
+            $twitter_status['geo'] = null;
+        }
+
         if (isset($this->auth_user)) {
             $twitter_status['favorited'] = $this->auth_user->hasFave($notice);
         } else {
@@ -353,10 +375,19 @@ class ApiAction extends Action
         $entry['pubDate'] = common_date_rfc2822($notice->created);
         $entry['guid'] = $entry['link'];
 
+        if (isset($notice->lat) && isset($notice->lon)) {
+            // This is the format that GeoJSON expects stuff to be in.
+            // showGeoRSS() below uses it for XML output, so we reuse it
+            $entry['geo'] = array('type' => 'Point',
+                                  'coordinates' => array((float) $notice->lat,
+                                                         (float) $notice->lon));
+        } else {
+            $entry['geo'] = null;
+        }
+
         return $entry;
     }
 
-
     function twitterRelationshipArray($source, $target)
     {
         $relationship = array();
@@ -432,6 +463,9 @@ class ApiAction extends Action
             case 'attachments':
                 $this->showXmlAttachments($twitter_status['attachments']);
                 break;
+            case 'geo':
+                $this->showGeoRSS($value);
+                break;
             default:
                 $this->element($element, null, $value);
             }
@@ -475,6 +509,18 @@ class ApiAction extends Action
         }
     }
 
+    function showGeoRSS($geo)
+    {
+        if (empty($geo)) {
+            // empty geo element
+            $this->element('geo');
+        } else {
+            $this->elementStart('geo', array('xmlns:georss' => 'http://www.georss.org/georss'));
+            $this->element('georss:point', null, $geo['coordinates'][0] . ' ' . $geo['coordinates'][1]);
+            $this->elementEnd('geo');
+        }
+    }
+
     function showTwitterRssItem($entry)
     {
         $this->elementStart('item');
@@ -496,6 +542,7 @@ class ApiAction extends Action
             }
         }
 
+        $this->showGeoRSS($entry['geo']);
         $this->elementEnd('item');
     }
 
@@ -520,7 +567,6 @@ class ApiAction extends Action
         $this->endDocument('json');
     }
 
-
     function showXmlTimeline($notice)
     {
 
@@ -640,7 +686,6 @@ class ApiAction extends Action
         $this->endTwitterRss();
     }
 
-
     function showTwitterAtomEntry($entry)
     {
         $this->elementStart('entry');
diff --git a/lib/apiprivateauth.php b/lib/apiprivateauth.php
new file mode 100644
index 000000000..5d0033005
--- /dev/null
+++ b/lib/apiprivateauth.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Base class for API actions that only require auth when a site
+ * is configured to be private
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  API
+ * @package   StatusNet
+ * @author    Adrian Lang <mail@adrianlang.de>
+ * @author    Brenda Wallace <shiny@cpan.org>
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Dan Moore <dan@moore.cx>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    mEDI <medi@milaro.net>
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @author    Zach Copley <zach@status.net> 
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/apiauth.php';
+
+/**
+ * Actions extending this class will require auth only if a site is private
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Adrian Lang <mail@adrianlang.de>
+ * @author   Brenda Wallace <shiny@cpan.org>
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Dan Moore <dan@moore.cx>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   mEDI <medi@milaro.net>
+ * @author   Sarven Capadisli <csarven@status.net>
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiPrivateAuthAction extends ApiAuthAction
+{
+
+   /**
+     * Does this API resource require authentication?
+     *
+     * @return boolean true or false
+     */
+
+    function requiresAuth()
+    {
+        // If the site is "private", all API methods except statusnet/config
+        // need authentication
+
+        if (common_config('site', 'private')) {
+            return true;
+        }
+
+        return false;
+    }
+
+}
diff --git a/lib/blockform.php b/lib/blockform.php
index 4820d09af..b6652b1f6 100644
--- a/lib/blockform.php
+++ b/lib/blockform.php
@@ -32,8 +32,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/form.php';
-
 /**
  * Form for blocking a user
  *
@@ -47,109 +45,38 @@ require_once INSTALLDIR.'/lib/form.php';
  * @see      UnblockForm
  */
 
-class BlockForm extends Form
+class BlockForm extends ProfileActionForm
 {
     /**
-     * Profile of user to block
-     */
-
-    var $profile = null;
-
-    /**
-     * Return-to args
-     */
-
-    var $args = null;
-
-    /**
-     * Constructor
+     * Action this form provides
      *
-     * @param HTMLOutputter $out     output channel
-     * @param Profile       $profile profile of user to block
-     * @param array         $args    return-to args
+     * @return string Name of the action, lowercased.
      */
 
-    function __construct($out=null, $profile=null, $args=null)
+    function target()
     {
-        parent::__construct($out);
-
-        $this->profile = $profile;
-        $this->args    = $args;
+        return 'block';
     }
 
     /**
-     * ID of the form
-     *
-     * @return int ID of the form
-     */
-
-    function id()
-    {
-        return 'block-' . $this->profile->id;
-    }
-
-
-    /**
-     * class of the form
-     *
-     * @return string class of the form
-     */
-
-    function formClass()
-    {
-        return 'form_user_block';
-    }
-
-
-    /**
-     * Action of the form
-     *
-     * @return string URL of the action
-     */
-
-    function action()
-    {
-        return common_local_url('block');
-    }
-
-
-    /**
-     * Legend of the Form
-     *
-     * @return void
-     */
-    function formLegend()
-    {
-        $this->out->element('legend', null, _('Block this user'));
-    }
-
-
-    /**
-     * Data elements of the form
+     * Title of the form
      *
-     * @return void
+     * @return string Title of the form, internationalized
      */
 
-    function formData()
+    function title()
     {
-        $this->out->hidden('blockto-' . $this->profile->id,
-                           $this->profile->id,
-                           'blockto');
-        if ($this->args) {
-            foreach ($this->args as $k => $v) {
-                $this->out->hidden('returnto-' . $k, $v);
-            }
-        }
+        return _('Block');
     }
 
     /**
-     * Action elements
+     * Description of the form
      *
-     * @return void
+     * @return string description of the form, internationalized
      */
 
-    function formActions()
+    function description()
     {
-        $this->out->submit('submit', _('Block'), 'submit', null, _('Block this user'));
+        return _('Block this user');
     }
 }
diff --git a/lib/command.php b/lib/command.php
index 11d40b8e1..7e98156b6 100644
--- a/lib/command.php
+++ b/lib/command.php
@@ -73,7 +73,7 @@ class UntrackCommand extends UnimplementedCommand
     }
 }
 
-class NudgeCommand extends UnimplementedCommand
+class NudgeCommand extends Command
 {
     var $other = null;
     function __construct($user, $other)
@@ -81,6 +81,26 @@ class NudgeCommand extends UnimplementedCommand
         parent::__construct($user);
         $this->other = $other;
     }
+    function execute($channel)
+    {
+        $recipient = User::staticGet('nickname', $this->other);
+        if(! $recipient){
+            $channel->error($this->user, sprintf(_('Could not find a user with nickname %s'),
+                               $this->other));
+        }else{
+            if ($recipient->id == $this->user->id) {
+                $channel->error($this->user, _('It does not make a lot of sense to nudge yourself!'));
+            }else{
+                if ($recipient->email && $recipient->emailnotifynudge) {
+                    mail_notify_nudge($this->user, $recipient);
+                }
+                // XXX: notify by IM
+                // XXX: notify by SMS
+                $channel->output($this->user, sprintf(_('Nudge sent to %s'),
+                               $recipient->nickname));
+            }
+        }
+    }
 }
 
 class InviteCommand extends UnimplementedCommand
@@ -124,18 +144,30 @@ class FavCommand extends Command
 
     function execute($channel)
     {
+        if(substr($this->other,0,1)=='#'){
+            //favoriting a specific notice_id
 
-        $recipient =
-          common_relative_profile($this->user, common_canonical_nickname($this->other));
+            $notice = Notice::staticGet(substr($this->other,1));
+            if (!$notice) {
+                $channel->error($this->user, _('Notice with that id does not exist'));
+                return;
+            }
+            $recipient = $notice->getProfile();
+        }else{
+            //favoriting a given user's last notice
 
-        if (!$recipient) {
-            $channel->error($this->user, _('No such user.'));
-            return;
-        }
-        $notice = $recipient->getCurrentNotice();
-        if (!$notice) {
-            $channel->error($this->user, _('User has no last notice'));
-            return;
+            $recipient =
+              common_relative_profile($this->user, common_canonical_nickname($this->other));
+
+            if (!$recipient) {
+                $channel->error($this->user, _('No such user.'));
+                return;
+            }
+            $notice = $recipient->getCurrentNotice();
+            if (!$notice) {
+                $channel->error($this->user, _('User has no last notice'));
+                return;
+            }
         }
 
         $fave = Fave::addNew($this->user, $notice);
@@ -347,6 +379,71 @@ class MessageCommand extends Command
     }
 }
 
+class ReplyCommand extends Command
+{
+    var $other = null;
+    var $text = null;
+    function __construct($user, $other, $text)
+    {
+        parent::__construct($user);
+        $this->other = $other;
+        $this->text = $text;
+    }
+
+    function execute($channel)
+    {
+        if(substr($this->other,0,1)=='#'){
+            //replying to a specific notice_id
+
+            $notice = Notice::staticGet(substr($this->other,1));
+            if (!$notice) {
+                $channel->error($this->user, _('Notice with that id does not exist'));
+                return;
+            }
+            $recipient = $notice->getProfile();
+        }else{
+            //replying to a given user's last notice
+
+            $recipient =
+              common_relative_profile($this->user, common_canonical_nickname($this->other));
+
+            if (!$recipient) {
+                $channel->error($this->user, _('No such user.'));
+                return;
+            }
+            $notice = $recipient->getCurrentNotice();
+            if (!$notice) {
+                $channel->error($this->user, _('User has no last notice'));
+                return;
+            }
+        }
+
+        $len = mb_strlen($this->text);
+
+        if ($len == 0) {
+            $channel->error($this->user, _('No content!'));
+            return;
+        }
+
+        $this->text = common_shorten_links($this->text);
+
+        if (Notice::contentTooLong($this->text)) {
+            $channel->error($this->user, sprintf(_('Notice too long - maximum is %d characters, you sent %d'),
+                                                 Notice::maxContent(), mb_strlen($this->text)));
+            return;
+        }
+
+        $notice = Notice::saveNew($this->user->id, $this->text, $channel->source(), 1,
+                                  $notice->id);
+        if ($notice) {
+            $channel->output($this->user, sprintf(_('Reply to %s sent'), $recipient->nickname));
+        } else {
+            $channel->error($this->user, _('Error saving notice.'));
+        }
+        common_broadcast_notice($notice);
+    }
+}
+
 class GetCommand extends Command
 {
 
@@ -482,6 +579,97 @@ class OnCommand extends Command
     }
 }
 
+class LoginCommand extends Command
+{
+    function execute($channel)
+    {
+        $login_token = Login_token::staticGet('user_id',$this->user->id);
+        if($login_token){
+            $login_token->delete();
+        }
+        $login_token = new Login_token();
+        $login_token->user_id = $this->user->id;
+        $login_token->token = common_good_rand(16);
+        $login_token->created = common_sql_now();
+        $result = $login_token->insert();
+        if (!$result) {
+          common_log_db_error($login_token, 'INSERT', __FILE__);
+          $channel->error($this->user, sprintf(_('Could not create login token for %s'),
+                                       $this->user->nickname));
+          return;
+        }
+        $channel->output($this->user,
+            sprintf(_('This link is useable only once, and is good for only 2 minutes: %s'),
+                    common_local_url('login',
+                        array('user_id'=>$login_token->user_id, 'token'=>$login_token->token))));
+    }
+}
+
+class SubscriptionsCommand extends Command
+{
+    function execute($channel)
+    {
+        $profile = $this->user->getSubscriptions(0);
+        $nicknames=array();
+        while ($profile->fetch()) {
+            $nicknames[]=$profile->nickname;
+        }
+        if(count($nicknames)==0){
+            $out=_('You are not subscribed to anyone.');
+        }else{
+            $out = ngettext('You are subscribed to this person:',
+                'You are subscribed to these people:',
+                count($nicknames));
+            $out .= ' ';
+            $out .= implode(', ',$nicknames);
+        }
+        $channel->output($this->user,$out);
+    }
+}
+
+class SubscribersCommand extends Command
+{
+    function execute($channel)
+    {
+        $profile = $this->user->getSubscribers();
+        $nicknames=array();
+        while ($profile->fetch()) {
+            $nicknames[]=$profile->nickname;
+        }
+        if(count($nicknames)==0){
+            $out=_('No one is subscribed to you.');
+        }else{
+            $out = ngettext('This person is subscribed to you:',
+                'These people are subscribed to you:',
+                count($nicknames));
+            $out .= ' ';
+            $out .= implode(', ',$nicknames);
+        }
+        $channel->output($this->user,$out);
+    }
+}
+
+class GroupsCommand extends Command
+{
+    function execute($channel)
+    {
+        $group = $this->user->getGroups();
+        $groups=array();
+        while ($group->fetch()) {
+            $groups[]=$group->nickname;
+        }
+        if(count($groups)==0){
+            $out=_('You are not a member of any groups.');
+        }else{
+            $out = ngettext('You are a member of this group:',
+                'You are a member of these groups:',
+                count($nicknames));
+            $out.=implode(', ',$groups);
+        }
+        $channel->output($this->user,$out);
+    }
+}
+
 class HelpCommand extends Command
 {
     function execute($channel)
@@ -492,12 +680,19 @@ class HelpCommand extends Command
                            "off - turn off notifications\n".
                            "help - show this help\n".
                            "follow <nickname> - subscribe to user\n".
+                           "groups - lists the groups you have joined\n".
+                           "subscriptions - list the people you follow\n".
+                           "subscribers - list the people that follow you\n".
                            "leave <nickname> - unsubscribe from user\n".
                            "d <nickname> <text> - direct message to user\n".
                            "get <nickname> - get last notice from user\n".
                            "whois <nickname> - get profile info on user\n".
                            "fav <nickname> - add user's last notice as a 'fave'\n".
+                           "fav #<notice_id> - add notice with the given id as a 'fave'\n".
+                           "reply #<notice_id> - reply to notice with a given id\n".
+                           "reply <nickname> - reply to the last notice from user\n".
                            "join <group> - join group\n".
+                           "login - Get a link to login to the web interface\n".
                            "drop <group> - leave group\n".
                            "stats - get your stats\n".
                            "stop - same as 'off'\n".
@@ -507,7 +702,7 @@ class HelpCommand extends Command
                            "last <nickname> - same as 'get'\n".
                            "on <nickname> - not yet implemented.\n".
                            "off <nickname> - not yet implemented.\n".
-                           "nudge <nickname> - not yet implemented.\n".
+                           "nudge <nickname> - remind a user to update.\n".
                            "invite <phone number> - not yet implemented.\n".
                            "track <word> - not yet implemented.\n".
                            "untrack <word> - not yet implemented.\n".
diff --git a/lib/commandinterpreter.php b/lib/commandinterpreter.php
index 60fc4c3c4..665015afc 100644
--- a/lib/commandinterpreter.php
+++ b/lib/commandinterpreter.php
@@ -41,6 +41,30 @@ class CommandInterpreter
                 return null;
             }
             return new HelpCommand($user);
+         case 'login':
+            if ($arg) {
+                return null;
+            } else {
+                return new LoginCommand($user);
+            }
+         case 'subscribers':
+            if ($arg) {
+                return null;
+            } else {
+                return new SubscribersCommand($user);
+            }
+         case 'subscriptions':
+            if ($arg) {
+                return null;
+            } else {
+                return new SubscriptionsCommand($user);
+            }
+         case 'groups':
+            if ($arg) {
+                return null;
+            } else {
+                return new GroupsCommand($user);
+            }
          case 'on':
             if ($arg) {
                 list($other, $extra) = $this->split_arg($arg);
@@ -134,6 +158,17 @@ class CommandInterpreter
             } else {
                 return new MessageCommand($user, $other, $extra);
             }
+         case 'r':
+         case 'reply':
+            if (!$arg) {
+                return null;
+            }
+            list($other, $extra) = $this->split_arg($arg);
+            if (!$extra) {
+                return null;
+            } else {
+                return new ReplyCommand($user, $other, $extra);
+            }
          case 'whois':
             if (!$arg) {
                 return null;
diff --git a/lib/common.php b/lib/common.php
index e29456ed4..063d7d9d9 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -19,6 +19,9 @@
 
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
+//exit with 200 response, if this is checking fancy from the installer
+if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') {  exit; } 
+
 define('STATUSNET_VERSION', '0.9.0dev');
 define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
 
@@ -38,12 +41,18 @@ define('FOREIGN_NOTICE_SEND_REPLY', 4);
 define('FOREIGN_FRIEND_SEND', 1);
 define('FOREIGN_FRIEND_RECV', 2);
 
-define_syslog_variables();
-
 # append our extlib dir as the last-resort place to find libs
 
 set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/extlib/');
 
+# To protect against upstream libraries which haven't updated
+# for PHP 5.3 where dl() function may not be present...
+if (!function_exists('dl')) {
+    function dl($library) {
+        return false;
+    }
+}
+
 # global configuration object
 
 require_once('PEAR.php');
@@ -169,6 +178,7 @@ if (isset($conffile)) {
     $_config_files[] = INSTALLDIR.'/config.php';
 }
 
+global $_have_a_config;
 $_have_a_config = false;
 
 foreach ($_config_files as $_config_file) {
@@ -185,7 +195,14 @@ function _have_config()
 }
 
 // XXX: Throw a conniption if database not installed
-
+// XXX: Find a way to use htmlwriter for this instead of handcoded markup
+if (!_have_config()) {
+  echo '<p>'. _('No configuration file found. ') .'</p>';
+  echo '<p>'. _('I looked for configuration files in the following places: ') .'<br/> '. implode($_config_files, '<br/>');
+  echo '<p>'. _('You may wish to run the installer to fix this.') .'</p>';
+  echo '<a href="install.php">'. _('Go to the installer.') .'</a>';
+  exit;
+}
 // Fixup for statusnet.ini
 
 $_db_name = substr($config['db']['database'], strrpos($config['db']['database'], '/') + 1);
@@ -219,10 +236,8 @@ require_once 'markdown.php';
 
 require_once INSTALLDIR.'/lib/util.php';
 require_once INSTALLDIR.'/lib/action.php';
-require_once INSTALLDIR.'/lib/theme.php';
 require_once INSTALLDIR.'/lib/mail.php';
 require_once INSTALLDIR.'/lib/subs.php';
-require_once INSTALLDIR.'/lib/Shorturl_api.php';
 
 require_once INSTALLDIR.'/lib/clientexception.php';
 require_once INSTALLDIR.'/lib/serverexception.php';
diff --git a/lib/curlclient.php b/lib/curlclient.php
deleted file mode 100644
index 36fc7d157..000000000
--- a/lib/curlclient.php
+++ /dev/null
@@ -1,179 +0,0 @@
-n<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Utility class for wrapping Curl
- *
- * 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  HTTP
- * @package   StatusNet
- * @author    Evan Prodromou <evan@status.net>
- * @copyright 2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET')) {
-    exit(1);
-}
-
-define(CURLCLIENT_VERSION, "0.1");
-
-/**
- * Wrapper for Curl
- *
- * Makes Curl HTTP client calls within our HTTPClient framework
- *
- * @category HTTP
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
- */
-
-class CurlClient extends HTTPClient
-{
-    function __construct()
-    {
-    }
-
-    function head($url, $headers=null)
-    {
-        $ch = curl_init($url);
-
-        $this->setup($ch);
-
-        curl_setopt_array($ch,
-                          array(CURLOPT_NOBODY => true));
-
-        if (!is_null($headers)) {
-            curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
-        }
-
-        $result = curl_exec($ch);
-
-        curl_close($ch);
-
-        return $this->parseResults($result);
-    }
-
-    function get($url, $headers=null)
-    {
-        $ch = curl_init($url);
-
-        $this->setup($ch);
-
-        if (!is_null($headers)) {
-            curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
-        }
-
-        $result = curl_exec($ch);
-
-        curl_close($ch);
-
-        return $this->parseResults($result);
-    }
-
-    function post($url, $headers=null, $body=null)
-    {
-        $ch = curl_init($url);
-
-        $this->setup($ch);
-
-        curl_setopt($ch, CURLOPT_POST, true);
-
-        if (!is_null($body)) {
-            curl_setopt($ch, CURLOPT_POSTFIELDS, $body);
-        }
-
-        if (!is_null($headers)) {
-            curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
-        }
-
-        $result = curl_exec($ch);
-
-        curl_close($ch);
-
-        return $this->parseResults($result);
-    }
-
-    function setup($ch)
-    {
-        curl_setopt_array($ch,
-                          array(CURLOPT_USERAGENT => $this->userAgent(),
-                                CURLOPT_HEADER => true,
-                                CURLOPT_RETURNTRANSFER => true));
-    }
-
-    function userAgent()
-    {
-        $version = curl_version();
-        return parent::userAgent() . " CurlClient/".CURLCLIENT_VERSION . " cURL/" . $version['version'];
-    }
-
-    function parseResults($results)
-    {
-        $resp = new HTTPResponse();
-
-        $lines = explode("\r\n", $results);
-
-        if (preg_match("#^HTTP/1.[01] (\d\d\d) .+$#", $lines[0], $match)) {
-            $resp->code = $match[1];
-        } else {
-            throw Exception("Bad format: initial line is not HTTP status line");
-        }
-
-        $lastk = null;
-
-        for ($i = 1; $i < count($lines); $i++) {
-            $l =& $lines[$i];
-            if (mb_strlen($l) == 0) {
-                $resp->body = implode("\r\n", array_slice($lines, $i + 1));
-                break;
-            }
-            if (preg_match("#^(\S+):\s+(.*)$#", $l, $match)) {
-                $k = $match[1];
-                $v = $match[2];
-
-                if (array_key_exists($k, $resp->headers)) {
-                    if (is_array($resp->headers[$k])) {
-                        $resp->headers[$k][] = $v;
-                    } else {
-                        $resp->headers[$k] = array($resp->headers[$k], $v);
-                    }
-                } else {
-                    $resp->headers[$k] = $v;
-                }
-                $lastk = $k;
-            } else if (preg_match("#^\s+(.*)$#", $l, $match)) {
-                // continuation line
-                if (is_null($lastk)) {
-                    throw Exception("Bad format: initial whitespace in headers");
-                }
-                $h =& $resp->headers[$lastk];
-                if (is_array($h)) {
-                    $n = count($h);
-                    $h[$n-1] .= $match[1];
-                } else {
-                    $h .= $match[1];
-                }
-            }
-        }
-
-        return $resp;
-    }
-}
diff --git a/lib/default.php b/lib/default.php
index 30e43eefb..95366e0b3 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -84,7 +84,8 @@ $default =
               'image' => 'http://i.creativecommons.org/l/by/3.0/80x15.png'),
         'mail' =>
         array('backend' => 'mail',
-              'params' => null),
+              'params' => null,
+              'domain_check' => true),
         'nickname' =>
         array('blacklist' => array(),
               'featured' => array()),
@@ -124,10 +125,6 @@ $default =
               'public' => array()), # JIDs of users who want to receive the public stream
         'invite' =>
         array('enabled' => true),
-        'sphinx' =>
-        array('enabled' => false,
-              'server' => 'localhost',
-              'port' => 3312),
         'tag' =>
         array('dropoff' => 864000.0),
         'popular' =>
@@ -227,6 +224,6 @@ $default =
         array('contentlimit' => null),
         'message' =>
         array('contentlimit' => null),
-        'http' =>
-        array('client' => 'curl'), // XXX: should this be the default?
+        'location' =>
+        array('namespace' => 1), // 1 = geonames, 2 = Yahoo Where on Earth
         );
diff --git a/lib/deleteuserform.php b/lib/deleteuserform.php
new file mode 100644
index 000000000..09ea8f68d
--- /dev/null
+++ b/lib/deleteuserform.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Form for deleting a user
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Form
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Form for deleting a user
+ *
+ * @category Form
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ *
+ */
+
+class DeleteUserForm extends ProfileActionForm
+{
+    /**
+     * Action this form provides
+     *
+     * @return string Name of the action, lowercased.
+     */
+
+    function target()
+    {
+        return 'deleteuser';
+    }
+
+    /**
+     * Title of the form
+     *
+     * @return string Title of the form, internationalized
+     */
+
+    function title()
+    {
+        return _('Delete');
+    }
+
+    /**
+     * Description of the form
+     *
+     * @return string description of the form, internationalized
+     */
+
+    function description()
+    {
+        return _('Delete this user');
+    }
+}
diff --git a/lib/designsettings.php b/lib/designsettings.php
index 820d534f2..5ce9ddeda 100644
--- a/lib/designsettings.php
+++ b/lib/designsettings.php
@@ -271,17 +271,20 @@ class DesignSettingsAction extends AccountSettingsAction
 
     function handlePost()
     {
-        // XXX: Robin's workaround for a bug in PHP where $_POST
-        // and $_FILE are empty in the case that the uploaded
-        // file is bigger than PHP is configured to handle.
-
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-            if (empty($_POST) && $_SERVER['CONTENT_LENGTH']) {
 
+            // Workaround for PHP returning empty $_POST and $_FILES when POST
+            // length > post_max_size in php.ini
+
+            if (empty($_FILES)
+                && empty($_POST)
+                && ($_SERVER['CONTENT_LENGTH'] > 0)
+            ) {
                 $msg = _('The server was unable to handle that much POST ' .
                     'data (%s bytes) due to its current configuration.');
 
                 $this->showForm(sprintf($msg, $_SERVER['CONTENT_LENGTH']));
+                return;
             }
         }
 
diff --git a/lib/error.php b/lib/error.php
index 6a9b76be1..3162cfe65 100644
--- a/lib/error.php
+++ b/lib/error.php
@@ -70,7 +70,7 @@ class ErrorAction extends Action
      */
     function extraHeaders()
     {
-        $status_string = $this->status[$this->code];
+        $status_string = @self::$status[$this->code];
         header('HTTP/1.1 '.$this->code.' '.$status_string);
     }
 
@@ -92,7 +92,7 @@ class ErrorAction extends Action
 
     function title()
     {
-        return self::$status[$this->code];
+        return @self::$status[$this->code];
     }
 
     function isReadOnly($args)
diff --git a/lib/grouplist.php b/lib/grouplist.php
index b41c5b5f8..99bff9cdc 100644
--- a/lib/grouplist.php
+++ b/lib/grouplist.php
@@ -85,19 +85,19 @@ class GroupList extends Widget
 
     function showGroup()
     {
-        $this->out->elementStart('li', array('class' => 'profile',
+        $this->out->elementStart('li', array('class' => 'profile hentry',
                                              'id' => 'group-' . $this->group->id));
 
         $user = common_current_user();
 
-        $this->out->elementStart('div', 'entity_profile vcard');
+        $this->out->elementStart('div', 'entity_profile vcard entry-content');
 
         $logo = ($this->group->stream_logo) ?
           $this->group->stream_logo : User_group::defaultLogo(AVATAR_STREAM_SIZE);
 
         $this->out->elementStart('a', array('href' => $this->group->homeUrl(),
-                                            'class' => 'url',
-                                            'rel' => 'group'));
+                                            'class' => 'url entry-title',
+                                            'rel' => 'contact group'));
         $this->out->element('img', array('src' => $logo,
                                          'class' => 'photo avatar',
                                          'width' => AVATAR_STREAM_SIZE,
@@ -105,48 +105,32 @@ class GroupList extends Widget
                                          'alt' =>
                                          ($this->group->fullname) ? $this->group->fullname :
                                          $this->group->nickname));
-        $hasFN = ($this->group->fullname) ? 'nickname url uid' : 'fn org nickname url uid';
+        $hasFN = ($this->group->fullname) ? 'nickname' : 'fn org nickname';
         $this->out->elementStart('span', $hasFN);
         $this->out->raw($this->highlight($this->group->nickname));
         $this->out->elementEnd('span');
         $this->out->elementEnd('a');
 
         if ($this->group->fullname) {
-            $this->out->elementStart('dl', 'entity_fn');
-            $this->out->element('dt', null, 'Full name');
-            $this->out->elementStart('dd');
             $this->out->elementStart('span', 'fn org');
             $this->out->raw($this->highlight($this->group->fullname));
             $this->out->elementEnd('span');
-            $this->out->elementEnd('dd');
-            $this->out->elementEnd('dl');
         }
         if ($this->group->location) {
-            $this->out->elementStart('dl', 'entity_location');
-            $this->out->element('dt', null, _('Location'));
-            $this->out->elementStart('dd', 'label');
+            $this->out->elementStart('span', 'label');
             $this->out->raw($this->highlight($this->group->location));
-            $this->out->elementEnd('dd');
-            $this->out->elementEnd('dl');
+            $this->out->elementEnd('span');
         }
         if ($this->group->homepage) {
-            $this->out->elementStart('dl', 'entity_url');
-            $this->out->element('dt', null, _('URL'));
-            $this->out->elementStart('dd');
             $this->out->elementStart('a', array('href' => $this->group->homepage,
                                                 'class' => 'url'));
             $this->out->raw($this->highlight($this->group->homepage));
             $this->out->elementEnd('a');
-            $this->out->elementEnd('dd');
-            $this->out->elementEnd('dl');
         }
         if ($this->group->description) {
-            $this->out->elementStart('dl', 'entity_note');
-            $this->out->element('dt', null, _('Note'));
-            $this->out->elementStart('dd', 'note');
+            $this->out->elementStart('p', 'note');
             $this->out->raw($this->highlight($this->group->description));
-            $this->out->elementEnd('dd');
-            $this->out->elementEnd('dl');
+            $this->out->elementEnd('p');
         }
 
         # If we're on a list with an owner (subscriptions or subscribers)...
diff --git a/lib/groupnav.php b/lib/groupnav.php
index 31cf378c8..131b38fa2 100644
--- a/lib/groupnav.php
+++ b/lib/groupnav.php
@@ -79,46 +79,49 @@ class GroupNav extends Widget
         $nickname = $this->group->nickname;
 
         $this->out->elementStart('ul', array('class' => 'nav'));
-        $this->out->menuItem(common_local_url('showgroup', array('nickname' =>
-                                                                 $nickname)),
-                             _('Group'),
-                             sprintf(_('%s group'), $nickname),
-                             $action_name == 'showgroup',
-                             'nav_group_group');
-        $this->out->menuItem(common_local_url('groupmembers', array('nickname' =>
-                                                                    $nickname)),
-                             _('Members'),
-                             sprintf(_('%s group members'), $nickname),
-                             $action_name == 'groupmembers',
-                             'nav_group_members');
+        if (Event::handle('StartGroupGroupNav', array($this))) {
+            $this->out->menuItem(common_local_url('showgroup', array('nickname' =>
+                                                                     $nickname)),
+                                 _('Group'),
+                                 sprintf(_('%s group'), $nickname),
+                                 $action_name == 'showgroup',
+                                 'nav_group_group');
+            $this->out->menuItem(common_local_url('groupmembers', array('nickname' =>
+                                                                        $nickname)),
+                                 _('Members'),
+                                 sprintf(_('%s group members'), $nickname),
+                                 $action_name == 'groupmembers',
+                                 'nav_group_members');
 
-        $cur = common_current_user();
+            $cur = common_current_user();
 
-        if ($cur && $cur->isAdmin($this->group)) {
-            $this->out->menuItem(common_local_url('blockedfromgroup', array('nickname' =>
-                                                                            $nickname)),
-                                 _('Blocked'),
-                                 sprintf(_('%s blocked users'), $nickname),
-                                 $action_name == 'blockedfromgroup',
-                                 'nav_group_blocked');
-            $this->out->menuItem(common_local_url('editgroup', array('nickname' =>
-                                                                     $nickname)),
-                                 _('Admin'),
-                                 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->menuItem(common_local_url('groupdesignsettings', array('nickname' =>
-                                                                  $nickname)),
-                                 _('Design'),
-                                 sprintf(_('Add or edit %s design'), $nickname),
-                                 $action_name == 'groupdesignsettings',
-                                 'nav_group_design');
+            if ($cur && $cur->isAdmin($this->group)) {
+                $this->out->menuItem(common_local_url('blockedfromgroup', array('nickname' =>
+                                                                                $nickname)),
+                                     _('Blocked'),
+                                     sprintf(_('%s blocked users'), $nickname),
+                                     $action_name == 'blockedfromgroup',
+                                     'nav_group_blocked');
+                $this->out->menuItem(common_local_url('editgroup', array('nickname' =>
+                                                                         $nickname)),
+                                     _('Admin'),
+                                     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->menuItem(common_local_url('groupdesignsettings', array('nickname' =>
+                                                                      $nickname)),
+                                     _('Design'),
+                                     sprintf(_('Add or edit %s design'), $nickname),
+                                     $action_name == 'groupdesignsettings',
+                                     'nav_group_design');
+            }
+            Event::handle('EndGroupGroupNav', array($this));
         }
         $this->out->elementEnd('ul');
     }
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index ce83295fb..c2ec83c28 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -375,8 +375,8 @@ class HTMLOutputter extends XMLOutputter
         $url = parse_url($src);
         if( empty($url->scheme) && empty($url->host) && empty($url->query) && empty($url->fragment))
         {
-            if(file_exists(theme_file($src,$theme))){
-               $src = theme_path($src, $theme) . '?version=' . STATUSNET_VERSION;
+            if(file_exists(Theme::file($src,$theme))){
+               $src = Theme::path($src, $theme) . '?version=' . STATUSNET_VERSION;
             }else{
                $src = common_path($src);
             }
diff --git a/lib/httpclient.php b/lib/httpclient.php
index f16e31e10..3f8262076 100644
--- a/lib/httpclient.php
+++ b/lib/httpclient.php
@@ -31,6 +31,9 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
+require_once 'HTTP/Request2.php';
+require_once 'HTTP/Request2/Response.php';
+
 /**
  * Useful structure for HTTP responses
  *
@@ -38,18 +41,53 @@ if (!defined('STATUSNET')) {
  * ways of doing them. This class hides the specifics of what underlying
  * library (curl or PHP-HTTP or whatever) that's used.
  *
+ * This extends the HTTP_Request2_Response class with methods to get info
+ * about any followed redirects.
+ *
  * @category HTTP
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @author Brion Vibber <brion@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
  */
-
-class HTTPResponse
+class HTTPResponse extends HTTP_Request2_Response
 {
-    public $code = null;
-    public $headers = array();
-    public $body = null;
+    function __construct(HTTP_Request2_Response $response, $url, $redirects=0)
+    {
+        foreach (get_object_vars($response) as $key => $val) {
+            $this->$key = $val;
+        }
+        $this->url = strval($url);
+        $this->redirectCount = intval($redirects);
+    }
+
+    /**
+     * Get the count of redirects that have been followed, if any.
+     * @return int
+     */
+    function getRedirectCount()
+    {
+        return $this->redirectCount;
+    }
+
+    /**
+     * Gets the final target URL, after any redirects have been followed.
+     * @return string URL
+     */
+    function getUrl()
+    {
+        return $this->url;
+    }
+
+    /**
+     * Check if the response is OK, generally a 200 status code.
+     * @return bool
+     */
+    function isOk()
+    {
+        return ($this->getStatus() == 200);
+    }
 }
 
 /**
@@ -59,64 +97,163 @@ class HTTPResponse
  * ways of doing them. This class hides the specifics of what underlying
  * library (curl or PHP-HTTP or whatever) that's used.
  *
+ * This extends the PEAR HTTP_Request2 package:
+ * - sends StatusNet-specific User-Agent header
+ * - 'follow_redirects' config option, defaulting off
+ * - 'max_redirs' config option, defaulting to 10
+ * - extended response class adds getRedirectCount() and getUrl() methods
+ * - get() and post() convenience functions return body content directly
+ *
  * @category HTTP
  * @package  StatusNet
  * @author   Evan Prodromou <evan@status.net>
+ * @author   Brion Vibber <brion@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
 
-class HTTPClient
+class HTTPClient extends HTTP_Request2
 {
-    static $_client = null;
 
-    static function start()
+    function __construct($url=null, $method=self::METHOD_GET, $config=array())
     {
-        if (!is_null(self::$_client)) {
-            return self::$_client;
-        }
-
-        $type = common_config('http', 'client');
-
-        switch ($type) {
-         case 'curl':
-            self::$_client = new CurlClient();
-            break;
-         default:
-            throw new Exception("Unknown HTTP client type '$type'");
-            break;
-        }
-
-        return self::$_client;
+        $this->config['max_redirs'] = 10;
+        $this->config['follow_redirects'] = true;
+        parent::__construct($url, $method, $config);
+        $this->setHeader('User-Agent', $this->userAgent());
     }
 
-    function head($url, $headers)
+    /**
+     * Convenience/back-compat instantiator
+     * @return HTTPClient
+     */
+    public static function start()
     {
-        throw new Exception("HEAD method unimplemented");
+        return new HTTPClient();
     }
 
-    function get($url, $headers)
+    /**
+     * Convenience function to run a GET request.
+     *
+     * @return HTTPResponse
+     * @throws HTTP_Request2_Exception
+     */
+    public function get($url, $headers=array())
     {
-        throw new Exception("GET method unimplemented");
+        return $this->doRequest($url, self::METHOD_GET, $headers);
     }
 
-    function post($url, $headers, $body)
+    /**
+     * Convenience function to run a HEAD request.
+     *
+     * @return HTTPResponse
+     * @throws HTTP_Request2_Exception
+     */
+    public function head($url, $headers=array())
     {
-        throw new Exception("POST method unimplemented");
+        return $this->doRequest($url, self::METHOD_HEAD, $headers);
     }
 
-    function put($url, $headers, $body)
+    /**
+     * Convenience function to POST form data.
+     *
+     * @param string $url
+     * @param array $headers optional associative array of HTTP headers
+     * @param array $data optional associative array or blob of form data to submit
+     * @return HTTPResponse
+     * @throws HTTP_Request2_Exception
+     */
+    public function post($url, $headers=array(), $data=array())
     {
-        throw new Exception("PUT method unimplemented");
+        if ($data) {
+            $this->addPostParameter($data);
+        }
+        return $this->doRequest($url, self::METHOD_POST, $headers);
     }
 
-    function delete($url, $headers)
+    /**
+     * @return HTTPResponse
+     * @throws HTTP_Request2_Exception
+     */
+    protected function doRequest($url, $method, $headers)
     {
-        throw new Exception("DELETE method unimplemented");
+        $this->setUrl($url);
+        $this->setMethod($method);
+        if ($headers) {
+            foreach ($headers as $header) {
+                $this->setHeader($header);
+            }
+        }
+        $response = $this->send();
+        return $response;
+    }
+    
+    protected function log($level, $detail) {
+        $method = $this->getMethod();
+        $url = $this->getUrl();
+        common_log($level, __CLASS__ . ": HTTP $method $url - $detail");
     }
 
+    /**
+     * Pulls up StatusNet's customized user-agent string, so services
+     * we hit can track down the responsible software.
+     *
+     * @return string
+     */
     function userAgent()
     {
         return "StatusNet/".STATUSNET_VERSION." (".STATUSNET_CODENAME.")";
     }
+
+    /**
+     * Actually performs the HTTP request and returns an HTTPResponse object
+     * with response body and header info.
+     *
+     * Wraps around parent send() to add logging and redirection processing.
+     *
+     * @return HTTPResponse
+     * @throw HTTP_Request2_Exception
+     */
+    public function send()
+    {
+        $maxRedirs = intval($this->config['max_redirs']);
+        if (empty($this->config['follow_redirects'])) {
+            $maxRedirs = 0;
+        }
+        $redirs = 0;
+        do {
+            try {
+                $response = parent::send();
+            } catch (HTTP_Request2_Exception $e) {
+                $this->log(LOG_ERR, $e->getMessage());
+                throw $e;
+            }
+            $code = $response->getStatus();
+            if ($code >= 200 && $code < 300) {
+                $reason = $response->getReasonPhrase();
+                $this->log(LOG_INFO, "$code $reason");
+            } elseif ($code >= 300 && $code < 400) {
+                $url = $this->getUrl();
+                $target = $response->getHeader('Location');
+                
+                if (++$redirs >= $maxRedirs) {
+                    common_log(LOG_ERR, __CLASS__ . ": Too many redirects: skipping $code redirect from $url to $target");
+                    break;
+                }
+                try {
+                    $this->setUrl($target);
+                    $this->setHeader('Referer', $url);
+                    common_log(LOG_INFO, __CLASS__ . ": Following $code redirect from $url to $target");
+                    continue;
+                } catch (HTTP_Request2_Exception $e) {
+                    common_log(LOG_ERR, __CLASS__ . ": Invalid $code redirect from $url to $target");
+                }
+            } else {
+                $reason = $response->getReasonPhrase();
+                $this->log(LOG_ERR, "$code $reason");
+            }
+            break;
+        } while ($maxRedirs);
+        return new HTTPResponse($response, $this->getUrl(), $redirs);
+    }
 }
diff --git a/lib/imagefile.php b/lib/imagefile.php
index 88f461481..cf1668f20 100644
--- a/lib/imagefile.php
+++ b/lib/imagefile.php
@@ -72,14 +72,19 @@ class ImageFile
             break;
          case UPLOAD_ERR_INI_SIZE:
          case UPLOAD_ERR_FORM_SIZE:
-            throw new Exception(sprintf(_('That file is too big. The maximum file size is %d.'),
+            throw new Exception(sprintf(_('That file is too big. The maximum file size is %s.'),
                 ImageFile::maxFileSize()));
             return;
          case UPLOAD_ERR_PARTIAL:
             @unlink($_FILES[$param]['tmp_name']);
             throw new Exception(_('Partial upload.'));
             return;
+         case UPLOAD_ERR_NO_FILE:
+            // No file; probably just a non-AJAX submission.
+            return;
          default:
+            common_log(LOG_ERR, __METHOD__ . ": Unknown upload error " .
+                $_FILES[$param]['error']);
             throw new Exception(_('System error uploading file.'));
             return;
         }
diff --git a/lib/jabber.php b/lib/jabber.php
index 3dcdce5db..a8e295ea5 100644
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -176,6 +176,7 @@ function jabber_format_entry($profile, $notice)
     $xs = new XMLStringer();
     $xs->elementStart('html', array('xmlns' => 'http://jabber.org/protocol/xhtml-im'));
     $xs->elementStart('body', array('xmlns' => 'http://www.w3.org/1999/xhtml'));
+    $xs->element("img", array('src'=> $profile->avatarUrl(AVATAR_MINI_SIZE)));
     $xs->element('a', array('href' => $profile->profileurl),
                  $profile->nickname);
     $xs->text(": ");
@@ -184,6 +185,11 @@ function jabber_format_entry($profile, $notice)
     } else {
         $xs->raw(common_render_content($notice->content, $notice));
     }
+    $xs->text(" ");
+    $xs->element('a', array(
+        'href'=>common_local_url('conversation',
+            array('id' => $notice->conversation)).'#notice-'.$notice->id
+         ),sprintf(_('[%s]'),$notice->id));
     $xs->elementEnd('body');
     $xs->elementEnd('html');
 
@@ -475,5 +481,5 @@ function jabber_public_notice($notice)
 
 function jabber_format_notice(&$profile, &$notice)
 {
-    return $profile->nickname . ': ' . $notice->content;
+    return $profile->nickname . ': ' . $notice->content . ' [' . $notice->id . ']';
 }
diff --git a/lib/language.php b/lib/language.php
index 7dcb808c9..2570907b7 100644
--- a/lib/language.php
+++ b/lib/language.php
@@ -100,38 +100,40 @@ function get_nice_language_list()
  * @return array mapping of language codes to language info
  */
 function get_all_languages() {
-	return array(
-		'bg'      => array('q' => 0.8, 'lang' => 'bg', 'name' => 'Bulgarian', 'direction' => 'ltr'),
-		'ca'      => array('q' => 0.5, 'lang' => 'ca', 'name' => 'Catalan', 'direction' => 'ltr'),
-		'cs'      => array('q' => 0.5, 'lang' => 'cs', 'name' => 'Czech', 'direction' => 'ltr'),
-		'de'      => array('q' => 0.8, 'lang' => 'de', 'name' => 'German', 'direction' => 'ltr'),
-		'el'      => array('q' => 0.1, 'lang' => 'el',    'name' => 'Greek', 'direction' => 'ltr'),
-		'en-us'   => array('q' => 1, 'lang' => 'en', 'name' => 'English (US)', 'direction' => 'ltr'),
-		'en-gb'   => array('q' => 1, 'lang' => 'en_GB', 'name' => 'English (British)', 'direction' => 'ltr'),
-		'en'      => array('q' => 1, 'lang' => 'en',    'name' => 'English (US)', 'direction' => 'ltr'),
-		'es'      => array('q' => 1, 'lang' => 'es',    'name' => 'Spanish', 'direction' => 'ltr'),
-		'fi'      => array('q' => 1, 'lang' => 'fi', 'name' => 'Finnish', 'direction' => 'ltr'),
-		'fr-fr'   => array('q' => 1, 'lang' => 'fr', 'name' => 'French', 'direction' => 'ltr'),
-		'ga'      => array('q' => 0.5, 'lang' => 'ga', 'name' => 'Galician', 'direction' => 'ltr'),
-		'he'      => array('q' => 0.5, 'lang' => 'he', 'name' => 'Hebrew', 'direction' => 'rtl'),
-		'it'      => array('q' => 1, 'lang' => 'it', 'name' => 'Italian', 'direction' => 'ltr'),
-		'jp'      => array('q' => 0.5, 'lang' => 'ja', 'name' => 'Japanese', 'direction' => 'ltr'),
-		'ko'      => array('q' => 0.9, 'lang' => 'ko',    'name' => 'Korean', 'direction' => 'ltr'),
-		'mk'      => array('q' => 0.5, 'lang' => 'mk', 'name' => 'Macedonian', 'direction' => 'ltr'),
-		'nb'      => array('q' => 0.1, 'lang' => 'nb', 'name' => 'Norwegian (Bokmål)', 'direction' => 'ltr'),
-		'no'      => array('q' => 0.1, 'lang' => 'nb', 'name' => 'Norwegian (Bokmål)', 'direction' => 'ltr'),
-		'nn'      => array('q' => 1, 'lang' => 'nn', 'name' => 'Norwegian (Nynorsk)', 'direction' => 'ltr'),
-		'nl'      => array('q' => 0.5, 'lang' => 'nl', 'name' => 'Dutch', 'direction' => 'ltr'),
-		'pl'      => array('q' => 0.5, 'lang' => 'pl', 'name' => 'Polish', 'direction' => 'ltr'),
-		'pt'      => array('q' => 0.1, 'lang' => 'pt',    'name' => 'Portuguese', 'direction' => 'ltr'),
-		'pt-br'   => array('q' => 0.9, 'lang' => 'pt_BR', 'name' => 'Portuguese Brazil', 'direction' => 'ltr'),
-		'ru'      => array('q' => 0.9, 'lang' => 'ru', 'name' => 'Russian', 'direction' => 'ltr'),
-		'sv'      => array('q' => 0.8, 'lang' => 'sv', 'name' => 'Swedish', 'direction' => 'ltr'),
-		'te'      => array('q' => 0.3, 'lang' => 'te', 'name' => 'Telugu', 'direction' => 'ltr'),
-		'tr'      => array('q' => 0.5, 'lang' => 'tr', 'name' => 'Turkish', 'direction' => 'ltr'),
-		'uk'      => array('q' => 1, 'lang' => 'uk', 'name' => 'Ukrainian', 'direction' => 'ltr'),
-		'vi'      => array('q' => 0.8, 'lang' => 'vi', '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_TW', 'name' => 'Chinese (Taiwanese)', 'direction' => 'ltr'),
-	);
+    return array(
+        'ar'      => array('q' => 0.8, 'lang' => 'ar', 'name' => 'Arabic', 'direction' => 'rtl'),
+        'bg'      => array('q' => 0.8, 'lang' => 'bg', 'name' => 'Bulgarian', 'direction' => 'ltr'),
+        'ca'      => array('q' => 0.5, 'lang' => 'ca', 'name' => 'Catalan', 'direction' => 'ltr'),
+        'cs'      => array('q' => 0.5, 'lang' => 'cs', 'name' => 'Czech', 'direction' => 'ltr'),
+        'de'      => array('q' => 0.8, 'lang' => 'de', 'name' => 'German', 'direction' => 'ltr'),
+        'el'      => array('q' => 0.1, 'lang' => 'el',    'name' => 'Greek', 'direction' => 'ltr'),
+        'en-us'   => array('q' => 1, 'lang' => 'en', 'name' => 'English (US)', 'direction' => 'ltr'),
+        'en-gb'   => array('q' => 1, 'lang' => 'en_GB', 'name' => 'English (British)', 'direction' => 'ltr'),
+        'en'      => array('q' => 1, 'lang' => 'en',    'name' => 'English (US)', 'direction' => 'ltr'),
+        'es'      => array('q' => 1, 'lang' => 'es',    'name' => 'Spanish', 'direction' => 'ltr'),
+        'fi'      => array('q' => 1, 'lang' => 'fi', 'name' => 'Finnish', 'direction' => 'ltr'),
+        'fr-fr'   => array('q' => 1, 'lang' => 'fr', 'name' => 'French', 'direction' => 'ltr'),
+        'ga'      => array('q' => 0.5, 'lang' => 'ga', 'name' => 'Galician', 'direction' => 'ltr'),
+        'he'      => array('q' => 0.5, 'lang' => 'he', 'name' => 'Hebrew', 'direction' => 'rtl'),
+        'is'      => array('q' => 0.1, 'lang' => 'is', 'name' => 'Icelandic', 'direction' => 'ltr'),
+        'it'      => array('q' => 1, 'lang' => 'it', 'name' => 'Italian', 'direction' => 'ltr'),
+        'jp'      => array('q' => 0.5, 'lang' => 'ja', 'name' => 'Japanese', 'direction' => 'ltr'),
+        'ko'      => array('q' => 0.9, 'lang' => 'ko',    'name' => 'Korean', 'direction' => 'ltr'),
+        'mk'      => array('q' => 0.5, 'lang' => 'mk', 'name' => 'Macedonian', 'direction' => 'ltr'),
+        'nb'      => array('q' => 0.1, 'lang' => 'nb', 'name' => 'Norwegian (Bokmål)', 'direction' => 'ltr'),
+        'no'      => array('q' => 0.1, 'lang' => 'nb', 'name' => 'Norwegian (Bokmål)', 'direction' => 'ltr'),
+        'nn'      => array('q' => 1, 'lang' => 'nn', 'name' => 'Norwegian (Nynorsk)', 'direction' => 'ltr'),
+        'nl'      => array('q' => 0.5, 'lang' => 'nl', 'name' => 'Dutch', 'direction' => 'ltr'),
+        'pl'      => array('q' => 0.5, 'lang' => 'pl', 'name' => 'Polish', 'direction' => 'ltr'),
+        'pt'      => array('q' => 0.1, 'lang' => 'pt',    'name' => 'Portuguese', 'direction' => 'ltr'),
+        'pt-br'   => array('q' => 0.9, 'lang' => 'pt_BR', 'name' => 'Portuguese Brazil', 'direction' => 'ltr'),
+        'ru'      => array('q' => 0.9, 'lang' => 'ru', 'name' => 'Russian', 'direction' => 'ltr'),
+        'sv'      => array('q' => 0.8, 'lang' => 'sv', 'name' => 'Swedish', 'direction' => 'ltr'),
+        'te'      => array('q' => 0.3, 'lang' => 'te', 'name' => 'Telugu', 'direction' => 'ltr'),
+        'tr'      => array('q' => 0.5, 'lang' => 'tr', 'name' => 'Turkish', 'direction' => 'ltr'),
+        'uk'      => array('q' => 1, 'lang' => 'uk', 'name' => 'Ukrainian', 'direction' => 'ltr'),
+        'vi'      => array('q' => 0.8, 'lang' => 'vi', '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_TW', 'name' => 'Chinese (Taiwanese)', 'direction' => 'ltr'),
+    );
 }
diff --git a/lib/location.php b/lib/location.php
new file mode 100644
index 000000000..bbfc15a36
--- /dev/null
+++ b/lib/location.php
@@ -0,0 +1,188 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Class for locations
+ *
+ * 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  Location
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * class for locations
+ *
+ * These are stored in the DB as part of notice and profile records,
+ * but since they're about the same in both, we have a separate class
+ * for them.
+ *
+ * @category Location
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class Location
+{
+    public  $lat;
+    public  $lon;
+    public  $location_id;
+    public  $location_ns;
+    private $_url;
+
+    var $names = array();
+
+    /**
+     * Constructor that makes a Location from a string name
+     *
+     * @param string $name     Human-readable name (any kind)
+     * @param string $language Language, default = common_language()
+     *
+     * @return Location Location with that name (or null if not found)
+     */
+
+    static function fromName($name, $language=null)
+    {
+        if (is_null($language)) {
+            $language = common_language();
+        }
+
+        $location = null;
+
+        // Let a third-party handle it
+
+        Event::handle('LocationFromName', array($name, $language, &$location));
+
+        return $location;
+    }
+
+    /**
+     * Constructor that makes a Location from an ID
+     *
+     * @param integer $id       Identifier ID
+     * @param integer $ns       Namespace of the identifier
+     * @param string  $language Language to return name in (default is common)
+     *
+     * @return Location The location with this ID (or null if none)
+     */
+
+    static function fromId($id, $ns, $language=null)
+    {
+        if (is_null($language)) {
+            $language = common_language();
+        }
+
+        $location = null;
+
+        // Let a third-party handle it
+
+        Event::handle('LocationFromId', array($id, $ns, $language, &$location));
+
+        return $location;
+    }
+
+    /**
+     * Constructor that finds the nearest location to a lat/lon pair
+     *
+     * @param float  $lat      Latitude
+     * @param float  $lon      Longitude
+     * @param string $language Language for results, default = current
+     *
+     * @return Location the location found, or null if none found
+     */
+
+    static function fromLatLon($lat, $lon, $language=null)
+    {
+        if (is_null($language)) {
+            $language = common_language();
+        }
+
+        $location = null;
+
+        // Let a third-party handle it
+
+        if (Event::handle('LocationFromLatLon',
+                          array($lat, $lon, $language, &$location))) {
+            // Default is just the lat/lon pair
+
+            $location = new Location();
+
+            $location->lat = $lat;
+            $location->lon = $lon;
+        }
+
+        return $location;
+    }
+
+    /**
+     * Get the name for this location in the given language
+     *
+     * @param string $language language to use, default = current
+     *
+     * @return string location name or null if not found
+     */
+
+    function getName($language=null)
+    {
+        if (is_null($language)) {
+            $language = common_language();
+        }
+
+        if (array_key_exists($language, $this->names)) {
+            return $this->names[$language];
+        } else {
+            $name = null;
+            Event::handle('LocationNameLanguage', array($this, $language, &$name));
+            if (!empty($name)) {
+                $this->names[$language] = $name;
+                return $name;
+            }
+        }
+    }
+
+    /**
+     * Get an URL suitable for this location
+     *
+     * @return string URL for this location or NULL
+     */
+
+    function getURL()
+    {
+        // Keep one cached
+
+        if (is_string($this->_url)) {
+            return $this->_url;
+        }
+
+        $url = null;
+
+        Event::handle('LocationUrl', array($this, &$url));
+
+        $this->_url = $url;
+
+        return $url;
+    }
+}
diff --git a/lib/mail.php b/lib/mail.php
index 5218059e9..dffac3262 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -216,7 +216,8 @@ function mail_subscribe_notify($listenee, $listener)
 
 function mail_subscribe_notify_profile($listenee, $other)
 {
-    if ($listenee->email && $listenee->emailnotifysub) {
+    if ($other->hasRight(Right::EMAILONSUBSCRIBE) &&
+        $listenee->email && $listenee->emailnotifysub) {
 
         // use the recipient's localization
         common_init_locale($listenee->language);
@@ -545,6 +546,10 @@ function mail_notify_message($message, $from=null, $to=null)
 
 function mail_notify_fave($other, $user, $notice)
 {
+    if (!$user->hasRight(Right::EMAILONFAVE)) {
+        return;
+    }
+
     $profile = $user->getProfile();
 
     $bestname = $profile->getBestName();
@@ -594,10 +599,14 @@ function mail_notify_attn($user, $notice)
 
     $sender = $notice->getProfile();
 
+    if (!$sender->hasRight(Right::EMAILONREPLY)) {
+        return;
+    }
+
     $bestname = $sender->getBestName();
 
     common_init_locale($user->language);
-	
+
 	if ($notice->conversation != $notice->id) {
 		$conversationEmailText = "The full conversation can be read here:\n\n".
 								 "\t%5\$s\n\n ";
@@ -607,9 +616,9 @@ function mail_notify_attn($user, $notice)
 		$conversationEmailText = "%5\$s";
 		$conversationUrl = null;
 	}
-	
+
     $subject = sprintf(_('%s (@%s) sent a notice to your attention'), $bestname, $sender->nickname);
-	
+
 	$body = sprintf(_("%1\$s (@%9\$s) just sent a notice to your attention (an '@-reply') on %2\$s.\n\n".
                       "The notice is here:\n\n".
                       "\t%3\$s\n\n" .
@@ -635,7 +644,7 @@ function mail_notify_attn($user, $notice)
                                      array('nickname' => $user->nickname)),//%7
                     common_local_url('emailsettings'), //%8
                     $sender->nickname); //%9
-	
+
     common_init_locale();
     mail_to_user($user, $subject, $body);
 }
diff --git a/lib/mailbox.php b/lib/mailbox.php
index e1d384a06..90a58b4c4 100644
--- a/lib/mailbox.php
+++ b/lib/mailbox.php
@@ -282,7 +282,7 @@ class MailboxAction extends CurrentUserDesignAction
                                     $ns->name);
                 $this->elementEnd('span');
             } else {
-                $this->out->element('span', 'device', $source_name);
+                $this->element('span', 'device', $source_name);
             }
             break;
         }
diff --git a/lib/mediafile.php b/lib/mediafile.php
new file mode 100644
index 000000000..29d752f0c
--- /dev/null
+++ b/lib/mediafile.php
@@ -0,0 +1,289 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Abstraction for media files in general
+ *
+ * TODO: combine with ImageFile?
+ *
+ * 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  Media
+ * @package   StatusNet
+ * @author    Robin Millette <robin@millette.info>
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2008-2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+class MediaFile
+{
+
+    var $filename      = null;
+    var $fileRecord    = null;
+    var $user          = null;
+    var $fileurl       = null;
+    var $short_fileurl = null;
+    var $mimetype      = null;
+
+    function __construct($user = null, $filename = null, $mimetype = null)
+    {
+        if ($user == null) {
+            $this->user = common_current_user();
+        }
+
+        $this->filename   = $filename;
+        $this->mimetype   = $mimetype;
+        $this->fileRecord = $this->storeFile();
+
+        $this->fileurl = common_local_url('attachment',
+                                    array('attachment' => $this->fileRecord->id));
+
+        $this->maybeAddRedir($this->fileRecord->id, $this->fileurl);
+        $this->short_fileurl = common_shorten_url($this->fileurl);
+        $this->maybeAddRedir($this->fileRecord->id, $this->short_fileurl);
+    }
+
+    function attachToNotice($notice)
+    {
+        File_to_post::processNew($this->fileRecord->id, $notice->id);
+        $this->maybeAddRedir($this->fileRecord->id,
+                             common_local_url('file', array('notice' => $notice->id)));
+    }
+
+    function shortUrl()
+    {
+        return $this->short_fileurl;
+    }
+
+    function delete()
+    {
+        $filepath = File::path($this->filename);
+        @unlink($filepath);
+    }
+
+    function storeFile() {
+
+        $file = new File;
+
+        $file->filename = $this->filename;
+        $file->url      = File::url($this->filename);
+        $filepath       = File::path($this->filename);
+        $file->size     = filesize($filepath);
+        $file->date     = time();
+        $file->mimetype = $this->mimetype;
+
+        $file_id = $file->insert();
+
+        if (!$file_id) {
+            common_log_db_error($file, "INSERT", __FILE__);
+            throw new ClientException(_('There was a database error while saving your file. Please try again.'));
+        }
+
+        return $file;
+    }
+
+    function rememberFile($file, $short)
+    {
+        $this->maybeAddRedir($file->id, $short);
+    }
+
+    function maybeAddRedir($file_id, $url)
+    {
+        $file_redir = File_redirection::staticGet('url', $url);
+
+        if (empty($file_redir)) {
+
+            $file_redir = new File_redirection;
+            $file_redir->url = $url;
+            $file_redir->file_id = $file_id;
+
+            $result = $file_redir->insert();
+
+            if (!$result) {
+                common_log_db_error($file_redir, "INSERT", __FILE__);
+                throw new ClientException(_('There was a database error while saving your file. Please try again.'));
+            }
+        }
+    }
+
+    static function fromUpload($param = 'media', $user = null)
+    {
+        if (empty($user)) {
+            $user = common_current_user();
+        }
+
+        if (!isset($_FILES[$param]['error'])){
+            return;
+        }
+
+        switch ($_FILES[$param]['error']) {
+        case UPLOAD_ERR_OK: // success, jump out
+            break;
+        case UPLOAD_ERR_INI_SIZE:
+            throw new ClientException(_('The uploaded file exceeds the ' .
+                'upload_max_filesize directive in php.ini.'));
+            return;
+        case UPLOAD_ERR_FORM_SIZE:
+            throw new ClientException(
+                _('The uploaded file exceeds the MAX_FILE_SIZE directive' .
+                ' that was specified in the HTML form.'));
+            return;
+        case UPLOAD_ERR_PARTIAL:
+            @unlink($_FILES[$param]['tmp_name']);
+            throw new ClientException(_('The uploaded file was only' .
+                ' partially uploaded.'));
+            return;
+        case UPLOAD_ERR_NO_FILE:
+            // No file; probably just a non-AJAX submission.
+            return;
+        case UPLOAD_ERR_NO_TMP_DIR:
+            throw new ClientException(_('Missing a temporary folder.'));
+            return;
+        case UPLOAD_ERR_CANT_WRITE:
+            throw new ClientException(_('Failed to write file to disk.'));
+            return;
+        case UPLOAD_ERR_EXTENSION:
+            throw new ClientException(_('File upload stopped by extension.'));
+            return;
+        default:
+            common_log(LOG_ERR, __METHOD__ . ": Unknown upload error " .
+                $_FILES[$param]['error']);
+            throw new ClientException(_('System error uploading file.'));
+            return;
+        }
+
+        if (!MediaFile::respectsQuota($user, $_FILES['attach']['size'])) {
+
+            // Should never actually get here
+
+            @unlink($_FILES[$param]['tmp_name']);
+            throw new ClientException(_('File exceeds user\'s quota!'));
+            return;
+        }
+
+        $mimetype = MediaFile::getUploadedFileType($_FILES[$param]['tmp_name']);
+
+        $filename = null;
+
+        if (isset($mimetype)) {
+
+            $basename = basename($_FILES[$param]['name']);
+            $filename = File::filename($user->getProfile(), $basename, $mimetype);
+            $filepath = File::path($filename);
+
+            $result = move_uploaded_file($_FILES[$param]['tmp_name'], $filepath);
+
+            if (!$result) {
+                throw new ClientException(_('File could not be moved to destination directory.'));
+                return;
+            }
+
+        } else {
+            throw new ClientException(_('Could not determine file\'s mime-type!'));
+            return;
+        }
+
+        return new MediaFile($user, $filename, $mimetype);
+    }
+
+    static function fromFilehandle($fh, $user) {
+
+        $stream = stream_get_meta_data($fh);
+
+        if (!MediaFile::respectsQuota($user, filesize($stream['uri']))) {
+
+            // Should never actually get here
+
+            throw new ClientException(_('File exceeds user\'s quota!'));
+            return;
+        }
+
+        $mimetype = MediaFile::getUploadedFileType($fh);
+
+        $filename = null;
+
+        if (isset($mimetype)) {
+
+            $filename = File::filename($user->getProfile(), "email", $mimetype);
+
+            $filepath = File::path($filename);
+
+            $result = copy($stream['uri'], $filepath) && chmod($filepath, 0664);
+
+            if (!$result) {
+                throw new ClientException(_('File could not be moved to destination directory.' .
+                    $stream['uri'] . ' ' . $filepath));
+            }
+        } else {
+            throw new ClientException(_('Could not determine file\'s mime-type!'));
+            return;
+        }
+
+        return new MediaFile($user, $filename, $mimetype);
+    }
+
+    static function getUploadedFileType($f) {
+        require_once 'MIME/Type.php';
+
+        $cmd = &PEAR::getStaticProperty('MIME_Type', 'fileCmd');
+        $cmd = common_config('attachments', 'filecommand');
+
+        $filetype = null;
+
+        if (is_string($f)) {
+
+            // assuming a filename
+
+            $filetype = MIME_Type::autoDetect($f);
+        } else {
+
+            // assuming a filehandle
+
+            $stream  = stream_get_meta_data($f);
+            $filetype = MIME_Type::autoDetect($stream['uri']);
+        }
+
+        if (in_array($filetype, common_config('attachments', 'supported'))) {
+            return $filetype;
+        }
+        $media = MIME_Type::getMedia($filetype);
+        if ('application' !== $media) {
+            $hint = sprintf(_(' Try using another %s format.'), $media);
+        } else {
+            $hint = '';
+        }
+        throw new ClientException(sprintf(
+            _('%s is not a supported filetype on this server.'), $filetype) . $hint);
+    }
+
+    static function respectsQuota($user, $filesize)
+    {
+        $file = new File;
+        $result = $file->isRespectsQuota($user, $filesize);
+        if ($result === true) {
+            return true;
+        } else {
+            throw new ClientException($result);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/lib/messageform.php b/lib/messageform.php
index e25ebfa08..b034be312 100644
--- a/lib/messageform.php
+++ b/lib/messageform.php
@@ -80,11 +80,22 @@ class MessageForm extends Form
     /**
      * ID of the form
      *
-     * @return int ID of the form
+     * @return string ID of the form
      */
 
     function id()
     {
+        return 'form_notice-direct';
+    }
+
+   /**
+     * Class of the form
+     *
+     * @return string class of the form
+     */
+
+    function formClass()
+    {
         return 'form_notice';
     }
 
diff --git a/lib/noticeform.php b/lib/noticeform.php
index 9864d15eb..1be011c18 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -105,7 +105,7 @@ class NoticeForm extends Form
     /**
      * ID of the form
      *
-     * @return int ID of the form
+     * @return string ID of the form
      */
 
     function id()
@@ -113,6 +113,17 @@ class NoticeForm extends Form
         return 'form_notice';
     }
 
+   /**
+     * Class of the form
+     *
+     * @return string class of the form
+     */
+
+    function formClass()
+    {
+        return 'form_notice';
+    }
+
     /**
      * Action of the form
      *
diff --git a/lib/noticelist.php b/lib/noticelist.php
index 6c296f82a..bf12bb73c 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -199,6 +199,7 @@ class NoticeListItem extends Widget
     {
         $this->out->elementStart('div', 'entry-content');
         $this->showNoticeLink();
+        $this->showNoticeLocation();
         $this->showNoticeSource();
         $this->showContext();
         $this->out->elementEnd('div');
@@ -370,6 +371,44 @@ class NoticeListItem extends Widget
     }
 
     /**
+     * show the notice location
+     *
+     * shows the notice location in the correct language.
+     *
+     * If an URL is available, makes a link. Otherwise, just a span.
+     *
+     * @return void
+     */
+
+    function showNoticeLocation()
+    {
+        $id = $this->notice->id;
+
+        $location = $this->notice->getLocation();
+
+        if (empty($location)) {
+            return;
+        }
+
+        $name = $location->getName();
+
+        if (empty($name)) {
+            // XXX: Could be a translation issue. Fall back to... something?
+            return;
+        }
+
+        $url  = $location->getUrl();
+
+        if (empty($url)) {
+            $this->out->element('span', array('class' => 'location'), $name);
+        } else {
+            $this->out->element('a', array('class' => 'location',
+                                           'href' => $url),
+                                $name);
+        }
+    }
+
+    /**
      * Show the source of the notice
      *
      * Either the name (and link) of the API client that posted the notice,
@@ -474,7 +513,7 @@ class NoticeListItem extends Widget
         $user = common_current_user();
 
         if (!empty($user) &&
-            ($this->notice->profile_id == $user->id || $user->hasRight(Right::deleteOthersNotice))) {
+            ($this->notice->profile_id == $user->id || $user->hasRight(Right::DELETEOTHERSNOTICE))) {
 
             $deleteurl = common_local_url('deletenotice',
                                           array('notice' => $this->notice->id));
diff --git a/lib/noticesection.php b/lib/noticesection.php
index b223932ef..24465f8ba 100644
--- a/lib/noticesection.php
+++ b/lib/noticesection.php
@@ -114,7 +114,7 @@ class NoticeSection extends Section
                     $att_class = 'attachments';
                 }
 
-                $clip = theme_path('images/icons/clip.png', 'base');
+                $clip = Theme::path('images/icons/clip.png', 'base');
                 $this->out->elementStart('a', array('class' => $att_class, 'style' => "font-style: italic;", 'href' => $href, 'title' => "# of attachments: $count"));
                 $this->out->raw(" ($count&nbsp");
                 $this->out->element('img', array('style' => 'display: inline', 'align' => 'top', 'width' => 20, 'height' => 20, 'src' => $clip, 'alt' => 'alt'));
diff --git a/lib/oauthclient.php b/lib/oauthclient.php
index f1827726e..1a86e2460 100644
--- a/lib/oauthclient.php
+++ b/lib/oauthclient.php
@@ -43,7 +43,7 @@ require_once 'OAuth.php';
  * @link     http://status.net/
  *
  */
-class OAuthClientCurlException extends Exception
+class OAuthClientException extends Exception
 {
 }
 
@@ -97,9 +97,14 @@ class OAuthClient
     function getRequestToken($url)
     {
         $response = $this->oAuthGet($url);
-        parse_str($response);
-        $token = new OAuthToken($oauth_token, $oauth_token_secret);
-        return $token;
+        $arr = array();
+        parse_str($response, $arr);
+        if (isset($arr['oauth_token']) && isset($arr['oauth_token_secret'])) {
+            $token = new OAuthToken($arr['oauth_token'], @$arr['oauth_token_secret']);
+            return $token;
+        } else {
+            throw new OAuthClientException();
+        }
     }
 
     /**
@@ -177,7 +182,7 @@ class OAuthClient
     }
 
     /**
-     * Make a HTTP request using cURL.
+     * Make a HTTP request.
      *
      * @param string $url    Where to make the
      * @param array  $params post parameters
@@ -186,40 +191,32 @@ class OAuthClient
      */
     function httpRequest($url, $params = null)
     {
-        $options = array(
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_FAILONERROR    => true,
-            CURLOPT_HEADER         => false,
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_USERAGENT      => 'StatusNet',
-            CURLOPT_CONNECTTIMEOUT => 120,
-            CURLOPT_TIMEOUT        => 120,
-            CURLOPT_HTTPAUTH       => CURLAUTH_ANY,
-            CURLOPT_SSL_VERIFYPEER => false,
-
-            // Twitter is strict about accepting invalid "Expect" headers
-
-            CURLOPT_HTTPHEADER => array('Expect:')
-        );
+        $request = new HTTPClient($url);
+        $request->setConfig(array(
+            'connect_timeout' => 120,
+            'timeout' => 120,
+            'follow_redirects' => true,
+            'ssl_verify_peer' => false,
+        ));
+
+        // Twitter is strict about accepting invalid "Expect" headers
+        $request->setHeader('Expect', '');
 
         if (isset($params)) {
-            $options[CURLOPT_POST]       = true;
-            $options[CURLOPT_POSTFIELDS] = $params;
+            $request->setMethod(HTTP_Request2::METHOD_POST);
+            $request->setBody($params);
         }
 
-        $ch = curl_init($url);
-        curl_setopt_array($ch, $options);
-        $response = curl_exec($ch);
-
-        if ($response === false) {
-            $msg  = curl_error($ch);
-            $code = curl_errno($ch);
-            throw new OAuthClientCurlException($msg, $code);
+        try {
+            $response = $request->send();
+            $code = $response->getStatus();
+            if ($code < 200 || $code >= 400) {
+                throw new OAuthClientException($response->getBody(), $code);
+            }
+            return $response->getBody();
+        } catch (Exception $e) {
+            throw new OAuthClientException($e->getMessage(), $e->getCode());
         }
-
-        curl_close($ch);
-
-        return $response;
     }
 
 }
diff --git a/lib/oauthstore.php b/lib/oauthstore.php
index d617a7df7..b04bcbb8b 100644
--- a/lib/oauthstore.php
+++ b/lib/oauthstore.php
@@ -351,7 +351,7 @@ class StatusNetOAuthDataStore extends OAuthDataStore
             $author = User::staticGet('uri', $author_uri);
         }
         if (!$author) {
-            throw new Exception('No such user');
+            throw new Exception('No such user.');
         }
 
         common_log(LOG_DEBUG, print_r($author, true), __FILE__);
@@ -407,7 +407,7 @@ class StatusNetOAuthDataStore extends OAuthDataStore
             $user = User::staticGet('uri', $uri);
         }
         if (!$user) {
-            throw new Exception('No such user');
+            throw new Exception('No such user.');
         }
         return $user;
     }
@@ -462,6 +462,10 @@ class StatusNetOAuthDataStore extends OAuthDataStore
         $subscribed = $this->_getAnyProfile($subscribed_user_uri);
         $subscriber = $this->_getAnyProfile($subscriber_uri);
 
+        if (!$subscriber->hasRight(Right::SUBSCRIBE)) {
+            return _('You have been banned from subscribing.');
+        }
+
         $sub->subscribed = $subscribed->id;
         $sub->subscriber = $subscriber->id;
 
diff --git a/lib/ping.php b/lib/ping.php
index 175bf8440..5698c4038 100644
--- a/lib/ping.php
+++ b/lib/ping.php
@@ -44,20 +44,16 @@ function ping_broadcast_notice($notice) {
 																array('nickname' => $profile->nickname)),
 											   $tags));
 
-            $context = stream_context_create(array('http' => array('method' => "POST",
-                                                                   'header' =>
-                                                                   "Content-Type: text/xml\r\n".
-                                                                   "User-Agent: StatusNet/".STATUSNET_VERSION."\r\n",
-                                                                   'content' => $req)));
-            $file = file_get_contents($notify_url, false, $context);
+            $request = HTTPClient::start();
+            $httpResponse = $request->post($notify_url, array('Content-Type: text/xml'), $req);
 
-            if ($file === false || mb_strlen($file) == 0) {
+            if (!$httpResponse || mb_strlen($httpResponse->getBody()) == 0) {
                 common_log(LOG_WARNING,
                            "XML-RPC empty results for ping ($notify_url, $notice->id) ");
                 continue;
             }
 
-            $response = xmlrpc_decode($file);
+            $response = xmlrpc_decode($httpResponse->getBody());
 
             if (is_array($response) && xmlrpc_is_fault($response)) {
                 common_log(LOG_WARNING,
diff --git a/lib/plugin.php b/lib/plugin.php
index 59bf3ba9d..87d7be5a7 100644
--- a/lib/plugin.php
+++ b/lib/plugin.php
@@ -76,18 +76,4 @@ class Plugin
     {
         return true;
     }
-
-    /* 
-    * the name of the shortener
-    * shortenerInfo associative array with additional information. One possible element is 'freeService' which can be true or false
-    * shortener array, first element is the name of the class, second element is an array to be passed as constructor parameters to the class
-    */
-    function registerUrlShortener($name, $shortenerInfo, $shortener)
-    {
-        global $_shorteners;
-        if(!is_array($_shorteners)){
-            $_shorteners=array();
-        }
-        $_shorteners[$name]=array('info'=>$shortenerInfo, 'callInfo'=>$shortener);
-    }
 }
diff --git a/lib/profileactionform.php b/lib/profileactionform.php
new file mode 100644
index 000000000..24d4595c0
--- /dev/null
+++ b/lib/profileactionform.php
@@ -0,0 +1,187 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Superclass for forms that operate on a profile
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Form
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Superclass for forms that operate on a profile
+ *
+ * Certain forms (block, silence, userflag, sandbox, delete) work on
+ * a single profile and work almost the same. So, this form extracts
+ * a lot of the common code to simplify those forms.
+ *
+ * @category Form
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ProfileActionForm extends Form
+{
+    /**
+     * Profile of user to act on
+     */
+
+    var $profile = null;
+
+    /**
+     * Return-to args
+     */
+
+    var $args = null;
+
+    /**
+     * Constructor
+     *
+     * @param HTMLOutputter $out     output channel
+     * @param Profile       $profile profile of user to act on
+     * @param array         $args    return-to args
+     */
+
+    function __construct($out=null, $profile=null, $args=null)
+    {
+        parent::__construct($out);
+
+        $this->profile = $profile;
+        $this->args    = $args;
+    }
+
+    /**
+     * ID of the form
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return $this->target() . '-' . $this->profile->id;
+    }
+
+    /**
+     * class of the form
+     *
+     * @return string class of the form
+     */
+
+    function formClass()
+    {
+        return 'form_user_'.$this->target();
+    }
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+
+    function action()
+    {
+        return common_local_url($this->target());
+    }
+
+    /**
+     * Legend of the Form
+     *
+     * @return void
+     */
+
+    function formLegend()
+    {
+        $this->out->element('legend', null, $this->description());
+    }
+
+    /**
+     * Data elements of the form
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $action = $this->target();
+
+        $this->out->hidden($action.'to-' . $this->profile->id,
+                           $this->profile->id,
+                           'profileid');
+
+        if ($this->args) {
+            foreach ($this->args as $k => $v) {
+                $this->out->hidden('returnto-' . $k, $v);
+            }
+        }
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->out->submit('submit', $this->title(), 'submit',
+                           null, $this->description());
+    }
+
+    /**
+     * Action this form targets
+     *
+     * @return string Name of the action, lowercased.
+     */
+
+    function target()
+    {
+        return null;
+    }
+
+    /**
+     * Title of the form
+     *
+     * @return string Title of the form, internationalized
+     */
+
+    function title()
+    {
+        return null;
+    }
+
+    /**
+     * Description of the form
+     *
+     * @return string description of the form, internationalized
+     */
+
+    function description()
+    {
+        return null;
+    }
+}
diff --git a/lib/profileformaction.php b/lib/profileformaction.php
new file mode 100644
index 000000000..8cb5f6a93
--- /dev/null
+++ b/lib/profileformaction.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * Superclass for actions that operate on a user
+ *
+ * PHP version 5
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Superclass for actions that operate on a user
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ */
+
+class ProfileFormAction extends Action
+{
+    var $profile = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $this->checkSessionToken();
+
+        if (!common_logged_in()) {
+            $this->clientError(_('Not logged in.'));
+            return false;
+        }
+
+        $id = $this->trimmed('profileid');
+
+        if (!$id) {
+            $this->clientError(_('No profile specified.'));
+            return false;
+        }
+
+        $this->profile = Profile::staticGet('id', $id);
+
+        if (!$this->profile) {
+            $this->clientError(_('No profile with that ID.'));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Handle request
+     *
+     * Shows a page with list of favorite notices
+     *
+     * @param array $args $_REQUEST args; handled in prepare()
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+            $this->handlePost();
+            $this->returnToArgs();
+        }
+    }
+
+    /**
+     * Return to the calling page based on hidden arguments
+     *
+     * @return void
+     */
+
+    function returnToArgs()
+    {
+        foreach ($this->args as $k => $v) {
+            if ($k == 'returnto-action') {
+                $action = $v;
+            } else if (substr($k, 0, 9) == 'returnto-') {
+                $args[substr($k, 9)] = $v;
+            }
+        }
+
+        if ($action) {
+            common_redirect(common_local_url($action, $args), 303);
+        } else {
+            $this->clientError(_("No return-to arguments"));
+        }
+    }
+
+    /**
+     * handle a POST request
+     *
+     * sub-classes should overload this request
+     *
+     * @return void
+     */
+
+    function handlePost()
+    {
+        $this->serverError(_("unimplemented method"));
+    }
+}
diff --git a/lib/profilelist.php b/lib/profilelist.php
index 5cc211e36..3412d41d1 100644
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -76,7 +76,7 @@ class ProfileList extends Widget
 
     function startList()
     {
-        $this->out->elementStart('ul', 'profiles');
+        $this->out->elementStart('ul', 'profiles xoxo');
     }
 
     function endList()
@@ -140,7 +140,7 @@ class ProfileListItem extends Widget
 
     function startItem()
     {
-        $this->out->elementStart('li', array('class' => 'profile',
+        $this->out->elementStart('li', array('class' => 'profile hentry',
                                              'id' => 'profile-' . $this->profile->id));
     }
 
@@ -175,14 +175,15 @@ class ProfileListItem extends Widget
 
     function startProfile()
     {
-        $this->out->elementStart('div', 'entity_profile vcard');
+        $this->out->elementStart('div', 'entity_profile vcard entry-content');
     }
 
     function showAvatar()
     {
         $avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE);
         $this->out->elementStart('a', array('href' => $this->profile->profileurl,
-                                            'class' => 'url'));
+                                            'class' => 'url entry-title',
+                                            'rel' => 'contact'));
         $this->out->element('img', array('src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_STREAM_SIZE),
                                          'class' => 'photo avatar',
                                          'width' => AVATAR_STREAM_SIZE,
@@ -190,7 +191,7 @@ class ProfileListItem extends Widget
                                          'alt' =>
                                          ($this->profile->fullname) ? $this->profile->fullname :
                                          $this->profile->nickname));
-        $hasFN = ($this->profile->fullname !== '') ? 'nickname' : 'fn nickname';
+        $hasFN = (!empty($this->profile->fullname)) ? 'nickname' : 'fn nickname';
         $this->out->elementStart('span', $hasFN);
         $this->out->raw($this->highlight($this->profile->nickname));
         $this->out->elementEnd('span');
@@ -200,53 +201,37 @@ class ProfileListItem extends Widget
     function showFullName()
     {
         if (!empty($this->profile->fullname)) {
-            $this->out->elementStart('dl', 'entity_fn');
-            $this->out->element('dt', null, 'Full name');
-            $this->out->elementStart('dd');
             $this->out->elementStart('span', 'fn');
             $this->out->raw($this->highlight($this->profile->fullname));
             $this->out->elementEnd('span');
-            $this->out->elementEnd('dd');
-            $this->out->elementEnd('dl');
         }
     }
 
     function showLocation()
     {
         if (!empty($this->profile->location)) {
-            $this->out->elementStart('dl', 'entity_location');
-            $this->out->element('dt', null, _('Location'));
-            $this->out->elementStart('dd', 'label');
+            $this->out->elementStart('span', 'location');
             $this->out->raw($this->highlight($this->profile->location));
-            $this->out->elementEnd('dd');
-            $this->out->elementEnd('dl');
+            $this->out->elementEnd('span');
         }
     }
 
     function showHomepage()
     {
         if (!empty($this->profile->homepage)) {
-            $this->out->elementStart('dl', 'entity_url');
-            $this->out->element('dt', null, _('URL'));
-            $this->out->elementStart('dd');
             $this->out->elementStart('a', array('href' => $this->profile->homepage,
                                                 'class' => 'url'));
             $this->out->raw($this->highlight($this->profile->homepage));
             $this->out->elementEnd('a');
-            $this->out->elementEnd('dd');
-            $this->out->elementEnd('dl');
         }
     }
 
     function showBio()
     {
         if (!empty($this->profile->bio)) {
-            $this->out->elementStart('dl', 'entity_note');
-            $this->out->element('dt', null, _('Note'));
-            $this->out->elementStart('dd', 'note');
+            $this->out->elementStart('p', 'note');
             $this->out->raw($this->highlight($this->profile->bio));
-            $this->out->elementEnd('dd');
-            $this->out->elementEnd('dl');
+            $this->out->elementEnd('p');
         }
     }
 
diff --git a/lib/right.php b/lib/right.php
index 4e0096d46..5e66eae0e 100644
--- a/lib/right.php
+++ b/lib/right.php
@@ -45,6 +45,17 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 class Right
 {
-    const deleteOthersNotice = 'deleteothersnotice';
+    const DELETEOTHERSNOTICE = 'deleteothersnotice';
+    const CONFIGURESITE      = 'configuresite';
+    const DELETEUSER         = 'deleteuser';
+    const SILENCEUSER        = 'silenceuser';
+    const SANDBOXUSER        = 'sandboxuser';
+    const NEWNOTICE          = 'newnotice';
+    const PUBLICNOTICE       = 'publicnotice';
+    const NEWMESSAGE         = 'newmessage';
+    const SUBSCRIBE          = 'subscribe';
+    const EMAILONREPLY       = 'emailonreply';
+    const EMAILONSUBSCRIBE   = 'emailonsubscribe';
+    const EMAILONFAVE        = 'emailonfave';
 }
 
diff --git a/lib/router.php b/lib/router.php
index 4fb0834fd..9629267ac 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -71,563 +71,585 @@ class Router
     {
         $m = Net_URL_Mapper::getInstance();
 
-        // In the "root"
+        if (Event::handle('StartInitializeRouter', array(&$m))) {
 
-        $m->connect('', array('action' => 'public'));
-        $m->connect('rss', array('action' => 'publicrss'));
-        $m->connect('featuredrss', array('action' => 'featuredrss'));
-        $m->connect('favoritedrss', array('action' => 'favoritedrss'));
-        $m->connect('opensearch/people', array('action' => 'opensearch',
-                                               'type' => 'people'));
-        $m->connect('opensearch/notice', array('action' => 'opensearch',
-                                               'type' => 'notice'));
+            // In the "root"
 
-        // docs
+            $m->connect('', array('action' => 'public'));
+            $m->connect('rss', array('action' => 'publicrss'));
+            $m->connect('featuredrss', array('action' => 'featuredrss'));
+            $m->connect('favoritedrss', array('action' => 'favoritedrss'));
+            $m->connect('opensearch/people', array('action' => 'opensearch',
+                                                   'type' => 'people'));
+            $m->connect('opensearch/notice', array('action' => 'opensearch',
+                                                   'type' => 'notice'));
 
-        $m->connect('doc/:title', array('action' => 'doc'));
+            // docs
 
-        // main stuff is repetitive
+            $m->connect('doc/:title', array('action' => 'doc'));
 
-        $main = array('login', 'logout', 'register', 'subscribe',
-                      'unsubscribe', 'confirmaddress', 'recoverpassword',
-                      'invite', 'favor', 'disfavor', 'sup',
-                      'block', 'unblock', 'subedit',
-                      'groupblock', 'groupunblock');
+            $m->connect('main/login?user_id=:user_id&token=:token', array('action'=>'login'), array('user_id'=> '[0-9]+', 'token'=>'.+'));
 
-        foreach ($main as $a) {
-            $m->connect('main/'.$a, array('action' => $a));
-        }
+            // main stuff is repetitive
 
-        $m->connect('main/sup/:seconds', array('action' => 'sup'),
-                    array('seconds' => '[0-9]+'));
+            $main = array('login', 'logout', 'register', 'subscribe',
+                          'unsubscribe', 'confirmaddress', 'recoverpassword',
+                          'invite', 'favor', 'disfavor', 'sup',
+                          'block', 'unblock', 'subedit',
+                          'groupblock', 'groupunblock',
+                          'sandbox', 'unsandbox',
+                          'silence', 'unsilence',
+                          'deleteuser');
 
-        $m->connect('main/tagother/:id', array('action' => 'tagother'));
+            foreach ($main as $a) {
+                $m->connect('main/'.$a, array('action' => $a));
+            }
 
-        $m->connect('main/oembed',
-                    array('action' => 'oembed'));
+            $m->connect('main/sup/:seconds', array('action' => 'sup'),
+                        array('seconds' => '[0-9]+'));
 
-        // these take a code
+            $m->connect('main/tagother/:id', array('action' => 'tagother'));
 
-        foreach (array('register', 'confirmaddress', 'recoverpassword') as $c) {
-            $m->connect('main/'.$c.'/:code', array('action' => $c));
-        }
+            $m->connect('main/oembed',
+                        array('action' => 'oembed'));
 
-        // exceptional
+            $m->connect('main/xrds',
+                        array('action' => 'publicxrds'));
 
-        $m->connect('main/remote', array('action' => 'remotesubscribe'));
-        $m->connect('main/remote?nickname=:nickname', array('action' => 'remotesubscribe'), array('nickname' => '[A-Za-z0-9_-]+'));
+            // these take a code
 
-        foreach (Router::$bare as $action) {
-            $m->connect('index.php?action=' . $action, array('action' => $action));
-        }
+            foreach (array('register', 'confirmaddress', 'recoverpassword') as $c) {
+                $m->connect('main/'.$c.'/:code', array('action' => $c));
+            }
 
-        // settings
+            // exceptional
 
-        foreach (array('profile', 'avatar', 'password', 'im',
-                       'email', 'sms', 'userdesign', 'other') as $s) {
-            $m->connect('settings/'.$s, array('action' => $s.'settings'));
-        }
+            $m->connect('main/remote', array('action' => 'remotesubscribe'));
+            $m->connect('main/remote?nickname=:nickname', array('action' => 'remotesubscribe'), array('nickname' => '['.NICKNAME_FMT.']+'));
 
-        // search
+            foreach (Router::$bare as $action) {
+                $m->connect('index.php?action=' . $action, array('action' => $action));
+            }
 
-        foreach (array('group', 'people', 'notice') as $s) {
-            $m->connect('search/'.$s, array('action' => $s.'search'));
-            $m->connect('search/'.$s.'?q=:q',
-                        array('action' => $s.'search'),
-                        array('q' => '.+'));
-        }
+            // settings
 
-        // The second of these is needed to make the link work correctly
-        // when inserted into the page. The first is needed to match the
-        // route on the way in. Seems to be another Net_URL_Mapper bug to me.
-        $m->connect('search/notice/rss', array('action' => 'noticesearchrss'));
-        $m->connect('search/notice/rss?q=:q', array('action' => 'noticesearchrss'),
-                    array('q' => '.+'));
-
-        $m->connect('attachment/:attachment',
-                    array('action' => 'attachment'),
-                    array('attachment' => '[0-9]+'));
-
-        $m->connect('attachment/:attachment/ajax',
-                    array('action' => 'attachment_ajax'),
-                    array('attachment' => '[0-9]+'));
-
-        $m->connect('attachment/:attachment/thumbnail',
-                    array('action' => 'attachment_thumbnail'),
-                    array('attachment' => '[0-9]+'));
-
-        $m->connect('notice/new', array('action' => 'newnotice'));
-        $m->connect('notice/new?replyto=:replyto',
-                    array('action' => 'newnotice'),
-                    array('replyto' => '[A-Za-z0-9_-]+'));
-        $m->connect('notice/new?replyto=:replyto&inreplyto=:inreplyto',
-                    array('action' => 'newnotice'),
-                    array('replyto' => '[A-Za-z0-9_-]+'),
-                    array('inreplyto' => '[0-9]+'));
-
-        $m->connect('notice/:notice/file',
-            array('action' => 'file'),
-            array('notice' => '[0-9]+'));
-
-        $m->connect('notice/:notice',
-                    array('action' => 'shownotice'),
-                    array('notice' => '[0-9]+'));
-        $m->connect('notice/delete', array('action' => 'deletenotice'));
-        $m->connect('notice/delete/:notice',
-                    array('action' => 'deletenotice'),
-                    array('notice' => '[0-9]+'));
-
-        // conversation
-
-        $m->connect('conversation/:id',
-                    array('action' => 'conversation'),
-                    array('id' => '[0-9]+'));
-
-        $m->connect('message/new', array('action' => 'newmessage'));
-        $m->connect('message/new?to=:to', array('action' => 'newmessage'), array('to' => '[A-Za-z0-9_-]+'));
-        $m->connect('message/:message',
-                    array('action' => 'showmessage'),
-                    array('message' => '[0-9]+'));
-
-        $m->connect('user/:id',
-                    array('action' => 'userbyid'),
-                    array('id' => '[0-9]+'));
-
-        $m->connect('tags/', array('action' => 'publictagcloud'));
-        $m->connect('tag/', array('action' => 'publictagcloud'));
-        $m->connect('tags', array('action' => 'publictagcloud'));
-        $m->connect('tag', array('action' => 'publictagcloud'));
-        $m->connect('tag/:tag/rss',
-                    array('action' => 'tagrss'),
-                    array('tag' => '[a-zA-Z0-9]+'));
-        $m->connect('tag/:tag',
-                    array('action' => 'tag'),
-                    array('tag' => '[\pL\pN_\-\.]{1,64}'));
-
-        $m->connect('peopletag/:tag',
-                    array('action' => 'peopletag'),
-                    array('tag' => '[a-zA-Z0-9]+'));
-
-        $m->connect('featured/', array('action' => 'featured'));
-        $m->connect('featured', array('action' => 'featured'));
-        $m->connect('favorited/', array('action' => 'favorited'));
-        $m->connect('favorited', array('action' => 'favorited'));
-
-        // groups
-
-        $m->connect('group/new', array('action' => 'newgroup'));
-
-        foreach (array('edit', 'join', 'leave') as $v) {
-            $m->connect('group/:nickname/'.$v,
-                        array('action' => $v.'group'),
-                        array('nickname' => '[a-zA-Z0-9]+'));
-        }
+            foreach (array('profile', 'avatar', 'password', 'im',
+                           'email', 'sms', 'userdesign', 'other') as $s) {
+                $m->connect('settings/'.$s, array('action' => $s.'settings'));
+            }
 
-        foreach (array('members', 'logo', 'rss', 'designsettings') as $n) {
-            $m->connect('group/:nickname/'.$n,
-                        array('action' => 'group'.$n),
-                        array('nickname' => '[a-zA-Z0-9]+'));
-        }
+            // search
 
-        $m->connect('group/:nickname/foaf',
-                    array('action' => 'foafgroup'),
-                    array('nickname' => '[a-zA-Z0-9]+'));
-
-        $m->connect('group/:nickname/blocked',
-                    array('action' => 'blockedfromgroup'),
-                    array('nickname' => '[a-zA-Z0-9]+'));
-
-        $m->connect('group/:nickname/makeadmin',
-                    array('action' => 'makeadmin'),
-                    array('nickname' => '[a-zA-Z0-9]+'));
-
-        $m->connect('group/:id/id',
-                    array('action' => 'groupbyid'),
-                    array('id' => '[0-9]+'));
-
-        $m->connect('group/:nickname',
-                    array('action' => 'showgroup'),
-                    array('nickname' => '[a-zA-Z0-9]+'));
-
-        $m->connect('group/', array('action' => 'groups'));
-        $m->connect('group', array('action' => 'groups'));
-        $m->connect('groups/', array('action' => 'groups'));
-        $m->connect('groups', array('action' => 'groups'));
-
-        // Twitter-compatible API
-
-        // statuses API
-
-        $m->connect('api/statuses/public_timeline.:format',
-                    array('action' => 'ApiTimelinePublic',
-                    'format' => '(xml|json|rss|atom)'));
+            foreach (array('group', 'people', 'notice') as $s) {
+                $m->connect('search/'.$s, array('action' => $s.'search'));
+                $m->connect('search/'.$s.'?q=:q',
+                            array('action' => $s.'search'),
+                            array('q' => '.+'));
+            }
 
-        $m->connect('api/statuses/friends_timeline.:format',
-                    array('action' => 'ApiTimelineFriends',
-                          'format' => '(xml|json|rss|atom)'));
+            // The second of these is needed to make the link work correctly
+            // when inserted into the page. The first is needed to match the
+            // route on the way in. Seems to be another Net_URL_Mapper bug to me.
+            $m->connect('search/notice/rss', array('action' => 'noticesearchrss'));
+            $m->connect('search/notice/rss?q=:q', array('action' => 'noticesearchrss'),
+                        array('q' => '.+'));
 
-        $m->connect('api/statuses/friends_timeline/:id.:format',
-                    array('action' => 'ApiTimelineFriends',
-                          'id' => '[a-zA-Z0-9]+',
-                          'format' => '(xml|json|rss|atom)'));
-        $m->connect('api/statuses/home_timeline.:format',
-                    array('action' => 'ApiTimelineFriends',
-                          'format' => '(xml|json|rss|atom)'));
+            $m->connect('attachment/:attachment',
+                        array('action' => 'attachment'),
+                        array('attachment' => '[0-9]+'));
+
+            $m->connect('attachment/:attachment/ajax',
+                        array('action' => 'attachment_ajax'),
+                        array('attachment' => '[0-9]+'));
+
+            $m->connect('attachment/:attachment/thumbnail',
+                        array('action' => 'attachment_thumbnail'),
+                        array('attachment' => '[0-9]+'));
+
+            $m->connect('notice/new', array('action' => 'newnotice'));
+            $m->connect('notice/new?replyto=:replyto',
+                        array('action' => 'newnotice'),
+                        array('replyto' => '['.NICKNAME_FMT.']+'));
+            $m->connect('notice/new?replyto=:replyto&inreplyto=:inreplyto',
+                        array('action' => 'newnotice'),
+                        array('replyto' => '['.NICKNAME_FMT.']+'),
+                        array('inreplyto' => '[0-9]+'));
+
+            $m->connect('notice/:notice/file',
+                        array('action' => 'file'),
+                        array('notice' => '[0-9]+'));
+
+            $m->connect('notice/:notice',
+                        array('action' => 'shownotice'),
+                        array('notice' => '[0-9]+'));
+            $m->connect('notice/delete', array('action' => 'deletenotice'));
+            $m->connect('notice/delete/:notice',
+                        array('action' => 'deletenotice'),
+                        array('notice' => '[0-9]+'));
+
+            $m->connect('bookmarklet/new', array('action' => 'bookmarklet'));
+
+            // conversation
+
+            $m->connect('conversation/:id',
+                        array('action' => 'conversation'),
+                        array('id' => '[0-9]+'));
+
+            $m->connect('message/new', array('action' => 'newmessage'));
+            $m->connect('message/new?to=:to', array('action' => 'newmessage'), array('to' => '['.NICKNAME_FMT.']+'));
+            $m->connect('message/:message',
+                        array('action' => 'showmessage'),
+                        array('message' => '[0-9]+'));
+
+            $m->connect('user/:id',
+                        array('action' => 'userbyid'),
+                        array('id' => '[0-9]+'));
+
+            $m->connect('tags/', array('action' => 'publictagcloud'));
+            $m->connect('tag/', array('action' => 'publictagcloud'));
+            $m->connect('tags', array('action' => 'publictagcloud'));
+            $m->connect('tag', array('action' => 'publictagcloud'));
+            $m->connect('tag/:tag/rss',
+                        array('action' => 'tagrss'),
+                        array('tag' => '[a-zA-Z0-9]+'));
+            $m->connect('tag/:tag',
+                        array('action' => 'tag'),
+                        array('tag' => '[\pL\pN_\-\.]{1,64}'));
+
+            $m->connect('peopletag/:tag',
+                        array('action' => 'peopletag'),
+                        array('tag' => '[a-zA-Z0-9]+'));
+
+            $m->connect('featured/', array('action' => 'featured'));
+            $m->connect('featured', array('action' => 'featured'));
+            $m->connect('favorited/', array('action' => 'favorited'));
+            $m->connect('favorited', array('action' => 'favorited'));
+
+            // groups
+
+            $m->connect('group/new', array('action' => 'newgroup'));
+
+            foreach (array('edit', 'join', 'leave') as $v) {
+                $m->connect('group/:nickname/'.$v,
+                            array('action' => $v.'group'),
+                            array('nickname' => '[a-zA-Z0-9]+'));
+            }
+
+            foreach (array('members', 'logo', 'rss', 'designsettings') as $n) {
+                $m->connect('group/:nickname/'.$n,
+                            array('action' => 'group'.$n),
+                            array('nickname' => '[a-zA-Z0-9]+'));
+            }
+
+            $m->connect('group/:nickname/foaf',
+                        array('action' => 'foafgroup'),
+                        array('nickname' => '[a-zA-Z0-9]+'));
 
-        $m->connect('api/statuses/home_timeline/:id.:format',
-                    array('action' => 'ApiTimelineFriends',
-                          'id' => '[a-zA-Z0-9]+',
-                          'format' => '(xml|json|rss|atom)'));
+            $m->connect('group/:nickname/blocked',
+                        array('action' => 'blockedfromgroup'),
+                        array('nickname' => '[a-zA-Z0-9]+'));
 
-        $m->connect('api/statuses/user_timeline.:format',
-                    array('action' => 'ApiTimelineUser',
-                    'format' => '(xml|json|rss|atom)'));
+            $m->connect('group/:nickname/makeadmin',
+                        array('action' => 'makeadmin'),
+                        array('nickname' => '[a-zA-Z0-9]+'));
 
-        $m->connect('api/statuses/user_timeline/:id.:format',
-                    array('action' => 'ApiTimelineUser',
-                    'id' => '[a-zA-Z0-9]+',
-                    'format' => '(xml|json|rss|atom)'));
+            $m->connect('group/:id/id',
+                        array('action' => 'groupbyid'),
+                        array('id' => '[0-9]+'));
 
-        $m->connect('api/statuses/mentions.:format',
-                    array('action' => 'ApiTimelineMentions',
-                    'format' => '(xml|json|rss|atom)'));
+            $m->connect('group/:nickname',
+                        array('action' => 'showgroup'),
+                        array('nickname' => '[a-zA-Z0-9]+'));
 
-        $m->connect('api/statuses/mentions/:id.:format',
-                    array('action' => 'ApiTimelineMentions',
-                    'id' => '[a-zA-Z0-9]+',
-                    'format' => '(xml|json|rss|atom)'));
+            $m->connect('group/', array('action' => 'groups'));
+            $m->connect('group', array('action' => 'groups'));
+            $m->connect('groups/', array('action' => 'groups'));
+            $m->connect('groups', array('action' => 'groups'));
+
+            // Twitter-compatible API
+
+            // statuses API
+
+            $m->connect('api/statuses/public_timeline.:format',
+                        array('action' => 'ApiTimelinePublic',
+                              'format' => '(xml|json|rss|atom)'));
+
+            $m->connect('api/statuses/friends_timeline.:format',
+                        array('action' => 'ApiTimelineFriends',
+                              'format' => '(xml|json|rss|atom)'));
+
+            $m->connect('api/statuses/friends_timeline/:id.:format',
+                        array('action' => 'ApiTimelineFriends',
+                              'id' => '['.NICKNAME_FMT.']+',
+                              'format' => '(xml|json|rss|atom)'));
+            $m->connect('api/statuses/home_timeline.:format',
+                        array('action' => 'ApiTimelineFriends',
+                              'format' => '(xml|json|rss|atom)'));
 
-        $m->connect('api/statuses/replies.:format',
-                    array('action' => 'ApiTimelineMentions',
-                    'format' => '(xml|json|rss|atom)'));
-
-        $m->connect('api/statuses/replies/:id.:format',
-                    array('action' => 'ApiTimelineMentions',
-                    'id' => '[a-zA-Z0-9]+',
-                    'format' => '(xml|json|rss|atom)'));
+            $m->connect('api/statuses/home_timeline/:id.:format',
+                        array('action' => 'ApiTimelineFriends',
+                              'id' => '['.NICKNAME_FMT.']+',
+                              'format' => '(xml|json|rss|atom)'));
 
-        $m->connect('api/statuses/friends.:format',
-                     array('action' => 'ApiUserFriends',
-                           'format' => '(xml|json)'));
+            $m->connect('api/statuses/user_timeline.:format',
+                        array('action' => 'ApiTimelineUser',
+                              'format' => '(xml|json|rss|atom)'));
 
-        $m->connect('api/statuses/friends/:id.:format',
-                    array('action' => 'ApiUserFriends',
-                    'id' => '[a-zA-Z0-9]+',
-                    'format' => '(xml|json)'));
+            $m->connect('api/statuses/user_timeline/:id.:format',
+                        array('action' => 'ApiTimelineUser',
+                              'id' => '['.NICKNAME_FMT.']+',
+                              'format' => '(xml|json|rss|atom)'));
+
+            $m->connect('api/statuses/mentions.:format',
+                        array('action' => 'ApiTimelineMentions',
+                              'format' => '(xml|json|rss|atom)'));
+
+            $m->connect('api/statuses/mentions/:id.:format',
+                        array('action' => 'ApiTimelineMentions',
+                              'id' => '['.NICKNAME_FMT.']+',
+                              'format' => '(xml|json|rss|atom)'));
+
+            $m->connect('api/statuses/replies.:format',
+                        array('action' => 'ApiTimelineMentions',
+                              'format' => '(xml|json|rss|atom)'));
+
+            $m->connect('api/statuses/replies/:id.:format',
+                        array('action' => 'ApiTimelineMentions',
+                              'id' => '['.NICKNAME_FMT.']+',
+                              'format' => '(xml|json|rss|atom)'));
 
-        $m->connect('api/statuses/followers.:format',
-                     array('action' => 'ApiUserFollowers',
-                           'format' => '(xml|json)'));
+            $m->connect('api/statuses/friends.:format',
+                        array('action' => 'ApiUserFriends',
+                              'format' => '(xml|json)'));
 
-        $m->connect('api/statuses/followers/:id.:format',
-                    array('action' => 'ApiUserFollowers',
-                    'id' => '[a-zA-Z0-9]+',
-                    'format' => '(xml|json)'));
+            $m->connect('api/statuses/friends/:id.:format',
+                        array('action' => 'ApiUserFriends',
+                              'id' => '['.NICKNAME_FMT.']+',
+                              'format' => '(xml|json)'));
 
-        $m->connect('api/statuses/show.:format',
-                    array('action' => 'ApiStatusesShow',
-                          'format' => '(xml|json)'));
+            $m->connect('api/statuses/followers.:format',
+                        array('action' => 'ApiUserFollowers',
+                              'format' => '(xml|json)'));
 
-        $m->connect('api/statuses/show/:id.:format',
-                    array('action' => 'ApiStatusesShow',
-                          'id' => '[0-9]+',
-                          'format' => '(xml|json)'));
+            $m->connect('api/statuses/followers/:id.:format',
+                        array('action' => 'ApiUserFollowers',
+                              'id' => '['.NICKNAME_FMT.']+',
+                              'format' => '(xml|json)'));
 
-        $m->connect('api/statuses/update.:format',
-                    array('action' => 'ApiStatusesUpdate',
-                          'format' => '(xml|json)'));
+            $m->connect('api/statuses/show.:format',
+                        array('action' => 'ApiStatusesShow',
+                              'format' => '(xml|json)'));
 
-        $m->connect('api/statuses/destroy.:format',
-                  array('action' => 'ApiStatusesDestroy',
-                        'format' => '(xml|json)'));
+            $m->connect('api/statuses/show/:id.:format',
+                        array('action' => 'ApiStatusesShow',
+                              'id' => '[0-9]+',
+                              'format' => '(xml|json)'));
 
-        $m->connect('api/statuses/destroy/:id.:format',
-                  array('action' => 'ApiStatusesDestroy',
-                        'id' => '[0-9]+',
-                        'format' => '(xml|json)'));
+            $m->connect('api/statuses/update.:format',
+                        array('action' => 'ApiStatusesUpdate',
+                              'format' => '(xml|json)'));
 
-        // users
+            $m->connect('api/statuses/destroy.:format',
+                        array('action' => 'ApiStatusesDestroy',
+                              'format' => '(xml|json)'));
 
-        $m->connect('api/users/show/:id.:format',
-                    array('action' => 'ApiUserShow',
-                          'id' => '[a-zA-Z0-9]+',
-                          'format' => '(xml|json)'));
+            $m->connect('api/statuses/destroy/:id.:format',
+                        array('action' => 'ApiStatusesDestroy',
+                              'id' => '[0-9]+',
+                              'format' => '(xml|json)'));
 
-        $m->connect('api/users/:method',
-                    array('action' => 'api',
-                          'apiaction' => 'users'),
-                    array('method' => 'show(\.(xml|json))?'));
+            // users
 
-        // direct messages
+            $m->connect('api/users/show/:id.:format',
+                        array('action' => 'ApiUserShow',
+                              'id' => '['.NICKNAME_FMT.']+',
+                              'format' => '(xml|json)'));
 
+            // direct messages
 
-        $m->connect('api/direct_messages.:format',
-                    array('action' => 'ApiDirectMessage',
-                          'format' => '(xml|json|rss|atom)'));
+            $m->connect('api/direct_messages.:format',
+                        array('action' => 'ApiDirectMessage',
+                              'format' => '(xml|json|rss|atom)'));
 
-        $m->connect('api/direct_messages/sent.:format',
-                    array('action' => 'ApiDirectMessage',
-                          'format' => '(xml|json|rss|atom)',
-                          'sent' => true));
+            $m->connect('api/direct_messages/sent.:format',
+                        array('action' => 'ApiDirectMessage',
+                              'format' => '(xml|json|rss|atom)',
+                              'sent' => true));
 
-        $m->connect('api/direct_messages/new.:format',
-                     array('action' => 'ApiDirectMessageNew',
-                           'format' => '(xml|json)'));
+            $m->connect('api/direct_messages/new.:format',
+                        array('action' => 'ApiDirectMessageNew',
+                              'format' => '(xml|json)'));
 
-        // friendships
+            // friendships
 
-        $m->connect('api/friendships/show.:format',
-                    array('action' => 'ApiFriendshipsShow',
-                          'format' => '(xml|json)'));
+            $m->connect('api/friendships/show.:format',
+                        array('action' => 'ApiFriendshipsShow',
+                              'format' => '(xml|json)'));
 
-        $m->connect('api/friendships/exists.:format',
-                    array('action' => 'ApiFriendshipsExists',
-                          'format' => '(xml|json)'));
+            $m->connect('api/friendships/exists.:format',
+                        array('action' => 'ApiFriendshipsExists',
+                              'format' => '(xml|json)'));
 
-        $m->connect('api/friendships/create.:format',
-                    array('action' => 'ApiFriendshipsCreate',
-                          'format' => '(xml|json)'));
+            $m->connect('api/friendships/create.:format',
+                        array('action' => 'ApiFriendshipsCreate',
+                              'format' => '(xml|json)'));
 
-        $m->connect('api/friendships/destroy.:format',
-                     array('action' => 'ApiFriendshipsDestroy',
-                          'format' => '(xml|json)'));
+            $m->connect('api/friendships/destroy.:format',
+                        array('action' => 'ApiFriendshipsDestroy',
+                              'format' => '(xml|json)'));
 
-        $m->connect('api/friendships/create/:id.:format',
-                    array('action' => 'ApiFriendshipsCreate',
-                          'id' => '[a-zA-Z0-9]+',
-                          'format' => '(xml|json)'));
+            $m->connect('api/friendships/create/:id.:format',
+                        array('action' => 'ApiFriendshipsCreate',
+                              'id' => '['.NICKNAME_FMT.']+',
+                              'format' => '(xml|json)'));
 
-        $m->connect('api/friendships/destroy/:id.:format',
-                    array('action' => 'ApiFriendshipsDestroy',
-                    'id' => '[a-zA-Z0-9]+',
-                    'format' => '(xml|json)'));
+            $m->connect('api/friendships/destroy/:id.:format',
+                        array('action' => 'ApiFriendshipsDestroy',
+                              'id' => '['.NICKNAME_FMT.']+',
+                              'format' => '(xml|json)'));
 
-        // Social graph
+            // Social graph
 
-        $m->connect('api/friends/ids/:id.:format',
-                    array('action' => 'apiFriends',
-                          'ids_only' => true));
+            $m->connect('api/friends/ids/:id.:format',
+                        array('action' => 'apiFriends',
+                              'ids_only' => true));
 
-        $m->connect('api/followers/ids/:id.:format',
-                    array('action' => 'apiFollowers',
-                          'ids_only' => true));
+            $m->connect('api/followers/ids/:id.:format',
+                        array('action' => 'apiFollowers',
+                              'ids_only' => true));
 
-        $m->connect('api/friends/ids.:format',
-                    array('action' => 'apiFriends',
-                          'ids_only' => true));
+            $m->connect('api/friends/ids.:format',
+                        array('action' => 'apiFriends',
+                              'ids_only' => true));
 
-        $m->connect('api/followers/ids.:format',
-                     array('action' => 'apiFollowers',
-                          'ids_only' => true));
+            $m->connect('api/followers/ids.:format',
+                        array('action' => 'apiFollowers',
+                              'ids_only' => true));
 
-        // account
+            // account
 
-        $m->connect('api/account/verify_credentials.:format',
-                    array('action' => 'ApiAccountVerifyCredentials'));
+            $m->connect('api/account/verify_credentials.:format',
+                        array('action' => 'ApiAccountVerifyCredentials'));
 
-        // special case where verify_credentials is called w/out a format
+            $m->connect('api/account/update_profile.:format',
+                        array('action' => 'ApiAccountUpdateProfile'));
 
-        $m->connect('api/account/verify_credentials',
-                    array('action' => 'ApiAccountVerifyCredentials'));
+            $m->connect('api/account/update_profile_image.:format',
+                        array('action' => 'ApiAccountUpdateProfileImage'));
 
-        $m->connect('api/account/rate_limit_status.:format',
-                    array('action' => 'ApiAccountRateLimitStatus'));
+            $m->connect('api/account/update_profile_background_image.:format',
+                        array('action' => 'ApiAccountUpdateProfileBackgroundImage'));
 
-        // favorites
+            $m->connect('api/account/update_profile_colors.:format',
+                        array('action' => 'ApiAccountUpdateProfileColors'));
 
-        $m->connect('api/favorites.:format',
-                    array('action' => 'ApiTimelineFavorites',
-                    'format' => '(xml|json|rss|atom)'));
+            $m->connect('api/account/update_delivery_device.:format',
+                        array('action' => 'ApiAccountUpdateDeliveryDevice'));
 
-        $m->connect('api/favorites/:id.:format',
-                    array('action' => 'ApiTimelineFavorites',
-                          'id' => '[a-zA-Z0-9]+',
-                          'format' => '(xmljson|rss|atom)'));
+            // special case where verify_credentials is called w/out a format
 
-        $m->connect('api/favorites/create/:id.:format',
-                    array('action' => 'ApiFavoriteCreate',
-                          'id' => '[a-zA-Z0-9]+',
-                          'format' => '(xml|json)'));
+            $m->connect('api/account/verify_credentials',
+                        array('action' => 'ApiAccountVerifyCredentials'));
 
-        $m->connect('api/favorites/destroy/:id.:format',
-                    array('action' => 'ApiFavoriteDestroy',
-                          'id' => '[a-zA-Z0-9]+',
-                          'format' => '(xml|json)'));
+            $m->connect('api/account/rate_limit_status.:format',
+                        array('action' => 'ApiAccountRateLimitStatus'));
 
-        // notifications
+            // favorites
 
-        $m->connect('api/notifications/:method/:argument',
-                    array('action' => 'api',
-                          'apiaction' => 'favorites'));
+            $m->connect('api/favorites.:format',
+                        array('action' => 'ApiTimelineFavorites',
+                              'format' => '(xml|json|rss|atom)'));
 
-        // blocks
+            $m->connect('api/favorites/:id.:format',
+                        array('action' => 'ApiTimelineFavorites',
+                              'id' => '['.NICKNAME_FMT.']+',
+                              'format' => '(xmljson|rss|atom)'));
 
-        $m->connect('api/blocks/create/:id.:format',
-                    array('action' => 'ApiBlockCreate',
-                          'id' => '[a-zA-Z0-9]+',
-                          'format' => '(xml|json)'));
+            $m->connect('api/favorites/create/:id.:format',
+                        array('action' => 'ApiFavoriteCreate',
+                              'id' => '['.NICKNAME_FMT.']+',
+                              'format' => '(xml|json)'));
 
-        $m->connect('api/blocks/destroy/:id.:format',
-                    array('action' => 'ApiBlockDestroy',
-                          'id' => '[a-zA-Z0-9]+',
-                          'format' => '(xml|json)'));
-        // help
+            $m->connect('api/favorites/destroy/:id.:format',
+                        array('action' => 'ApiFavoriteDestroy',
+                              'id' => '['.NICKNAME_FMT.']+',
+                              'format' => '(xml|json)'));
+            // blocks
 
-        $m->connect('api/help/test.:format',
-                    array('action' => 'ApiHelpTest',
-                          'format' => '(xml|json)'));
+            $m->connect('api/blocks/create/:id.:format',
+                        array('action' => 'ApiBlockCreate',
+                              'id' => '['.NICKNAME_FMT.']+',
+                              'format' => '(xml|json)'));
 
-        // statusnet
+            $m->connect('api/blocks/destroy/:id.:format',
+                        array('action' => 'ApiBlockDestroy',
+                              'id' => '['.NICKNAME_FMT.']+',
+                              'format' => '(xml|json)'));
+            // help
 
-        $m->connect('api/statusnet/version.:format',
-                    array('action' => 'ApiStatusnetVersion',
-                          'format' => '(xml|json)'));
-
-        $m->connect('api/statusnet/config.:format',
-                    array('action' => 'ApiStatusnetConfig',
-                   'format' => '(xml|json)'));
-
-        // For older methods, we provide "laconica" base action
-
-        $m->connect('api/laconica/version.:format',
-                    array('action' => 'ApiStatusnetVersion',
-                          'format' => '(xml|json)'));
-
-        $m->connect('api/laconica/config.:format',
-                    array('action' => 'ApiStatusnetConfig',
-                    'format' => '(xml|json)'));
+            $m->connect('api/help/test.:format',
+                        array('action' => 'ApiHelpTest',
+                              'format' => '(xml|json)'));
 
-        // Groups and tags are newer than 0.8.1 so no backward-compatibility
-        // necessary
+            // statusnet
 
-        // Groups
-        //'list' has to be handled differently, as php will not allow a method to be named 'list'
-
-        $m->connect('api/statusnet/groups/timeline/:id.:format',
-                    array('action' => 'ApiTimelineGroup',
-                          'id' => '[a-zA-Z0-9]+',
-                          'format' => '(xmljson|rss|atom)'));
+            $m->connect('api/statusnet/version.:format',
+                        array('action' => 'ApiStatusnetVersion',
+                              'format' => '(xml|json)'));
 
-        $m->connect('api/statusnet/groups/show.:format',
-                    array('action' => 'ApiGroupShow',
-                    'format' => '(xml|json)'));
+            $m->connect('api/statusnet/config.:format',
+                        array('action' => 'ApiStatusnetConfig',
+                              'format' => '(xml|json)'));
 
-        $m->connect('api/statusnet/groups/show/:id.:format',
-                    array('action' => 'ApiGroupShow',
-                          'id' => '[a-zA-Z0-9]+',
-                          'format' => '(xml|json)'));
-
-        $m->connect('api/statusnet/groups/join.:format',
-                    array('action' => 'ApiGroupJoin',
-                          'id' => '[a-zA-Z0-9]+',
-                          'format' => '(xml|json)'));
-
-        $m->connect('api/statusnet/groups/join/:id.:format',
-                    array('action' => 'ApiGroupJoin',
-                    'format' => '(xml|json)'));
-
-        $m->connect('api/statusnet/groups/leave.:format',
-                    array('action' => 'ApiGroupLeave',
-                          'id' => '[a-zA-Z0-9]+',
-                          'format' => '(xml|json)'));
-
-        $m->connect('api/statusnet/groups/leave/:id.:format',
-                    array('action' => 'ApiGroupLeave',
-                          'format' => '(xml|json)'));
-
-        $m->connect('api/statusnet/groups/is_member.:format',
-                    array('action' => 'ApiGroupIsMember',
-                          'format' => '(xml|json)'));
-
-        $m->connect('api/statusnet/groups/list.:format',
-                    array('action' => 'ApiGroupList',
-                          'format' => '(xml|json|rss|atom)'));
-
-        $m->connect('api/statusnet/groups/list/:id.:format',
-                    array('action' => 'ApiGroupList',
-                          'id' => '[a-zA-Z0-9]+',
-                          'format' => '(xml|json|rss|atom)'));
-
-        $m->connect('api/statusnet/groups/list_all.:format',
-                    array('action' => 'ApiGroupListAll',
-                          'format' => '(xml|json|rss|atom)'));
-
-        $m->connect('api/statusnet/groups/membership.:format',
-                    array('action' => 'ApiGroupMembership',
-                         'format' => '(xml|json)'));
-
-        $m->connect('api/statusnet/groups/membership/:id.:format',
-                    array('action' => 'ApiGroupMembership',
-                           'id' => '[a-zA-Z0-9]+',
-                           'format' => '(xml|json)'));
-                           
-        $m->connect('api/statusnet/groups/create.:format',
-                    array('action' => 'ApiGroupCreate',
-                          'format' => '(xml|json)'));
-        // Tags
-        $m->connect('api/statusnet/tags/timeline/:tag.:format',
-                    array('action' => 'ApiTimelineTag',
-                          'format' => '(xmljson|rss|atom)'));
-
-        // search
-        $m->connect('api/search.atom', array('action' => 'twitapisearchatom'));
-        $m->connect('api/search.json', array('action' => 'twitapisearchjson'));
-        $m->connect('api/trends.json', array('action' => 'twitapitrends'));
-
-        // user stuff
-
-        foreach (array('subscriptions', 'subscribers',
-                       'nudge', 'all', 'foaf', 'xrds',
-                       'replies', 'inbox', 'outbox', 'microsummary') as $a) {
-            $m->connect(':nickname/'.$a,
-                        array('action' => $a),
-                        array('nickname' => '[a-zA-Z0-9]{1,64}'));
-        }
+            // For older methods, we provide "laconica" base action
 
-        foreach (array('subscriptions', 'subscribers') as $a) {
-            $m->connect(':nickname/'.$a.'/:tag',
-                        array('action' => $a),
-                        array('tag' => '[a-zA-Z0-9]+',
-                              'nickname' => '[a-zA-Z0-9]{1,64}'));
-        }
+            $m->connect('api/laconica/version.:format',
+                        array('action' => 'ApiStatusnetVersion',
+                              'format' => '(xml|json)'));
 
-        foreach (array('rss', 'groups') as $a) {
-            $m->connect(':nickname/'.$a,
-                        array('action' => 'user'.$a),
-                        array('nickname' => '[a-zA-Z0-9]{1,64}'));
-        }
+            $m->connect('api/laconica/config.:format',
+                        array('action' => 'ApiStatusnetConfig',
+                              'format' => '(xml|json)'));
+
+            // Groups and tags are newer than 0.8.1 so no backward-compatibility
+            // necessary
 
-        foreach (array('all', 'replies', 'favorites') as $a) {
-            $m->connect(':nickname/'.$a.'/rss',
-                        array('action' => $a.'rss'),
-                        array('nickname' => '[a-zA-Z0-9]{1,64}'));
+            // Groups
+            //'list' has to be handled differently, as php will not allow a method to be named 'list'
+
+            $m->connect('api/statusnet/groups/timeline/:id.:format',
+                        array('action' => 'ApiTimelineGroup',
+                              'id' => '[a-zA-Z0-9]+',
+                              'format' => '(xmljson|rss|atom)'));
+
+            $m->connect('api/statusnet/groups/show.:format',
+                        array('action' => 'ApiGroupShow',
+                              'format' => '(xml|json)'));
+
+            $m->connect('api/statusnet/groups/show/:id.:format',
+                        array('action' => 'ApiGroupShow',
+                              'id' => '[a-zA-Z0-9]+',
+                              'format' => '(xml|json)'));
+
+            $m->connect('api/statusnet/groups/join.:format',
+                        array('action' => 'ApiGroupJoin',
+                              'id' => '[a-zA-Z0-9]+',
+                              'format' => '(xml|json)'));
+
+            $m->connect('api/statusnet/groups/join/:id.:format',
+                        array('action' => 'ApiGroupJoin',
+                              'format' => '(xml|json)'));
+
+            $m->connect('api/statusnet/groups/leave.:format',
+                        array('action' => 'ApiGroupLeave',
+                              'id' => '[a-zA-Z0-9]+',
+                              'format' => '(xml|json)'));
+
+            $m->connect('api/statusnet/groups/leave/:id.:format',
+                        array('action' => 'ApiGroupLeave',
+                              'format' => '(xml|json)'));
+
+            $m->connect('api/statusnet/groups/is_member.:format',
+                        array('action' => 'ApiGroupIsMember',
+                              'format' => '(xml|json)'));
+
+            $m->connect('api/statusnet/groups/list.:format',
+                        array('action' => 'ApiGroupList',
+                              'format' => '(xml|json|rss|atom)'));
+
+            $m->connect('api/statusnet/groups/list/:id.:format',
+                        array('action' => 'ApiGroupList',
+                              'id' => '[a-zA-Z0-9]+',
+                              'format' => '(xml|json|rss|atom)'));
+
+            $m->connect('api/statusnet/groups/list_all.:format',
+                        array('action' => 'ApiGroupListAll',
+                              'format' => '(xml|json|rss|atom)'));
+
+            $m->connect('api/statusnet/groups/membership.:format',
+                        array('action' => 'ApiGroupMembership',
+                              'format' => '(xml|json)'));
+
+            $m->connect('api/statusnet/groups/membership/:id.:format',
+                        array('action' => 'ApiGroupMembership',
+                              'id' => '[a-zA-Z0-9]+',
+                              'format' => '(xml|json)'));
+
+            $m->connect('api/statusnet/groups/create.:format',
+                        array('action' => 'ApiGroupCreate',
+                              'format' => '(xml|json)'));
+            // Tags
+            $m->connect('api/statusnet/tags/timeline/:tag.:format',
+                        array('action' => 'ApiTimelineTag',
+                              'format' => '(xmljson|rss|atom)'));
+
+            // search
+            $m->connect('api/search.atom', array('action' => 'twitapisearchatom'));
+            $m->connect('api/search.json', array('action' => 'twitapisearchjson'));
+            $m->connect('api/trends.json', array('action' => 'twitapitrends'));
+
+            $m->connect('admin/site', array('action' => 'siteadminpanel'));
+            $m->connect('admin/design', array('action' => 'designadminpanel'));
+
+            $m->connect('getfile/:filename',
+                        array('action' => 'getfile'),
+                        array('filename' => '[A-Za-z0-9._-]+'));
+
+            // user stuff
+
+            foreach (array('subscriptions', 'subscribers',
+                           'nudge', 'all', 'foaf', 'xrds',
+                           'replies', 'inbox', 'outbox', 'microsummary') as $a) {
+                $m->connect(':nickname/'.$a,
+                            array('action' => $a),
+                            array('nickname' => '['.NICKNAME_FMT.']{1,64}'));
+            }
+
+            foreach (array('subscriptions', 'subscribers') as $a) {
+                $m->connect(':nickname/'.$a.'/:tag',
+                            array('action' => $a),
+                            array('tag' => '[a-zA-Z0-9]+',
+                                  'nickname' => '['.NICKNAME_FMT.']{1,64}'));
+            }
+
+            foreach (array('rss', 'groups') as $a) {
+                $m->connect(':nickname/'.$a,
+                            array('action' => 'user'.$a),
+                            array('nickname' => '[a-zA-Z0-9]{1,64}'));
+            }
+
+            foreach (array('all', 'replies', 'favorites') as $a) {
+                $m->connect(':nickname/'.$a.'/rss',
+                            array('action' => $a.'rss'),
+                            array('nickname' => '['.NICKNAME_FMT.']{1,64}'));
+            }
+
+            $m->connect(':nickname/favorites',
+                        array('action' => 'showfavorites'),
+                        array('nickname' => '['.NICKNAME_FMT.']{1,64}'));
+
+            $m->connect(':nickname/avatar/:size',
+                        array('action' => 'avatarbynickname'),
+                        array('size' => '(original|96|48|24)',
+                              'nickname' => '['.NICKNAME_FMT.']{1,64}'));
+
+            $m->connect(':nickname/tag/:tag/rss',
+                        array('action' => 'userrss'),
+                        array('nickname' => '['.NICKNAME_FMT.']{1,64}'),
+                        array('tag' => '[a-zA-Z0-9]+'));
+
+            $m->connect(':nickname/tag/:tag',
+                        array('action' => 'showstream'),
+                        array('nickname' => '['.NICKNAME_FMT.']{1,64}'),
+                        array('tag' => '[a-zA-Z0-9]+'));
+
+            $m->connect(':nickname',
+                        array('action' => 'showstream'),
+                        array('nickname' => '['.NICKNAME_FMT.']{1,64}'));
+
+            Event::handle('RouterInitialized', array($m));
         }
 
-        $m->connect(':nickname/favorites',
-                    array('action' => 'showfavorites'),
-                    array('nickname' => '[a-zA-Z0-9]{1,64}'));
-
-        $m->connect(':nickname/avatar/:size',
-                    array('action' => 'avatarbynickname'),
-                    array('size' => '(original|96|48|24)',
-                          'nickname' => '[a-zA-Z0-9]{1,64}'));
-
-        $m->connect(':nickname/tag/:tag/rss',
-            array('action' => 'userrss'),
-            array('nickname' => '[a-zA-Z0-9]{1,64}'),
-            array('tag' => '[a-zA-Z0-9]+'));
-
-        $m->connect(':nickname/tag/:tag',
-                    array('action' => 'showstream'),
-                    array('nickname' => '[a-zA-Z0-9]{1,64}'),
-                    array('tag' => '[a-zA-Z0-9]+'));
-
-        $m->connect(':nickname',
-                    array('action' => 'showstream'),
-                    array('nickname' => '[a-zA-Z0-9]{1,64}'));
-
-        Event::handle('RouterInitialized', array($m));
-
         return $m;
     }
 
diff --git a/lib/sandboxform.php b/lib/sandboxform.php
new file mode 100644
index 000000000..7a98e0a5f
--- /dev/null
+++ b/lib/sandboxform.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Form for sandboxing a user
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Form
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Form for sandboxing a user
+ *
+ * @category Form
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ *
+ * @see      UnSandboxForm
+ */
+
+class SandboxForm extends ProfileActionForm
+{
+    /**
+     * Action this form provides
+     *
+     * @return string Name of the action, lowercased.
+     */
+
+    function target()
+    {
+        return 'sandbox';
+    }
+
+    /**
+     * Title of the form
+     *
+     * @return string Title of the form, internationalized
+     */
+
+    function title()
+    {
+        return _('Sandbox');
+    }
+
+    /**
+     * Description of the form
+     *
+     * @return string description of the form, internationalized
+     */
+
+    function description()
+    {
+        return _('Sandbox this user');
+    }
+}
diff --git a/lib/schema.php b/lib/schema.php
index 1e0c1f3e9..560884d9f 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -373,6 +373,26 @@ class Schema
     }
 
     /**
+     * Ensures that the table that backs a given
+     * Plugin_DataObject class exists.
+     *
+     * If the table does not yet exist, it will
+     * create the table. If it does exist, it will
+     * alter the table to match the column definitions.
+     *
+     * @param Plugin_DataObject $dataObjectClass
+     *
+     * @return boolean success flag
+     */
+
+    public function ensureDataObject($dataObjectClass)
+    {
+        $obj = new $dataObjectClass();
+        $tableDef = $obj->tableDef();
+        return $this->ensureTable($tableDef->name,$tableDef->columns);
+    }
+
+    /**
      * Ensures that a table exists with the given
      * name and the given column definitions.
      *
@@ -544,6 +564,19 @@ class TableDef
     public $name;
     /** array of ColumnDef objects for the columns. */
     public $columns;
+    
+    /**
+     * Constructor.
+     *
+     * @param string  $name     name of the table
+     * @param array   $columns  columns in the table
+     */
+
+    function __construct($name=null,$columns=null)
+    {
+        $this->name = $name;
+        $this->columns = $columns;
+    }
 }
 
 /**
@@ -576,6 +609,8 @@ class ColumnDef
     /** 'extra' stuff. Returned by MySQL, largely
      * unused. */
     public $extra;
+    /** auto increment this field if no value is specific for it during an insert **/
+    public $auto_increment;
 
     /**
      * Constructor.
@@ -591,7 +626,7 @@ class ColumnDef
 
     function __construct($name=null, $type=null, $size=null,
                          $nullable=true, $key=null, $default=null,
-                         $extra=null)
+                         $extra=null, $auto_increment=false)
     {
         $this->name     = strtolower($name);
         $this->type     = strtolower($type);
@@ -600,6 +635,7 @@ class ColumnDef
         $this->key      = $key;
         $this->default  = $default;
         $this->extra    = $extra;
+        $this->auto_increment = $auto_increment;
     }
 
     /**
@@ -617,7 +653,8 @@ class ColumnDef
                 $this->_typeMatch($other) &&
                 $this->_defaultMatch($other) &&
                 $this->_nullMatch($other) &&
-                $this->key == $other->key);
+                $this->key == $other->key &&
+                $this->auto_increment == $other->auto_increment);
     }
 
     /**
diff --git a/lib/search_engines.php b/lib/search_engines.php
index 69f6ff468..332db3f89 100644
--- a/lib/search_engines.php
+++ b/lib/search_engines.php
@@ -46,70 +46,11 @@ class SearchEngine
     }
 }
 
-class SphinxSearch extends SearchEngine
-{
-    private $sphinx;
-    private $connected;
-
-    function __construct($target, $table)
-    {
-        $fp = @fsockopen(common_config('sphinx', 'server'), common_config('sphinx', 'port'));
-        if (!$fp) {
-            $this->connected = false;
-            return;
-        }
-        fclose($fp);
-        parent::__construct($target, $table);
-        $this->sphinx = new SphinxClient;
-        $this->sphinx->setServer(common_config('sphinx', 'server'), common_config('sphinx', 'port'));
-        $this->connected = true;
-    }
-
-    function is_connected()
-    {
-        return $this->connected;
-    }
-
-    function limit($offset, $count, $rss = false)
-    {
-        //FIXME without LARGEST_POSSIBLE, the most recent results aren't returned
-        //      this probably has a large impact on performance
-        $LARGEST_POSSIBLE = 1e6;
-
-        if ($rss) {
-            $this->sphinx->setLimits($offset, $count, $count, $LARGEST_POSSIBLE);
-        }
-        else {
-            // return at most 50 pages of results
-            $this->sphinx->setLimits($offset, $count, 50 * ($count - 1), $LARGEST_POSSIBLE);
-        }
-
-        return $this->target->limit(0, $count);
-    }
-
-    function query($q)
-    {
-        $result = $this->sphinx->query($q, $this->table);
-        if (!isset($result['matches'])) return false;
-        $id_set = join(', ', array_keys($result['matches']));
-        $this->target->whereAdd("id in ($id_set)");
-        return true;
-     }
-
-    function set_sort_mode($mode)
-    {
-        if ('chron' === $mode) {
-            $this->sphinx->SetSortMode(SPH_SORT_ATTR_DESC, 'created_ts');
-            return $this->target->orderBy('created desc');
-        }
-    }
-}
-
 class MySQLSearch extends SearchEngine
 {
     function query($q)
     {
-        if ('identica_people' === $this->table) {
+        if ('profile' === $this->table) {
             $this->target->whereAdd('MATCH(nickname, fullname, location, bio, homepage) ' .
                                     'AGAINST (\''.addslashes($q).'\' IN BOOLEAN MODE)');
             if (strtolower($q) != $q) {
@@ -117,7 +58,7 @@ class MySQLSearch extends SearchEngine
                                         'AGAINST (\''.addslashes(strtolower($q)).'\' IN BOOLEAN MODE)', 'OR');
             }
             return true;
-        } else if ('identica_notices' === $this->table) {
+        } else if ('notice' === $this->table) {
 
             // Don't show imported notices
             $this->target->whereAdd('notice.is_local != ' . Notice::GATEWAY);
@@ -143,13 +84,13 @@ class MySQLLikeSearch extends SearchEngine
 {
     function query($q)
     {
-        if ('identica_people' === $this->table) {
+        if ('profile' === $this->table) {
             $qry = sprintf('(nickname LIKE "%%%1$s%%" OR '.
                            ' fullname LIKE "%%%1$s%%" OR '.
                            ' location LIKE "%%%1$s%%" OR '.
                            ' bio      LIKE "%%%1$s%%" OR '.
                            ' homepage LIKE "%%%1$s%%")', addslashes($q));
-        } else if ('identica_notices' === $this->table) {
+        } else if ('notice' === $this->table) {
             $qry = sprintf('content LIKE "%%%1$s%%"', addslashes($q));
         } else {
             throw new ServerException('Unknown table: ' . $this->table);
@@ -165,9 +106,9 @@ class PGSearch extends SearchEngine
 {
     function query($q)
     {
-        if ('identica_people' === $this->table) {
+        if ('profile' === $this->table) {
             return $this->target->whereAdd('textsearch @@ plainto_tsquery(\''.addslashes($q).'\')');
-        } else if ('identica_notices' === $this->table) {
+        } else if ('notice' === $this->table) {
 
             // XXX: We need to filter out gateway notices (notice.is_local = -2) --Zach
 
diff --git a/lib/silenceform.php b/lib/silenceform.php
new file mode 100644
index 000000000..9673fa120
--- /dev/null
+++ b/lib/silenceform.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Form for silencing a user
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Form
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Form for silencing a user
+ *
+ * @category Form
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ *
+ * @see      UnSilenceForm
+ */
+
+class SilenceForm extends ProfileActionForm
+{
+    /**
+     * Action this form provides
+     *
+     * @return string Name of the action, lowercased.
+     */
+
+    function target()
+    {
+        return 'silence';
+    }
+
+    /**
+     * Title of the form
+     *
+     * @return string Title of the form, internationalized
+     */
+
+    function title()
+    {
+        return _('Silence');
+    }
+
+    /**
+     * Description of the form
+     *
+     * @return string description of the form, internationalized
+     */
+
+    function description()
+    {
+        return _('Silence this user');
+    }
+}
diff --git a/lib/snapshot.php b/lib/snapshot.php
index ede846e5b..2a10c6b93 100644
--- a/lib/snapshot.php
+++ b/lib/snapshot.php
@@ -172,26 +172,9 @@ class Snapshot
     {
         // XXX: Use OICU2 and OAuth to make authorized requests
 
-        $postdata = http_build_query($this->stats);
-
-        $opts =
-          array('http' =>
-                array(
-                      'method'  => 'POST',
-                      'header'  => 'Content-type: '.
-                                   'application/x-www-form-urlencoded',
-                      'content' => $postdata,
-                      'user_agent' => 'StatusNet/'.STATUSNET_VERSION
-                      )
-                );
-
-        $context = stream_context_create($opts);
-
         $reporturl = common_config('snapshot', 'reporturl');
-
-        $result = @file_get_contents($reporturl, false, $context);
-
-        return $result;
+        $request = HTTPClient::start();
+        $request->post($reporturl, null, $this->stats);
     }
 
     /**
diff --git a/lib/subs.php b/lib/subs.php
index 68c89c842..2fc3160de 100644
--- a/lib/subs.php
+++ b/lib/subs.php
@@ -44,8 +44,12 @@ function subs_subscribe_user($user, $other_nickname)
 
 function subs_subscribe_to($user, $other)
 {
+    if (!$user->hasRight(Right::SUBSCRIBE)) {
+        return _('You have been banned from subscribing.');
+    }
+
     if ($user->isSubscribed($other)) {
-        return _('Already subscribed!.');
+        return _('Already subscribed!');
     }
 
     if ($other->hasBlocked($user)) {
@@ -121,7 +125,7 @@ function subs_unsubscribe_user($user, $other_nickname)
 function subs_unsubscribe_to($user, $other)
 {
     if (!$user->isSubscribed($other))
-        return _('Not subscribed!.');
+        return _('Not subscribed!');
 
     $sub = DB_DataObject::factory('subscription');
 
diff --git a/lib/theme.php b/lib/theme.php
index 08e3e8538..020ce1ac4 100644
--- a/lib/theme.php
+++ b/lib/theme.php
@@ -23,7 +23,7 @@
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
  * @author    Sarven Capadisli <csarven@status.net>
- * @copyright 2008 StatusNet, Inc.
+ * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -33,62 +33,215 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 }
 
 /**
- * Gets the full path of a file in a theme dir based on its relative name
+ * Class for querying and manipulating a theme
  *
- * @param string $relative relative path within the theme directory
- * @param string $theme    name of the theme; defaults to current theme
+ * Themes are directories with some expected sub-directories and files
+ * in them. They're found in either local/theme (for locally-installed themes)
+ * or theme/ subdir of installation dir.
  *
- * @return string File path to the theme file
+ * This used to be a couple of functions, but for various reasons it's nice
+ * to have a class instead.
+ *
+ * @category Output
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
  */
 
-function theme_file($relative, $theme=null)
+class Theme
 {
-    if (empty($theme)) {
-        $theme = common_config('site', 'theme');
+    var $dir  = null;
+    var $path = null;
+
+    /**
+     * Constructor
+     *
+     * Determines the proper directory and path for this theme.
+     *
+     * @param string $name Name of the theme; defaults to config value
+     */
+
+    function __construct($name=null)
+    {
+        if (empty($name)) {
+            $name = common_config('site', 'theme');
+        }
+
+        // Check to see if it's in the local dir
+
+        $localroot = self::localRoot();
+
+        $fulldir = $localroot.'/'.$name;
+
+        if (file_exists($fulldir) && is_dir($fulldir)) {
+            $this->dir  = $fulldir;
+            $this->path = common_path('local/theme/'.$name.'/');
+            return;
+        }
+
+        // Check to see if it's in the distribution dir
+
+        $instroot = self::installRoot();
+
+        $fulldir = $instroot.'/'.$name;
+
+        if (file_exists($fulldir) && is_dir($fulldir)) {
+
+            $this->dir = $fulldir;
+
+            $path = common_config('theme', 'path');
+
+            if (empty($path)) {
+                $path = common_config('site', 'path') . '/theme/';
+            }
+
+            if ($path[strlen($path)-1] != '/') {
+                $path .= '/';
+            }
+
+            if ($path[0] != '/') {
+                $path = '/'.$path;
+            }
+
+            $server = common_config('theme', 'server');
+
+            if (empty($server)) {
+                $server = common_config('site', 'server');
+            }
+
+            // XXX: protocol
+
+            $this->path = 'http://'.$server.$path.$name;
+        }
     }
-    $dir = common_config('theme', 'dir');
-    if (empty($dir)) {
-        $dir = INSTALLDIR.'/theme';
+
+    /**
+     * Gets the full local filename of a file in this theme.
+     *
+     * @param string $relative relative name, like 'logo.png'
+     *
+     * @return string full pathname, like /var/www/mublog/theme/default/logo.png
+     */
+
+    function getFile($relative)
+    {
+        return $this->dir.'/'.$relative;
     }
-    return $dir.'/'.$theme.'/'.$relative;
-}
 
-/**
- * Gets the full URL of a file in a theme dir based on its relative name
- *
- * @param string $relative relative path within the theme directory
- * @param string $theme    name of the theme; defaults to current theme
- *
- * @return string URL of the file
- */
+    /**
+     * Gets the full HTTP url of a file in this theme
+     *
+     * @param string $relative relative name, like 'logo.png'
+     *
+     * @return string full URL, like 'http://example.com/theme/default/logo.png'
+     */
 
-function theme_path($relative, $theme=null)
-{
-    if (empty($theme)) {
-        $theme = common_config('site', 'theme');
+    function getPath($relative)
+    {
+        return $this->path.'/'.$relative;
+    }
+
+    /**
+     * Gets the full path of a file in a theme dir based on its relative name
+     *
+     * @param string $relative relative path within the theme directory
+     * @param string $name     name of the theme; defaults to current theme
+     *
+     * @return string File path to the theme file
+     */
+
+    static function file($relative, $name=null)
+    {
+        $theme = new Theme($name);
+        return $theme->getFile($relative);
     }
 
-    $path = common_config('theme', 'path');
+    /**
+     * Gets the full URL of a file in a theme dir based on its relative name
+     *
+     * @param string $relative relative path within the theme directory
+     * @param string $name     name of the theme; defaults to current theme
+     *
+     * @return string URL of the file
+     */
 
-    if (empty($path)) {
-        $path = common_config('site', 'path') . '/theme/';
+    static function path($relative, $name=null)
+    {
+        $theme = new Theme($name);
+        return $theme->getPath($relative);
     }
 
-    if ($path[strlen($path)-1] != '/') {
-        $path .= '/';
+    /**
+     * list available theme names
+     *
+     * @return array list of available theme names
+     */
+
+    static function listAvailable()
+    {
+        $local   = self::subdirsOf(self::localRoot());
+        $install = self::subdirsOf(self::installRoot());
+
+        $i = array_search('base', $install);
+
+        unset($install[$i]);
+
+        return array_merge($local, $install);
     }
 
-    if ($path[0] != '/') {
-        $path = '/'.$path;
+    /**
+     * Utility for getting subdirs of a directory
+     *
+     * @param string $dir full path to directory to check
+     *
+     * @return array relative filenames of subdirs, or empty array
+     */
+
+    protected static function subdirsOf($dir)
+    {
+        $subdirs = array();
+
+        if (is_dir($dir)) {
+            if ($dh = opendir($dir)) {
+                while (($filename = readdir($dh)) !== false) {
+                    if ($filename != '..' && $filename !== '.' &&
+                        is_dir($dir.'/'.$filename)) {
+                        $subdirs[] = $filename;
+                    }
+                }
+                closedir($dh);
+            }
+        }
+
+        return $subdirs;
     }
 
-    $server = common_config('theme', 'server');
+    /**
+     * Local root dir for themes
+     *
+     * @return string local root dir for themes
+     */
 
-    if (empty($server)) {
-        $server = common_config('site', 'server');
+    protected static function localRoot()
+    {
+        return INSTALLDIR.'/local/theme';
     }
 
-    // XXX: protocol
+    /**
+     * Root dir for themes that are shipped with StatusNet
+     *
+     * @return string root dir for StatusNet themes
+     */
+
+    protected static function installRoot()
+    {
+        $instroot = common_config('theme', 'dir');
 
-    return 'http://'.$server.$path.$theme.'/'.$relative;
+        if (empty($instroot)) {
+            $instroot = INSTALLDIR.'/theme';
+        }
+
+        return $instroot;
+    }
 }
diff --git a/lib/unblockform.php b/lib/unblockform.php
index f1343757c..4fe28b21a 100644
--- a/lib/unblockform.php
+++ b/lib/unblockform.php
@@ -28,12 +28,10 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/form.php';
-
 /**
  * Form for unblocking a user
  *
@@ -47,106 +45,38 @@ require_once INSTALLDIR.'/lib/form.php';
  * @see      BlockForm
  */
 
-class UnblockForm extends Form
+class UnblockForm extends ProfileActionForm
 {
     /**
-     * Profile of user to unblock
-     */
-
-    var $profile = null;
-
-    /**
-     * Return-to args
-     */
-
-    var $args = null;
-
-    /**
-     * Constructor
-     *
-     * @param HTMLOutputter $out     output channel
-     * @param Profile       $profile profile of user to unblock
-     * @param array         $args    return-to args
-     */
-
-    function __construct($out=null, $profile=null, $args=null)
-    {
-        parent::__construct($out);
-
-        $this->profile = $profile;
-        $this->args    = $args;
-    }
-
-    /**
-     * ID of the form
-     *
-     * @return int ID of the form
-     */
-
-    function id()
-    {
-        return 'unblock-' . $this->profile->id;
-    }
-
-    /**
-     * class of the form
+     * Action this form provides
      *
-     * @return string class of the form
+     * @return string Name of the action, lowercased.
      */
 
-    function formClass()
+    function target()
     {
-        return 'form_user_unblock';
+        return 'unblock';
     }
 
     /**
-     * Action of the form
-     *
-     * @return string URL of the action
-     */
-
-    function action()
-    {
-        return common_local_url('unblock');
-    }
-
-    /**
-     * Legend of the Form
-     *
-     * @return void
-     */
-    function formLegend()
-    {
-        $this->out->element('legend', null, _('Unblock this user'));
-    }
-
-
-    /**
-     * Data elements of the form
+     * Title of the form
      *
-     * @return void
+     * @return string Title of the form, internationalized
      */
 
-    function formData()
+    function title()
     {
-        $this->out->hidden('unblockto-' . $this->profile->id,
-                           $this->profile->id,
-                           'unblockto');
-        if ($this->args) {
-            foreach ($this->args as $k => $v) {
-                $this->out->hidden('returnto-' . $k, $v);
-            }
-        }
+        return _('Unblock');
     }
 
     /**
-     * Action elements
+     * Description of the form
      *
-     * @return void
+     * @return string description of the form, internationalized
      */
 
-    function formActions()
+    function description()
     {
-        $this->out->submit('submit', _('Unblock'), 'submit', null, _('Unblock this user'));
+        return _('Unlock this user');
     }
 }
diff --git a/lib/unsandboxform.php b/lib/unsandboxform.php
new file mode 100644
index 000000000..a77634244
--- /dev/null
+++ b/lib/unsandboxform.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Form for unsandboxing a user
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Form
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Form for unsandboxing a user
+ *
+ * Removes the "sandboxed" role for a user.
+ *
+ * @category Form
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ *
+ * @see      UnSandboxForm
+ */
+
+class UnsandboxForm extends ProfileActionForm
+{
+    /**
+     * Action this form provides
+     *
+     * @return string Name of the action, lowercased.
+     */
+
+    function target()
+    {
+        return 'unsandbox';
+    }
+
+    /**
+     * Title of the form
+     *
+     * @return string Title of the form, internationalized
+     */
+
+    function title()
+    {
+        return _('Unsandbox');
+    }
+
+    /**
+     * Description of the form
+     *
+     * @return string description of the form, internationalized
+     */
+
+    function description()
+    {
+        return _('Unsandbox this user');
+    }
+}
diff --git a/lib/unsilenceform.php b/lib/unsilenceform.php
new file mode 100644
index 000000000..ac02b8b6c
--- /dev/null
+++ b/lib/unsilenceform.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Form for unsilencing a user
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Form
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Form for unsilencing a user
+ *
+ * @category Form
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ *
+ * @see      SilenceForm
+ */
+
+class UnSilenceForm extends ProfileActionForm
+{
+    /**
+     * Action this form provides
+     *
+     * @return string Name of the action, lowercased.
+     */
+
+    function target()
+    {
+        return 'unsilence';
+    }
+
+    /**
+     * Title of the form
+     *
+     * @return string Title of the form, internationalized
+     */
+
+    function title()
+    {
+        return _('Unsilence');
+    }
+
+    /**
+     * Description of the form
+     *
+     * @return string description of the form, internationalized
+     */
+
+    function description()
+    {
+        return _('Unsilence this user');
+    }
+}
diff --git a/lib/userprofile.php b/lib/userprofile.php
new file mode 100644
index 000000000..ee205af85
--- /dev/null
+++ b/lib/userprofile.php
@@ -0,0 +1,358 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Profile for a particular user
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @copyright 2008 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/widget.php';
+
+/**
+ * Profile of a user
+ *
+ * Shows profile information about a particular user
+ *
+ * @category Output
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ *
+ * @see      HTMLOutputter
+ */
+
+class UserProfile extends Widget
+{
+    var $user = null;
+    var $profile = null;
+
+    function __construct($action=null, $user=null, $profile=null)
+    {
+        parent::__construct($action);
+        $this->user = $user;
+        $this->profile = $profile;
+    }
+
+    function show()
+    {
+        $this->showProfileData();
+        $this->showEntityActions();
+    }
+
+    function showProfileData()
+    {
+        if (Event::handle('StartProfilePageProfileSection', array(&$this->out, $this->profile))) {
+
+            $this->out->elementStart('div', 'entity_profile vcard author');
+            $this->out->element('h2', null, _('User profile'));
+
+            if (Event::handle('StartProfilePageProfileElements', array(&$this->out, $this->profile))) {
+
+                $this->showAvatar();
+                $this->showNickname();
+                $this->showFullName();
+                $this->showLocation();
+                $this->showHomepage();
+                $this->showBio();
+                $this->showProfileTags();
+
+                Event::handle('EndProfilePageProfileElements', array(&$this->out, $this->profile));
+            }
+
+            $this->out->elementEnd('div');
+            Event::handle('EndProfilePageProfileSection', array(&$this->out, $this->profile));
+        }
+    }
+
+    function showAvatar()
+    {
+        if (Event::handle('StartProfilePageAvatar', array($this->out, $this->profile))) {
+
+            $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
+
+            $this->out->elementStart('dl', 'entity_depiction');
+            $this->out->element('dt', null, _('Photo'));
+            $this->out->elementStart('dd');
+            $this->out->element('img', array('src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE),
+                                        'class' => 'photo avatar',
+                                        'width' => AVATAR_PROFILE_SIZE,
+                                        'height' => AVATAR_PROFILE_SIZE,
+                                        'alt' => $this->profile->nickname));
+            $this->out->elementEnd('dd');
+
+            $user = User::staticGet('id', $this->profile->id);
+
+            $cur = common_current_user();
+            if ($cur && $cur->id == $user->id) {
+                $this->out->elementStart('dd');
+                $this->out->element('a', array('href' => common_local_url('avatarsettings')), _('Edit Avatar'));
+                $this->out->elementEnd('dd');
+            }
+
+            $this->out->elementEnd('dl');
+
+            Event::handle('EndProfilePageAvatar', array($this->out, $this->profile));
+        }
+    }
+
+    function showNickname()
+    {
+        if (Event::handle('StartProfilePageNickname', array($this->out, $this->profile))) {
+
+            $this->out->elementStart('dl', 'entity_nickname');
+            $this->out->element('dt', null, _('Nickname'));
+            $this->out->elementStart('dd');
+            $hasFN = ($this->profile->fullname) ? 'nickname url uid' : 'fn nickname url uid';
+            $this->out->element('a', array('href' => $this->profile->profileurl,
+                                      'rel' => 'me', 'class' => $hasFN),
+                           $this->profile->nickname);
+            $this->out->elementEnd('dd');
+            $this->out->elementEnd('dl');
+
+            Event::handle('EndProfilePageNickname', array($this->out, $this->profile));
+        }
+    }
+
+    function showFullName()
+    {
+        if (Event::handle('StartProfilePageFullName', array($this->out, $this->profile))) {
+            if ($this->profile->fullname) {
+                $this->out->elementStart('dl', 'entity_fn');
+                $this->out->element('dt', null, _('Full name'));
+                $this->out->elementStart('dd');
+                $this->out->element('span', 'fn', $this->profile->fullname);
+                $this->out->elementEnd('dd');
+                $this->out->elementEnd('dl');
+            }
+            Event::handle('EndProfilePageFullName', array($this->out, $this->profile));
+        }
+    }
+
+    function showLocation()
+    {
+        if (Event::handle('StartProfilePageLocation', array($this->out, $this->profile))) {
+            if ($this->profile->location) {
+                $this->out->elementStart('dl', 'entity_location');
+                $this->out->element('dt', null, _('Location'));
+                $this->out->element('dd', 'label', $this->profile->location);
+                $this->out->elementEnd('dl');
+            }
+            Event::handle('EndProfilePageLocation', array($this->out, $this->profile));
+        }
+    }
+
+    function showHomepage()
+    {
+        if (Event::handle('StartProfilePageHomepage', array($this->out, $this->profile))) {
+            if ($this->profile->homepage) {
+                $this->out->elementStart('dl', 'entity_url');
+                $this->out->element('dt', null, _('URL'));
+                $this->out->elementStart('dd');
+                $this->out->element('a', array('href' => $this->profile->homepage,
+                                          'rel' => 'me', 'class' => 'url'),
+                               $this->profile->homepage);
+                $this->out->elementEnd('dd');
+                $this->out->elementEnd('dl');
+            }
+            Event::handle('EndProfilePageHomepage', array($this->out, $this->profile));
+        }
+    }
+
+    function showBio()
+    {
+        if (Event::handle('StartProfilePageBio', array($this->out, $this->profile))) {
+            if ($this->profile->bio) {
+                $this->out->elementStart('dl', 'entity_note');
+                $this->out->element('dt', null, _('Note'));
+                $this->out->element('dd', 'note', $this->profile->bio);
+                $this->out->elementEnd('dl');
+            }
+            Event::handle('EndProfilePageBio', array($this->out, $this->profile));
+        }
+    }
+
+    function showProfileTags()
+    {
+        if (Event::handle('StartProfilePageProfileTags', array($this->out, $this->profile))) {
+            $tags = Profile_tag::getTags($this->profile->id, $this->profile->id);
+
+            if (count($tags) > 0) {
+                $this->out->elementStart('dl', 'entity_tags');
+                $this->out->element('dt', null, _('Tags'));
+                $this->out->elementStart('dd');
+                $this->out->elementStart('ul', 'tags xoxo');
+                foreach ($tags as $tag) {
+                    $this->out->elementStart('li');
+                    // Avoid space by using raw output.
+                    $pt = '<span class="mark_hash">#</span><a rel="tag" href="' .
+                      common_local_url('peopletag', array('tag' => $tag)) .
+                      '">' . $tag . '</a>';
+                    $this->out->raw($pt);
+                    $this->out->elementEnd('li');
+                }
+                $this->out->elementEnd('ul');
+                $this->out->elementEnd('dd');
+                $this->out->elementEnd('dl');
+            }
+            Event::handle('EndProfilePageProfileTags', array($this->out, $this->profile));
+        }
+    }
+
+    function showEntityActions()
+    {
+        if (Event::handle('StartProfilePageActionsSection', array(&$this->out, $this->profile))) {
+
+            $cur = common_current_user();
+
+            $this->out->elementStart('div', 'entity_actions');
+            $this->out->element('h2', null, _('User actions'));
+            $this->out->elementStart('ul');
+
+            if (Event::handle('StartProfilePageActionsElements', array(&$this->out, $this->profile))) {
+                if (empty($cur)) { // not logged in
+                    $this->out->elementStart('li', 'entity_subscribe');
+                    $this->showRemoteSubscribeLink();
+                    $this->out->elementEnd('li');
+                } else {
+                    if ($cur->id == $this->profile->id) { // your own page
+                        $this->out->elementStart('li', 'entity_edit');
+                        $this->out->element('a', array('href' => common_local_url('profilesettings'),
+                                                  'title' => _('Edit profile settings')),
+                                       _('Edit'));
+                        $this->out->elementEnd('li');
+                    } else { // someone else's page
+
+                        // subscribe/unsubscribe button
+
+                        $this->out->elementStart('li', 'entity_subscribe');
+
+                        if ($cur->isSubscribed($this->profile)) {
+                            $usf = new UnsubscribeForm($this->out, $this->profile);
+                            $usf->show();
+                        } else {
+                            $sf = new SubscribeForm($this->out, $this->profile);
+                            $sf->show();
+                        }
+                        $this->out->elementEnd('li');
+
+                        if ($cur->mutuallySubscribed($this->user)) {
+
+                            // message
+
+                            $this->out->elementStart('li', 'entity_send-a-message');
+                            $this->out->element('a', array('href' => common_local_url('newmessage', array('to' => $this->user->id)),
+                                                      'title' => _('Send a direct message to this user')),
+                                           _('Message'));
+                            $this->out->elementEnd('li');
+
+                            // nudge
+
+                            if ($this->user->email && $this->user->emailnotifynudge) {
+                                $this->out->elementStart('li', 'entity_nudge');
+                                $nf = new NudgeForm($this->out, $this->user);
+                                $nf->show();
+                                $this->out->elementEnd('li');
+                            }
+                        }
+
+                        // return-to args, so we don't have to keep re-writing them
+
+                        list($action, $r2args) = $this->out->returnToArgs();
+
+                        // push the action into the list
+
+                        $r2args['action'] = $action;
+
+                        // block/unblock
+
+                        $blocked = $cur->hasBlocked($this->profile);
+                        $this->out->elementStart('li', 'entity_block');
+                        if ($blocked) {
+                            $ubf = new UnblockForm($this->out, $this->profile, $r2args);
+                            $ubf->show();
+                        } else {
+                            $bf = new BlockForm($this->out, $this->profile, $r2args);
+                            $bf->show();
+                        }
+                        $this->out->elementEnd('li');
+
+                        if ($cur->hasRight(Right::SANDBOXUSER)) {
+                            $this->out->elementStart('li', 'entity_sandbox');
+                            if ($this->user->isSandboxed()) {
+                                $usf = new UnSandboxForm($this->out, $this->profile, $r2args);
+                                $usf->show();
+                            } else {
+                                $sf = new SandboxForm($this->out, $this->profile, $r2args);
+                                $sf->show();
+                            }
+                            $this->out->elementEnd('li');
+                        }
+
+                        if ($cur->hasRight(Right::SILENCEUSER)) {
+                            $this->out->elementStart('li', 'entity_silence');
+                            if ($this->user->isSilenced()) {
+                                $usf = new UnSilenceForm($this->out, $this->profile, $r2args);
+                                $usf->show();
+                            } else {
+                                $sf = new SilenceForm($this->out, $this->profile, $r2args);
+                                $sf->show();
+                            }
+                            $this->out->elementEnd('li');
+                        }
+
+                        if ($cur->hasRight(Right::DELETEUSER)) {
+                            $this->out->elementStart('li', 'entity_delete');
+                            $df = new DeleteUserForm($this->out, $this->profile, $r2args);
+                            $df->show();
+                            $this->out->elementEnd('li');
+                        }
+                    }
+                }
+
+                Event::handle('EndProfilePageActionsElements', array(&$this->out, $this->profile));
+            }
+
+            $this->out->elementEnd('ul');
+            $this->out->elementEnd('div');
+
+            Event::handle('EndProfilePageActionsSection', array(&$this->out, $this->profile));
+        }
+    }
+
+    function showRemoteSubscribeLink()
+    {
+        $url = common_local_url('remotesubscribe',
+                                array('nickname' => $this->profile->nickname));
+        $this->out->element('a', array('href' => $url,
+                                  'class' => 'entity_remote_subscribe'),
+                       _('Subscribe'));
+    }
+}
diff --git a/lib/util.php b/lib/util.php
index b6e89f0bd..68f3520db 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -57,12 +57,11 @@ function common_init_language()
     // we can set in another locale that may not be set up
     // (say, ga_ES for Galego/Galician) it seems to take it.
     common_init_locale("en_US");
-    
+
     $language = common_language();
     $locale_set = common_init_locale($language);
     setlocale(LC_CTYPE, 'C');
-    
-    // So we don't have to make people install the gettext locales
+    // So we do not have to make people install the gettext locales
     $path = common_config('site','locale_path');
     bindtextdomain("statusnet", $path);
     bind_textdomain_codeset("statusnet", "UTF-8");
@@ -117,23 +116,26 @@ function common_munge_password($password, $id)
 }
 
 // check if a username exists and has matching password
+
 function common_check_user($nickname, $password)
 {
-    // NEVER allow blank passwords, even if they match the DB
-    if (mb_strlen($password) == 0) {
-        return false;
-    }
-    $user = User::staticGet('nickname', $nickname);
-    if (is_null($user) || $user === false) {
-        return false;
-    } else {
-        if (0 == strcmp(common_munge_password($password, $user->id),
-                        $user->password)) {
-            return $user;
-        } else {
-            return false;
+    $authenticatedUser = false;
+
+    if (Event::handle('StartCheckPassword', array($nickname, $password, &$authenticatedUser))) {
+        $user = User::staticGet('nickname', $nickname);
+        if (!empty($user)) {
+            if (!empty($password)) { // never allow login with blank password
+                if (0 == strcmp(common_munge_password($password, $user->id),
+                                $user->password)) {
+                    //internal checking passed
+                    $authenticatedUser =& $user;
+                }
+            }
         }
+        Event::handle('EndCheckPassword', array($nickname, $password, $authenticatedUser));
     }
+
+    return $authenticatedUser;
 }
 
 // is the current user logged in?
@@ -348,8 +350,11 @@ function common_current_user()
             common_ensure_session();
             $id = isset($_SESSION['userid']) ? $_SESSION['userid'] : false;
             if ($id) {
-                $_cur = User::staticGet($id);
-                return $_cur;
+                $user = User::staticGet($id);
+                if ($user) {
+                	$_cur = $user;
+                	return $_cur;
+                }
             }
         }
 
@@ -422,7 +427,7 @@ function common_render_text($text)
 function common_replace_urls_callback($text, $callback, $notice_id = null) {
     // Start off with a regex
     $regex = '#'.
-    '(?:^|[\s\(\)\[\]\{\}\\\'\\\";]+)(?![\@\!\#])'.
+    '(?:^|[\s\<\>\(\)\[\]\{\}\\\'\\\";]+)(?![\@\!\#])'.
     '('.
         '(?:'.
             '(?:'. //Known protocols
@@ -452,9 +457,9 @@ function common_replace_urls_callback($text, $callback, $notice_id = null) {
         ')'.
         '(?:'.
             '(?:\:\d+)?'. //:port
-            '(?:/[\pN\pL$\[\]\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'\"@]*)?'. // /path
-            '(?:\?[\pN\pL\$\[\]\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'\"@\/]*)?'. // ?query string
-            '(?:\#[\pN\pL$\[\]\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'\"\@/\?\#]*)?'. // #fragment
+            '(?:/[\pN\pL$\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'@]*)?'. // /path
+            '(?:\?[\pN\pL\$\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'@\/]*)?'. // ?query string
+            '(?:\#[\pN\pL$\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'\@/\?\#]*)?'. // #fragment
         ')(?<![\?\.\,\#\,])'.
     ')'.
     '#ixu';
@@ -480,6 +485,10 @@ function callback_helper($matches, $callback, $notice_id) {
         array(
             'left'=>'{',
             'right'=>'}'
+        ),
+        array(
+            'left'=>'<',
+            'right'=>'>'
         )
     );
     $cannotEndWith=array('.','?',',','#');
@@ -781,12 +790,18 @@ function common_path($relative, $ssl=false)
         if (is_string(common_config('site', 'sslserver')) &&
             mb_strlen(common_config('site', 'sslserver')) > 0) {
             $serverpart = common_config('site', 'sslserver');
-        } else {
+        } else if (common_config('site', 'server')) {
             $serverpart = common_config('site', 'server');
+        } else {
+            common_log(LOG_ERR, 'Site Sever not configured, unable to determine site name.');
         }
     } else {
         $proto = 'http';
-        $serverpart = common_config('site', 'server');
+        if (common_config('site', 'server')) {
+            $serverpart = common_config('site', 'server');
+        } else {
+            common_log(LOG_ERR, 'Site Sever not configured, unable to determine site name.');
+        }
     }
 
     return $proto.'://'.$serverpart.'/'.$pathpart.$relative;
@@ -1074,7 +1089,11 @@ function common_log_objstring(&$object)
     $arr = $object->toArray();
     $fields = array();
     foreach ($arr as $k => $v) {
-        $fields[] = "$k='$v'";
+        if (is_object($v)) {
+            $fields[] = "$k='".get_class($v)."'";
+        } else {
+            $fields[] = "$k='$v'";
+        }
     }
     $objstring = $object->tableName() . '[' . implode(',', $fields) . ']';
     return $objstring;
@@ -1360,9 +1379,28 @@ function common_memcache()
     }
 }
 
+function common_license_terms($uri)
+{
+    if(preg_match('/creativecommons.org\/licenses\/([^\/]+)/', $uri, $matches)) {
+        return explode('-',$matches[1]);
+    }
+    return array($uri);
+}
+
 function common_compatible_license($from, $to)
 {
+    $from_terms = common_license_terms($from);
+    // public domain and cc-by are compatible with everything
+    if(count($from_terms) == 1 && ($from_terms[0] == 'publicdomain' || $from_terms[0] == 'by')) {
+        return true;
+    }
+    $to_terms = common_license_terms($to);
+    // sa is compatible across versions. IANAL
+    if(in_array('sa',$from_terms) || in_array('sa',$to_terms)) {
+        return count(array_diff($from_terms, $to_terms)) == 0;
+    }
     // XXX: better compatibility check needed here!
+    // Should at least normalise URIs
     return ($from == $to);
 }
 
@@ -1385,25 +1423,18 @@ function common_shorten_url($long_url)
     if (empty($user)) {
         // common current user does not find a user when called from the XMPP daemon
         // therefore we'll set one here fix, so that XMPP given URLs may be shortened
-        $svc = 'ur1.ca';
+        $shortenerName = 'ur1.ca';
     } else {
-        $svc = $user->urlshorteningservice;
-    }
-    global $_shorteners;
-    if (!isset($_shorteners[$svc])) {
-        //the user selected service doesn't exist, so default to ur1.ca
-        $svc = 'ur1.ca';
+        $shortenerName = $user->urlshorteningservice;
     }
-    if (!isset($_shorteners[$svc])) {
-    	// no shortener plugins installed.
-    	return $long_url;
-    }
-
-    $reflectionObj = new ReflectionClass($_shorteners[$svc]['callInfo'][0]);
-    $short_url_service = $reflectionObj->newInstanceArgs($_shorteners[$svc]['callInfo'][1]);
-    $short_url = $short_url_service->shorten($long_url);
 
-    return $short_url;
+    if(Event::handle('StartShortenUrl', array($long_url,$shortenerName,&$shortenedUrl))){
+        //URL wasn't shortened, so return the long url
+        return $long_url;
+    }else{
+        //URL was shortened, so return the result
+        return $shortenedUrl;
+    }
 }
 
 function common_client_ip()
diff --git a/plugins/OpenID/publicxrds.php b/lib/xrdsoutputter.php
index 1b2b359ca..4b77ed5a3 100644
--- a/plugins/OpenID/publicxrds.php
+++ b/lib/xrdsoutputter.php
@@ -1,21 +1,12 @@
 <?php
-
 /**
- * Public XRDS for OpenID
- *
- * PHP version 5
+ * StatusNet, the distributed open-source microblogging tool
  *
- * @category Action
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @author   Robin Millette <millette@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://status.net/
+ * Low-level generator for HTML
  *
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
+ * PHP version 5
  *
- * This program is free software: you can redistribute it and/or modify
+ * 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.
@@ -27,60 +18,44 @@
  *
  * 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  Output
+ * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @copyright 2008 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
  */
 
 if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/plugins/OpenID/openid.php';
+require_once INSTALLDIR.'/lib/xmloutputter.php';
 
 /**
- * Public XRDS for OpenID
+ * Low-level generator for XRDS XML
  *
- * @category Action
+ * @category Output
  * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @author   Robin Millette <millette@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
- * @todo factor out similarities with XrdsAction
+ * @see      Action
+ * @see      XMLOutputter
  */
-class PublicxrdsAction extends Action
+class XRDSOutputter extends XMLOutputter
 {
-    /**
-     * Is read only?
-     *
-     * @return boolean true
-     */
-    function isReadOnly($args)
+    public function startXRDS()
     {
-        return true;
-    }
-
-    /**
-     * Class handler.
-     *
-     * @param array $args array of arguments
-     *
-     * @return nothing
-     */
-    function handle($args)
-    {
-        parent::handle($args);
         header('Content-Type: application/xrds+xml');
         $this->startXML();
         $this->elementStart('XRDS', array('xmlns' => 'xri://$xrds'));
-        $this->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
-                                          'xmlns:simple' => 'http://xrds-simple.net/core/1.0',
-                                          'version' => '2.0'));
-        $this->element('Type', null, 'xri://$xrds*simple');
-        foreach (array('finishopenidlogin', 'finishaddopenid') as $finish) {
-            $this->showService(Auth_OpenID_RP_RETURN_TO_URL_TYPE,
-                                common_local_url($finish));
-        }
-        $this->elementEnd('XRD');
+    }
+    
+    public function endXRDS()
+    {
         $this->elementEnd('XRDS');
         $this->endXML();
     }
@@ -96,7 +71,7 @@ class PublicxrdsAction extends Action
      *
      * @return void
      */
-    function showService($type, $uri, $params=null, $sigs=null, $localId=null)
+    function showXrdsService($type, $uri, $params=null, $sigs=null, $localId=null)
     {
         $this->elementStart('Service');
         if ($uri) {
@@ -119,4 +94,3 @@ class PublicxrdsAction extends Action
         $this->elementEnd('Service');
     }
 }
-
diff --git a/locale/ar/LC_MESSAGES/statusnet.mo b/locale/ar/LC_MESSAGES/statusnet.mo
new file mode 100644
index 000000000..9d156ce91
--- /dev/null
+++ b/locale/ar/LC_MESSAGES/statusnet.mo
diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
new file mode 100644
index 000000000..8cbdb40b1
--- /dev/null
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -0,0 +1,4549 @@
+# Translation of StatusNet to Arabic
+#
+# Author@translatewiki.net: OsamaK
+# --
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:42:46+0000\n"
+"Language-Team: Arabic\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ar\n"
+"X-Message-Group: out-statusnet\n"
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+msgid "No such page"
+msgstr "لا صفحة كهذه"
+
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
+msgstr "لا مستخدم كهذا."
+
+#: actions/all.php:84
+#, php-format
+msgid "%s and friends, page %d"
+msgstr ""
+
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#, php-format
+msgid "%s and friends"
+msgstr ""
+
+#: actions/all.php:99
+#, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr ""
+
+#: actions/all.php:107
+#, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr ""
+
+#: actions/all.php:115
+#, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr ""
+
+#: actions/all.php:127
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+
+#: actions/all.php:132
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+
+#: actions/all.php:134
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
+
+#: actions/all.php:165
+msgid "You and friends"
+msgstr "أنت والأصدقاء"
+
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
+msgstr "لم يوجد رمز التأكيد."
+
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+msgid "Could not update user."
+msgstr "تعذّر تحديث المستخدم."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
+msgstr ""
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+msgid "Could not update your design."
+msgstr "تعذّر تحديث تصميمك."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "ليس للمستخدم ملف شخصي."
+
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "تعذّر حفظ الملف الشخصي."
+
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
+msgstr "فشل منع المستخدم."
+
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "لا نص في الرسالة!"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr ""
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "لم يُعثر على المستخدم المستلم."
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
+#: actions/apidirectmessage.php:89
+#, php-format
+msgid "Direct messages from %s"
+msgstr "رسائل مباشرة من %s"
+
+#: actions/apidirectmessage.php:93
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr ""
+
+#: actions/apidirectmessage.php:101
+#, php-format
+msgid "Direct messages to %s"
+msgstr "رسالة مباشرة %s"
+
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
+
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr ""
+
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
+msgstr ""
+
+#: actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
+msgstr ""
+
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+msgstr "تعذّر إنشاء مفضلة."
+
+#: actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
+msgstr "تلك الحالة ليست مفضلة!"
+
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr "تعذّر حذف المفضلة."
+
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: actions/apifriendshipscreate.php:118
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr ""
+
+#: actions/apifriendshipsdestroy.php:109
+msgid "Could not unfollow user: User not found."
+msgstr ""
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
+msgstr ""
+
+#: actions/apifriendshipsshow.php:135
+msgid "Could not determine source user."
+msgstr ""
+
+#: actions/apifriendshipsshow.php:143
+msgid "Could not find target user."
+msgstr "تعذّر إيجاد المستخدم الهدف."
+
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
+msgid "Could not create group."
+msgstr ""
+
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
+msgid "Could not create aliases."
+msgstr "تعذّر إنشاء الكنى."
+
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+msgid "Could not set group membership."
+msgstr "تعذّر ضبط عضوية المجموعة."
+
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr ""
+
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "ليس اسمًا مستعارًا صحيحًا."
+
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "الصفحة الرئيسية ليست عنونًا صالحًا."
+
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
+
+#: actions/apigroupcreate.php:261
+#, php-format
+msgid "Description is too long (max %d chars)."
+msgstr ""
+
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr ""
+
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "كنية غير صالحة: \"%s\""
+
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr ""
+
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/apigroupjoin.php:110
+msgid "You are already a member of that group."
+msgstr ""
+
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#: actions/apigroupjoin.php:138
+#, php-format
+msgid "Could not join user %s to group %s."
+msgstr ""
+
+#: actions/apigroupleave.php:114
+msgid "You are not a member of this group."
+msgstr ""
+
+#: actions/apigroupleave.php:124
+#, php-format
+msgid "Could not remove user %s to group %s."
+msgstr ""
+
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "مجموعات %s"
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr "مجموعات %s"
+
+#: actions/apigrouplist.php:95
+#, php-format
+msgid "%s's groups"
+msgstr "مجموعات %s"
+
+#: actions/apigrouplist.php:103
+#, php-format
+msgid "Groups %s is a member of on %s."
+msgstr ""
+
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
+msgstr ""
+
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: actions/apistatusesshow.php:138
+msgid "Status deleted."
+msgstr "حُذِفت الحالة."
+
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
+msgstr ""
+
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr ""
+
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
+msgstr "لم يوجد"
+
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+msgid "Unsupported format."
+msgstr "نسق غير مدعوم."
+
+#: actions/apitimelinefavorites.php:107
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr ""
+
+#: actions/apitimelinefavorites.php:119
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr ""
+
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
+#, php-format
+msgid "%s timeline"
+msgstr "مسار %s الزمني"
+
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: actions/apitimelinementions.php:116
+#, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr ""
+
+#: actions/apitimelinementions.php:126
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#, php-format
+msgid "%s public timeline"
+msgstr ""
+
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: actions/apitimelinetag.php:101 actions/tag.php:66
+#, php-format
+msgid "Notices tagged with %s"
+msgstr "الإشعارات الموسومة ب%s"
+
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr ""
+
+#: actions/apiusershow.php:96
+msgid "Not found."
+msgstr ""
+
+#: actions/attachment.php:73
+msgid "No such attachment."
+msgstr "لا مرفق كهذا."
+
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+msgstr "لا اسم مستعار."
+
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "لا حجم."
+
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "حجم غير صالح."
+
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "أفتار"
+
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr ""
+
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
+msgstr ""
+
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+msgid "Avatar settings"
+msgstr "إعدادات الأفتار"
+
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr "الأصلي"
+
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr "عاين"
+
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+msgid "Delete"
+msgstr "احذف"
+
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+msgstr "ارفع"
+
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
+msgstr ""
+
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr ""
+
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
+msgstr ""
+
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
+msgstr ""
+
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+msgstr "رُفع الأفتار."
+
+#: actions/avatarsettings.php:363
+msgid "Failed updating avatar."
+msgstr ""
+
+#: actions/avatarsettings.php:387
+msgid "Avatar deleted."
+msgstr "حُذف الأفتار."
+
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+msgid "No nickname"
+msgstr "لا اسم مستعار"
+
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
+msgstr "لا مجموعة كهذه"
+
+#: actions/blockedfromgroup.php:90
+#, php-format
+msgid "%s blocked profiles"
+msgstr ""
+
+#: actions/blockedfromgroup.php:93
+#, php-format
+msgid "%s blocked profiles, page %d"
+msgstr ""
+
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr ""
+
+#: actions/blockedfromgroup.php:281
+msgid "Unblock user from group"
+msgstr ""
+
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
+msgstr "ألغِ المنع"
+
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+msgid "Unblock this user"
+msgstr "ألغِ منع هذا المستخدم"
+
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "لست والجًا."
+
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
+msgstr "لا ملف شخصي مُحدّد."
+
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
+msgstr "لا ملف شخصي بهذه الهوية."
+
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+msgid "Block user"
+msgstr "امنع المستخدم"
+
+#: actions/block.php:136
+msgid ""
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
+msgstr ""
+
+#: actions/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
+msgid "No"
+msgstr "لا"
+
+#: actions/block.php:149
+msgid "Do not block this user"
+msgstr "لا تمنع هذا المستخدم"
+
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
+msgstr "نعم"
+
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+msgid "Block this user"
+msgstr "امنع هذا المستخدم"
+
+#: actions/block.php:165
+msgid "You have already blocked this user."
+msgstr ""
+
+#: actions/block.php:170
+msgid "Failed to save block information."
+msgstr ""
+
+#: actions/bookmarklet.php:50
+msgid "Post to "
+msgstr ""
+
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+msgstr "لا رمز تأكيد."
+
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "لم يوجد رمز التأكيد."
+
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "رمز التأكيد ليس لك!"
+
+#: actions/confirmaddress.php:90
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr ""
+
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr ""
+
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "تعذّر تحديث المستخدم."
+
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr "تعذّر حذف تأكيد البريد الإلكتروني."
+
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "عنوان التأكيد"
+
+#: actions/confirmaddress.php:159
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr ""
+
+#: actions/conversation.php:99
+msgid "Conversation"
+msgstr "محادثة"
+
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
+msgstr "الإشعارات"
+
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
+msgstr "لا إشعار كهذا."
+
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "تعذّر حذف هذا الإشعار."
+
+#: actions/deletenotice.php:103
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr "احذف الإشعار"
+
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟"
+
+#: actions/deletenotice.php:145
+msgid "Do not delete this notice"
+msgstr "لا تحذف هذا الإشعار"
+
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+msgid "Delete this notice"
+msgstr "احذف هذا الإشعار"
+
+#: actions/deletenotice.php:157
+msgid "There was a problem with your session token.  Try again, please."
+msgstr ""
+
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr "هذا الشعار ليس مفضلًا!"
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "أضف إلى المفضلات"
+
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "لا مستند كهذا."
+
+#: actions/editgroup.php:56
+#, php-format
+msgid "Edit %s group"
+msgstr "عدّل مجموعة %s"
+
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
+msgstr ""
+
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+msgid "You must be an admin to edit the group"
+msgstr "يجب أن تكون إداريًا لتعدّل المجموعة"
+
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
+msgstr "استخدم هذا النموذج لتعديل المجموعة."
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, php-format
+msgid "description is too long (max %d chars)."
+msgstr ""
+
+#: actions/editgroup.php:253
+msgid "Could not update group."
+msgstr "تعذر تحديث المجموعة."
+
+#: actions/editgroup.php:269
+msgid "Options saved."
+msgstr "حُفظت الخيارات."
+
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "إعدادات البريد الإلكتروني"
+
+#: actions/emailsettings.php:71
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "العنوان"
+
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr ""
+
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "أزل"
+
+#: actions/emailsettings.php:113
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
+
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "ألغِ"
+
+#: actions/emailsettings.php:121
+msgid "Email Address"
+msgstr "عنوان البريد الإلكتروني"
+
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr "عنوان البريد الإلكتروني، مثل \"UserName@example.org\""
+
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "أضف"
+
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+msgstr "البريد الإلكتروني الوارد"
+
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
+msgstr "أرسل بريدًا إلكترونيًا إلى هذا العنوان لترسل إشعارات جديدة."
+
+#: actions/emailsettings.php:145 actions/smssettings.php:162
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr ""
+
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
+msgstr "جديد"
+
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
+msgstr "التفضيلات"
+
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+
+#: actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr ""
+
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
+msgstr "أريد أن أرسل الملاحظات عبر البريد الإلكتروني."
+
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "أرسل"
+
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+msgstr "حُفِظت التفضيلات."
+
+#: actions/emailsettings.php:319
+msgid "No email address."
+msgstr "لا عنوان بريد إلكتروني."
+
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: actions/emailsettings.php:330
+msgid "Not a valid email address"
+msgstr "ليس عنوان بريد صالح"
+
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
+msgstr ""
+
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+msgstr ""
+
+#: actions/emailsettings.php:358
+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/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
+msgstr ""
+
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "هذا عنوان محادثة فورية خاطئ."
+
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "أُلغي التأكيد."
+
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
+msgstr "هذا ليس عنوان بريدك الإلكتروني."
+
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "أزيل هذا العنوان."
+
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
+msgstr ""
+
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
+msgstr ""
+
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
+msgstr ""
+
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
+msgstr ""
+
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+msgid "Popular notices"
+msgstr ""
+
+#: actions/favorited.php:67
+#, php-format
+msgid "Popular notices, page %d"
+msgstr ""
+
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
+msgstr ""
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+
+#: actions/favorited.php:153
+msgid ""
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
+msgstr ""
+
+#: actions/favorited.php:156
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
+msgstr ""
+
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: actions/favoritesrss.php:115
+#, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr ""
+
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "ألغِ تفضيل المفضلة"
+
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr "مستخدمون مختارون"
+
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr ""
+
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
+msgstr ""
+
+#: actions/file.php:34
+msgid "No notice id"
+msgstr "لا هوية إشعار"
+
+#: actions/file.php:38
+msgid "No notice"
+msgstr "لا إشعار"
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr "لا مرفقات"
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr "لا مرفقات مرفوعة"
+
+#: actions/finishremotesubscribe.php:69
+msgid "Not expecting this response!"
+msgstr "لم أتوقع هذا الرد!"
+
+#: actions/finishremotesubscribe.php:80
+msgid "User being listened to does not exist."
+msgstr "المستخدم الذي تستمع إليه غير موجود."
+
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:106
+msgid "You are not authorized."
+msgstr "لا تملك تصريحًا."
+
+#: actions/finishremotesubscribe.php:109
+msgid "Could not convert request token to access token."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:114
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "خطأ أثناء تحديث الملف الشخصي البعيد"
+
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+msgid "No such group."
+msgstr "لا مجموعة كهذه."
+
+#: actions/getfile.php:75
+msgid "No such file."
+msgstr "لا ملف كهذا."
+
+#: actions/getfile.php:79
+msgid "Cannot read file."
+msgstr "تعذّرت قراءة الملف."
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
+msgstr "لا مجموعة مُحدّدة."
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
+
+#: actions/groupblock.php:95
+msgid "User is already blocked from group."
+msgstr ""
+
+#: actions/groupblock.php:100
+msgid "User is not a member of group."
+msgstr "المستخدم ليس عضوًا في المجموعة."
+
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+msgid "Block user from group"
+msgstr "امنع المستخدم من المجموعة"
+
+#: actions/groupblock.php:162
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+
+#: actions/groupblock.php:178
+msgid "Do not block this user from this group"
+msgstr ""
+
+#: actions/groupblock.php:179
+msgid "Block this user from this group"
+msgstr ""
+
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
+msgstr ""
+
+#: actions/groupbyid.php:74
+msgid "No ID"
+msgstr "لا هوية"
+
+#: actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
+msgstr "يجب أن تلج لتُعدّل المجموعات."
+
+#: actions/groupdesignsettings.php:141
+msgid "Group design"
+msgstr "تصميم المجموعة"
+
+#: actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+msgid "Couldn't update your design."
+msgstr "تعذّر تحديث تصميمك."
+
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+msgid "Unable to save your design settings!"
+msgstr ""
+
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+msgid "Design preferences saved."
+msgstr ""
+
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
+msgstr "شعار المجموعة"
+
+#: actions/grouplogo.php:150
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
+
+#: actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
+msgstr ""
+
+#: actions/grouplogo.php:396
+msgid "Logo updated."
+msgstr "حُدّث الشعار."
+
+#: actions/grouplogo.php:398
+msgid "Failed updating logo."
+msgstr "فشل رفع الشعار."
+
+#: actions/groupmembers.php:93 lib/groupnav.php:92
+#, php-format
+msgid "%s group members"
+msgstr "أعضاء مجموعة %s"
+
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
+msgstr ""
+
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr "قائمة بمستخدمي هذه المجموعة."
+
+#: actions/groupmembers.php:175 lib/groupnav.php:107
+msgid "Admin"
+msgstr "إداري"
+
+#: actions/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
+msgstr "امنع"
+
+#: actions/groupmembers.php:441
+msgid "Make user an admin of the group"
+msgstr ""
+
+#: actions/groupmembers.php:473
+msgid "Make Admin"
+msgstr ""
+
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr "اجعل هذا المستخدم إداريًا"
+
+#: actions/grouprss.php:133
+#, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr ""
+
+#: actions/groupsearch.php:52
+#, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+
+#: actions/groupsearch.php:58
+msgid "Group search"
+msgstr "بحث في المجموعات"
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+msgid "No results."
+msgstr "لا نتائج."
+
+#: actions/groupsearch.php:82
+#, php-format
+msgid ""
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
+msgstr ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "مجموعات"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr ""
+
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
+
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "أنشئ مجموعة جديدة"
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
+
+#: actions/groupunblock.php:95
+msgid "User is not blocked from group."
+msgstr ""
+
+#: actions/groupunblock.php:128 actions/unblock.php:108
+msgid "Error removing the block."
+msgstr "خطأ أثناء منع الحجب."
+
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "إعدادات المراسلة الفورية"
+
+#: actions/imsettings.php:70
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+
+#: actions/imsettings.php:89
+msgid "IM is not available."
+msgstr "المراسلة الفورية غير متوفرة."
+
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr ""
+
+#: actions/imsettings.php:114
+#, 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/imsettings.php:124
+msgid "IM Address"
+msgstr "عنوان المراسلة الفورية"
+
+#: actions/imsettings.php:126
+#, 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/imsettings.php:143
+msgid "Send me notices through Jabber/GTalk."
+msgstr ""
+
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr ""
+
+#: actions/imsettings.php:153
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "لا هوية جابر."
+
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr ""
+
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "ليست هوية جابر صالحة"
+
+#: actions/imsettings.php:299
+msgid "That is already your Jabber ID."
+msgstr ""
+
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr ""
+
+#: actions/imsettings.php:327
+#, 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/imsettings.php:387
+msgid "That is not your Jabber ID."
+msgstr "هذه ليست هويتك في جابر."
+
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/invite.php:41
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr ""
+
+#: actions/invite.php:72
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "عنوان بريد إلكتروني غير صالح: %s"
+
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
+msgstr "أُرسلت الدعوة"
+
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr "ادعُ مستخدمين جددًا"
+
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: actions/invite.php:131 actions/invite.php:139
+#, php-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: actions/invite.php:136
+msgid ""
+"These people are already users and you were automatically subscribed to them:"
+msgstr ""
+
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: actions/invite.php:150
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr ""
+
+#: actions/invite.php:162
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
+msgstr ""
+
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "عناوين البريد الإلكتروني"
+
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: actions/invite.php:192
+msgid "Personal message"
+msgstr "رسالة شخصية"
+
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
+msgstr "أرسل"
+
+#: actions/invite.php:226
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: actions/invite.php:228
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
+msgstr ""
+
+#: actions/joingroup.php:90 lib/command.php:217
+msgid "You are already a member of that group"
+msgstr ""
+
+#: actions/joingroup.php:128 lib/command.php:234
+#, php-format
+msgid "Could not join user %s to group %s"
+msgstr ""
+
+#: actions/joingroup.php:135 lib/command.php:239
+#, php-format
+msgid "%s joined group %s"
+msgstr "%s انضم إلى مجموعة %s"
+
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
+msgstr ""
+
+#: actions/leavegroup.php:90 lib/command.php:268
+msgid "You are not a member of that group."
+msgstr "لست عضوا في تلك المجموعة."
+
+#: actions/leavegroup.php:119 lib/command.php:278
+msgid "Could not find membership record."
+msgstr ""
+
+#: actions/leavegroup.php:127 lib/command.php:284
+#, php-format
+msgid "Could not remove user %s to group %s"
+msgstr ""
+
+#: actions/leavegroup.php:134 lib/command.php:289
+#, php-format
+msgid "%s left group %s"
+msgstr ""
+
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "والج بالفعل."
+
+#: actions/login.php:110 actions/login.php:120
+msgid "Invalid or expired token."
+msgstr ""
+
+#: actions/login.php:143
+msgid "Incorrect username or password."
+msgstr "اسم المستخدم أو كلمة السر غير صحيحان."
+
+#: actions/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
+msgstr "خطأ أثناء ضبط المستخدم."
+
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "لُج"
+
+#: actions/login.php:243
+msgid "Login to site"
+msgstr "لُج إلى الموقع"
+
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "الاسم المستعار"
+
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "كلمة السر"
+
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "تذكّرني"
+
+#: actions/login.php:253 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
+msgstr ""
+
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "أنسيت كلمة السر؟"
+
+#: actions/login.php:282
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr ""
+
+#: actions/login.php:286
+#, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
+
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
+
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
+
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr "لا حالة حالية"
+
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr "مجموعة جديدة"
+
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
+msgstr "استخدم هذا النموذج لإنشاء مجموعة جديدة."
+
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr "رسالة جديدة"
+
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
+msgstr ""
+
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+msgstr "لا محتوى!"
+
+#: actions/newmessage.php:158
+msgid "No recipient specified."
+msgstr ""
+
+#: actions/newmessage.php:164 lib/command.php:370
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly instead."
+msgstr ""
+
+#: actions/newmessage.php:181
+msgid "Message sent"
+msgstr "أُرسلت الرسالة"
+
+#: actions/newmessage.php:185 lib/command.php:375
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
+msgstr "خطأ أجاكس"
+
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "إشعار جديد"
+
+#: actions/newnotice.php:199
+msgid "Notice posted"
+msgstr ""
+
+#: actions/noticesearch.php:68
+#, php-format
+msgid ""
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
+msgstr ""
+
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "بحث النص"
+
+#: actions/noticesearch.php:91
+#, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr ""
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+
+#: actions/noticesearch.php:124
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
+msgstr ""
+
+#: actions/noticesearchrss.php:89
+#, php-format
+msgid "Updates with \"%s\""
+msgstr ""
+
+#: actions/noticesearchrss.php:91
+#, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr ""
+
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+
+#: actions/nudge.php:94
+msgid "Nudge sent"
+msgstr "أرسل التنبيه"
+
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr "أُرسل التنبيه!"
+
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+msgstr ""
+
+#: actions/oembed.php:86 actions/shownotice.php:180
+#, php-format
+msgid "%1$s's status on %2$s"
+msgstr ""
+
+#: actions/oembed.php:157
+msgid "content type "
+msgstr "نوع المحتوى "
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
+
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
+msgstr ""
+
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "بحث الأشخاص"
+
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "بحث الإشعارات"
+
+#: actions/othersettings.php:60
+msgid "Other Settings"
+msgstr "إعدادات أخرى"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr " (خدمة حرة)"
+
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
+msgstr "قصّر المسارات بـ"
+
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
+msgstr "خدمة التقصير المطلوب استخدامها."
+
+#: actions/othersettings.php:122
+msgid "View profile designs"
+msgstr "اعرض تصاميم الملف الشخصي"
+
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/othersettings.php:153
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr ""
+
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr ""
+
+#: actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "غيّر كلمة السر"
+
+#: actions/passwordsettings.php:69
+msgid "Change your password."
+msgstr "غيّر كلمة سرك."
+
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+msgid "Password change"
+msgstr "تغيير كلمة السر"
+
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "كلمة السر القديمة"
+
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "كلمة سر جديدة"
+
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr ""
+
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "أكّد"
+
+#: actions/passwordsettings.php:113
+msgid "same as password above"
+msgstr "نفس كلمة السر أعلاه"
+
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "غيّر"
+
+#: actions/passwordsettings.php:154 actions/register.php:230
+msgid "Password must be 6 or more characters."
+msgstr ""
+
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "كلمتا السر غير متطابقتين."
+
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "كلمة السر القديمة غير صحيحة"
+
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "خطأ أثناء حفظ المستخدم؛ غير صالح."
+
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "تعذّر حفظ كلمة السر الجديدة."
+
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "حُفظت كلمة السر."
+
+#: actions/peoplesearch.php:52
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "بحث الأشخاص"
+
+#: actions/peopletag.php:70
+#, php-format
+msgid "Not a valid people tag: %s"
+msgstr ""
+
+#: actions/peopletag.php:144
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "محتوى إشعار غير صالح"
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "إعدادات الملف الشخصي"
+
+#: actions/profilesettings.php:71
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+
+#: actions/profilesettings.php:99
+msgid "Profile information"
+msgstr "معلومات الملف الشخصي"
+
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full name"
+msgstr "الاسم الكامل"
+
+#: actions/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "الصفحة الرئيسية"
+
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:460
+#, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr ""
+
+#: actions/profilesettings.php:125 actions/register.php:463
+msgid "Describe yourself and your interests"
+msgstr "صِف نفسك واهتماماتك"
+
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "السيرة"
+
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "الموقع"
+
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr ""
+
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
+msgstr "الوسوم"
+
+#: actions/profilesettings.php:140
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+
+#: actions/profilesettings.php:144
+msgid "Language"
+msgstr "اللغة"
+
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr "اللغة المفضلة"
+
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr "المنطقة الزمنية"
+
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
+msgstr "ما المنطقة الزمنية التي تتواجد فيها عادة؟"
+
+#: actions/profilesettings.php:160
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+
+#: actions/profilesettings.php:221 actions/register.php:223
+#, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr ""
+
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr "لم تُختر المنطقة الزمنية."
+
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr ""
+
+#: actions/profilesettings.php:246 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "وسم غير صالح: \"%s\""
+
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+msgstr "تعذّر حفظ الملف الشخصي."
+
+#: actions/profilesettings.php:336
+msgid "Couldn't save tags."
+msgstr "تعذّر حفظ الوسوم."
+
+#: actions/profilesettings.php:344
+msgid "Settings saved."
+msgstr "حُفظت الإعدادات."
+
+#: actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr "وراء حد الصفحة (%s)"
+
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
+msgstr ""
+
+#: actions/public.php:129
+#, php-format
+msgid "Public timeline, page %d"
+msgstr "المسار الزمني العام، صفحة %d"
+
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr "المسار الزمني العام"
+
+#: actions/public.php:151
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr ""
+
+#: actions/public.php:155
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr ""
+
+#: actions/public.php:159
+msgid "Public Stream Feed (Atom)"
+msgstr ""
+
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr "كن أول من يُرسل!"
+
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+
+#: actions/public.php:233
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
+msgstr ""
+"هنا %%site.name%%، خدمة [التدوين المُصغّر](http://en.wikipedia.org/wiki/Micro-"
+"blogging) المبنية على البرنامج الحر [StatusNet](http://status.net/).  [انضم "
+"الآن](%%action.register%%) لتشارك اشعاراتك مع أصدقائك وعائلتك وزملائك! "
+"([اقرأ المزيد](%%doc.help%%))"
+
+#: actions/public.php:238
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
+msgstr ""
+"هنا %%site.name%%، خدمة [التدوين المُصغّر](http://en.wikipedia.org/wiki/Micro-"
+"blogging) المبنية على البرنامج الحر [StatusNet](http://status.net/)."
+
+#: actions/publictagcloud.php:57
+msgid "Public tag cloud"
+msgstr "سحابة الوسوم العمومية"
+
+#: actions/publictagcloud.php:63
+#, php-format
+msgid "These are most popular recent tags on %s "
+msgstr ""
+
+#: actions/publictagcloud.php:69
+#, php-format
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
+msgstr ""
+
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
+msgstr "كن أول من يُرسل!"
+
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
+msgstr "سحابة الوسوم"
+
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "أنت والج بالفعل!"
+
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "لا رمز استعادة كهذا."
+
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "ليس رمز استعادة."
+
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr "رمز استعادة لمستخدم غير معروف."
+
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "خطأ في رمز التأكيد."
+
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
+msgstr "رمز التأكيد هذا قديم جدًا. من فضلك ابدأ من جديد."
+
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
+msgstr ""
+
+#: actions/recoverpassword.php:152
+msgid ""
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
+msgstr ""
+
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
+msgstr ""
+
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
+msgstr "استعادة كلمة السر"
+
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
+msgstr "الاسم المستعار أو البريد الإلكتروني"
+
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
+msgstr ""
+
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
+msgstr "استرجع"
+
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "أعد ضبط كلمة السر"
+
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr "استعد كلمة السر"
+
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
+msgstr "طُلبت استعادة كلمة السر"
+
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
+msgstr "إجراء غير معروف"
+
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr ""
+
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "نفس كلمة السر أعلاه"
+
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "أعد الضبط"
+
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "أدخل اسمًا مستعارًا أو عنوان بريد إلكتروني."
+
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
+msgstr ""
+
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr ""
+
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "خطأ أثناء حفظ تأكيد العنوان."
+
+#: actions/recoverpassword.php:325
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr ""
+
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
+msgstr ""
+
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr ""
+
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
+msgstr ""
+
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
+msgstr ""
+
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
+msgstr ""
+
+#: actions/register.php:92
+msgid "Sorry, invalid invitation code."
+msgstr "عذرا، رمز دعوة غير صالح."
+
+#: actions/register.php:112
+msgid "Registration successful"
+msgstr "نجح التسجيل"
+
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "سجّل"
+
+#: actions/register.php:135
+msgid "Registration not allowed."
+msgstr "لا يُسمح بالتسجيل."
+
+#: actions/register.php:198
+msgid "You can't register if you don't agree to the license."
+msgstr ""
+
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "ليس عنوان بريد صالح."
+
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "عنوان البريد الإلكتروني موجود مسبقًا."
+
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr ""
+
+#: actions/register.php:342
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+
+#: actions/register.php:424
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: actions/register.php:433
+msgid "Same as password above. Required."
+msgstr ""
+
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "البريد الإلكتروني"
+
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
+msgstr ""
+
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
+msgstr ""
+
+#: actions/register.php:493
+msgid "My text and files are available under "
+msgstr ""
+
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
+msgstr "المشاع المبدع نسبة المنصف إلى مؤلفه 3.0"
+
+#: actions/register.php:496
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+
+#: actions/register.php:537
+#, 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/register.php:561
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: actions/remotesubscribe.php:98
+#, php-format
+msgid ""
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
+msgstr ""
+
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr "اشتراك بعيد"
+
+#: actions/remotesubscribe.php:124
+msgid "Subscribe to a remote user"
+msgstr "اشترك بمستخدم بعيد"
+
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "اسم المستخدم المستعار"
+
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr ""
+
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "مسار الملف الشخصي"
+
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
+msgstr ""
+
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
+msgstr "اشترك"
+
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr ""
+
+#: actions/remotesubscribe.php:168
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr ""
+
+#: actions/remotesubscribe.php:176
+msgid "That’s a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/remotesubscribe.php:183
+msgid "Couldn’t get a request token."
+msgstr ""
+
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
+#, php-format
+msgid "Replies to %s"
+msgstr "الردود على %s"
+
+#: actions/replies.php:127
+#, php-format
+msgid "Replies to %s, page %d"
+msgstr "الردود على %s، الصفحة %d"
+
+#: actions/replies.php:144
+#, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr ""
+
+#: actions/replies.php:151
+#, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr ""
+
+#: actions/replies.php:158
+#, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr ""
+
+#: actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
+
+#: actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+
+#: actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/repliesrss.php:72
+#, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%s's favorite notices, page %d"
+msgstr ""
+
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
+msgstr ""
+
+#: actions/showfavorites.php:170
+#, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr ""
+
+#: actions/showfavorites.php:177
+#, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr ""
+
+#: actions/showfavorites.php:184
+#, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr ""
+
+#: actions/showfavorites.php:205
+msgid ""
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
+msgstr ""
+
+#: actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr "إنها إحدى وسائل مشاركة ما تحب."
+
+#: actions/showgroup.php:82 lib/groupnav.php:86
+#, php-format
+msgid "%s group"
+msgstr "مجموعة %s"
+
+#: actions/showgroup.php:84
+#, php-format
+msgid "%s group, page %d"
+msgstr ""
+
+#: actions/showgroup.php:218
+msgid "Group profile"
+msgstr "ملف المجموعة الشخصي"
+
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
+msgid "URL"
+msgstr "مسار"
+
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
+msgid "Note"
+msgstr "ملاحظة"
+
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr "الكنى"
+
+#: actions/showgroup.php:293
+msgid "Group actions"
+msgstr ""
+
+#: actions/showgroup.php:328
+#, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr ""
+
+#: actions/showgroup.php:334
+#, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr ""
+
+#: actions/showgroup.php:340
+#, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr ""
+
+#: actions/showgroup.php:345
+#, php-format
+msgid "FOAF for %s group"
+msgstr ""
+
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
+msgid "Members"
+msgstr "الأعضاء"
+
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/tagcloudsection.php:71
+msgid "(None)"
+msgstr "(لا شيء)"
+
+#: actions/showgroup.php:392
+msgid "All members"
+msgstr "جميع الأعضاء"
+
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "إحصاءات"
+
+#: actions/showgroup.php:432
+msgid "Created"
+msgstr "أنشئ"
+
+#: actions/showgroup.php:448
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+
+#: actions/showgroup.php:454
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
+msgstr ""
+
+#: actions/showgroup.php:482
+msgid "Admins"
+msgstr "الإداريون"
+
+#: actions/showmessage.php:81
+msgid "No such message."
+msgstr "لا رسالة كهذه."
+
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient may read this message."
+msgstr "يحق للمُرسل والمستلم فقط قراءة هذه الرسالة."
+
+#: actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr ""
+
+#: actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr ""
+
+#: actions/shownotice.php:90
+msgid "Notice deleted."
+msgstr "حُذف الإشعار."
+
+#: actions/showstream.php:73
+#, php-format
+msgid " tagged %s"
+msgstr ""
+
+#: actions/showstream.php:79
+#, php-format
+msgid "%s, page %d"
+msgstr ""
+
+#: actions/showstream.php:122
+#, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr ""
+
+#: actions/showstream.php:129
+#, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr ""
+
+#: actions/showstream.php:136
+#, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr ""
+
+#: actions/showstream.php:143
+#, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr ""
+
+#: actions/showstream.php:148
+#, php-format
+msgid "FOAF for %s"
+msgstr ""
+
+#: actions/showstream.php:191
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:198
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:234
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+
+#: actions/showstream.php:239
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
+msgstr ""
+
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr ""
+
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
+#: actions/smssettings.php:91
+msgid "SMS is not available."
+msgstr ""
+
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
+
+#: actions/smssettings.php:130
+msgid "Confirmation code"
+msgstr "رمز التأكيد"
+
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
+msgstr ""
+
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: actions/smssettings.php:174
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+
+#: actions/smssettings.php:306
+msgid "No phone number."
+msgstr "لا رقم هاتف."
+
+#: actions/smssettings.php:311
+msgid "No carrier selected."
+msgstr ""
+
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
+msgstr ""
+
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: actions/smssettings.php:347
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
+msgstr "هذا ليس رقم هاتفك."
+
+#: actions/smssettings.php:465
+msgid "Mobile carrier"
+msgstr ""
+
+#: actions/smssettings.php:469
+msgid "Select a carrier"
+msgstr ""
+
+#: actions/smssettings.php:476
+#, 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/smssettings.php:498
+msgid "No code entered"
+msgstr ""
+
+#: actions/subedit.php:70
+msgid "You are not subscribed to that profile."
+msgstr ""
+
+#: actions/subedit.php:83
+msgid "Could not save subscription."
+msgstr "تعذّر حفظ الاشتراك."
+
+#: actions/subscribe.php:55
+msgid "Not a local user."
+msgstr "ليس مُستخدمًا محليًا."
+
+#: actions/subscribe.php:69
+msgid "Subscribed"
+msgstr "مُشترك"
+
+#: actions/subscribers.php:50
+#, php-format
+msgid "%s subscribers"
+msgstr "مشتركو %s"
+
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %d"
+msgstr "مشتركو %s، الصفحة %d"
+
+#: actions/subscribers.php:63
+msgid "These are the people who listen to your notices."
+msgstr ""
+
+#: actions/subscribers.php:67
+#, php-format
+msgid "These are the people who listen to %s's notices."
+msgstr ""
+
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
+msgstr ""
+
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr ""
+
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
+#: actions/subscriptions.php:52
+#, php-format
+msgid "%s subscriptions"
+msgstr "اشتراكات %s"
+
+#: actions/subscriptions.php:54
+#, php-format
+msgid "%s subscriptions, page %d"
+msgstr "اشتراكات %s، الصفحة %d"
+
+#: actions/subscriptions.php:65
+msgid "These are the people whose notices you listen to."
+msgstr "هؤلاء الأشخاص الذي تستمع إليهم."
+
+#: actions/subscriptions.php:69
+#, php-format
+msgid "These are the people whose notices %s listens to."
+msgstr "هؤلاء الأشخاص الذي يستمع %s إليهم."
+
+#: actions/subscriptions.php:121
+#, php-format
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
+msgstr ""
+
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, php-format
+msgid "%s is not listening to anyone."
+msgstr ""
+
+#: actions/subscriptions.php:194
+msgid "Jabber"
+msgstr "جابر"
+
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
+msgstr ""
+
+#: actions/tagother.php:33
+msgid "Not logged in"
+msgstr "لست والجًا"
+
+#: actions/tagother.php:39
+msgid "No id argument."
+msgstr "لا مُدخل هوية."
+
+#: actions/tagother.php:65
+#, php-format
+msgid "Tag %s"
+msgstr ""
+
+#: actions/tagother.php:77 lib/userprofile.php:75
+msgid "User profile"
+msgstr "ملف المستخدم الشخصي"
+
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
+msgstr "صورة"
+
+#: actions/tagother.php:141
+msgid "Tag user"
+msgstr ""
+
+#: actions/tagother.php:151
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+
+#: actions/tagother.php:193
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:200
+msgid "Could not save tags."
+msgstr ""
+
+#: actions/tagother.php:236
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr ""
+
+#: actions/tag.php:86
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr ""
+
+#: actions/tag.php:92
+#, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr ""
+
+#: actions/tag.php:98
+#, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr ""
+
+#: actions/tagrss.php:35
+msgid "No such tag."
+msgstr "لا وسم كهذا."
+
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
+msgstr ""
+
+#: actions/unsubscribe.php:77
+msgid "No profile id in request."
+msgstr ""
+
+#: actions/unsubscribe.php:84
+msgid "No profile with that id."
+msgstr "لا ملف بهذه الهوية."
+
+#: actions/unsubscribe.php:98
+msgid "Unsubscribed"
+msgstr ""
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr ""
+
+#: actions/userauthorization.php:110
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
+msgstr ""
+
+#: actions/userauthorization.php:188
+msgid "License"
+msgstr "الرخصة"
+
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "اقبل"
+
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "اشترك بهذا المستخدم"
+
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "ارفض"
+
+#: actions/userauthorization.php:212
+msgid "Reject this subscription"
+msgstr "ارفض هذا الاشتراك"
+
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
+msgstr "لا طلب استيثاق!"
+
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+msgstr ""
+
+#: actions/userauthorization.php:249
+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:259
+msgid "Subscription rejected"
+msgstr "رُفض الاشتراك"
+
+#: actions/userauthorization.php:261
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr ""
+
+#: actions/userauthorization.php:348
+#, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr ""
+
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr "لا هوية."
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+msgid "Profile design"
+msgstr "تصميم الملف الشخصي"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr "استمتع بالنقانق!"
+
+#: actions/usergroups.php:64
+#, php-format
+msgid "%s groups, page %d"
+msgstr ""
+
+#: actions/usergroups.php:130
+msgid "Search for more groups"
+msgstr ""
+
+#: actions/usergroups.php:153
+#, php-format
+msgid "%s is not a member of any group."
+msgstr ""
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Message.php:55
+msgid "Could not insert message."
+msgstr ""
+
+#: classes/Message.php:65
+msgid "Could not update message with new URI."
+msgstr ""
+
+#: classes/Notice.php:164
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: classes/Notice.php:179
+msgid "Problem saving notice. Too long."
+msgstr ""
+
+#: classes/Notice.php:183
+msgid "Problem saving notice. Unknown user."
+msgstr ""
+
+#: classes/Notice.php:188
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:194
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+
+#: classes/Notice.php:202
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
+msgstr "مشكلة أثناء حفظ الإشعار."
+
+#: classes/Notice.php:1120
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr ""
+
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr ""
+
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "الملف الشخصي"
+
+#: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
+msgstr "غيّر إعدادات ملفك الشخصي"
+
+#: lib/accountsettingsaction.php:112
+msgid "Upload an avatar"
+msgstr ""
+
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr "غير كلمة سرّك"
+
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
+msgstr "غير أسلوب التعامل مع البريد الإلكتروني"
+
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
+msgstr "التصميم"
+
+#: lib/accountsettingsaction.php:124
+msgid "Design your profile"
+msgstr "صمّم ملفك الشخصي"
+
+#: lib/accountsettingsaction.php:128
+msgid "Other"
+msgstr "أخرى"
+
+#: lib/accountsettingsaction.php:128
+msgid "Other options"
+msgstr "خيارات أخرى"
+
+#: lib/action.php:144
+#, php-format
+msgid "%s - %s"
+msgstr "%s - %s"
+
+#: lib/action.php:159
+msgid "Untitled page"
+msgstr "صفحة غير مُعنونة"
+
+#: lib/action.php:424
+msgid "Primary site navigation"
+msgstr ""
+
+#: lib/action.php:430
+msgid "Home"
+msgstr "الرئيسية"
+
+#: lib/action.php:430
+msgid "Personal profile and friends timeline"
+msgstr "الملف الشخصي ومسار الأصدقاء الزمني"
+
+#: lib/action.php:432
+msgid "Account"
+msgstr "الحساب"
+
+#: lib/action.php:432
+msgid "Change your email, avatar, password, profile"
+msgstr ""
+
+#: lib/action.php:435
+msgid "Connect"
+msgstr "اتصل"
+
+#: lib/action.php:435
+msgid "Connect to services"
+msgstr ""
+
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
+msgstr "ادعُ"
+
+#: lib/action.php:440 lib/subgroupnav.php:106
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr ""
+
+#: lib/action.php:445
+msgid "Logout"
+msgstr "اخرج"
+
+#: lib/action.php:445
+msgid "Logout from the site"
+msgstr ""
+
+#: lib/action.php:450
+msgid "Create an account"
+msgstr ""
+
+#: lib/action.php:453
+msgid "Login to the site"
+msgstr ""
+
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
+msgstr "مساعدة"
+
+#: lib/action.php:456
+msgid "Help me!"
+msgstr "ساعدني!"
+
+#: lib/action.php:459
+msgid "Search"
+msgstr "ابحث"
+
+#: lib/action.php:459
+msgid "Search for people or text"
+msgstr ""
+
+#: lib/action.php:480
+msgid "Site notice"
+msgstr "إشعار الموقع"
+
+#: lib/action.php:546
+msgid "Local views"
+msgstr ""
+
+#: lib/action.php:612
+msgid "Page notice"
+msgstr "إشعار الصفحة"
+
+#: lib/action.php:714
+msgid "Secondary site navigation"
+msgstr ""
+
+#: lib/action.php:721
+msgid "About"
+msgstr "عن"
+
+#: lib/action.php:723
+msgid "FAQ"
+msgstr "الأسئلة المكررة"
+
+#: lib/action.php:727
+msgid "TOS"
+msgstr "الشروط"
+
+#: lib/action.php:730
+msgid "Privacy"
+msgstr "خصوصية"
+
+#: lib/action.php:732
+msgid "Source"
+msgstr "المصدر"
+
+#: lib/action.php:734
+msgid "Contact"
+msgstr "اتصل"
+
+#: lib/action.php:736
+msgid "Badge"
+msgstr ""
+
+#: lib/action.php:764
+msgid "StatusNet software license"
+msgstr ""
+
+#: lib/action.php:767
+#, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
+msgstr ""
+
+#: lib/action.php:769
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr ""
+
+#: lib/action.php:771
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+"تعمل على برنامج التدوين المُصغّر [StatusNet](http://status.net/) -النسخة %s- "
+"المتوفر تحت [رخصة غنو أفيرو العمومية](http://www.fsf.org/licensing/licenses/"
+"agpl-3.0.html)."
+
+#: lib/action.php:785
+msgid "Site content license"
+msgstr "رخصة محتوى الموقع"
+
+#: lib/action.php:794
+msgid "All "
+msgstr ""
+
+#: lib/action.php:799
+msgid "license."
+msgstr "الرخصة."
+
+#: lib/action.php:1052
+msgid "Pagination"
+msgstr ""
+
+#: lib/action.php:1061
+msgid "After"
+msgstr "بعد"
+
+#: lib/action.php:1069
+msgid "Before"
+msgstr "قبل"
+
+#: lib/action.php:1117
+msgid "There was a problem with your session token."
+msgstr ""
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr "مرفقات"
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr "المؤلف"
+
+#: lib/attachmentlist.php:278
+msgid "Provider"
+msgstr "المزود"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr "وسوم هذا المرفق"
+
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
+msgstr "نتائج الأمر"
+
+#: lib/channel.php:210
+msgid "Command complete"
+msgstr "اكتمل الأمر"
+
+#: lib/channel.php:221
+msgid "Command failed"
+msgstr "فشل الأمر"
+
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: lib/command.php:88
+#, php-format
+msgid "Could not find a user with nickname %s"
+msgstr ""
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, php-format
+msgid "Nudge sent to %s"
+msgstr ""
+
+#: lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+"الاشتراكات: %1$s\n"
+"المشتركون: %2$s\n"
+"الإشعارات: %3$s"
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
+msgstr "ليس للمستخدم إشعار أخير"
+
+#: lib/command.php:190
+msgid "Notice marked as fave."
+msgstr ""
+
+#: lib/command.php:315
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#: lib/command.php:318
+#, php-format
+msgid "Fullname: %s"
+msgstr "الاسم الكامل: %s"
+
+#: lib/command.php:321
+#, php-format
+msgid "Location: %s"
+msgstr "الموقع: %s"
+
+#: lib/command.php:324
+#, php-format
+msgid "Homepage: %s"
+msgstr "الصفحة الرئيسية: %s"
+
+#: lib/command.php:327
+#, php-format
+msgid "About: %s"
+msgstr "عن: %s"
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr ""
+
+#: lib/command.php:377
+msgid "Error sending direct message."
+msgstr ""
+
+#: lib/command.php:431
+#, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr ""
+
+#: lib/command.php:439
+#, php-format
+msgid "Reply to %s sent"
+msgstr "رُد على رسالة %s"
+
+#: lib/command.php:441
+msgid "Error saving notice."
+msgstr "خطأ أثناء حفظ الإشعار."
+
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: lib/command.php:502
+#, php-format
+msgid "Subscribed to %s"
+msgstr "مُشترك ب%s"
+
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
+
+#: lib/command.php:530
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr ""
+
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
+msgstr ""
+
+#: lib/command.php:551
+msgid "Notification off."
+msgstr ""
+
+#: lib/command.php:553
+msgid "Can't turn off notification."
+msgstr ""
+
+#: lib/command.php:574
+msgid "Notification on."
+msgstr ""
+
+#: lib/command.php:576
+msgid "Can't turn on notification."
+msgstr ""
+
+#: lib/command.php:597
+#, php-format
+msgid "Could not create login token for %s"
+msgstr ""
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "لا تملك تصريحًا."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "الأشخاص المشتركون ب%s"
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "الأشخاص الذين اشترك بهم %s"
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "الأشخاص المشتركون ب%s"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "لست عضوا في تلك المجموعة."
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "لست عضوا في تلك المجموعة."
+
+#: lib/command.php:670
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+
+#: lib/common.php:192
+msgid "No configuration file found. "
+msgstr ""
+
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:195
+msgid "Go to the installer."
+msgstr "اذهب إلى المُثبّت."
+
+#: lib/connectsettingsaction.php:110
+msgid "IM"
+msgstr "محادثة فورية"
+
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
+msgstr ""
+
+#: lib/dberroraction.php:60
+msgid "Database error"
+msgstr "خطأ قاعدة بيانات"
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr "غيّر صورة الخلفية"
+
+#: lib/designsettings.php:105
+msgid "Upload file"
+msgstr "ارفع ملفًا"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+msgid "Change colours"
+msgstr "غيّر الألوان"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr "الخلفية"
+
+#: lib/designsettings.php:191
+msgid "Content"
+msgstr "المحتوى"
+
+#: lib/designsettings.php:204
+msgid "Sidebar"
+msgstr "الشريط الجانبي"
+
+#: lib/designsettings.php:217
+msgid "Text"
+msgstr "النص"
+
+#: lib/designsettings.php:230
+msgid "Links"
+msgstr "وصلات"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr "استخدم المبدئيات"
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr "استعد التصميمات المبدئية"
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr "ارجع إلى المبدئي"
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr "احفظ التصميم"
+
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
+msgstr "استعيدت مبدئيات التصميم."
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
+msgstr "ألغِ تفضيل هذا الإشعار"
+
+#: lib/favorform.php:114 lib/favorform.php:140
+msgid "Favor this notice"
+msgstr "فضّل هذا الإشعار"
+
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr "فضّل"
+
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr "صدّر البيانات"
+
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr "آرإس​إس 1.0"
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr "آرإس​إس 2.0"
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr "أتوم"
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr "FOAF"
+
+#: lib/galleryaction.php:121
+msgid "Filter tags"
+msgstr "رشّح الوسوم"
+
+#: lib/galleryaction.php:131
+msgid "All"
+msgstr "الكل"
+
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
+msgstr "اختر وسمًا لترشيحه"
+
+#: lib/galleryaction.php:140
+msgid "Tag"
+msgstr "الوسم"
+
+#: lib/galleryaction.php:141
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/galleryaction.php:143
+msgid "Go"
+msgstr "اذهب"
+
+#: lib/groupeditform.php:163
+msgid "URL of the homepage or blog of the group or topic"
+msgstr ""
+
+#: lib/groupeditform.php:168
+msgid "Describe the group or topic"
+msgstr ""
+
+#: lib/groupeditform.php:170
+#, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr ""
+
+#: lib/groupeditform.php:172
+msgid "Description"
+msgstr "الوصف"
+
+#: lib/groupeditform.php:179
+msgid ""
+"Location for the group, if any, like \"City, State (or Region), Country\""
+msgstr ""
+
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+msgid "Group"
+msgstr "المجموعة"
+
+#: lib/groupnav.php:101
+msgid "Blocked"
+msgstr "ممنوع"
+
+#: lib/groupnav.php:102
+#, php-format
+msgid "%s blocked users"
+msgstr ""
+
+#: lib/groupnav.php:108
+#, php-format
+msgid "Edit %s group properties"
+msgstr "عدّل خصائص مجموعة %s"
+
+#: lib/groupnav.php:113
+msgid "Logo"
+msgstr "الشعار"
+
+#: lib/groupnav.php:114
+#, php-format
+msgid "Add or edit %s logo"
+msgstr "أضف أو عدّل شعار %s"
+
+#: lib/groupnav.php:120
+#, php-format
+msgid "Add or edit %s design"
+msgstr ""
+
+#: lib/groupsbymemberssection.php:71
+msgid "Groups with most members"
+msgstr "المجموعات الأكثر أعضاءً"
+
+#: lib/groupsbypostssection.php:71
+msgid "Groups with most posts"
+msgstr "المجموعات الأكثر مرسلات"
+
+#: lib/grouptagcloudsection.php:56
+#, php-format
+msgid "Tags in %s group's notices"
+msgstr ""
+
+#: lib/htmloutputter.php:104
+msgid "This page is not available in a media type you accept"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr ""
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr ""
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr ""
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr ""
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr ""
+
+#: lib/imagefile.php:118
+msgid "Lost our file."
+msgstr ""
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr "نوع ملف غير معروف"
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr ""
+
+#: lib/joinform.php:114
+msgid "Join"
+msgstr "انضم"
+
+#: lib/leaveform.php:114
+msgid "Leave"
+msgstr "غادر"
+
+#: lib/logingroupnav.php:80
+msgid "Login with a username and password"
+msgstr ""
+
+#: lib/logingroupnav.php:86
+msgid "Sign up for a new account"
+msgstr ""
+
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+msgid "from"
+msgstr "من"
+
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "تأكيد عنوان البريد الإلكتروني"
+
+#: lib/mail.php:174
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%s\n"
+"\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
+msgstr ""
+
+#: lib/mail.php:235
+#, php-format
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr ""
+
+#: lib/mail.php:240
+#, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
+
+#: lib/mail.php:253
+#, php-format
+msgid "Location: %s\n"
+msgstr "الموقع: %s\n"
+
+#: lib/mail.php:255
+#, php-format
+msgid "Homepage: %s\n"
+msgstr "الصفحة الرئيسية: %s\n"
+
+#: lib/mail.php:257
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
+msgstr "السيرة: %s\n"
+
+#: lib/mail.php:285
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: lib/mail.php:288
+#, 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 ""
+
+#: lib/mail.php:412
+#, php-format
+msgid "%s status"
+msgstr "حالة %s"
+
+#: lib/mail.php:438
+msgid "SMS confirmation"
+msgstr ""
+
+#: lib/mail.php:462
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:466
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
+msgstr ""
+
+#: lib/mail.php:509
+#, php-format
+msgid "New private message from %s"
+msgstr "رسالة خاصة جديدة من %s"
+
+#: lib/mail.php:513
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%5$s\n"
+msgstr ""
+
+#: lib/mail.php:554
+#, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr ""
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, php-format
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+msgstr ""
+
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+msgid "Could not determine file's mime-type!"
+msgstr ""
+
+#: lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: lib/messageform.php:120
+msgid "Send a direct notice"
+msgstr "أرسل إشعارًا مباشرًا"
+
+#: lib/messageform.php:146
+msgid "To"
+msgstr "إلى"
+
+#: lib/messageform.php:162 lib/noticeform.php:173
+msgid "Available characters"
+msgstr "المحارف المتوفرة"
+
+#: lib/noticeform.php:145
+msgid "Send a notice"
+msgstr "أرسل إشعارًا"
+
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
+msgstr "ما الأخبار يا %s؟"
+
+#: lib/noticeform.php:180
+msgid "Attach"
+msgstr "أرفق"
+
+#: lib/noticeform.php:184
+msgid "Attach a file"
+msgstr "أرفق ملفًا"
+
+#: lib/noticelist.php:478
+msgid "in context"
+msgstr "في السياق"
+
+#: lib/noticelist.php:498
+msgid "Reply to this notice"
+msgstr "رُد على هذا الإشعار"
+
+#: lib/noticelist.php:499
+msgid "Reply"
+msgstr "رُد"
+
+#: lib/nudgeform.php:116
+msgid "Nudge this user"
+msgstr "نبّه هذا المستخدم"
+
+#: lib/nudgeform.php:128
+msgid "Nudge"
+msgstr "نبّه"
+
+#: lib/nudgeform.php:128
+msgid "Send a nudge to this user"
+msgstr ""
+
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "خطأ أثناء إدراج الملف الشخصي الجديد"
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr ""
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "خطأ أثناء إدراج الملف الشخصي البعيد"
+
+#: lib/oauthstore.php:345
+msgid "Duplicate notice"
+msgstr "ضاعف الإشعار"
+
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
+msgstr "تعذّر إدراج اشتراك جديد."
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "شخصية"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "الردود"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr "المفضلات"
+
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr "المستخدم"
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr "صندوق الوارد"
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr "رسائلك الواردة"
+
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr "صندوق الصادر"
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr "رسائلك المُرسلة"
+
+#: lib/personaltagcloudsection.php:56
+#, php-format
+msgid "Tags in %s's notices"
+msgstr ""
+
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "الاشتراكات"
+
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "جميع الاشتراكات"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "المشتركون"
+
+#: lib/profileaction.php:157
+msgid "All subscribers"
+msgstr "جميع المشتركين"
+
+#: lib/profileaction.php:177
+msgid "User ID"
+msgstr "هوية المستخدم"
+
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "عضو منذ"
+
+#: lib/profileaction.php:235
+msgid "All groups"
+msgstr "كل المجموعات"
+
+#: lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "عام"
+
+#: lib/publicgroupnav.php:82
+msgid "User groups"
+msgstr "مجموعات المستخدمين"
+
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
+msgid "Recent tags"
+msgstr "الوسوم الحديثة"
+
+#: lib/publicgroupnav.php:88
+msgid "Featured"
+msgstr "مُختارون"
+
+#: lib/publicgroupnav.php:92
+msgid "Popular"
+msgstr ""
+
+#: lib/searchaction.php:120
+msgid "Search site"
+msgstr "ابحث في الموقع"
+
+#: lib/searchaction.php:162
+msgid "Search help"
+msgstr "ابحث في المساعدة"
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "أشخاص"
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr "ابحث عن أشخاص على هذا الموقع"
+
+#: lib/searchgroupnav.php:82
+msgid "Notice"
+msgstr "إشعار"
+
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr ""
+
+#: lib/searchgroupnav.php:85
+msgid "Find groups on this site"
+msgstr ""
+
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr "قسم غير مُعنون"
+
+#: lib/section.php:106
+msgid "More..."
+msgstr "المزيد..."
+
+#: lib/subgroupnav.php:83
+#, php-format
+msgid "People %s subscribes to"
+msgstr "الأشخاص الذين اشترك بهم %s"
+
+#: lib/subgroupnav.php:91
+#, php-format
+msgid "People subscribed to %s"
+msgstr "الأشخاص المشتركون ب%s"
+
+#: lib/subgroupnav.php:99
+#, php-format
+msgid "Groups %s is a member of"
+msgstr "المجموعات التي %s عضو فيها"
+
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(لا شيء)"
+
+#: lib/subs.php:48
+msgid "Already subscribed!"
+msgstr "مُشترك أصلا!"
+
+#: lib/subs.php:52
+msgid "User has blocked you."
+msgstr "لقد منعك المستخدم."
+
+#: lib/subs.php:56
+msgid "Could not subscribe."
+msgstr "تعذّر الاشتراك."
+
+#: lib/subs.php:75
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: lib/subs.php:124
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "لست مُشتركًا!"
+
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
+msgstr "تعذّر حذف الاشتراك."
+
+#: lib/tagcloudsection.php:56
+msgid "None"
+msgstr "لا شيء"
+
+#: lib/topposterssection.php:74
+msgid "Top posters"
+msgstr "أعلى المرسلين"
+
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+msgid "Unsubscribe from this user"
+msgstr "ألغِ الاشتراك مع هذا المستخدم"
+
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "ألغِ الاشتراك"
+
+#: lib/userprofile.php:116
+msgid "Edit Avatar"
+msgstr "عدّل الأفتار"
+
+#: lib/userprofile.php:236
+msgid "User actions"
+msgstr "تصرفات المستخدم"
+
+#: lib/userprofile.php:248
+msgid "Edit profile settings"
+msgstr "عدّل إعدادات الملف الشخصي"
+
+#: lib/userprofile.php:249
+msgid "Edit"
+msgstr "عدّل"
+
+#: lib/userprofile.php:272
+msgid "Send a direct message to this user"
+msgstr "أرسل رسالة مباشرة إلى هذا المستخدم"
+
+#: lib/userprofile.php:273
+msgid "Message"
+msgstr "رسالة"
+
+#: lib/util.php:821
+msgid "a few seconds ago"
+msgstr "قبل لحظات قليلة"
+
+#: lib/util.php:823
+msgid "about a minute ago"
+msgstr "قبل دقيقة تقريبًا"
+
+#: lib/util.php:825
+#, php-format
+msgid "about %d minutes ago"
+msgstr ""
+
+#: lib/util.php:827
+msgid "about an hour ago"
+msgstr "قبل ساعة تقريبًا"
+
+#: lib/util.php:829
+#, php-format
+msgid "about %d hours ago"
+msgstr ""
+
+#: lib/util.php:831
+msgid "about a day ago"
+msgstr "قبل يوم تقريبا"
+
+#: lib/util.php:833
+#, php-format
+msgid "about %d days ago"
+msgstr ""
+
+#: lib/util.php:835
+msgid "about a month ago"
+msgstr "قبل شهر تقريبًا"
+
+#: lib/util.php:837
+#, php-format
+msgid "about %d months ago"
+msgstr ""
+
+#: lib/util.php:839
+msgid "about a year ago"
+msgstr "قبل سنة تقريبًا"
+
+#: lib/webcolor.php:82
+#, php-format
+msgid "%s is not a valid color!"
+msgstr "%s ليس لونًا صحيحًا!"
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr "تعذّر تحليل الرسالة."
+
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr ""
+
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr ""
diff --git a/locale/bg/LC_MESSAGES/statusnet.mo b/locale/bg/LC_MESSAGES/statusnet.mo
index 335fe0b92..48af8295b 100644
--- a/locale/bg/LC_MESSAGES/statusnet.mo
+++ b/locale/bg/LC_MESSAGES/statusnet.mo
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index c0bc8379f..c4930c6ff 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -1,4245 +1,2989 @@
-# #-#-#-#-#  statusnet.pot (StatusNet 0.6.4)  #-#-#-#-#
-# StatusNet Bulgarian translation.
-# Copyright (C) 2008
-# This file is distributed under the same license as the StatusNet package.
-# Yasen Pramatarov <yasen@lindeas.com>, 2008
-# Stoyan Zhekov <statusnet@zh.otherinbox.com>, 2008
+# Translation of StatusNet to Bulgarian
 #
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: StatusNet 0.6.4\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-06-27 18:04+0000\n"
-"Last-Translator: Yasen Pramatarov <yasen@lindeas.com>\n"
-"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:42:49+0000\n"
+"Language-Team: Bulgarian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: bg\n"
+"X-Message-Group: out-statusnet\n"
 
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
-#, 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
-#: actions/finishopenidlogin.php:110
-msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr " освен тези лични данни: парола, е-поща, месинджър, телефон."
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+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/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
+msgstr "Няма такъв потребител"
 
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/all.php:84
 #, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr "%1$s / Реплики на %2$s"
+msgid "%s and friends, page %d"
+msgstr "%s и приятели, страница %d"
 
-#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s ви кани да ползвате заедно %2$s"
+msgid "%s and friends"
+msgstr "%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/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Емисия с приятелите на %s"
 
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s вече получава бележките ви в %2$s."
+#: actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Емисия с приятелите на %s"
 
-#: ../lib/mail.php:126
+#: actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Емисия с приятелите на %s"
+
+#: actions/all.php:127
 #, 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"
+"This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
-"%1$s вече получава бележките ви в %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"С уважение,\n"
-"%4$s.\n"
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "%1$s реплики на съобщения от %2$s / %3$s."
 
-#: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/all.php:132
 #, php-format
-msgid "%1$s's status on %2$s"
-msgstr "Бележка на %1$s от %2$s"
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
 
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/all.php:134
 #, php-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
 
-#: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
 #, php-format
-msgid "%s Public Stream"
-msgstr "Общ поток в %s"
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+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
-#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
-#, php-format
-msgid "%s and friends"
+#: actions/all.php:165
+#, fuzzy
+msgid "You and friends"
 msgstr "%s и приятели"
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
 #, php-format
-msgid "%s public timeline"
-msgstr "Общ поток на %s"
-
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
-#, php-format
-msgid "%s status"
-msgstr "Състояние на %s"
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr "Бележки от %1$s и приятели в %2$s."
 
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
-#, php-format
-msgid "%s timeline"
-msgstr "Поток на %s"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
+msgstr "Не е открит методът в API."
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
+msgstr "Този метод изисква заявка POST."
 
-#: ../actions/register.php:213
+#: actions/apiaccountupdatedeliverydevice.php:105
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
 msgstr ""
-"(Трябва да получите веднага електронно писмо с указания за потвърждаване "
-"адреса на е-пощата ви.)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Грешка при обновяване на потребителя."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
 msgstr ""
-"**%%site.name%%** е услуга за микроблогване, предоставена ви от [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
-
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
-#, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** е услуга за микроблогване. "
 
-#: ../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
-#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "От 1 до 64 малки букви или цифри, без пунктоация и интервали"
-
-#: ../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
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr "6 или повече знака"
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "Грешка при записване настройките за Twitter"
 
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
-msgid "6 or more characters, and don't forget it!"
-msgstr "6 или повече знака. И не ги забравяйте!"
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Грешка при обновяване на потребителя."
 
-#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
-msgid "6 or more characters. Required."
-msgstr "6 или повече знака. Задължително поле."
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+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 ""
-"На месинджъра ви е изпратен код за потвърждение. За да получавате съобщения "
-"от %s, трябва да го одобрите."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+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."
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
 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."
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
 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 actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
-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 actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
-msgid "API method under construction."
-msgstr "Методът в API все още се разработва."
-
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
-msgid "About"
-msgstr "Относно"
-
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
-msgid "Accept"
-msgstr "Приемане"
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+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 actions/emailsettings.php:120
-#: actions/imsettings.php:127 actions/openidsettings.php:111
-#: actions/smssettings.php:133 actions/twittersettings.php:163
-msgid "Add"
-msgstr "Добавяне"
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Твърде дълго. Може да е най-много 140 знака."
 
-#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
-msgstr "Добавяне на OpenID"
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-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
-#: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
-msgstr "Адрес"
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "Получателят не е открит"
 
-#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-msgid "Addresses of friends to invite (one per line)"
-msgstr "Адреси на приятели, които каните (по един на ред)"
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+"Не може да изпращате преки съобщения до хора, които не са в списъка ви с "
+"приятели."
 
-#: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
-msgid "All subscriptions"
-msgstr "Всички абонаменти"
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "Преки съобщения до %s"
 
-#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/apidirectmessage.php:93
 #, php-format
-msgid "All updates for %s"
-msgstr "Всички бележки за %s"
+msgid "All the direct messages sent from %s"
+msgstr "Всички преки съобщения, изпратени от %s"
 
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/apidirectmessage.php:101
 #, 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
-#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
-msgid "Already logged in."
-msgstr "Вече сте влезли."
-
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
-msgid "Already subscribed!."
-msgstr "Вече сте абонирани!"
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
-msgid "Are you sure you want to delete this notice?"
-msgstr "Наистина ли искате да изтриете тази бележка?"
-
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
-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 actions/avatarsettings.php:65
-#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
-msgid "Avatar"
-msgstr "Аватар"
-
-#: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
-msgid "Avatar updated."
-msgstr "Аватарът е обновен."
+msgid "Direct messages to %s"
+msgstr "Преки съобщения до %s"
 
-#: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/apidirectmessage.php:105
 #, 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 в списъка си там?)"
+msgid "All the direct messages sent to %s"
+msgstr "Всички преки съобщения, изпратени до %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/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "Не е открит методът в API."
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
-msgid "Awaiting confirmation on this phone number."
-msgstr "Очаква се потвърждение за този телефонен номер."
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
+msgstr "Не е открита бележка с такъв идентификатор."
 
-#: ../lib/util.php:1318 lib/util.php:1452
-msgid "Before »"
-msgstr "Преди »"
+#: actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+msgstr "Тази бележка вече е отбелязана като любима!"
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
-#: actions/profilesettings.php:82 actions/register.php:184
-#: actions/profilesettings.php:112 actions/register.php:402
-msgid "Bio"
-msgstr "За мен"
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+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
-#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
-msgid "Bio is too long (max 140 chars)."
-msgstr "Автобиографията е твърде дълга (до 140 символа)."
+#: actions/apifavoritedestroy.php:122
+#, fuzzy
+msgid "That status is not a favorite!"
+msgstr "Тази бележка не е отбелязана като любима!"
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
-msgid "Can't delete this notice."
-msgstr "Грешка при изтриване на бележката."
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr "Грешка при изтриване на любима бележка."
 
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
+msgstr "Грешка при проследяване — потребителят не е намерен."
+
+#: actions/apifriendshipscreate.php:118
 #, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr "Грешка при четене адреса на аватара '%s'"
+msgid "Could not follow user: %s is already on your list."
+msgstr "Грешка при проследяване на потребител: %s вече е в списъка ви."
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404 actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-msgid "Can't save new password."
-msgstr "Грешка при запазване на новата парола."
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+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
-#: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
-msgstr "Отказ"
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
 
-#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Грешка при създаване на потребителски OpenID обект"
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
+msgstr "Трябва да се дадат два идентификатора или имена на потребители."
 
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
-msgstr "Грешка при нормализация на този Jabber ID"
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Грешка при изтегляне на общия поток"
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
-msgid "Cannot normalize that email address"
-msgstr "Грешка при нормализиране адреса на е-пощата"
+#: actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Не са открити бележки."
 
-#: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
-msgstr "Промяна"
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
+msgid "Could not create group."
+msgstr "Грешка при създаване на групата."
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
-msgstr "Промяна обработката на писмата"
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Грешка при отбелязване като любима."
 
-#: ../actions/password.php:32 actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr "Смяна на паролата"
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Грешка при създаване на нов абонамент."
 
-#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
-msgid "Change your password"
-msgstr "Смяна на паролата"
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"Псевдонимът може да съдържа само малки букви, числа и никакво разстояние "
+"между тях."
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-msgid "Change your profile settings"
-msgstr "Промяна настройките на профила"
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+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
-#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
-#: actions/register.php:376 actions/smssettings.php:122
-msgid "Confirm"
-msgstr "Потвърждаване"
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "Неправилен псевдоним."
 
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "Потвърждаване на адреса"
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "Адресът на личната страница не е правилен URL."
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245 actions/emailsettings.php:256
-#: actions/imsettings.php:230 actions/smssettings.php:253
-#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
-msgid "Confirmation cancelled."
-msgstr "Потвърждаването е прекъснато."
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "Пълното име е твърде дълго (макс. 255 знака)"
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
-msgid "Confirmation code"
-msgstr "Код за потвърждение"
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "Автобиографията е твърде дълга (до 140 символа)."
 
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-msgid "Confirmation code not found."
-msgstr "Кодът за потвърждение не е открит."
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "Името на местоположението е твърде дълго (макс. 255 знака)."
 
-#: ../actions/register.php:202
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
 #, 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."
+msgid "Too many aliases! Maximum %d."
 msgstr ""
-"Поздравления, %s! И добре дошли в %%%%site.name%%%%! от тук можете да...\n"
-"\n"
-"* Отидете в [профила си](%s) и да публикувате първата си бележка.\n"
-"* Добавите [адрес в Jabber/GTalk](%%%%action.imsettings%%%%), за да "
-"изпращате бележки от програмата си за моментни съобщения.\n"
-"* [Търсите хора](%%%%action.peoplesearch%%%%), които познавате или с които "
-"споделяте общи интереси. \n"
-"* Обновите [настройките на профила(%%%%action.profilesettings%%%%) си, за да "
-"кажете повече за себе си на другите. \n"
-"* Прочетете наличната [документация](%%%%doc.help%%%%) на сайта, за да се "
-"запознаете с възможностите му. \n"
-"\n"
-"Благодарим, че се включихте в сайта и дано ползването на услугата ви носи "
-"само приятни мигове!"
 
-#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
-msgid "Connect"
-msgstr "Свързване"
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Неправилен етикет: \"%s\""
 
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
-msgid "Connect existing account"
-msgstr "Свързване на съществуваща сметка"
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Опитайте друг псевдоним, този вече е зает."
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
-msgid "Contact"
-msgstr "Контакт"
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
 
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
-#, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "Грешка при създаване на OpenID форма: %s"
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Вече членувате в тази група."
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr "Грешка при проследяване на потребител: %s вече е в списъка ви."
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
-msgid "Could not follow user: User not found."
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
 msgstr "Грешка при проследяване — потребителят не е намерен."
 
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Грешка при пренасочване към сървър: %s"
-
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
-msgid "Could not save avatar info"
-msgstr "Грешка при запазване данните на аватара"
-
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
-msgid "Could not save new profile info"
-msgstr "Грешка при запазване на новия профил"
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Не членувате в тази група."
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
-msgid "Could not subscribe other to you."
-msgstr "Грешка при абониране на друг потребител за вас."
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Грешка при проследяване — потребителят не е намерен."
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
-msgid "Could not subscribe."
-msgstr "Грешка при абониране."
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "Групи на %s"
 
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
-msgstr "Грешка при обновяване на потребител с потвърден email адрес."
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Търсене на групи в сайта"
 
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-msgid "Couldn't convert request tokens to access tokens."
-msgstr "Грешка при преобразуване на tokens за одобрение в tokens за достъп."
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "Групи на %s"
 
-#: ../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
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-msgid "Couldn't delete email confirmation."
-msgstr "Грешка при изтриване потвърждението по е-поща."
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Групи, в които участва %s"
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
-msgid "Couldn't delete subscription."
-msgstr "Грешка при изтриване на абонамента."
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
+msgstr "Този метод изисква заявка POST или DELETE."
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
-msgid "Couldn't find any statuses."
-msgstr "Не са открити бележки."
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
+msgstr "Не може да изтривате бележки на друг потребител."
 
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-msgid "Couldn't get a request token."
-msgstr "Не е получен token за одобрение."
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+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
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
-msgid "Couldn't insert confirmation code."
-msgstr "Не може да се вмъкне код за потвърждение."
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
+msgstr "Не е открита бележка с такъв идентификатор."
 
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
-msgstr "Грешка при добавяне на нов абонамент."
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "Твърде дълга бележка. Трябва да е най-много 140 знака."
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-msgid "Couldn't save profile."
-msgstr "Грешка при запазване на профила."
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
+msgstr "Не е открито."
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
-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
-#: actions/confirmaddress.php:114 actions/emailsettings.php:280
-#: actions/emailsettings.php:411 actions/imsettings.php:252
-#: actions/imsettings.php:395 actions/othersettings.php:162
-#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
-msgid "Couldn't update user."
-msgstr "Грешка при обновяване на потребителя."
-
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
-msgid "Create"
-msgstr "Създаване"
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Форматът на файла с изображението не се поддържа."
 
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
-msgid "Create a new user with this nickname."
-msgstr "Създаване на нов потребител с този псевдоним."
+#: actions/apitimelinefavorites.php:107
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr "%s / Отбелязани като любими от %s"
 
-#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
-msgid "Create new account"
-msgstr "Създаване на нова сметка"
+#: actions/apitimelinefavorites.php:119
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr "%s бележки отбелязани като любими от %s / %s."
 
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
-msgid "Creating new account for OpenID that already has a user."
-msgstr "Създаване на нов акаунт за OpenID, който вече има потребител."
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
+#, php-format
+msgid "%s timeline"
+msgstr "Поток на %s"
 
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "Текущ потвърден Jabber/GTalk адрес."
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "Бележки от %1$s в %2$s."
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "Текущ потвърден телефонен номер за SMS-и."
+#: actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Реплики на %2$s"
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-msgid "Current confirmed email address."
-msgstr "Текущ потвърден адрес на е-поща."
+#: actions/apitimelinementions.php:126
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr "%1$s реплики на съобщения от %2$s / %3$s."
 
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
-msgstr "В момента"
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#, php-format
+msgid "%s public timeline"
+msgstr "Общ поток на %s"
 
-#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
 #, php-format
-msgid "DB error inserting hashtag: %s"
+msgid "%s updates from everyone!"
 msgstr ""
 
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: actions/apitimelinetag.php:101 actions/tag.php:66
 #, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Грешка в базата от данни — отговор при вмъкването: %s"
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
-msgid "Delete notice"
-msgstr "Изтриване на бележката"
-
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "Опишете себе си и интересите си в до 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 actions/register.php:381
-#: actions/register.php:385 lib/accountsettingsaction.php:113
-msgid "Email"
-msgstr "Е-поща"
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-msgid "Email Address"
-msgstr "Адрес на е-поща"
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
-msgstr "Настройки на е-поща"
-
-#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-msgid "Email address already exists."
-msgstr "Адресът на е-поща вече се използва."
-
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
-msgid "Email address confirmation"
-msgstr "Потвърждаване адреса на е-поща"
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
-msgstr "Адрес на е-поща, като \"UserName@example.org\""
+msgid "Notices tagged with %s"
+msgstr "Бележки с етикет %s"
 
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-msgid "Email addresses"
-msgstr "Адреси на е-поща"
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Бележки от %1$s в %2$s."
 
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
-msgid "Enter a nickname or email address."
-msgstr "Въведете псевдоним или е-поща."
+#: actions/apiusershow.php:96
+msgid "Not found."
+msgstr "Не е открито."
 
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
-msgstr "Въведете кода, който получихте по телефона."
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "Няма такъв документ."
 
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
-msgid "Error authorizing token"
-msgstr "Грешка при одобряване на token"
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+msgstr "Няма псевдоним."
 
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
-msgid "Error connecting user to OpenID."
-msgstr "Грешка при свързване на потребителя към OpenID."
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "Няма размер."
 
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
-msgstr "Грешка при свързване на потребителя."
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "Неправилен размер."
 
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
-msgstr "Грешка при вмъкване на аватар"
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "Аватар"
 
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
-msgstr "Грешка при вмъкване на нов профил"
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "Можете да качите личен аватар тук."
 
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
-msgstr "Грешка при вмъкване на отдалечен профил"
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
+msgstr "Потребител без съответстващ профил"
 
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
-msgid "Error saving address confirmation."
-msgstr "Грешка при запазване на потвърждение за адрес"
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+msgid "Avatar settings"
+msgstr "Настройки за аватар"
 
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
-msgid "Error saving remote profile"
-msgstr "Грешка при запазване на отдалечен профил"
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr "Оригинал"
 
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-msgid "Error saving the profile."
-msgstr "Грешка при запазване на профил"
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr "Преглед"
 
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-msgid "Error saving the user."
-msgstr "Грешка при запазване на потребител."
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+msgid "Delete"
+msgstr "Изтриване"
 
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
-msgid "Error saving user; invalid."
-msgstr "Грешка при запазване на потребител — невалидност."
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+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 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-msgid "Error setting user."
-msgstr "Грешка в настройките на потребителя."
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
+msgstr "Изрязване"
 
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr "Грешка при обновяване на профил"
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Имаше проблем със сесията ви в сайта. Моля, опитайте отново!"
 
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
-msgstr "Грешка при обновяване на отдалечен профил"
+#: actions/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Неочаквано изпращане на форма."
 
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr "Грешка в кода за потвърждение."
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
+msgstr "Изберете квадратна област от изображението за аватар"
 
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
-msgid "Existing nickname"
-msgstr "Съществуващ псевдоним"
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
+msgstr ""
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
-msgid "FAQ"
-msgstr "Въпроси"
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+msgstr "Аватарът е обновен."
 
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Неуспешно обновяване на аватара."
 
-#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
-#, 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 actions/replies.php:134
-#: actions/repliesrss.php:71
-#, php-format
-msgid "Feed for replies to %s"
-msgstr "Емисия с отговорите към %s"
-
-#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
-#, php-format
-msgid "Feed for tag %s"
-msgstr "Емисия за етикета %s"
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
-msgstr "Търсене в съдържанието на бележките"
+#: actions/avatarsettings.php:387
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Аватарът е обновен."
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
-msgstr "Търсене на хора в сайта"
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+msgid "No nickname"
+msgstr "Няма псевдоним."
 
-#: ../actions/login.php:122
-msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
-msgstr ""
-"За по-голяма сигурност, моля въведете отново потребителското си име и парола "
-"при промяна на настройките."
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
+msgstr "Няма такава група."
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
-#: actions/profilesettings.php:77 actions/register.php:178
-#: actions/profilesettings.php:103 actions/register.php:391
-#: actions/showgroup.php:235 actions/showstream.php:262
-#: actions/tagother.php:105 lib/groupeditform.php:142
-msgid "Full name"
-msgstr "Пълно име"
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+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
-#: actions/editgroup.php:195 actions/newgroup.php:146
-#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
-msgid "Full name is too long (max 255 chars)."
-msgstr "Пълното име е твърде дълго (макс. 255 знака)"
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s и приятели, страница %d"
 
-#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
-msgid "Help"
-msgstr "Помощ"
+#: actions/blockedfromgroup.php:108
+#, fuzzy
+msgid "A list of the users blocked from joining this group."
+msgstr "Списък с потребителите в тази група."
 
-#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
-msgid "Home"
-msgstr "Начало"
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Разблокиране на този потребител"
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
-msgid "Homepage"
-msgstr "Лична страница"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
+msgstr "Разблокиране"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
-msgid "Homepage is not a valid URL."
-msgstr "Адресът на личната страница не е правилен URL."
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+msgid "Unblock this user"
+msgstr "Разблокиране на този потребител"
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
-msgid "I want to post notices by email."
-msgstr "Искам да изпращам бележки по пощата."
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Не сте влезли в системата."
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
-msgstr "IM"
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
+msgstr "Не е указан профил."
 
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
-msgstr "IM адрес"
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
+msgstr "Не е открит профил с такъв идентификатор."
 
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
-msgstr "IM настройки"
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Блокиране на потребителя"
 
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/block.php:136
 msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
 msgstr ""
-"Ако вече имате сметка, за да я свържете с 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/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
+msgid "No"
+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/block.php:149
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Разблокиране на този потребител"
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-#: actions/emailsettings.php:127 actions/smssettings.php:140
-msgid "Incoming email"
-msgstr "Входяща поща"
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
+msgstr "Да"
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
-msgid "Incoming email address removed."
-msgstr "Входящият адрес на е-поща е премахнат."
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+msgid "Block this user"
+msgstr "Блокиране на потребителя"
 
-#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
-msgid "Incorrect old password"
-msgstr "Грешна стара парола"
+#: actions/block.php:165
+msgid "You have already blocked this user."
+msgstr "Вече сте блокирали този потребител."
 
-#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
-msgid "Incorrect username or password."
-msgstr "Грешно име или парола."
+#: actions/block.php:170
+msgid "Failed to save block information."
+msgstr "Грешка при записване данните за блокирането."
 
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
-msgstr ""
-"На е-пощата, с която сте регистрирани са изпратени инструкции за "
-"възстановяване на паролата."
+#: actions/bookmarklet.php:50
+#, fuzzy
+msgid "Post to "
+msgstr "Снимка"
 
-#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "Неправилен адрес на аватар '%s'"
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+msgstr "Няма код за потвърждение."
 
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
-#, php-format
-msgid "Invalid email address: %s"
-msgstr "Неправилен адрес на е-поща: %s"
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "Кодът за потвърждение не е открит."
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
-#, php-format
-msgid "Invalid homepage '%s'"
-msgstr "Неправилен адрес на домашна страница '%s'"
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "Този код за потвърждение не е за вас!"
 
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/confirmaddress.php:90
 #, php-format
-msgid "Invalid license URL '%s'"
-msgstr "Неправилен адрес на лиценз '%s'"
-
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
-msgstr "Невалидно съдържание на бележка"
+msgid "Unrecognized address type %s"
+msgstr "Неразпознат вид адрес %s"
 
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
-msgstr "Неправилен адрес на бележка"
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr "Този адрес е вече потвърден."
 
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
-msgstr "Неправилен адрес на бележка"
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "Грешка при обновяване на потребителя."
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "Неправилен адрес на профил '%s'."
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr "Грешка при изтриване потвърждението по е-поща."
 
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
-msgstr "Неправилен адрес на профил (грешен формат)"
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "Потвърждаване на адреса"
 
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
-msgstr "Върнат от сървъра неправилен адрес на профила."
+#: actions/confirmaddress.php:159
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "Адресът \"%s\" е потвърден за сметката ви."
 
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
-#: actions/avatarbynickname.php:69
-msgid "Invalid size."
-msgstr "Неправилен размер."
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+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
-#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
-msgid "Invalid username or password."
-msgstr "Неправилно име или парола."
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
+msgstr "Бележки"
 
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-msgid "Invitation(s) sent"
-msgstr "Поканите са изпратени."
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
+msgstr "Няма такава бележка."
 
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-msgid "Invitation(s) sent to the following people:"
-msgstr "Изпратени са покани до следните хора:"
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "Грешка при изтриване на бележката."
 
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
-msgid "Invite"
-msgstr "Покани"
+#: actions/deletenotice.php:103
+#, fuzzy
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr "Ще изтриете напълно бележката. Изтриването е невъзвратимо."
 
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-msgid "Invite new users"
-msgstr "Покани за нови потребители"
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr "Изтриване на бележката"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
-#, php-format
-msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
-msgstr ""
-"Ползва [StatusNet](http://status.net/) версия %s, система за микроблогване, "
-"достъпна под [GNU Affero General Public License](http://www.fsf.org/"
-"licensing/licenses/agpl-3.0.html)."
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr "Наистина ли искате да изтриете тази бележка?"
 
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
-msgstr "Този Jabber ID принадлежи на друг потребител."
+#: actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+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 ""
-"Jabber или GTalk адрес, като \"UserName@example.org\". Първо се уверете, че "
-"сте добавили %s в списъка си с приятели в IM или GTalk клиента си."
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+msgid "Delete this notice"
+msgstr "Изтриване на бележката"
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
-msgid "Language"
-msgstr "Език"
+#: actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
+msgstr "Имаше проблем със сесията ви в сайта. Моля, опитайте отново!"
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
-msgid "Language is too long (max 50 chars)."
-msgstr "Името на езика е твърде дълго (може да е до 50 знака)."
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr "Тази бележка не е отбелязана като любима!"
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
-msgid "Location"
-msgstr "Местоположение"
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+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
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
-msgid "Location is too long (max 255 chars)."
-msgstr "Името на местоположението е твърде дълго (макс. 255 знака)."
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "Няма такъв документ."
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
-#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
-#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
-#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: actions/editgroup.php:56
 #, php-format
-msgid "Login"
-msgstr "Вход"
+msgid "Edit %s group"
+msgstr ""
 
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Влизане с [OpenID](%%doc.openid%%)."
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
+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%"
-"%). "
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+msgid "You must be an admin to edit the group"
+msgstr "За да редактирате групата, трябва да сте й администратор."
+
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
 msgstr ""
-"Влезте с име и парола. Нямате такива? [Регистрирайте](%%action.register%%) "
-"нова сметка или опитайте с [OpenID](%%action.openidlogin%%). "
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
-msgid "Logout"
-msgstr "Изход"
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Автобиографията е твърде дълга (до 140 символа)."
 
-#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
-msgid "Longer name, preferably your \"real\" name"
-msgstr "По-дълго име, за предпочитане \"истинското\" ви име."
+#: actions/editgroup.php:253
+msgid "Could not update group."
+msgstr "Грешка при обновяване на групата."
 
-#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
-msgid "Lost or forgotten password?"
-msgstr "Загубена или забравена парола"
+#: actions/editgroup.php:269
+msgid "Options saved."
+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:60
+msgid "Email Settings"
+msgstr "Настройки на е-поща"
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
 #: actions/emailsettings.php:71
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Управление на пощата, идваща от %%site.name%%."
 
-#: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
-msgid "Member since"
-msgstr "Участник от"
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "Адрес"
 
-#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
-#, php-format
-msgid "Microblog by %s"
-msgstr "Микроблог на %s"
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr "Текущ потвърден адрес на е-поща."
 
-#: ../actions/smssettings.php:304
-#, php-format
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "Премахване"
+
+#: actions/emailsettings.php:113
 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."
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
 msgstr ""
-"Мобилен оператор за SMS. Ако знаете оператор, поддържащ SMS от е-поща, който "
-"не фигурира тук, пишете ни на адрес %s."
-
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-msgid "My text and files are available under "
-msgstr "Текстовете и файловите ми са достъпни под "
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#: actions/emailsettings.php:142 actions/smssettings.php:152
-msgid "New"
-msgstr "Ново"
-
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
-#, php-format
-msgid "New email address for posting to %s"
-msgstr "Нов адрес на е-поща за публикщуване в %s"
+"Очаква се потвърждение за този адрес. Проверете кутията си (или папката за "
+"спам) за съобщение с указания."
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
-msgid "New incoming email address added."
-msgstr "Добавен е нов входящ адрес на е-поща."
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "Отказ"
 
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
-msgid "New nickname"
-msgstr "Нов псевдоним"
+#: actions/emailsettings.php:121
+msgid "Email Address"
+msgstr "Адрес на е-поща"
 
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
-msgstr "Нова бележка"
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr "Адрес на е-поща, като \"UserName@example.org\""
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-msgid "New password"
-msgstr "Нова парола"
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "Добавяне"
 
-#: ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
-msgstr "Новата парола е запазена. Влязохте успешно."
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+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
-#: actions/login.php:228 actions/profilesettings.php:98
-#: actions/register.php:367 actions/showgroup.php:224
-#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
-msgid "Nickname"
-msgstr "Псевдоним"
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
+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
-#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
-msgid "Nickname already in use. Try another one."
-msgstr "Опитайте друг псевдоним, този вече е зает."
+#: actions/emailsettings.php:145 actions/smssettings.php:162
+msgid "Make a new email address for posting to; cancels the old 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
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Псевдонимът може да съдържа само малки букви, числа и никакво разстояние "
-"между тях."
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
+msgstr "Ново"
 
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
-msgid "Nickname not allowed."
-msgstr "Този псевдоним не е разрешен тук."
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
+msgstr "Настройки"
 
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
-msgstr "Псевдоним на потребител, когото искате да следите"
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
+msgstr "Изпращане на уведомления за нови абонаменти по пощата."
 
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
-msgid "Nickname or email"
-msgstr "Псевдоним или е-поща"
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr "Изпращане на писмо при отбелязване на моя бележка като любима."
 
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
-msgid "No"
-msgstr "Не"
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
+msgstr "Изпращане на писмо при ново лично съобщение."
 
-#: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
-msgstr "Няма Jabber ID."
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "Изпращане на писмо при ново лично съобщение."
 
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
-msgid "No authorization request!"
-msgstr "Няма заявка за одобрение."
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
-msgid "No carrier selected."
-msgstr "Не е избран оператор."
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
+msgstr "Искам да изпращам бележки по пощата."
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
-msgstr "Не е въведен код."
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
+msgstr "Публикуване на MicroID за адреса на е-пощата."
 
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
-#: actions/confirmaddress.php:75
-msgid "No confirmation code."
-msgstr "Няма код за потвърждение."
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Запазване"
 
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
-#: actions/newnotice.php:126 classes/Command.php:223
-msgid "No content!"
-msgstr "Няма съдържание!"
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+msgstr "Настройките са запазени."
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr "Не е въведена е-поща."
 
-#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
-msgid "No id."
-msgstr "Няма id."
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
-msgid "No incoming email address."
-msgstr "Няма входящ адрес на е-поща."
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
+msgstr "Грешка при нормализиране адреса на е-пощата"
 
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr "Отдалеченият сървър не е предоставил псевдоним."
+#: actions/emailsettings.php:330
+msgid "Not a valid email address"
+msgstr "Това не е правилен адрес на е-поща."
 
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
-msgid "No nickname."
-msgstr "Няма псевдоним."
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
+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
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
-msgid "No pending confirmation to cancel."
-msgstr "Няма потвърждения, очакващи да бъдат отказани."
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another user."
+msgstr "Тази е-поща вече се използва от друг потребител."
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
-msgstr "Не е въведен телефонен номер."
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+msgstr "Не може да се вмъкне код за потвърждение."
 
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
-msgstr "Сървърът не е върнал адрес на профила."
+#: actions/emailsettings.php:358
+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/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
-msgid "No registered email address for that user."
-msgstr "Няма указана е-поща за този потребител."
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
+msgstr "Няма потвърждения, очакващи да бъдат отказани."
 
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr "Заявката не е намерена!"
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "Грешен IM адрес."
 
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
-msgid "No results"
-msgstr "Няма резултати"
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "Потвърждаването е прекъснато."
 
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
-msgstr "Няма размер."
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
+msgstr "Това не е вашият адрес на е-поща."
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
-msgid "No status found with that ID."
-msgstr "Не е открита бележка с такъв идентификатор."
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "Адресът е премахнат."
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
-msgid "No status with that ID found."
-msgstr "Не е открита бележка с такъв идентификатор."
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
+msgstr "Няма входящ адрес на е-поща."
 
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
-msgstr "Няма такъв OpenID-адрес."
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
+msgstr "Грешка при обновяване записа на потребител."
 
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
-msgid "No such document."
-msgstr "Няма такъв документ."
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
+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 actions/shownotice.php:87
-#: lib/deleteaction.php:51
-msgid "No such notice."
-msgstr "Няма такава бележка."
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
+msgstr "Добавен е нов входящ адрес на е-поща."
 
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr "Няма такъв код за възстановяване."
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+msgid "Popular notices"
+msgstr "Популярни бележки"
 
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-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 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
-msgid "No such user."
-msgstr "Няма такъв потребител"
+#: actions/favorited.php:67
+#, php-format
+msgid "Popular notices, page %d"
+msgstr "Популярни бележки, страница %d"
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-msgid "No user with that email address or username."
-msgstr "Няма потребител с такава е-поща или потребителско име."
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
+msgstr "Най-популярните бележки в момента в сайта."
 
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
-msgstr "Няма никого за показване!"
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
 
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr "Това не е код за възстановяване."
+#: actions/favorited.php:153
+msgid ""
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
+msgstr ""
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
-msgstr "Това не е регистриран потребител."
+#: actions/favorited.php:156
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
+msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
-msgid "Not a supported data format."
-msgstr "Неподдържан формат на данните"
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
+msgstr "Любими бележки на %s"
 
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
-msgstr "Неправилен Jabber ID"
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Бележки от %1$s в %2$s."
 
-#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-msgid "Not a valid OpenID."
-msgstr "Неправилен OpenID"
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Тази бележка вече е отбелязана като любима!"
 
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
-msgid "Not a valid email address"
-msgstr "Това не е правилен адрес на е-поща."
+#: actions/favor.php:92 lib/disfavorform.php:140
+#, fuzzy
+msgid "Disfavor favorite"
+msgstr "Нелюбимо"
 
-#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-msgid "Not a valid email address."
-msgstr "Неправилен адрес на е-поща."
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr "Избрани потребители"
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-#: actions/editgroup.php:186 actions/newgroup.php:137
-#: actions/profilesettings.php:195 actions/register.php:161
-msgid "Not a valid nickname."
-msgstr "Неправилен псевдоним."
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr "Избрани потребители, страница %d"
 
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
-msgstr "Неправилен адрес на профил (грешна услуга)."
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
+msgstr ""
 
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr "Неправилен адрес на профил (няма зададен XRDS)."
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "Нова бележка"
 
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr "Неправилен адрес на профил (няма YADIS документ)."
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Нова бележка"
 
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
-msgid "Not an image or corrupt file."
-msgstr "Файлът не е изображение или е повреден."
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
-msgid "Not authorized."
-msgstr "Забранено."
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Неочакван отговор."
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
-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 actions/block.php:59 actions/disfavor.php:61
-#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
-#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
-#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
-#: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Не сте влезли в системата."
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "Потребителят, когото проследявате, не съществува. "
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
-msgid "Not subscribed!."
-msgstr "Не сте абонирани!"
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+msgstr "Можете да ползвате локален абонамент!"
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
-msgstr "Търсене на бележки"
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
+msgstr "Потребителят е забранил да се абонирате за него."
 
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
-#, php-format
-msgid "Notice feed for %s"
-msgstr "Емисия с бележки на %s"
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "Забранено."
 
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
-msgstr "Бележката няма профил"
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "Грешка при преобразуване на tokens за одобрение в tokens за достъп."
 
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
-msgid "Notices"
-msgstr "Бележки"
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Непозната версия на протокола OMB."
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
-#, php-format
-msgid "Notices tagged with %s"
-msgstr "Бележки с етикет %s"
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "Грешка при обновяване на отдалечен профил"
 
-#: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
-msgstr "Стара парола"
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+msgid "No such group."
+msgstr "Няма такава група"
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
-msgid "OpenID"
-msgstr "OpenID"
-
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
-msgid "OpenID Account Setup"
-msgstr "Настройки на OpenID"
-
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-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
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-msgid "OpenID Login"
-msgstr "Влизане с OpenID"
-
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-#: actions/openidlogin.php:102 actions/openidsettings.php:101
-msgid "OpenID URL"
-msgstr "OpenID URL"
-
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
-msgid "OpenID authentication cancelled."
-msgstr "Влизането с OpenID е прекратено."
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr "Грешка при влизане с OpenID: %s"
-
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "Проблем с OpenID: %s"
-
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr "OpenID е премахнат."
-
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
-msgstr "Настройки на OpenID"
-
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-msgid "Optionally add a personal message to the invitation."
-msgstr "Може да добавите и лично съобщение към поканата."
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "Няма такава бележка."
 
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
-msgid "Partial upload."
-msgstr "Частично качване на файла."
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+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 actions/finishopenidlogin.php:118
-#: actions/login.php:231 actions/register.php:372
-#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-msgid "Password"
-msgstr "Парола"
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "Не е указан профил."
 
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
-msgid "Password and confirmation do not match."
-msgstr "Паролата и потвърждението й не съвпадат."
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
 
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
-msgid "Password must be 6 chars or more."
-msgstr "Паролата трябва да е от поне 6 знака."
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "Потребителят ви е блокирал."
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-msgid "Password recovery requested"
-msgstr "Поискано е възстановяване на парола"
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "Не членувате в тази група."
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-msgid "Password saved."
-msgstr "Паролата е записана."
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "Блокиране на потребителя"
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-msgid "Passwords don't match."
-msgstr "Паролите не съвпадат."
+#: actions/groupblock.php:162
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
-msgstr "Хора"
+#: actions/groupblock.php:178
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "Списък с потребителите в тази група."
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
-msgstr "Търсене на хора"
+#: actions/groupblock.php:179
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "Списък с потребителите в тази група."
 
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
-msgstr "Търсене на хора"
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
+msgstr ""
 
-#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
-msgid "Personal"
-msgstr "Лично"
+#: actions/groupbyid.php:74
+msgid "No ID"
+msgstr "Липсва ID"
 
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-msgid "Personal message"
-msgstr "Лично съобщение"
+#: actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "За да създавате група, трябва да сте влезли."
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "Телефонен номер — с код, без пунктоация и без интервали."
+#: actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "Групи"
 
-#: ../actions/userauthorization.php:78
+#: actions/groupdesignsettings.php:152
 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\"."
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
 msgstr ""
-"Проверете тези детайли и се уверете, че искате да се абонирате за бележките "
-"на този потребител. Ако не искате абонамента, натиснете \"Cancel\" (Отказ)."
 
-#: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Публикуване промяната на състоянието ми в Jabber/GTalk."
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+#, fuzzy
+msgid "Couldn't update your design."
+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 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
-msgid "Preferences"
-msgstr "Настройки"
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "Грешка при записване настройките за Twitter"
 
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163 actions/emailsettings.php:180
-#: actions/imsettings.php:152 actions/smssettings.php:171
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
-msgid "Preferences saved."
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+#, fuzzy
+msgid "Design preferences saved."
 msgstr "Настройките са запазени."
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
-msgid "Preferred language"
-msgstr "Предпочитан език"
-
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
-msgid "Privacy"
-msgstr "Поверителност"
-
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-msgid "Problem saving notice."
-msgstr "Проблем при записване на бележката."
-
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
-msgid "Profile"
-msgstr "Профил"
-
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
-msgstr "Адрес на профила"
-
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
-msgstr "Настройки на профила"
-
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-msgid "Profile unknown"
-msgstr "Непознат профил"
-
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
-msgid "Public Stream Feed"
-msgstr "Емисия на общия поток"
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
+msgstr "Лого на групата"
 
-#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
-msgid "Public timeline"
-msgstr "Общ поток"
+#: actions/grouplogo.php:150
+#, fuzzy, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr "Може да качите лого за групата ви."
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Публикуване на MicroID за адреса в Jabber/GTalk."
+#: actions/grouplogo.php:362
+#, fuzzy
+msgid "Pick a square area of the image to be the logo."
+msgstr "Изберете квадратна област от изображението за аватар"
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
-msgid "Publish a MicroID for my email address."
-msgstr "Публикуване на MicroID за адреса на е-пощата."
+#: actions/grouplogo.php:396
+msgid "Logo updated."
+msgstr "Лотого е обновено."
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr "Скорошни етикети"
+#: actions/grouplogo.php:398
+msgid "Failed updating logo."
+msgstr "Неуспешно обновяване на логото."
 
-#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
-msgid "Recover"
-msgstr "Възстановяване"
+#: actions/groupmembers.php:93 lib/groupnav.php:92
+#, php-format
+msgid "%s group members"
+msgstr ""
 
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
-msgid "Recover password"
-msgstr "Възстановяване на паролата"
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
+msgstr ""
 
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-msgid "Recovery code for unknown user."
-msgstr "Код за възстановяване на непознат потребител."
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+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
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-msgid "Register"
-msgstr "Регистриране"
+#: actions/groupmembers.php:175 lib/groupnav.php:107
+msgid "Admin"
+msgstr ""
 
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
-msgid "Registration not allowed."
-msgstr "Записването не е позволено."
+#: actions/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
+msgstr "Блокиране"
 
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
-msgid "Registration successful"
-msgstr "Записването е успешно."
+#: actions/groupmembers.php:441
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "За да редактирате групата, трябва да сте й администратор."
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
-msgid "Reject"
-msgstr "Охвърляне"
+#: actions/groupmembers.php:473
+msgid "Make Admin"
+msgstr ""
 
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
-msgid "Remember me"
-msgstr "Запомни ме"
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
-msgid "Remote profile with no matching profile"
-msgstr "Отдалечен профил без съответстващ локален"
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Бележки от %1$s в %2$s."
 
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
-msgstr "Отдалечен абонамент"
+#: actions/groupsearch.php:52
+#, fuzzy, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"Търсене на хора в %%site.name%% по техните име, място или интереси. "
+"Отделяйте фразите за "
 
-#: ../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 actions/emailsettings.php:101
-#: actions/emailsettings.php:134 actions/imsettings.php:102
-#: actions/openidsettings.php:166 actions/smssettings.php:103
-#: actions/smssettings.php:146 actions/twittersettings.php:115
-msgid "Remove"
-msgstr "Премахване"
+#: actions/groupsearch.php:58
+msgid "Group search"
+msgstr "Търсене на групи"
 
-#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
-msgstr "Премахване на OpenID"
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "Няма резултати"
 
-#: ../actions/openidsettings.php:73
+#: actions/groupsearch.php:82
+#, php-format
 msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
 msgstr ""
-"Премахването на единствения OpenID ще направи влизането в системата "
-"невъзможно. За да го изтриете, първо добавете друг OpenID."
-
-#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
-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
-#: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: actions/groupsearch.php:85
 #, php-format
-msgid "Replies to %s"
-msgstr "Отговори на %s"
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
 
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
-msgid "Reset"
-msgstr "Обновяване"
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Групи"
 
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
-msgid "Reset password"
-msgstr "Нова парола"
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Групи, страница %d"
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-msgid "SMS"
-msgstr "SMS"
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
-msgid "SMS Phone number"
-msgstr "Телефонен номер за SMS"
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Създаване на нова група"
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
-msgstr "Настройки за SMS"
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
-msgid "SMS confirmation"
-msgstr "Потвърждение за SMS"
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "Потребителят ви е блокирал."
 
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
-msgid "Same as password above"
-msgstr "Също като паролата по-горе"
+#: actions/groupunblock.php:128 actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Грешка при запазване на потребител."
 
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
-msgid "Same as password above. Required."
-msgstr "Същото като паролата по-горе. Задължително поле."
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "IM настройки"
 
-#: ../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 actions/emailsettings.php:182
-#: actions/facebooksettings.php:114 actions/imsettings.php:157
-#: actions/othersettings.php:117 actions/profilesettings.php:150
-#: actions/smssettings.php:169 actions/subscriptions.php:124
-#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
-msgid "Save"
-msgstr "Запазване"
+#: actions/imsettings.php:70
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+"Можете да получавате съобщения по Jabber/GTalk [instant messages](%%doc.im%"
+"%). Въведете адреса си в настройките по-долу."
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
-msgid "Search"
-msgstr "Търсене"
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Страницата не е достъпна във вида медия, който приемате"
 
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
-msgstr "Търсене в емисията на потока"
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Текущ потвърден Jabber/GTalk адрес."
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/imsettings.php:114
 #, php-format
 msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
+"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 ""
-"Търсене на бележки в %%site.name%% по съдържанието им. Отделяйте фразите за "
-"търсене (трябва да са по-дълги от 3 символа) с интервали."
+"Oчаква се потвърждение на този адрес. Проверете акаунта си в Jabber/GTalk за "
+"съобщение с инструкции. (Добавихте ли %s в списъка си там?)"
+
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "IM адрес"
 
-#: ../actions/peoplesearch.php:28
+#: actions/imsettings.php:126
 #, 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."
+"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 ""
-"Търсене на хора в %%site.name%% по техните име, място или интереси. "
-"Отделяйте фразите за "
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
-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 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
-msgid "Send"
-msgstr "Прати"
-
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
-msgstr "Изпратете писмо до този адрес за публикуване като бележка."
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
-msgstr "Изпращане на уведомления за нови абонаменти по пощата."
+"Jabber или GTalk адрес, като \"UserName@example.org\". Първо се уверете, че "
+"сте добавили %s в списъка си с приятели в IM или GTalk клиента си."
 
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:143
 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:148
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr "Публикуване промяната на състоянието ми в Jabber/GTalk."
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:153
 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 lib/facebookaction.php:215
-msgid "Settings"
-msgstr "Настройки"
-
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
-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
-#: actions/finishaddopenid.php:114
-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
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
-msgstr "Случи се нещо странно."
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
-msgstr "Входящата поща не е разрешена."
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
-msgstr "Това не е вашият входящ адрес."
-
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
-msgid "Source"
-msgstr "Изходен код"
-
-#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
-msgid "Statistics"
-msgstr "Статистики"
-
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-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
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
-msgid "Subscribe"
-msgstr "Абониране"
-
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
-msgid "Subscribers"
-msgstr "Абонати"
-
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
-msgid "Subscription authorized"
-msgstr "Абонаментът е одобрен"
-
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
-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
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
-msgid "Subscriptions"
-msgstr "Абонаменти"
-
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
-msgid "System error uploading file."
-msgstr "Системна грешка при качване на файл."
-
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
-#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
-msgid "Tags"
-msgstr "Етикети"
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "Текст"
-
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
-msgid "Text search"
-msgstr "Търсене на текст"
-
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
-msgstr "Този OpenID не ви принадлежи."
-
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
-msgstr "Този адрес е вече потвърден."
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Публикуване на MicroID за адреса в Jabber/GTalk."
 
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
-msgstr "Този код за потвърждение не е за вас!"
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "Няма Jabber ID."
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr "Тази е-поща вече се използва от друг потребител."
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr "Грешка при нормализация на този Jabber ID"
 
-#: ../actions/avatar.php:80 actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
-msgstr "Файлът е твърде голям."
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "Неправилен Jabber ID"
 
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "Това вече е вашият Jabber ID."
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
-msgid "That is already your email address."
-msgstr "Това и сега е адресът на е-пощата ви."
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr "Този Jabber ID принадлежи на друг потребител."
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
-msgid "That is already your phone number."
-msgstr "Това и сега е номерът на телефона ви."
+#: actions/imsettings.php:327
+#, 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/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "Това не е вашият Jabber ID."
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
-msgid "That is not your email address."
-msgstr "Това не е вашият адрес на е-поща."
-
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
-msgstr "Това не е вашият телефонен номер."
-
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-#: actions/emailsettings.php:367 actions/imsettings.php:349
-msgid "That is the wrong IM address."
-msgstr "Грешен IM адрес."
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
-msgstr "Този код за потвърждение е грешен."
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-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
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-msgid "That's too long. Max notice size is 140 chars."
-msgstr "Твърде дълга бележка. Трябва да е най-много 140 знака."
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "Това е твърде дълго. Трябва да е най-много 255 знака."
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr "Входяща кутия за %s — страница %d"
 
-#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/inbox.php:62
 #, php-format
-msgid "The address \"%s\" has been confirmed for your account."
-msgstr "Адресът \"%s\" е потвърден за сметката ви."
+msgid "Inbox for %s"
+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
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
-msgid "The address was removed."
-msgstr "Адресът е премахнат."
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
+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:"
+#: actions/invite.php:39
+msgid "Invites have been disabled."
 msgstr ""
-"Абонаментът е одобрен, но не е зададен callback URL. За да завършите "
-"одобряването, проверете инструкциите на сайта. Вашият token за абонамент е:"
 
-#: ../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 ""
-"Абонаментът е отказан, но не е зададен callback URL. За да откажете напълно "
-"абонамента, проверете инструкциите на сайта."
+#: actions/invite.php:41
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr "За да каните хора в %s, трябва да сте влезли."
 
-#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/invite.php:72
 #, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr "Това са хората, които четат бележките на %s."
+msgid "Invalid email address: %s"
+msgstr "Неправилен адрес на е-поща: %s"
 
-#: ../actions/subscribers.php:33 actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr "Tова са хората, които четат бележките ви."
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
+msgstr "Поканите са изпратени."
 
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
-#, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr "Хора, чийто бележки %s чете."
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr "Покани за нови потребители"
 
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr "Няма хора, чийто бележки четете."
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr "Вече сте абонирани за следните потребители:"
 
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:131 actions/invite.php:139
+#, php-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: actions/invite.php:136
 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 "Кодът за потвърждение е твърде стар. Започнете процеса отново."
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
+msgstr "Изпратени са покани до следните хора:"
 
-#: ../lib/openid.php:195
+#: actions/invite.php:150
 msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 msgstr ""
-"Формата би трябвало да се изпрати автоматично. Ако това не се случи, за да "
-"преминете към OpenID доставчика си натиснете бутона за изпращане."
+"Ще ви уведомим при приемане на покана и записване в сайта. Благодарим ви за "
+"увеличаването на общността тук!"
 
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
-#, php-format
+#: actions/invite.php:162
 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 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-msgid "This method requires a POST or DELETE."
-msgstr "Този метод изисква заявка POST или DELETE."
+"Use this form to invite your friends and colleagues to use this service."
+msgstr ""
+"Използвайте това поле, за да поканите приятели и колеги да използват "
+"услугата на сайта."
 
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
-msgid "This method requires a POST."
-msgstr "Този метод изисква заявка POST."
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "Адреси на е-поща"
 
-#: ../lib/util.php:164 lib/util.php:246
-msgid "This page is not available in a media type you accept"
-msgstr "Страницата не е достъпна във вида медия, който приемате"
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr "Адреси на приятели, които каните (по един на ред)"
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
-msgid "Timezone"
-msgstr "Часови пояс"
+#: actions/invite.php:192
+msgid "Personal message"
+msgstr "Лично съобщение"
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
-msgid "Timezone not selected."
-msgstr "Не е избран часови пояс"
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
+msgstr "Може да добавите и лично съобщение към поканата."
+
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
+msgstr "Прати"
+
+#: actions/invite.php:226
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s ви кани да ползвате заедно %2$s"
 
-#: ../actions/remotesubscribe.php:43
+#: actions/invite.php:228
 #, 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."
+"%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 ""
-"За да се абонирате, можете да  [влезете](%%action.login%%) или да "
-"[регистрирате](%%action.register%%) нова сметка. Ако имате сметка на друга, "
-"[подобна услуга за микроблогване](%%doc.openmublog%%), въведете адреса на "
-"профила си в нея по-долу."
+"%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/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
-msgid "Two user ids or screen_names must be supplied."
-msgstr "Трябва да се дадат два идентификатора или имена на потребители."
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
+msgstr "За да се присъедините към група, трябва да сте влезли."
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "Адрес на личната ви страница, блог или профил в друг сайт"
+#: actions/joingroup.php:90 lib/command.php:217
+msgid "You are already a member of that group"
+msgstr "Вече членувате в тази група."
 
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-msgid "URL of your profile on another compatible microblogging service"
-msgstr "Адрес на профила ви в друга, съвместима услуга за микроблогване"
+#: actions/joingroup.php:128 lib/command.php:234
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s"
+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 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-msgid "Unexpected form submission."
-msgstr "Неочаквано изпращане на форма."
+#: actions/joingroup.php:135 lib/command.php:239
+#, php-format
+msgid "%s joined group %s"
+msgstr "%s се присъедини към групата %s"
 
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
-msgid "Unexpected password reset."
-msgstr "Неочаквано подновяване на паролата."
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
+msgstr "За напуснете група, трябва да сте влезли."
 
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-msgid "Unknown action"
-msgstr "Непознато действие"
+#: actions/leavegroup.php:90 lib/command.php:268
+msgid "You are not a member of that group."
+msgstr "Не членувате в тази група."
 
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-msgid "Unknown version of OMB protocol."
-msgstr "Непозната версия на протокола OMB."
+#: actions/leavegroup.php:119 lib/command.php:278
+#, fuzzy
+msgid "Could not find membership record."
+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/leavegroup.php:127 lib/command.php:284
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "Грешка при проследяване — потребителят не е намерен."
 
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
-msgid "Unrecognized address type %s"
-msgstr "Неразпознат вид адрес %s"
-
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
-msgstr "Отписване"
-
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-msgid "Unsupported OMB version"
-msgstr "Неподдържана версия на OMB"
-
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
-msgid "Unsupported image file format."
-msgstr "Форматът на файла с изображението не се поддържа."
+msgid "%s left group %s"
+msgstr ""
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
-msgstr "Бележки през SMS"
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "Вече сте влезли."
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
-msgstr "Бележки през месинджър (IM)"
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Невалидно съдържание на бележка"
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr "Бележки от %1$s и приятели в %2$s."
+#: actions/login.php:143
+msgid "Incorrect username or password."
+msgstr "Грешно име или парола."
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr "Бележки от %1$s в %2$s."
+#: actions/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
+msgstr "Грешка в настройките на потребителя."
 
-#: ../actions/avatar.php:68 actions/profilesettings.php:161
-#: actions/avatarsettings.php:162 actions/grouplogo.php:232
-msgid "Upload"
-msgstr "Качване"
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
+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."
+#: actions/login.php:243
+msgid "Login to site"
 msgstr ""
-"Качете нов \"аватар\" (потребителско изображение) тук. Не можете да го "
-"промените по-късно, затова се уверете, че е поне приблизително квадратен. "
-"Трябва да е с лиценз като самия сайт. Използвайте картинка, която ви "
-"принадлежи и искате да споделите."
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr "Качване на нова снимка за профила"
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Псевдоним"
 
-#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
-msgstr ""
-"Използвайте това поле, за да поканите приятели и колеги да използват "
-"услугата на сайта."
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+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/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "Запомни ме"
 
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
-msgid "User being listened to doesn't exist."
-msgstr "Потребителят, когото проследявате, не съществува. "
+#: actions/login.php:253 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
+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
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-msgid "User has no profile."
-msgstr "Потребителят няма профил."
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "Загубена или забравена парола"
 
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
-msgstr "Потребителски псевдоним"
+#: actions/login.php:282
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr ""
+"За по-голяма сигурност, моля въведете отново потребителското си име и парола "
+"при промяна на настройките."
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr "Потребителят не е открит."
+#: actions/login.php:286
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"Влезте с име и парола. Нямате такива? [Регистрирайте](%%action.register%%) "
+"нова сметка или опитайте с [OpenID](%%action.openidlogin%%). "
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
-msgid "What timezone are you normally in?"
-msgstr "В кой часови пояс сте обикновено?"
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
 
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: actions/makeadmin.php:95
 #, 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
-#: actions/profilesettings.php:119
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Къде се намирате (град, община, държава и т.н.)"
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/makeadmin.php:132
 #, php-format
-msgid "Wrong image type for '%s'"
-msgstr "Грешен вид изображение за '%s'"
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/makeadmin.php:145
 #, 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
-#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
-msgid "Yes"
-msgstr "Да"
-
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-msgid "You already have this OpenID!"
-msgstr "Вече използвате този OpenID!"
+msgid "Can't make %s an admin for group %s"
+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/microsummary.php:69
+msgid "No current status"
+msgstr ""
 
-#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
-msgstr "Вече сте влезли!"
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr "Нова група"
 
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-msgid "You are already subscribed to these users:"
-msgstr "Вече сте абонирани за следните потребители:"
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
+msgstr "Използвайте тази бланка за създаване на нова група."
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
-msgid "You are not friends with the specified user."
-msgstr "С указания потребител не сте записани като приятели."
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr "Ново съобщение"
 
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr "Тук можете да смените паролата си. Внимавайте колко е добра новата."
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
+msgstr "Не може да изпращате съобщения до този потребител."
 
-#: ../actions/register.php:135 actions/register.php:145
-msgid "You can create a new account to start posting notices."
-msgstr "Първо се регистрирайте, за да започнете да публикувате бележки."
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+msgstr "Няма съдържание!"
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "Може да получавате на е-пощата си SMS-съобщения от %%site.name%%."
+#: actions/newmessage.php:158
+msgid "No recipient specified."
+msgstr "Не е указан получател."
 
-#: ../actions/openidsettings.php:86
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 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 [instant messages](%%doc.im%"
-"%). Въведете адреса си в настройките по-долу."
+#: actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "Съобщение"
 
-#: ../actions/profilesettings.php:27
-msgid ""
-"You can update your personal profile info here so people know more about you."
-msgstr "Можете да обновите личния си профил, за да знаят хората повече за вас."
+#: actions/newmessage.php:185 lib/command.php:375
+#, php-format
+msgid "Direct message to %s sent"
+msgstr "Прякото съобщение до %s е изпратено."
 
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
-msgstr "Можете да ползвате локален абонамент!"
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
+msgstr "Грешка в Ajax"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
-msgid "You can't register if you don't agree to the license."
-msgstr "Не можете да се регистрате, ако не сте съгласни с  лиценза."
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "Нова бележка"
 
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
-msgid "You did not send us that profile"
-msgstr "Не сте ни изпратили този профил"
+#: actions/newnotice.php:199
+#, fuzzy
+msgid "Notice posted"
+msgstr "Бележки"
 
-#: ../lib/mail.php:147
+#: actions/noticesearch.php:68
 #, 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"
+"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/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
-msgid "You may not delete another user's status."
-msgstr "Не може да изтривате бележки на друг потребител."
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "Търсене на текст"
 
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr "За да каните хора в %s, трябва да сте влезли."
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr " Търсене на \"%s\" в потока"
 
-#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/noticesearch.php:121
+#, php-format
 msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 msgstr ""
-"Ще ви уведомим при приемане на покана и записване в сайта. Благодарим ви за "
-"увеличаването на общността тук!"
-
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr "Разпознати сте. Въведете паролата си по-долу. "
-
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
-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
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
-"account.  Manage your associated OpenIDs from here."
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
-"[OpenID](%%doc.openid%%) ви позволява влизане в различни сайтове с един и "
-"същ акаунт. От тук се управляват съответните OpenID."
-
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
-msgid "a few seconds ago"
-msgstr "преди няколко секунди"
-
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
-#, php-format
-msgid "about %d days ago"
-msgstr "преди около %d дни"
-
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
-#, php-format
-msgid "about %d hours ago"
-msgstr "преди около %d часа"
-
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
-#, php-format
-msgid "about %d minutes ago"
-msgstr "преди около %d минути"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
-#, php-format
-msgid "about %d months ago"
-msgstr "преди около %d месеца"
-
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
-msgid "about a day ago"
-msgstr "преди около ден"
-
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
-msgid "about a minute ago"
-msgstr "преди около минута"
-
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
-msgid "about a month ago"
-msgstr "преди около месец"
-
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
-msgid "about a year ago"
-msgstr "преди около година"
-
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
-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 actions/noticesearch.php:187
-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 actions/noticesearch.php:194
-msgid "reply"
-msgstr "отговор"
-
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-msgid "same as password above"
-msgstr "също като паролата по-горе"
-
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
-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
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Имаше проблем със сесията ви в сайта. Моля, опитайте отново!"
-
-#: actions/disfavor.php:55 actions/disfavor.php:81
-msgid "This notice is not a favorite!"
-msgstr "Тази бележка не е отбелязана като любима!"
-
-#: actions/disfavor.php:63 actions/disfavor.php:87
-msgid "Could not delete favorite."
-msgstr "Грешка при изтриване на любима бележка."
-
-#: actions/disfavor.php:72 lib/favorform.php:140
-msgid "Favor"
-msgstr "Любимо"
-
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
-msgstr "Изпращане на писмо при отбелязване на моя бележка като любима."
-
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-msgid "Send me email when someone sends me a private message."
-msgstr "Изпращане на писмо при ново лично съобщение."
-
-#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
-msgid "This notice is already a favorite!"
-msgstr "Тази бележка вече е отбелязана като любима!"
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Бележки от %1$s в %2$s."
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132 actions/favor.php:86
-#: actions/twitapifavorites.php:125 classes/Command.php:152
-msgid "Could not create favorite."
-msgstr "Грешка при отбелязване като любима."
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Всички бележки, намерени с \"%s\""
 
-#: actions/favor.php:70
-msgid "Disfavor"
-msgstr "Нелюбимо"
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
-#, php-format
-msgid "%s favorite notices"
-msgstr "%s любими бележки"
+#: actions/nudge.php:94
+msgid "Nudge sent"
+msgstr "Побутването е изпратено"
 
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
-#, php-format
-msgid "Feed of favorite notices of %s"
-msgstr "Емисия с любимите бележки на %s"
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr "Побутването е изпратено!"
 
-#: actions/inbox.php:28 actions/inbox.php:59
-#, php-format
-msgid "Inbox for %s - page %d"
-msgstr "Входяща кутия за %s — страница %d"
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+msgstr "Бележката няма профил"
 
-#: actions/inbox.php:30 actions/inbox.php:62
+#: actions/oembed.php:86 actions/shownotice.php:180
 #, php-format
-msgid "Inbox for %s"
-msgstr "Входяща кутия за %s"
+msgid "%1$s's status on %2$s"
+msgstr "Бележка на %1$s от %2$s"
 
-#: actions/inbox.php:53 actions/inbox.php:115
-msgid "This is your inbox, which lists your incoming private messages."
-msgstr "Това е входящата ви кутия с лични съобщения от други потребители."
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Свързване"
 
-#: actions/invite.php:178 actions/invite.php:213
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+#: actions/oembed.php:160
+msgid "Only "
 msgstr ""
-"%1$s използва %2$s (%3$s) и ви кани да се присъедините.\n"
-"\n"
-
-#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-msgid "Automatically login in the future; "
-msgstr "Автоматично влизане за в бъдеще; "
 
-#: actions/login.php:122 actions/login.php:264
-msgid "For security reasons, please re-enter your "
-msgstr "С оглед на сигурността, въведете отново "
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
+msgstr "Неподдържан формат на данните"
 
-#: actions/login.php:126 actions/login.php:268
-msgid "Login with your username and password. "
-msgstr "Влезте с името и паролата си. "
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "Търсене на хора"
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
-msgid "That's too long. Max message size is 140 chars."
-msgstr "Твърде дълго. Може да е най-много 140 знака."
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "Търсене на бележки"
 
-#: actions/newmessage.php:65 actions/newmessage.php:128
-msgid "No recipient specified."
-msgstr "Не е указан получател."
+#: actions/othersettings.php:60
+msgid "Other Settings"
+msgstr "Други настройки"
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206 actions/newmessage.php:131
-#: actions/newmessage.php:168 classes/Command.php:237
-msgid "You can't send a message to this user."
-msgstr "Не може да изпращате съобщения до този потребител."
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr "Управление на различни други настройки."
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
+#: actions/othersettings.php:108
+msgid " (free service)"
 msgstr ""
-"Не може да изпращате съобщения до себе си. По-добре си го кажете на себе си "
-"тихичко."
-
-#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
-msgid "No such user"
-msgstr "Няма такъв потребител"
-
-#: actions/newmessage.php:117 actions/newmessage.php:67
-msgid "New message"
-msgstr "Ново съобщение"
 
-#: actions/noticesearch.php:95 actions/noticesearch.php:146
-msgid "Notice without matching profile"
-msgstr "Бележка без съответстващ профил"
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
+msgstr ""
 
-#: actions/openidsettings.php:28 actions/openidsettings.php:70
-#, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr "[OpenID](%%doc.openid%%) ви позволява да влизате в различни сайтове"
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
+msgstr "Услуга за автоматично съкращаване, която да се ползва."
 
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
-msgstr "Ако искате да добавите OpenID към профила си, "
+#: actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "Настройки на профила"
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr "Ако премахнете единствения си OpenID, няма да можете да влизате!"
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
 
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-msgid "You can remove an OpenID from your account "
-msgstr "Можете да премахнете OpenID от профила си "
+#: actions/othersettings.php:153
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Услугата за съкращаване е твърде дълга (може да е до 50 знака)."
 
-#: actions/outbox.php:28 actions/outbox.php:58
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %s - page %d"
 msgstr "Изходяща кутия за %s — страница %d"
 
-#: actions/outbox.php:30 actions/outbox.php:61
+#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Изходяща кутия за %s"
 
-#: actions/outbox.php:53 actions/outbox.php:116
+#: actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Това е изходящата ви кутия с лични съобщения до други потребители."
 
-#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
-#, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
-msgstr "Търсене на хора в %%site.name%% по име, местоположение или интереси. "
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "Смяна на паролата"
 
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
-msgid "You can update your personal profile info here "
-msgstr "Можете а обновите личните си данни тук "
+#: actions/passwordsettings.php:69
+msgid "Change your password."
+msgstr "Смяна на паролата."
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
-msgid "User without matching profile"
-msgstr "Потребител без съответстващ профил"
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#, fuzzy
+msgid "Password change"
+msgstr "Паролата е записана."
 
-#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
-msgstr "Кодът ви за потвърждение е твърде стар. "
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "Стара парола"
 
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
-msgstr ""
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "Нова парола"
 
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a "
-msgstr ""
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6 или повече знака"
 
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-msgid "Your nickname on this server, "
-msgstr "Псевдонимът ви на този сървър, "
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "Потвърждаване"
 
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-msgid "Instructions for recovering your password "
-msgstr "Упътване за възстановяване на паролата "
+#: actions/passwordsettings.php:113
+msgid "same as password above"
+msgstr "също като паролата по-горе"
 
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
-msgid "New password successfully saved. "
-msgstr "Новата парола е записана. "
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "Промяна"
 
-#: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:154 actions/register.php:230
 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 actions/remotesubscribe.php:74
-#, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr ""
-
-#: actions/showfavorites.php:61 actions/showfavorites.php:145
-#, php-format
-msgid "Feed for favorites of %s"
-msgstr "Емисия с любимите бележки на %s"
-
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-msgid "Could not retrieve favorite notices."
-msgstr "Грешка при изтегляне на любимите бележки"
-
-#: actions/showmessage.php:33 actions/showmessage.php:81
-msgid "No such message."
-msgstr "Няма такова съобщение"
-
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
-msgstr "Само подателят и получателят могат да четат това съобщение."
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "Паролите не съвпадат."
 
-#: actions/showmessage.php:61 actions/showmessage.php:108
-#, php-format
-msgid "Message to %1$s on %2$s"
-msgstr "Съобщение до %1$s в %2$s"
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "Грешна стара парола"
 
-#: actions/showmessage.php:66 actions/showmessage.php:113
-#, php-format
-msgid "Message from %1$s on %2$s"
-msgstr "Съобщение от %1$s в %2$s"
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "Грешка при запазване на потребител — невалидност."
 
-#: actions/showstream.php:154
-msgid "Send a message"
-msgstr "Изпращане на съобщение"
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "Грешка при запазване на новата парола."
 
-#: actions/smssettings.php:312 actions/smssettings.php:464
-#, php-format
-msgid "Mobile carrier for your phone. "
-msgstr "Мобилен оператор на телефона ви."
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "Паролата е записана."
 
-#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/peoplesearch.php:52
 #, php-format
-msgid "Direct messages to %s"
-msgstr "Преки съобщения до %s"
+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%% по техните име, място или интереси. "
+"Отделяйте фразите за "
 
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
-#, php-format
-msgid "All the direct messages sent to %s"
-msgstr "Всички преки съобщения, изпратени до %s"
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "Търсене на хора"
 
-#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-msgid "Direct Messages You've Sent"
-msgstr "Изпратени от вас преки съобщения"
+#: actions/peopletag.php:70
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Това не е правилен адрес на е-поща."
 
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/peopletag.php:144
 #, php-format
-msgid "All the direct messages sent from %s"
-msgstr "Всички преки съобщения, изпратени от %s"
-
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-msgid "No message text!"
-msgstr "Липсва текст на съобщението"
-
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-msgid "Recipient user not found."
-msgstr "Получателят не е открит"
-
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Users self-tagged with %s - page %d"
 msgstr ""
-"Не може да изпращате преки съобщения до хора, които не са в списъка ви с "
-"приятели."
 
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
-#, php-format
-msgid "%s / Favorites from %s"
-msgstr "%s / Отбелязани като любими от %s"
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "Невалидно съдържание на бележка"
 
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/postnotice.php:90
 #, php-format
-msgid "%s updates favorited by %s / %s."
-msgstr "%s бележки отбелязани като любими от %s / %s."
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
-#, php-format
-msgid "%s added your notice as a favorite"
-msgstr "%s отбеляза бележката ви като любима"
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "Настройки на профила"
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
-#, php-format
+#: actions/profilesettings.php:71
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
-msgstr ""
-"%1$s току-що отбеляза като любима бележката ви от %2$s.\n"
-"\n"
+"You can update your personal profile info here so people know more about you."
+msgstr "Можете да обновите личния си профил, за да знаят хората повече за вас."
 
-#: actions/twittersettings.php:27
-msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
-msgstr ""
-"Добавяне на профила ви в Twitter за автоматично препращане на бележките ви и "
-"там."
+#: actions/profilesettings.php:99
+msgid "Profile information"
+msgstr "Данни на профила"
 
-#: actions/twittersettings.php:41 actions/twittersettings.php:60
-msgid "Twitter settings"
-msgstr "Настройки за Twitter"
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "От 1 до 64 малки букви или цифри, без пунктоация и интервали"
 
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-msgid "Twitter Account"
-msgstr "Профил в Twitter"
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full name"
+msgstr "Пълно име"
 
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-msgid "Current verified Twitter account."
-msgstr "Текущ проверен профил в Twitter"
+#: actions/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "Лична страница"
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr "Име в Twitter"
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "Адрес на личната ви страница, блог или профил в друг сайт"
 
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-msgid "No spaces, please."
-msgstr "Без интервали, моля!"
+#: actions/profilesettings.php:122 actions/register.php:460
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Опишете себе си и интересите си в до 140 букви"
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
-msgstr "Парола за Twitter"
+#: actions/profilesettings.php:125 actions/register.php:463
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Опишете себе си и интересите си в до 140 букви"
 
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-msgid "Automatically send my notices to Twitter."
-msgstr "Автоматично препращане на бележките ми към Twitter"
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "За мен"
 
-#: actions/twittersettings.php:75 actions/twittersettings.php:146
-msgid "Send local \"@\" replies to Twitter."
-msgstr "Препращане на локалните отговори с \"@\" и към Twitter"
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "Местоположение"
 
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-msgid "Subscribe to my Twitter friends here."
-msgstr "Абониране за приятелите ми от Twitter тук"
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "Къде се намирате (град, община, държава и т.н.)"
 
-#: actions/twittersettings.php:122
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
+msgstr "Етикети"
+
+#: actions/profilesettings.php:140
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
-"Потребителското име може да съдържа само цифри, малки и главни букви и добна "
-"черта. Може да е най-много 15 знака."
 
-#: actions/twittersettings.php:128 actions/twittersettings.php:334
-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/profilesettings.php:144
+msgid "Language"
+msgstr "Език"
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-msgid "Unable to save your Twitter settings!"
-msgstr "Грешка при записване настройките за Twitter"
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr "Предпочитан език"
 
-#: actions/twittersettings.php:174 actions/twittersettings.php:376
-msgid "Twitter settings saved."
-msgstr "Настройките за Twitter са запазени."
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr "Часови пояс"
 
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-msgid "That is not your Twitter account."
-msgstr "Това не е вашият профил в Twitter."
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
+msgstr "В кой часови пояс сте обикновено?"
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
-msgid "Couldn't remove Twitter user."
-msgstr "Грешка при премахване на профила от Twitter"
+#: actions/profilesettings.php:160
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+"Автоматично абониране за всеки, който се абонира за мен (подходящо за "
+"ботове)."
 
-#: actions/twittersettings.php:212 actions/twittersettings.php:407
-msgid "Twitter account removed."
-msgstr "Профилът от Twitter е премахнат."
+#: actions/profilesettings.php:221 actions/register.php:223
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Автобиографията е твърде дълга (до 140 символа)."
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
-msgid "Couldn't save Twitter preferences."
-msgstr "Грешка при записване настройките за Twitter"
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr "Не е избран часови пояс"
 
-#: actions/twittersettings.php:245 actions/twittersettings.php:461
-msgid "Twitter preferences saved."
-msgstr "Настройките за Twitter са запазени."
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr "Името на езика е твърде дълго (може да е до 50 знака)."
 
-#: actions/userauthorization.php:84 actions/userauthorization.php:86
-msgid "Please check these details to make sure "
-msgstr ""
+#: actions/profilesettings.php:246 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Неправилен етикет: \"%s\""
 
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
-msgid "The subscription has been authorized, but no "
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
 msgstr ""
 
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-msgid "The subscription has been rejected, but no "
-msgstr ""
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+msgstr "Грешка при запазване на профила."
 
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-msgid "Command results"
-msgstr "Резултат от командата"
+#: actions/profilesettings.php:336
+msgid "Couldn't save tags."
+msgstr "Грешка при запазване етикетите."
 
-#: classes/Channel.php:148 classes/Channel.php:204
-msgid "Command complete"
-msgstr "Командата е изпълнена"
+#: actions/profilesettings.php:344
+msgid "Settings saved."
+msgstr "Настройките са запазени."
 
-#: classes/Channel.php:158 classes/Channel.php:215
-msgid "Command failed"
-msgstr "Грешка при изпълнение на командата"
+#: actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
 
-#: classes/Command.php:39 classes/Command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "За съжаление тази команда все още не се поддържа."
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
+msgstr "Грешка при изтегляне на общия поток"
 
-#: classes/Command.php:96 classes/Command.php:113
+#: actions/public.php:129
 #, php-format
-msgid "Subscriptions: %1$s\n"
-msgstr "Абонаменти: %1$s\n"
+msgid "Public timeline, page %d"
+msgstr "Общ поток, страница %d"
 
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
-msgid "User has no last notice"
-msgstr "Потребителят няма последна бележка"
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr "Общ поток"
 
-#: classes/Command.php:146 classes/Command.php:166
-msgid "Notice marked as fave."
-msgstr "Бележката е отбелязана като любима."
+#: actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Емисия на общия поток"
 
-#: classes/Command.php:166 classes/Command.php:189
-#, php-format
-msgid "%1$s (%2$s)"
-msgstr "%1$s (%2$s)"
+#: actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Емисия на общия поток"
 
-#: classes/Command.php:169 classes/Command.php:192
-#, php-format
-msgid "Fullname: %s"
-msgstr "Пълно име: %s"
+#: actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Емисия на общия поток"
 
-#: classes/Command.php:172 classes/Command.php:195
+#: actions/public.php:179
 #, php-format
-msgid "Location: %s"
-msgstr "Местоположение: %s"
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
 
-#: classes/Command.php:175 classes/Command.php:198
-#, php-format
-msgid "Homepage: %s"
-msgstr "Домашна страница: %s"
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
 
-#: classes/Command.php:178 classes/Command.php:201
+#: actions/public.php:186
 #, php-format
-msgid "About: %s"
-msgstr "Относно: %s"
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
 
-#: classes/Command.php:200 classes/Command.php:228
+#: actions/public.php:233
 #, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
-"Съобщението е твърде дълго. Най-много може да е 140 знака, а сте въвели %d."
 
-#: classes/Command.php:214 classes/Command.php:245
+#: actions/public.php:238
 #, php-format
-msgid "Direct message to %s sent"
-msgstr "Прякото съобщение до %s е изпратено."
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
+msgstr ""
 
-#: classes/Command.php:216 classes/Command.php:247
-msgid "Error sending direct message."
-msgstr "Грешка при изпращане на прякото съобщение"
+#: actions/publictagcloud.php:57
+#, fuzzy
+msgid "Public tag cloud"
+msgstr "Емисия на общия поток"
 
-#: classes/Command.php:263 classes/Command.php:300
-msgid "Specify the name of the user to subscribe to"
-msgstr "Уточнете името на потребителя, за когото се абонирате."
+#: actions/publictagcloud.php:63
+#, php-format
+msgid "These are most popular recent tags on %s "
+msgstr ""
 
-#: classes/Command.php:270 classes/Command.php:307
+#: actions/publictagcloud.php:69
 #, php-format
-msgid "Subscribed to %s"
-msgstr "Абонирани сте за %s."
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
+msgstr ""
 
-#: classes/Command.php:288 classes/Command.php:328
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Уточнете името на потребителя, от когото се отписвате."
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
+msgstr ""
 
-#: classes/Command.php:295 classes/Command.php:335
+#: actions/publictagcloud.php:75
 #, php-format
-msgid "Unsubscribed from %s"
-msgstr "Отписани сте от %s."
-
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
-msgid "Command not yet implemented."
-msgstr "Командата все още не се поддържа."
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
 
-#: classes/Command.php:313 classes/Command.php:356
-msgid "Notification off."
-msgstr "Уведомлението е изключено."
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
+msgstr ""
 
-#: classes/Command.php:315 classes/Command.php:358
-msgid "Can't turn off notification."
-msgstr "Грешка при изключване на уведомлението."
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "Вече сте влезли!"
 
-#: classes/Command.php:333 classes/Command.php:379
-msgid "Notification on."
-msgstr "Уведомлението е включено."
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "Няма такъв код за възстановяване."
 
-#: classes/Command.php:335 classes/Command.php:381
-msgid "Can't turn on notification."
-msgstr "Грешка при включване на уведомлението."
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "Това не е код за възстановяване."
 
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
-msgstr "Команди:\n"
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr "Код за възстановяване на непознат потребител."
 
-#: classes/Message.php:53 classes/Message.php:56
-msgid "Could not insert message."
-msgstr "Грешка при вмъкване на съобщението."
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "Грешка в кода за потвърждение."
 
-#: classes/Message.php:63 classes/Message.php:66
-msgid "Could not update message with new URI."
-msgstr "Грешка при обновяване на бележката с нов URL-адрес."
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
+msgstr "Кодът за потвърждение е твърде стар. Започнете процеса отново."
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
-msgstr "Потребител без съответстващ профил в системата."
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
+msgstr "Грешка при обновяване на потребител с потвърден email адрес."
 
-#: lib/mail.php:147 lib/mail.php:289
-#, php-format
+#: actions/recoverpassword.php:152
 msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
 msgstr ""
 
-#: lib/mail.php:249 lib/mail.php:508
-#, php-format
-msgid "New private message from %s"
-msgstr "Ново лично съобщение от %s"
-
-#: lib/mail.php:253 lib/mail.php:512
-#, php-format
-msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
 msgstr ""
-"%1$s (%2$s) ви изпрати лично съобщение:\n"
-"\n"
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "Само потребителят може да отваря собствената си кутия."
-
-#: lib/openid.php:195 lib/openid.php:203
-msgid "This form should automatically submit itself. "
-msgstr "Тази форма сама ще се изпрати автоматично."
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
+msgstr ""
 
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-msgid "Favorites"
-msgstr "Любими"
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
+msgstr ""
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-#, php-format
-msgid "%s's favorite notices"
-msgstr "Любими бележки на %s"
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
+msgstr "Псевдонимът ви на този сървър или е-пощата, с която сте регистрирани."
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-msgid "User"
-msgstr "Потребител"
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
+msgstr "Възстановяване"
 
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-msgid "Inbox"
-msgstr "Входящи"
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "Нова парола"
 
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-msgid "Your incoming messages"
-msgstr "Получените от вас съобщения"
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr "Възстановяване на паролата"
 
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-msgid "Outbox"
-msgstr "Изходящи"
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
+msgstr "Поискано е възстановяване на парола"
 
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-msgid "Your sent messages"
-msgstr "Изпратените от вас съобщения"
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
+msgstr "Непознато действие"
 
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-msgid "Twitter"
-msgstr "Twitter"
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 или повече знака. И не ги забравяйте!"
 
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
-msgstr "Настройки за интеграция с Twitter"
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Също като паролата по-горе"
 
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-msgid "To"
-msgstr "До"
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "Обновяване"
 
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-msgid "Could not parse message."
-msgstr "Грешка при обработка на съобщението"
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "Въведете псевдоним или е-поща."
 
-#: actions/all.php:63 actions/facebookhome.php:162
-#, php-format
-msgid "%s and friends, page %d"
-msgstr "%s и приятели, страница %d"
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
+msgstr "Няма потребител с такава е-поща или потребителско име."
 
-#: actions/avatarsettings.php:76
-msgid "You can upload your personal avatar."
-msgstr "Можете да качите личен аватар тук."
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr "Няма указана е-поща за този потребител."
 
-#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
-msgid "Avatar settings"
-msgstr "Настройки за аватар"
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "Грешка при запазване на потвърждение за адрес"
 
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-msgid "Original"
-msgstr "Оригинал"
+#: actions/recoverpassword.php:325
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr ""
+"На е-пощата, с която сте регистрирани са изпратени инструкции за "
+"възстановяване на паролата."
 
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-msgid "Preview"
-msgstr "Преглед"
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
+msgstr "Неочаквано подновяване на паролата."
 
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
-msgid "Crop"
-msgstr "Изрязване"
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "Паролата трябва да е от поне 6 знака."
 
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-#, fuzzy
-msgid "There was a problem with your session token. "
-msgstr "Имаше проблем със сесията ви в сайта. Моля, опитайте отново!"
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
+msgstr "Паролата и потвърждението й не съвпадат."
 
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-msgid "Pick a square area of the image to be your avatar"
-msgstr "Изберете квадратна област от изображението за аватар"
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
+msgstr "Новата парола е запазена. Влязохте успешно."
 
-#: actions/avatarsettings.php:327 actions/grouplogo.php:384
-msgid "Lost our file data."
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: actions/register.php:92
 #, fuzzy
-msgid "Lost our file."
-msgstr "Няма такава бележка."
-
-#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
-#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
-msgid "Unknown file type"
-msgstr "Неподдържан вид файл"
-
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "Не е указан профил."
-
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "Не е открит профил с такъв идентификатор."
-
-#: actions/block.php:111
-msgid "Block user"
-msgstr "Блокиране на потребителя"
-
-#: actions/block.php:129
-msgid "Are you sure you want to block this user? "
-msgstr "Наистина ли искате да блокирате този потребител? "
-
-#: actions/block.php:162
-msgid "You have already blocked this user."
-msgstr "Вече сте блокирали този потребител."
-
-#: actions/block.php:167
-msgid "Failed to save block information."
-msgstr "Грешка при записване данните за блокирането."
-
-#: actions/confirmaddress.php:159
-#, fuzzy, php-format
-msgid "The address \"%s\" has been "
-msgstr "Адресът е премахнат."
-
-#: actions/deletenotice.php:73
-msgid "You are about to permanently delete a notice. "
-msgstr "Ще изтриете напълно бележката. "
+msgid "Sorry, invalid invitation code."
+msgstr "Грешка в кода за потвърждение."
 
-#: actions/disfavor.php:94
-msgid "Add to favorites"
-msgstr "Добавяне към любимите"
+#: actions/register.php:112
+msgid "Registration successful"
+msgstr "Записването е успешно."
 
-#: actions/editgroup.php:54
-#, php-format
-msgid "Edit %s group"
-msgstr ""
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "Регистриране"
 
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-msgid "Inboxes must be enabled for groups to work"
-msgstr ""
+#: actions/register.php:135
+msgid "Registration not allowed."
+msgstr "Записването не е позволено."
 
-#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-msgid "You must be logged in to create a group."
-msgstr "За да създавате група, трябва да сте влезли."
+#: actions/register.php:198
+msgid "You can't register if you don't agree to the license."
+msgstr "Не можете да се регистрате, ако не сте съгласни с  лиценза."
 
-#: actions/editgroup.php:87 actions/grouplogo.php:87
-#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
-msgid "No nickname"
-msgstr "Няма псевдоним."
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "Неправилен адрес на е-поща."
 
-#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
-#: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
-msgid "No such group"
-msgstr "Няма такава група."
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "Адресът на е-поща вече се използва."
 
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
-msgid "You must be an admin to edit the group"
-msgstr "За да редактирате групата, трябва да сте й администратор."
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "Неправилно име или парола."
 
-#: actions/editgroup.php:157
-msgid "Use this form to edit the group."
+#: actions/register.php:342
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
 msgstr ""
 
-#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
-#, fuzzy
-msgid "Nickname must have only lowercase letters "
+#: actions/register.php:424
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
-"Псевдонимът може да съдържа само малки букви, числа и никакво разстояние "
-"между тях."
+"От 1 до 64 малки букви или цифри, без пунктоация и интервали. Задължително "
+"поле."
 
-#: actions/editgroup.php:198 actions/newgroup.php:149
-#, fuzzy
-msgid "description is too long (max 140 chars)."
-msgstr "Автобиографията е твърде дълга (до 140 символа)."
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr "6 или повече знака. Задължително поле."
 
-#: actions/editgroup.php:218
-msgid "Could not update group."
-msgstr "Грешка при обновяване на групата."
+#: actions/register.php:433
+msgid "Same as password above. Required."
+msgstr "Същото като паролата по-горе. Задължително поле."
 
-#: actions/editgroup.php:226
-msgid "Options saved."
-msgstr "Настройките са запазени."
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "Е-поща"
 
-#: actions/emailsettings.php:107 actions/imsettings.php:108
-#, php-format
-msgid "Awaiting confirmation on this address. "
-msgstr "Очаква се потвърждение за този адрес. "
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
+msgstr "Използва се само за промени, обяви или възстановяване на паролата"
 
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-#, fuzzy
-msgid "Make a new email address for posting to; "
-msgstr "Нов адрес на е-поща за публикщуване в %s"
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
+msgstr "По-дълго име, за предпочитане \"истинското\" ви име."
 
-#: actions/emailsettings.php:157
-#, fuzzy
-msgid "Send me email when someone "
-msgstr "Изпращане на писмо при ново лично съобщение."
+#: actions/register.php:493
+msgid "My text and files are available under "
+msgstr "Текстовете и файловите ми са достъпни под "
 
-#: actions/emailsettings.php:168
-msgid "Allow friends to nudge me and send me an email."
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
-#: actions/emailsettings.php:321
-#, fuzzy
-msgid "That email address already belongs "
-msgstr "Тази е-поща вече се използва от друг потребител."
-
-#: actions/emailsettings.php:343
+#: actions/register.php:496
 #, fuzzy
-msgid "A confirmation code was sent to the email address you added. "
-msgstr ""
-"На месинджъра ви е изпратен код за потвърждение. За да получавате съобщения "
-"от %s, трябва да го одобрите."
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr " освен тези лични данни: парола, е-поща, месинджър, телефон."
 
-#: actions/facebookhome.php:110
-msgid "Server error - couldn't get user!"
+#: actions/register.php:537
+#, 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/facebookhome.php:196
-#, php-format
-msgid "If you would like the %s app to automatically update "
+#: actions/register.php:561
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
 msgstr ""
+"(Трябва да получите веднага електронно писмо с указания за потвърждаване "
+"адреса на е-пощата ви.)"
 
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#: actions/remotesubscribe.php:98
 #, php-format
-msgid "Allow %s to update my Facebook status"
+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/facebookhome.php:218
-msgid "Skip"
-msgstr "Пропускане"
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr "Отдалечен абонамент"
 
-#: actions/facebookhome.php:235
+#: actions/remotesubscribe.php:124
 #, fuzzy
-msgid "No notice content!"
-msgstr "Няма съдържание!"
-
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-msgid "Pagination"
-msgstr "Страниране"
-
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-msgid "After"
-msgstr "След"
-
-#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
-msgid "Before"
-msgstr "Преди"
-
-#: actions/facebookinvite.php:70
-#, php-format
-msgid "Thanks for inviting your friends to use %s"
-msgstr "Благодарим ви, че поканихте приятели да ползват %s!"
-
-#: actions/facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Изпратени са покани до следните хора:"
+msgid "Subscribe to a remote user"
+msgstr "Абониране за този потребител"
 
-#: actions/facebookinvite.php:96
-#, fuzzy, php-format
-msgid "You have been invited to %s"
-msgstr "\"Побутване\" от %s"
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "Потребителски псевдоним"
 
-#: actions/facebookinvite.php:105
-#, fuzzy, php-format
-msgid "Invite your friends to use %s"
-msgstr "Емисия с приятелите на %s"
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr "Псевдоним на потребител, когото искате да следите"
 
-#: actions/facebookinvite.php:113
-#, php-format
-msgid "Friends already using %s:"
-msgstr ""
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "Адрес на профила"
 
-#: actions/facebookinvite.php:130
-#, php-format
-msgid "Send invitations"
-msgstr "Изпращане на покани"
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "Адрес на профила ви в друга, съвместима услуга за микроблогване"
 
-#: actions/facebookremove.php:56
-msgid "Couldn't remove Facebook user."
-msgstr "Грешка при премахване на профила от Facebook."
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
+msgstr "Абониране"
 
-#: actions/facebooksettings.php:65
-#, fuzzy
-msgid "There was a problem saving your sync preferences!"
-msgstr "Имаше проблем със сесията ви в сайта. Моля, опитайте отново!"
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr "Неправилен адрес на профил (грешен формат)"
 
-#: actions/facebooksettings.php:67
+#: actions/remotesubscribe.php:168
 #, fuzzy
-msgid "Sync preferences saved."
-msgstr "Настройките са запазени."
-
-#: actions/facebooksettings.php:90
-msgid "Automatically update my Facebook status with my notices."
-msgstr "Автоматично препращане на бележките ми към Facebook."
-
-#: actions/facebooksettings.php:97
-msgid "Send \"@\" replies to Facebook."
-msgstr "Препращане на локалните отговори с \"@\" и към Facebook."
-
-#: actions/facebooksettings.php:106
-msgid "Prefix"
-msgstr "Прeдставка"
-
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
-msgstr "Представка за добавяне към бележките."
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "Неправилен адрес на профил (няма YADIS документ)."
 
-#: actions/facebooksettings.php:124
-#, php-format
-msgid "If you would like %s to automatically update "
+#: actions/remotesubscribe.php:176
+msgid "That’s a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/facebooksettings.php:147
-msgid "Sync preferences"
-msgstr "Синхронизиране на настройките"
-
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/remotesubscribe.php:183
 #, fuzzy
-msgid "Disfavor favorite"
-msgstr "Нелюбимо"
+msgid "Couldn’t get a request token."
+msgstr "Не е получен token за одобрение."
 
-#: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
-msgid "Popular notices"
-msgstr "Популярни бележки"
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
+#, php-format
+msgid "Replies to %s"
+msgstr "Отговори на %s"
 
-#: actions/favorited.php:67
+#: actions/replies.php:127
 #, php-format
-msgid "Popular notices, page %d"
-msgstr "Популярни бележки, страница %d"
+msgid "Replies to %s, page %d"
+msgstr "Отговори на %s, страница %d"
 
-#: actions/favorited.php:79
-msgid "The most popular notices on the site right now."
-msgstr "Най-популярните бележки в момента в сайта."
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Емисия с бележки на %s"
 
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
-msgid "Featured users"
-msgstr "Избрани потребители"
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Емисия с бележки на %s"
 
-#: actions/featured.php:71
-#, php-format
-msgid "Featured users, page %d"
-msgstr "Избрани потребители, страница %d"
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Емисия с бележки на %s"
 
-#: actions/featured.php:99
+#: actions/replies.php:198
 #, php-format
-msgid "A selection of some of the great users on %s"
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
 msgstr ""
 
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
-msgstr "Потребителят е забранил да се абонирате за него."
-
-#: actions/groupbyid.php:79
-msgid "No ID"
-msgstr "Липсва ID"
-
-#: actions/grouplogo.php:138 actions/grouplogo.php:191
-msgid "Group logo"
-msgstr "Лого на групата"
-
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
-msgstr "Може да качите лого за групата ви."
-
-#: actions/grouplogo.php:448
-msgid "Logo updated."
-msgstr "Лотого е обновено."
-
-#: actions/grouplogo.php:450
-msgid "Failed updating logo."
-msgstr "Неуспешно обновяване на логото."
-
-#: actions/groupmembers.php:93 lib/groupnav.php:91
+#: actions/replies.php:203
 #, php-format
-msgid "%s group members"
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
 msgstr ""
 
-#: actions/groupmembers.php:96
+#: actions/replies.php:205
 #, php-format
-msgid "%s group members, page %d"
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
-msgstr "Списък с потребителите в тази група."
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Съобщение до %1$s в %2$s"
 
-#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
-msgid "Groups"
-msgstr "Групи"
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "Любими бележки на %s, страница %d"
 
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "Групи, страница %d"
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
+msgstr "Грешка при изтегляне на любимите бележки"
 
-#: actions/groups.php:90
+#: actions/showfavorites.php:170
 #, php-format
-msgid "%%%%site.name%%%% groups let you find and talk with "
-msgstr ""
-
-#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-msgid "Create a new group"
-msgstr "Създаване на нова група"
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Емисия с приятелите на %s"
 
-#: actions/groupsearch.php:57
+#: actions/showfavorites.php:177
 #, php-format
-msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-msgstr "Търсене на групи в %%site.name%% по име, местоположение или описание."
-
-#: actions/groupsearch.php:63
-msgid "Group search"
-msgstr "Търсене на групи"
-
-#: actions/imsettings.php:70
-#, fuzzy
-msgid "You can send and receive notices through "
-msgstr "Не може да изпращате съобщения до този потребител."
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Емисия с приятелите на %s"
 
-#: actions/imsettings.php:120
+#: actions/showfavorites.php:184
 #, php-format
-msgid "Jabber or GTalk address, "
-msgstr "Адрес в Jabber или GTalk, "
-
-#: actions/imsettings.php:147
-msgid "Send me replies through Jabber/GTalk "
-msgstr "Изпращане на бележките по Jabber/GTalk "
-
-#: actions/imsettings.php:321
-#, fuzzy, php-format
-msgid "A confirmation code was sent "
-msgstr "Няма код за потвърждение."
-
-#: actions/joingroup.php:65
-msgid "You must be logged in to join a group."
-msgstr "За да се присъедините към група, трябва да сте влезли."
-
-#: actions/joingroup.php:95
-msgid "You are already a member of that group"
-msgstr "Вече членувате в тази група."
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Емисия с приятелите на %s"
 
-#: actions/joingroup.php:128
-#, fuzzy, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Грешка при проследяване — потребителят не е намерен."
+#: actions/showfavorites.php:205
+msgid ""
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
+msgstr ""
 
-#: actions/joingroup.php:135
+#: actions/showfavorites.php:207
 #, php-format
-msgid "%s joined group %s"
-msgstr "%s се присъедини към групата %s"
-
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
 msgstr ""
 
-#: actions/leavegroup.php:65
-msgid "You must be logged in to leave a group."
-msgstr "За напуснете група, трябва да сте влезли."
-
-#: actions/leavegroup.php:88
-msgid "No such group."
-msgstr "Няма такава група"
-
-#: actions/leavegroup.php:95
-msgid "You are not a member of that group."
-msgstr "Не членувате в тази група."
-
-#: actions/leavegroup.php:100
-#, fuzzy
-msgid "You may not leave a group while you are its administrator."
-msgstr "Не може да изтривате бележки на друг потребител."
-
-#: actions/leavegroup.php:130
-#, fuzzy
-msgid "Could not find membership record."
-msgstr "Грешка при обновяване записа на потребител."
-
-#: actions/leavegroup.php:138
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "Грешка при проследяване — потребителят не е намерен."
-
-#: actions/leavegroup.php:145
+#: actions/showfavorites.php:211
 #, php-format
-msgid "%s left group %s"
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
 msgstr ""
 
-#: actions/login.php:225 lib/facebookaction.php:304
-msgid "Login to site"
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
 msgstr ""
 
-#: actions/microsummary.php:69
-msgid "No current status"
+#: actions/showgroup.php:82 lib/groupnav.php:86
+#, php-format
+msgid "%s group"
 msgstr ""
 
-#: actions/newgroup.php:53
-msgid "New group"
-msgstr "Нова група"
-
-#: actions/newgroup.php:115
-msgid "Use this form to create a new group."
-msgstr "Използвайте тази бланка за създаване на нова група."
-
-#: actions/newgroup.php:177
-msgid "Could not create group."
-msgstr "Грешка при създаване на групата."
-
-#: actions/newgroup.php:191
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "Грешка при създаване на нов абонамент."
+#: actions/showgroup.php:84
+#, php-format
+msgid "%s group, page %d"
+msgstr ""
 
-#: actions/newmessage.php:119 actions/newnotice.php:132
-msgid "That's too long. "
-msgstr "Това е твърде дълго. "
+#: actions/showgroup.php:218
+msgid "Group profile"
+msgstr "Профил на групата"
 
-#: actions/newmessage.php:134
-#, fuzzy
-msgid "Don't send a message to yourself; "
-msgstr "Не може да изпращате съобщения до този потребител."
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
+msgid "URL"
+msgstr ""
 
-#: actions/newnotice.php:166
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
 #, fuzzy
-msgid "Notice posted"
+msgid "Note"
 msgstr "Бележки"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
-msgid "Ajax Error"
-msgstr "Грешка в Ajax"
-
-#: actions/nudge.php:85
-msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
 msgstr ""
 
-#: actions/nudge.php:94
-msgid "Nudge sent"
-msgstr "Побутването е изпратено"
-
-#: actions/nudge.php:97
-msgid "Nudge sent!"
-msgstr "Побутването е изпратено!"
-
-#: actions/openidlogin.php:97
-#, fuzzy
-msgid "OpenID login"
-msgstr "Влизане с OpenID"
+#: actions/showgroup.php:293
+msgid "Group actions"
+msgstr ""
 
-#: actions/openidsettings.php:128
-#, fuzzy
-msgid "Removing your only OpenID "
-msgstr "Премахване на OpenID"
+#: actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Емисия с бележки на %s"
 
-#: actions/othersettings.php:60
-msgid "Other Settings"
-msgstr "Други настройки"
+#: actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Емисия с бележки на %s"
 
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Управление на различни други настройки."
+#: actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Емисия с бележки на %s"
 
-#: actions/othersettings.php:93
-msgid "URL Auto-shortening"
-msgstr "Автоматично съкращаване на адреси"
+#: actions/showgroup.php:345
+#, php-format
+msgid "FOAF for %s group"
+msgstr "Изходяща кутия за %s"
 
-#: actions/othersettings.php:112
-msgid "Service"
-msgstr "Услуга"
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
+msgid "Members"
+msgstr "Членове"
 
-#: actions/othersettings.php:113
-msgid "Automatic shortening service to use."
-msgstr "Услуга за автоматично съкращаване, която да се ползва."
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/tagcloudsection.php:71
+msgid "(None)"
+msgstr ""
 
-#: actions/othersettings.php:144
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "Услугата за съкращаване е твърде дълга (може да е до 50 знака)."
+#: actions/showgroup.php:392
+msgid "All members"
+msgstr "Всички членове"
 
-#: actions/passwordsettings.php:69
-msgid "Change your password."
-msgstr "Смяна на паролата."
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "Статистики"
 
-#: actions/passwordsettings.php:89
+#: actions/showgroup.php:432
 #, fuzzy
-msgid "Password change"
-msgstr "Паролата е записана."
-
-#: actions/peopletag.php:35
-#, fuzzy, php-format
-msgid "Not a valid people tag: %s"
-msgstr "Това не е правилен адрес на е-поща."
+msgid "Created"
+msgstr "Създаване"
 
-#: actions/peopletag.php:47
+#: actions/showgroup.php:448
 #, php-format
-msgid "Users self-tagged with %s - page %d"
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/peopletag.php:91
+#: actions/showgroup.php:454
 #, php-format
-msgid "These are users who have tagged themselves \"%s\" "
-msgstr ""
-
-#: actions/profilesettings.php:91
-msgid "Profile information"
-msgstr "Данни на профила"
-
-#: actions/profilesettings.php:124
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
 msgstr ""
 
-#: actions/profilesettings.php:144
-#, fuzzy
-msgid "Automatically subscribe to whoever "
+#: actions/showgroup.php:482
+msgid "Admins"
 msgstr ""
-"Автоматично абониране за всеки, който се абонира за мен (подходящо за "
-"ботове)."
 
-#: actions/profilesettings.php:229 actions/tagother.php:176
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Неправилен етикет: \"%s\""
-
-#: actions/profilesettings.php:311
-msgid "Couldn't save tags."
-msgstr "Грешка при запазване етикетите."
-
-#: actions/public.php:107
-#, php-format
-msgid "Public timeline, page %d"
-msgstr "Общ поток, страница %d"
+#: actions/showmessage.php:81
+msgid "No such message."
+msgstr "Няма такова съобщение"
 
-#: actions/public.php:173
-msgid "Could not retrieve public stream."
-msgstr "Грешка при изтегляне на общия поток"
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient may read this message."
+msgstr "Само подателят и получателят могат да четат това съобщение."
 
-#: actions/public.php:220
+#: actions/showmessage.php:108
 #, php-format
-msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
-msgstr ""
-
-#: actions/publictagcloud.php:57
-#, fuzzy
-msgid "Public tag cloud"
-msgstr "Емисия на общия поток"
+msgid "Message to %1$s on %2$s"
+msgstr "Съобщение до %1$s в %2$s"
 
-#: actions/publictagcloud.php:63
+#: actions/showmessage.php:113
 #, php-format
-msgid "These are most popular recent tags on %s "
-msgstr ""
-
-#: actions/publictagcloud.php:119
-msgid "Tag cloud"
-msgstr ""
-
-#: actions/register.php:139 actions/register.php:349
-msgid "Sorry, only invited people can register."
-msgstr ""
+msgid "Message from %1$s on %2$s"
+msgstr "Съобщение от %1$s в %2$s"
 
-#: actions/register.php:149
+#: actions/shownotice.php:90
 #, fuzzy
-msgid "You can't register if you don't "
-msgstr "Не можете да се регистрате, ако не сте съгласни с  лиценза."
+msgid "Notice deleted."
+msgstr "Бележки"
 
-#: actions/register.php:286
-msgid "With this form you can create "
-msgstr ""
+#: actions/showstream.php:73
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "Бележки с етикет %s"
 
-#: actions/register.php:368
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, "
-msgstr "От 1 до 64 малки букви или цифри, без пунктоация и интервали"
+#: actions/showstream.php:79
+#, php-format
+msgid "%s, page %d"
+msgstr "%s, страница %d"
 
-#: actions/register.php:382 actions/register.php:386
-#, fuzzy
-msgid "Used only for updates, announcements, "
-msgstr "Използва се само за промени, обяви или възстановяване на паролата"
+#: actions/showstream.php:122
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Емисия с бележки на %s"
 
-#: actions/register.php:398
-#, fuzzy
-msgid "URL of your homepage, blog, "
-msgstr "Адрес на личната ви страница, блог или профил в друг сайт"
+#: actions/showstream.php:129
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Емисия с бележки на %s"
 
-#: actions/register.php:404
-#, fuzzy
-msgid "Describe yourself and your "
-msgstr "Опишете себе си и интересите си в до 140 букви"
+#: actions/showstream.php:136
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Емисия с бележки на %s"
 
-#: actions/register.php:410
-#, fuzzy
-msgid "Where you are, like \"City, "
-msgstr "Къде се намирате (град, община, държава и т.н.)"
+#: actions/showstream.php:143
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Емисия с бележки на %s"
 
-#: actions/register.php:432
-#, fuzzy
-msgid " except this private data: password, "
-msgstr "освен тези лични данни: парола, е-поща, месинджър, телефон."
+#: actions/showstream.php:148
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Изходяща кутия за %s"
 
-#: actions/register.php:471
+#: actions/showstream.php:191
 #, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
-msgstr "Поздравления, %s! И добре дошли в %%%%site.name%%%%. "
-
-#: actions/register.php:495
-msgid "(You should receive a message by email "
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
 msgstr ""
 
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
 msgstr ""
 
-#: actions/replies.php:118
-#, php-format
-msgid "Replies to %s, page %d"
-msgstr "Отговори на %s, страница %d"
-
-#: actions/showfavorites.php:79
+#: actions/showstream.php:198
 #, php-format
-msgid "%s favorite notices, page %d"
-msgstr "Любими бележки на %s, страница %d"
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showstream.php:234
 #, php-format
-msgid "%s group"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/showgroup.php:79
+#: actions/showstream.php:239
 #, php-format
-msgid "%s group, page %d"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
 msgstr ""
 
-#: actions/showgroup.php:206
-msgid "Group profile"
-msgstr "Профил на групата"
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "Настройки за SMS"
 
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
-msgid "URL"
-msgstr ""
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr "Може да получавате на е-пощата си SMS-съобщения от %%site.name%%."
 
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/smssettings.php:91
 #, fuzzy
-msgid "Note"
-msgstr "Бележки"
+msgid "SMS is not available."
+msgstr "Страницата не е достъпна във вида медия, който приемате"
 
-#: actions/showgroup.php:270
-msgid "Group actions"
-msgstr ""
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Текущ потвърден телефонен номер за SMS-и."
 
-#: actions/showgroup.php:323
-#, fuzzy, php-format
-msgid "Notice feed for %s group"
-msgstr "Емисия с бележки на %s"
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
+msgstr "Очаква се потвърждение за този телефонен номер."
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
-msgid "Members"
-msgstr "Членове"
+#: actions/smssettings.php:130
+msgid "Confirmation code"
+msgstr "Код за потвърждение"
 
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
-msgid "(None)"
-msgstr ""
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
+msgstr "Въведете кода, който получихте по телефона."
 
-#: actions/showgroup.php:370
-msgid "All members"
-msgstr "Всички членове"
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
+msgstr "Телефонен номер за SMS"
 
-#: actions/showgroup.php:378
-#, php-format
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "Телефонен номер — с код, без пунктоация и без интервали."
+
+#: actions/smssettings.php:174
 msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
 msgstr ""
+"Получаване на бележки в SMS. Имайте предвид, че може да има допълнителни "
+"такси от оператора."
 
-#: actions/showmessage.php:98
-#, fuzzy
-msgid "Only the sender and recipient "
-msgstr "Само подателят и получателят могат да четат това съобщение."
-
-#: actions/showstream.php:73
-#, php-format
-msgid "%s, page %d"
-msgstr "%s, страница %d"
+#: actions/smssettings.php:306
+msgid "No phone number."
+msgstr "Не е въведен телефонен номер."
 
-#: actions/showstream.php:143
-#, fuzzy
-msgid "'s profile"
-msgstr "Профил на "
+#: actions/smssettings.php:311
+msgid "No carrier selected."
+msgstr "Не е избран оператор."
 
-#: actions/showstream.php:236 actions/tagother.php:77
-msgid "User profile"
-msgstr "Потребителски профил"
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
+msgstr "Това и сега е номерът на телефона ви."
 
-#: actions/showstream.php:240 actions/tagother.php:81
-msgid "Photo"
-msgstr "Снимка"
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
+msgstr "Този телефонен номер вече се използва от друг потребител."
 
-#: actions/showstream.php:317
-msgid "User actions"
-msgstr "Потребителски действия"
+#: actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"На телефонния номер, който сте въвели, беше изпратен код за потвърждение. "
+"Проверете съобщенията (или папката за спам) за кода и указанията за "
+"използването му."
 
-#: actions/showstream.php:342
-msgid "Send a direct message to this user"
-msgstr "Изпращате на пряко съобщение до този потребител."
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
+msgstr "Този код за потвърждение е грешен."
 
-#: actions/showstream.php:343
-msgid "Message"
-msgstr "Съобщение"
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
+msgstr "Това не е вашият телефонен номер."
 
-#: actions/showstream.php:451
-msgid "All subscribers"
-msgstr "Всички абонати"
+#: actions/smssettings.php:465
+msgid "Mobile carrier"
+msgstr "Мобилен оператор"
 
-#: actions/showstream.php:533
-msgid "All groups"
-msgstr "Всички групи"
+#: actions/smssettings.php:469
+msgid "Select a carrier"
+msgstr "Изберете оператор"
 
-#: actions/showstream.php:542
+#: actions/smssettings.php:476
 #, php-format
 msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"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/smssettings.php:128
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, "
-msgstr "Телефонен номер — с код, без пунктоация и без интервали."
-
-#: actions/smssettings.php:162
-#, fuzzy
-msgid "Send me notices through SMS; "
-msgstr "Изпращане на бележките по Jabber/GTalk."
-
-#: actions/smssettings.php:335
-#, fuzzy
-msgid "A confirmation code was sent to the phone number you added. "
-msgstr "Очаква се потвърждение за този телефонен номер."
-
-#: actions/smssettings.php:453
-msgid "Mobile carrier"
-msgstr "Мобилен оператор"
+#: actions/smssettings.php:498
+msgid "No code entered"
+msgstr "Не е въведен код."
 
 #: actions/subedit.php:70
 msgid "You are not subscribed to that profile."
@@ -4271,15 +3015,32 @@ msgid "%s subscribers, page %d"
 msgstr ""
 
 #: actions/subscribers.php:63
-#, fuzzy
-msgid "These are the people who listen to "
-msgstr "Това са хората, които четат бележките на %s."
+msgid "These are the people who listen to your notices."
+msgstr "Tова са хората, които четат бележките ви."
 
 #: actions/subscribers.php:67
-#, fuzzy, php-format
-msgid "These are the people who "
+#, php-format
+msgid "These are the people who listen to %s's notices."
 msgstr "Това са хората, които четат бележките на %s."
 
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
+msgstr ""
+
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr ""
+
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
 #: actions/subscriptions.php:52
 #, php-format
 msgid "%s subscriptions"
@@ -4291,28 +3052,36 @@ msgid "%s subscriptions, page %d"
 msgstr "Абонаменти на %s, страница %d"
 
 #: actions/subscriptions.php:65
-#, fuzzy
-msgid "These are the people whose notices "
-msgstr "Хора, чийто бележки %s чете."
+msgid "These are the people whose notices you listen to."
+msgstr "Няма хора, чийто бележки четете."
 
 #: actions/subscriptions.php:69
+#, php-format
+msgid "These are the people whose notices %s listens to."
+msgstr "Хора, чийто бележки %s чете."
+
+#: actions/subscriptions.php:121
+#, php-format
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
+msgstr ""
+
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
 #, fuzzy, php-format
-msgid "These are the people whose "
-msgstr "Това са хората, които четат бележките на %s."
+msgid "%s is not listening to anyone."
+msgstr "%1$s вече получава бележките ви в %2$s."
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:194
 msgid "Jabber"
 msgstr "Jabber"
 
-#: actions/tag.php:43
-#, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Бележки с етикет %s, страница %d"
-
-#: actions/tag.php:66
-#, php-format
-msgid "Messages tagged \"%s\", most recent first"
-msgstr ""
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
+msgstr "SMS"
 
 #: actions/tagother.php:33
 #, fuzzy
@@ -4329,260 +3098,913 @@ msgstr "Няма такъв документ."
 msgid "Tag %s"
 msgstr "Етикети"
 
+#: actions/tagother.php:77 lib/userprofile.php:75
+msgid "User profile"
+msgstr "Потребителски профил"
+
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
+msgstr "Снимка"
+
 #: actions/tagother.php:141
 #, fuzzy
 msgid "Tag user"
 msgstr "Етикети"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 msgstr ""
 
-#: actions/tagother.php:164
-msgid "There was a problem with your session token."
-msgstr "Имаше проблем със сесията ви в сайта."
-
-#: actions/tagother.php:191
+#: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:198
+#: actions/tagother.php:200
 msgid "Could not save tags."
 msgstr "Грешка при запазване на етикетите."
 
-#: actions/tagother.php:233
+#: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Бележки с етикет %s, страница %d"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Емисия с бележки на %s"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Емисия с бележки на %s"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Емисия с бележки на %s"
+
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Няма такъв етикет."
 
-#: actions/tagrss.php:66
-#, fuzzy, php-format
-msgid "Microblog tagged with %s"
-msgstr "Бележки с етикет %s"
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
+msgstr "Методът в API все още се разработва."
 
-#: actions/twitapiblocks.php:47
-msgid "Block user failed."
+#: actions/unsubscribe.php:77
+#, fuzzy
+msgid "No profile id in request."
+msgstr "Сървърът не е върнал адрес на профила."
+
+#: actions/unsubscribe.php:84
+#, fuzzy
+msgid "No profile with that id."
+msgstr "Не е открита бележка с такъв идентификатор."
+
+#: actions/unsubscribe.php:98
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Отписване"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
-#: actions/twitapiblocks.php:69
-msgid "Unblock user failed."
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "Одобряване на абонамента"
+
+#: actions/userauthorization.php:110
+#, fuzzy
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
 msgstr ""
+"Проверете тези детайли и се уверете, че искате да се абонирате за бележките "
+"на този потребител. Ако не искате абонамента, натиснете \"Cancel\" (Отказ)."
 
-#: actions/twitapiusers.php:48
-msgid "Not found."
-msgstr "Не е открито."
+#: actions/userauthorization.php:188
+#, fuzzy
+msgid "License"
+msgstr "лиценз."
+
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "Приемане"
+
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Абониране за този потребител"
 
-#: actions/twittersettings.php:71
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "Охвърляне"
+
+#: actions/userauthorization.php:212
 #, fuzzy
-msgid "Add your Twitter account to automatically send "
+msgid "Reject this subscription"
+msgstr "Абонаменти на %s"
+
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
+msgstr "Няма заявка за одобрение."
+
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+msgstr "Абонаментът е одобрен"
+
+#: actions/userauthorization.php:249
+#, fuzzy
+msgid ""
+"The subscription has been authorized, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to authorize the "
+"subscription. Your subscription token is:"
 msgstr ""
-"Добавяне на профила ви в Twitter за автоматично препращане на бележките ви и "
-"там."
+"Абонаментът е одобрен, но не е зададен callback URL. За да завършите "
+"одобряването, проверете инструкциите на сайта. Вашият token за абонамент е:"
 
-#: actions/twittersettings.php:119
-msgid "Twitter user name"
-msgstr "Име в Twitter"
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
+msgstr "Абонаментът е отказан"
+
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"Абонаментът е отказан, но не е зададен callback URL. За да откажете напълно "
+"абонамента, проверете инструкциите на сайта."
+
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
 
-#: actions/twittersettings.php:126
-msgid "Twitter password"
-msgstr "Парола за Twitter"
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
 
-#: actions/twittersettings.php:228
-msgid "Twitter Friends"
-msgstr "Приятели от Twitter"
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
 
-#: actions/twittersettings.php:327
-msgid "Username must have only numbers, "
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr ""
 
-#: actions/twittersettings.php:341
+#: actions/userauthorization.php:343
 #, fuzzy, php-format
-msgid "Unable to retrieve account information "
-msgstr "Грешка при извличане данните на профила \"%s\" от Twitter."
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Грешка при четене адреса на аватара '%s'"
 
-#: actions/unblock.php:108
-#, fuzzy
-msgid "Error removing the block."
-msgstr "Грешка при запазване на потребител."
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Грешен вид изображение за '%s'"
 
-#: actions/unsubscribe.php:50
-#, fuzzy
-msgid "No profile id in request."
-msgstr "Сървърът не е върнал адрес на профила."
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr "Няма id."
 
-#: actions/unsubscribe.php:57
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
 #, fuzzy
-msgid "No profile with that id."
-msgstr "Не е открита бележка с такъв идентификатор."
+msgid "Profile design"
+msgstr "Настройки на профила"
 
-#: actions/unsubscribe.php:71
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "Отписване"
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
 
-#: actions/usergroups.php:63
-#, php-format
-msgid "%s groups"
-msgstr "Групи на %s"
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "Групи на %s, страница %d"
 
-#: classes/Notice.php:104
+#: actions/usergroups.php:130
+#, fuzzy
+msgid "Search for more groups"
+msgstr "Търсене за хора или бележки"
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "Не членувате в тази група."
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Message.php:55
+msgid "Could not insert message."
+msgstr "Грешка при вмъкване на съобщението."
+
+#: classes/Message.php:65
+msgid "Could not update message with new URI."
+msgstr "Грешка при обновяване на бележката с нов URL-адрес."
+
+#: classes/Notice.php:164
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Проблем при записване на бележката."
+
+#: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
 msgstr "Грешка при записване на бележката. Непознат потребител."
 
-#: classes/Notice.php:109
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте "
 "отново след няколко минути."
 
-#: classes/Notice.php:116
+#: classes/Notice.php:194
+#, fuzzy
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+"Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте "
+"отново след няколко минути."
+
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr "Забранено ви е да публикувате бележки в този сайт."
 
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
+msgstr "Проблем при записване на бележката."
+
+#: classes/Notice.php:1120
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "Грешка в базата от данни — отговор при вмъкването: %s"
+
+#: classes/User.php:347
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Съобщение до %1$s в %2$s"
+
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Профил"
+
 #: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
+msgstr "Промяна настройките на профила"
+
+#: lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "Качване на аватар"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr "Смяна на паролата"
+
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
+msgstr "Промяна обработката на писмата"
+
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:124
+#, fuzzy
+msgid "Design your profile"
+msgstr "Потребителски профил"
+
+#: lib/accountsettingsaction.php:128
 msgid "Other"
 msgstr "Друго"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:128
 msgid "Other options"
 msgstr "Други настройки"
 
-#: lib/action.php:130
+#: lib/action.php:144
 #, fuzzy, php-format
 msgid "%s - %s"
 msgstr "%s (%s)"
 
-#: lib/action.php:145
+#: lib/action.php:159
 msgid "Untitled page"
 msgstr "Неозаглавена страница"
 
-#: lib/action.php:316
+#: lib/action.php:424
 msgid "Primary site navigation"
 msgstr ""
 
-#: lib/action.php:322
+#: lib/action.php:430
+msgid "Home"
+msgstr "Начало"
+
+#: lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: lib/action.php:325
-msgid "Search for people or text"
-msgstr "Търсене за хора или бележки"
-
-#: lib/action.php:328
+#: lib/action.php:432
 msgid "Account"
 msgstr "Сметка"
 
-#: lib/action.php:328
+#: lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr "Промяна на поща, аватар, парола, профил"
 
-#: lib/action.php:330
-msgid "Connect to IM, SMS, Twitter"
-msgstr "Свързване към моментни съобщения, SMS, Twitter"
+#: lib/action.php:435
+msgid "Connect"
+msgstr "Свързване"
 
-#: lib/action.php:332
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Грешка при пренасочване към сървър: %s"
+
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
+msgstr "Покани"
+
+#: lib/action.php:440 lib/subgroupnav.php:106
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr "Поканете приятели и колеги да се присъединят към вас в %s"
+
+#: lib/action.php:445
+msgid "Logout"
+msgstr "Изход"
+
+#: lib/action.php:445
 msgid "Logout from the site"
 msgstr "Излизане от сайта"
 
-#: lib/action.php:335
-msgid "Login to the site"
-msgstr "Влизане в сайта"
-
-#: lib/action.php:338
+#: lib/action.php:450
 msgid "Create an account"
 msgstr "Създаване на нова сметка"
 
-#: lib/action.php:341
-msgid "Login with OpenID"
-msgstr "Влизане с OpenID"
+#: lib/action.php:453
+msgid "Login to the site"
+msgstr "Влизане в сайта"
+
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
+msgstr "Помощ"
 
-#: lib/action.php:344
+#: lib/action.php:456
 #, fuzzy
 msgid "Help me!"
 msgstr "Помощ"
 
-#: lib/action.php:362
+#: lib/action.php:459
+msgid "Search"
+msgstr "Търсене"
+
+#: lib/action.php:459
+msgid "Search for people or text"
+msgstr "Търсене за хора или бележки"
+
+#: lib/action.php:480
 #, fuzzy
 msgid "Site notice"
 msgstr "Нова бележка"
 
-#: lib/action.php:417
+#: lib/action.php:546
 msgid "Local views"
 msgstr ""
 
-#: lib/action.php:472
+#: lib/action.php:612
 #, fuzzy
 msgid "Page notice"
 msgstr "Нова бележка"
 
-#: lib/action.php:562
+#: lib/action.php:714
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "Абонаменти"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:721
+msgid "About"
+msgstr "Относно"
+
+#: lib/action.php:723
+msgid "FAQ"
+msgstr "Въпроси"
+
+#: lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/action.php:730
+msgid "Privacy"
+msgstr "Поверителност"
+
+#: lib/action.php:732
+msgid "Source"
+msgstr "Изходен код"
+
+#: lib/action.php:734
+msgid "Contact"
+msgstr "Контакт"
+
+#: lib/action.php:736
+#, fuzzy
+msgid "Badge"
+msgstr "Побутване"
+
+#: lib/action.php:764
 msgid "StatusNet software license"
 msgstr "Лиценз на програмата StatusNet"
 
-#: lib/action.php:630
+#: lib/action.php:767
+#, 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/action.php:769
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** е услуга за микроблогване. "
+
+#: lib/action.php:771
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+"Ползва [StatusNet](http://status.net/) версия %s, система за микроблогване, "
+"достъпна под [GNU Affero General Public License](http://www.fsf.org/"
+"licensing/licenses/agpl-3.0.html)."
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "Лиценз на програмата StatusNet"
+
+#: lib/action.php:794
 msgid "All "
 msgstr "Всички "
 
-#: lib/action.php:635
+#: lib/action.php:799
 msgid "license."
 msgstr "лиценз."
 
-#: lib/blockform.php:123 lib/blockform.php:153
-msgid "Block this user"
-msgstr "Блокиране на потребителя"
+#: lib/action.php:1052
+msgid "Pagination"
+msgstr "Страниране"
 
-#: lib/blockform.php:153
-msgid "Block"
-msgstr "Блокиране"
+#: lib/action.php:1061
+msgid "After"
+msgstr "След"
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
+#: lib/action.php:1069
+msgid "Before"
+msgstr "Преди"
+
+#: lib/action.php:1117
+msgid "There was a problem with your session token."
+msgstr "Имаше проблем със сесията ви в сайта."
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
 #, fuzzy
-msgid "Disfavor this notice"
-msgstr "%s любими бележки"
+msgid "Provider"
+msgstr "Профил"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
 
-#: lib/facebookaction.php:268
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
+msgstr "Резултат от командата"
+
+#: lib/channel.php:210
+msgid "Command complete"
+msgstr "Командата е изпълнена"
+
+#: lib/channel.php:221
+msgid "Command failed"
+msgstr "Грешка при изпълнение на командата"
+
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr "За съжаление тази команда все още не се поддържа."
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Грешка при обновяване на потребител с потвърден email адрес."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "Побутването е изпратено"
+
+#: lib/command.php:126
 #, php-format
-msgid "To use the %s Facebook Application you need to login "
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/facebookaction.php:271
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
+msgstr "Потребителят няма последна бележка"
+
+#: lib/command.php:190
+msgid "Notice marked as fave."
+msgstr "Бележката е отбелязана като любима."
+
+#: lib/command.php:315
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#: lib/command.php:318
+#, php-format
+msgid "Fullname: %s"
+msgstr "Пълно име: %s"
+
+#: lib/command.php:321
+#, php-format
+msgid "Location: %s"
+msgstr "Местоположение: %s"
+
+#: lib/command.php:324
+#, php-format
+msgid "Homepage: %s"
+msgstr "Домашна страница: %s"
+
+#: lib/command.php:327
+#, php-format
+msgid "About: %s"
+msgstr "Относно: %s"
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr ""
+"Съобщението е твърде дълго. Най-много може да е 140 знака, а сте въвели %d."
+
+#: lib/command.php:377
+msgid "Error sending direct message."
+msgstr "Грешка при изпращане на прякото съобщение"
+
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr ""
+"Съобщението е твърде дълго. Най-много може да е 140 знака, а сте въвели %d."
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Отговаряне на тази бележка"
+
+#: lib/command.php:441
 #, fuzzy
-msgid " a new account."
-msgstr "Създаване на нова сметка"
+msgid "Error saving notice."
+msgstr "Проблем при записване на бележката."
+
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
+msgstr "Уточнете името на потребителя, за когото се абонирате."
+
+#: lib/command.php:502
+#, php-format
+msgid "Subscribed to %s"
+msgstr "Абонирани сте за %s."
+
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
+msgstr "Уточнете името на потребителя, от когото се отписвате."
+
+#: lib/command.php:530
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr "Отписани сте от %s."
+
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
+msgstr "Командата все още не се поддържа."
+
+#: lib/command.php:551
+msgid "Notification off."
+msgstr "Уведомлението е изключено."
+
+#: lib/command.php:553
+msgid "Can't turn off notification."
+msgstr "Грешка при изключване на уведомлението."
+
+#: lib/command.php:574
+msgid "Notification on."
+msgstr "Уведомлението е включено."
+
+#: lib/command.php:576
+msgid "Can't turn on notification."
+msgstr "Грешка при включване на уведомлението."
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Грешка при създаване на OpenID форма: %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Не сте абонирани за този профил"
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Не сте абонирани за този профил"
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Грешка при абониране на друг потребител за вас."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Абонирани за %s"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Не членувате в тази група."
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "Не членувате в тази група."
+
+#: lib/command.php:670
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
 
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-msgid "Published"
-msgstr "Публикувано"
+#: lib/common.php:192
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Няма код за потвърждение."
+
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:195
+#, fuzzy
+msgid "Go to the installer."
+msgstr "Влизане в сайта"
+
+#: lib/connectsettingsaction.php:110
+msgid "IM"
+msgstr "IM"
+
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Бележки през месинджър (IM)"
+
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
+msgstr "Бележки през SMS"
+
+#: lib/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Качване"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Смяна на паролата"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Свързване"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Търсене"
+
+#: lib/designsettings.php:217
+msgid "Text"
+msgstr "Текст"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Списък"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+#, fuzzy
+msgid "Disfavor this notice"
+msgstr "%s любими бележки"
 
 #: lib/favorform.php:114 lib/favorform.php:140
 msgid "Favor this notice"
 msgstr "Отбелязване като любимо"
 
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr "Любимо"
+
 #: lib/feedlist.php:64
 msgid "Export data"
 msgstr "Изнасяне на данните"
 
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr ""
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr ""
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr ""
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Филтриране на етикетите"
@@ -4591,57 +4013,85 @@ msgstr "Филтриране на етикетите"
 msgid "All"
 msgstr "Всички"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Изберете оператор"
+
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Етикет"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "Изберете етикет за конкретизиране"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr ""
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "Адрес на страница, блог или профил в друг сайт на групата"
 
-#: lib/groupeditform.php:151
-msgid "Description"
-msgstr "Описание"
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Опишете групата или темата й в до 140 букви"
 
-#: lib/groupeditform.php:153
-msgid "Describe the group or topic in 140 chars"
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
 msgstr "Опишете групата или темата й в до 140 букви"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:172
+msgid "Description"
+msgstr "Описание"
+
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr "Къде се намира групата — град, община, държава и т.н. (ако е приложимо)"
+msgstr ""
+"Къде се намира групата — град, община, държава и т.н. (ако е приложимо)"
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
 msgid "Group"
 msgstr "Група"
 
-#: lib/groupnav.php:100
-msgid "Admin"
-msgstr ""
-
 #: lib/groupnav.php:101
+#, fuzzy
+msgid "Blocked"
+msgstr "Блокиране"
+
+#: lib/groupnav.php:102
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Блокиране на потребителя"
+
+#: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
 msgstr "Редактиране настройките на групата %s"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:113
 msgid "Logo"
 msgstr "Лого"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:114
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "Добавяне или редактиране логото на %s"
 
+#: lib/groupnav.php:120
+#, fuzzy, php-format
+msgid "Add or edit %s design"
+msgstr "Добавяне или редактиране логото на %s"
+
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Групи с най-много членове"
@@ -4656,10 +4106,44 @@ msgid "Tags in %s group's notices"
 msgstr "Етикети в бележките към групата %s"
 
 #: lib/htmloutputter.php:104
-#, fuzzy
-msgid "This page is not available in a "
+msgid "This page is not available in a media type you accept"
 msgstr "Страницата не е достъпна във вида медия, който приемате"
 
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Може да качите лого за групата ви."
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr "Частично качване на файла."
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr "Системна грешка при качване на файл."
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr "Файлът не е изображение или е повреден."
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr "Форматът на файла с изображението не се поддържа."
+
+#: lib/imagefile.php:118
+#, fuzzy
+msgid "Lost our file."
+msgstr "Няма такава бележка."
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr "Неподдържан вид файл"
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr ""
+
 #: lib/joinform.php:114
 msgid "Join"
 msgstr "Присъединяване"
@@ -4668,43 +4152,87 @@ msgstr "Присъединяване"
 msgid "Leave"
 msgstr "Напускане"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr "Вход с име и парола"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr "Създаване на нова сметка"
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
-msgstr "Вход или записване с OpenID"
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "Само потребителят може да отваря собствената си кутия."
 
-#: lib/mail.php:175
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr " от "
+
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "Потвърждаване адреса на е-поща"
+
+#: lib/mail.php:174
 #, php-format
 msgid ""
 "Hey, %s.\n"
 "\n"
-msgstr ""
-"Здрасти, %s!\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%s\n"
 "\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
+msgstr ""
 
-#: lib/mail.php:236
-#, fuzzy, php-format
-msgid "%1$s is now listening to "
+#: lib/mail.php:235
+#, php-format
+msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s вече получава бележките ви в %2$s."
 
-#: lib/mail.php:254
+#: lib/mail.php:240
+#, fuzzy, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
+"%1$s вече получава бележките ви в %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"С уважение,\n"
+"%4$s.\n"
+
+#: lib/mail.php:253
 #, php-format
 msgid "Location: %s\n"
 msgstr "Местоположение: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:255
 #, php-format
 msgid "Homepage: %s\n"
 msgstr "Лична страница: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
@@ -4713,57 +4241,218 @@ msgstr ""
 "Биография: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:285
+#, php-format
+msgid "New email address for posting to %s"
+msgstr "Нов адрес на е-поща за публикщуване в %s"
+
+#: lib/mail.php:288
+#, 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 ""
+
+#: lib/mail.php:412
+#, php-format
+msgid "%s status"
+msgstr "Състояние на %s"
+
+#: lib/mail.php:438
+msgid "SMS confirmation"
+msgstr "Потвърждение за SMS"
+
+#: lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "Побутнати сте от %s"
 
-#: lib/mail.php:465
+#: lib/mail.php:466
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
+msgstr ""
+
+#: lib/mail.php:509
+#, php-format
+msgid "New private message from %s"
+msgstr "Ново лично съобщение от %s"
+
+#: lib/mail.php:513
 #, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
-msgstr "%1$s (%2$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 ""
 
-#: lib/mail.php:555
+#: lib/mail.php:554
 #, fuzzy, php-format
-msgid "%1$s just added your notice from %2$s"
-msgstr "%1$s току-що отбеляза като любима бележката ви от %2$s."
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s отбеляза бележката ви като любима"
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, php-format
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+msgstr ""
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
-msgid "From"
-msgstr "От"
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
 
-#: lib/messageform.php:110
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+msgid "Could not determine file's mime-type!"
+msgstr "Грешка при изтегляне на общия поток"
+
+#: lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Изпращане на пряко съобщеие"
 
-#: lib/noticeform.php:125
-msgid "Send a notice"
-msgstr "Изпращане на бележка"
+#: lib/messageform.php:146
+msgid "To"
+msgstr "До"
 
-#: lib/noticeform.php:152
+#: lib/messageform.php:162 lib/noticeform.php:173
 msgid "Available characters"
 msgstr "Налични знаци"
 
-#: lib/noticelist.php:426
-msgid "in reply to"
-msgstr "в отговор на"
+#: lib/noticeform.php:145
+msgid "Send a notice"
+msgstr "Изпращане на бележка"
+
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
+msgstr "Какво става, %s?"
+
+#: lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "Няма съдържание!"
+
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr "Отговаряне на тази бележка"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "Отговор"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
-msgid "Delete this notice"
-msgstr "Изтриване на бележката"
-
-#: lib/noticelist.php:474
-msgid "Delete"
-msgstr "Изтриване"
-
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Побутване на този потребител"
@@ -4776,39 +4465,139 @@ msgstr "Побутване"
 msgid "Send a nudge to this user"
 msgstr "Побутване на този потребител"
 
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "Грешка при вмъкване на нов профил"
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "Грешка при вмъкване на аватар"
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "Грешка при вмъкване на отдалечен профил"
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Изтриване на бележката"
+
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
+msgstr "Грешка при добавяне на нов абонамент."
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "Лично"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "Отговори"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr "Любими"
+
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr "Потребител"
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr "Входящи"
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr "Получените от вас съобщения"
+
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr "Изходящи"
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr "Изпратените от вас съобщения"
+
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Етикети в бележките на %s"
 
-#: lib/profilelist.php:182
-msgid "(none)"
-msgstr "(няма)"
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "Абонаменти"
+
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "Всички абонаменти"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "Абонати"
+
+#: lib/profileaction.php:157
+msgid "All subscribers"
+msgstr "Всички абонати"
+
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "Потребител"
+
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "Участник от"
+
+#: lib/profileaction.php:235
+msgid "All groups"
+msgstr "Всички групи"
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Общ поток"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr ""
 
-#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Скорошни етикети"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Избрано"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Популярно"
 
+#: lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Търсене"
+
+#: lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Търсене"
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "Хора"
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr "Търсене на хора в сайта"
+
 #: lib/searchgroupnav.php:82
 msgid "Notice"
 msgstr "Бележки"
 
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr "Търсене в съдържанието на бележките"
+
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Търсене на групи в сайта"
@@ -4817,33 +4606,63 @@ msgstr "Търсене на групи в сайта"
 msgid "Untitled section"
 msgstr "Неозаглавен раздел"
 
-#: lib/subgroupnav.php:81
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Абонаменти на %s"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:91
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Абонирани за %s"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Групи, в които участва %s"
 
-#: lib/subgroupnav.php:104
-#, php-format
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Поканете приятели и колеги да се присъединят към вас в %s"
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
 
-#: lib/subs.php:53
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(няма)"
+
+#: lib/subs.php:48
+msgid "Already subscribed!"
+msgstr ""
+
+#: lib/subs.php:52
 msgid "User has blocked you."
 msgstr "Потребителят ви е блокирал."
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Абониране за този потребител"
+#: lib/subs.php:56
+msgid "Could not subscribe."
+msgstr "Грешка при абониране."
+
+#: lib/subs.php:75
+msgid "Could not subscribe other to you."
+msgstr "Грешка при абониране на друг потребител за вас."
+
+#: lib/subs.php:124
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Не сте абонирани!"
+
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
+msgstr "Грешка при изтриване на абонамента."
 
 #: lib/tagcloudsection.php:56
 msgid "None"
@@ -4853,68 +4672,106 @@ msgstr "Без"
 msgid "Top posters"
 msgstr "Най-често пишещи"
 
-#: lib/unblockform.php:120 lib/unblockform.php:150
-msgid "Unblock this user"
-msgstr "Разблокиране на този потребител"
-
-#: lib/unblockform.php:150
-msgid "Unblock"
-msgstr "Разблокиране"
-
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Отписване от този потребител"
 
-#, fuzzy
-#~ msgid "Code not yet ready."
-#~ msgstr "Командата все още не се поддържа."
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "Отписване"
 
+#: lib/userprofile.php:116
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "Създаване на нова сметка"
+msgid "Edit Avatar"
+msgstr "Аватар"
 
-#, fuzzy
-#~ msgid "Delete my account confirmation"
-#~ msgstr "Грешка при изтриване потвърждението по е-поща."
+#: lib/userprofile.php:236
+msgid "User actions"
+msgstr "Потребителски действия"
 
+#: lib/userprofile.php:248
 #, fuzzy
-#~ msgid "Check if you are sure you want to delete your account."
-#~ msgstr "Наистина ли искате да изтриете тази бележка?"
+msgid "Edit profile settings"
+msgstr "Настройки на профила"
 
-#, fuzzy
-#~ msgid "Showing recently popular notices"
-#~ msgstr "Търсене в съдържанието на бележките"
+#: lib/userprofile.php:249
+msgid "Edit"
+msgstr ""
 
-#~ msgid "List"
-#~ msgstr "Списък"
+#: lib/userprofile.php:272
+msgid "Send a direct message to this user"
+msgstr "Изпращате на пряко съобщение до този потребител."
 
-#~ msgid "Icons"
-#~ msgstr "Икони"
+#: lib/userprofile.php:273
+msgid "Message"
+msgstr "Съобщение"
 
-#, fuzzy
-#~ msgid ""
-#~ "Hey, %s.\n"
-#~ "\n"
-#~ "Someone just entered this email address on %s.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Здравей %s.\n"
-#~ "\n"
-#~ "Друг потребител вече въведе този email адрес на %s.\n"
-#~ "\n"
+#: lib/util.php:821
+msgid "a few seconds ago"
+msgstr "преди няколко секунди"
+
+#: lib/util.php:823
+msgid "about a minute ago"
+msgstr "преди около минута"
+
+#: lib/util.php:825
+#, php-format
+msgid "about %d minutes ago"
+msgstr "преди около %d минути"
+
+#: lib/util.php:827
+msgid "about an hour ago"
+msgstr "преди около час"
+
+#: lib/util.php:829
+#, php-format
+msgid "about %d hours ago"
+msgstr "преди около %d часа"
+
+#: lib/util.php:831
+msgid "about a day ago"
+msgstr "преди около ден"
+
+#: lib/util.php:833
+#, php-format
+msgid "about %d days ago"
+msgstr "преди около %d дни"
+
+#: lib/util.php:835
+msgid "about a month ago"
+msgstr "преди около месец"
+
+#: lib/util.php:837
+#, php-format
+msgid "about %d months ago"
+msgstr "преди около %d месеца"
+
+#: lib/util.php:839
+msgid "about a year ago"
+msgstr "преди около година"
+
+#: lib/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "Адресът на личната страница не е правилен URL."
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "Не може да се потвърди електронната поща."
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
 
-#~ msgid "Email address"
-#~ msgstr "Адрес на е-поща"
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr "Грешка при обработка на съобщението"
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Грешка при вмъкване на бележка"
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr "Това не е регистриран потребител."
 
-#~ 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 ""
-#~ "Ако сте забравили или изгубили паролата си, може да ви бъде изпратена "
-#~ "нова на е-пощата, записана в сметката ви."
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr "Това не е вашият входящ адрес."
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr "Входящата поща не е разрешена."
diff --git a/locale/ca/LC_MESSAGES/statusnet.mo b/locale/ca/LC_MESSAGES/statusnet.mo
index aadf38da9..cd6cf878e 100644
--- a/locale/ca/LC_MESSAGES/statusnet.mo
+++ b/locale/ca/LC_MESSAGES/statusnet.mo
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index 44944c8ba..417607800 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -1,4265 +1,3029 @@
-# 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.
+# Translation of StatusNet to Catalan
 #
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-06-12 09:18+0000\n"
-"Last-Translator: animarval <animarval@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:42:52+0000\n"
+"Language-Team: Catalan\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: out-statusnet\n"
 
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
-#, php-format
-msgid " Search Stream for \"%s\""
-msgstr "Cerca \"%s\" al flux"
-
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-#: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
-msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr ""
-"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
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr " de "
-
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr "%1$s / Notificacions contestant a %2$s"
-
-#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s t'ha convidat us ha convidat a unir-te al grup %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 us ha convidat a unir-vos a %2$s (%3$s).\n"
-"\n"
-"%2$s és un servei de micro-blogging que us permetrà estar al dia amb gent "
-"que conegueu i gent que us interessi.\n"
-"\n"
-"Podeu també compartir notícies sobre vosaltres mateixos, el que penseu, o la "
-"vostra vida a la xarxa amb gent que conegueu. És també força bo per "
-"conèixer nova gent amb qui compartir els vostres interessos.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your time.\n"
-"\n"
-"Sincerely, %2$s\n"
-
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
-#, php-format
-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
-#, 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 ara està escoltant els teus avisos a %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Atentament,\n"
-"%4$s.\n"
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "%1$s notificacions que responen a notificacions de %2$s / %3$s."
-
-#: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr "estat de %1$s a %2$s"
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "No existeix aquesta etiqueta."
 
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
-#, php-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
+msgstr "No existeix aquest usuari."
 
-#: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/all.php:84
 #, php-format
-msgid "%s Public Stream"
-msgstr "Flux públic de %s"
+msgid "%s and friends, page %d"
+msgstr "%s i amics, pàgina %d"
 
-#: ../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
-#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s i amics"
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
-#, php-format
-msgid "%s public timeline"
-msgstr "%s línia temporal pública"
+#: actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Feed per a amics de %s"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
-#, php-format
-msgid "%s status"
-msgstr "%s estat"
+#: actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Feed per a amics de %s"
 
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
-#, php-format
-msgid "%s timeline"
-msgstr "%s línia temporal"
+#: actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Feed per a amics de %s"
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/all.php:127
 #, php-format
-msgid "%s updates from everyone!"
-msgstr "%s notificacions de tots!"
-
-#: ../actions/register.php:213
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
-"(Hauries de rebre un missatge per correu electrònic d'aquí uns moments, amb "
-"instruccions sobre com confirmar la teva direcció de correu electrònic.)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: actions/all.php:132
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
 msgstr ""
-"**%%site.name%%** és un servei de microblogging de [%%site.broughtby%%**](%%"
-"site.broughtbyurl%%)."
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: actions/all.php:134
 #, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** és un servei de microblogging."
-
-#: ../lib/util.php:274 lib/util.php:290
-msgid ". Contributors should be attributed by full name or nickname."
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
-". Els col·laboradors han de ser citats pel seu nom complet o sobrenom. "
 
-#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
-#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
 msgstr ""
-"1-64 lletres en minúscula o números, sense signes de puntuació o espais"
 
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 lletres en minúscula o números, sense puntuacions ni espais. Requerit."
+#: actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s i amics"
 
-#: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr "6 o més caràcters"
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr "Actualitzacions de %1$s i amics a %2$s!"
 
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
-msgid "6 or more characters, and don't forget it!"
-msgstr "6 o més caràcters, i no te n'oblidis!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
+msgstr "No s'ha trobat el mètode API!"
 
-#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
-msgid "6 or more characters. Required."
-msgstr "6 o més caràcters. Requerit."
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
+msgstr "Aquest mètode requereix POST."
 
-#: ../actions/imsettings.php:197 actions/imsettings.php:205
-#, php-format
+#: actions/apiaccountupdatedeliverydevice.php:105
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
 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 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 ""
-"S'ha enviat un codi de confirmació al correu electrònic que has afegit. "
-"Revisa la teva safata d'entrada (i la carpeta de spam!) per veure aquest "
-"codi i les instruccions per utilitzar-lo."
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "No s'ha pogut actualitzar l'usuari."
 
-#: ../actions/smssettings.php:216 actions/smssettings.php:224
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
+#, php-format
 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."
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
 msgstr ""
-"S'ha enviat un codi de confirmació al número de telèfon has afegit. Revisa "
-"la teva safata d'entrada (i la carpeta de spam!) per veure aquest codi i les "
-"instruccions per utilitzar-lo."
 
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../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 actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
-msgid "API method not found!"
-msgstr "No s'ha trobat el mètode API!"
-
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../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 actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
-msgid "API method under construction."
-msgstr "Mètode API en construcció."
-
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
-msgid "About"
-msgstr "Sobre"
-
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
-msgid "Accept"
-msgstr "Acceptar"
-
-#: ../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 actions/emailsettings.php:120
-#: actions/imsettings.php:127 actions/openidsettings.php:111
-#: actions/smssettings.php:133 actions/twittersettings.php:163
-msgid "Add"
-msgstr "Afegir"
-
-#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
-msgstr "Afegir OpenID"
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-msgid "Add or remove OpenIDs"
-msgstr "Afegir o eliminar OpenIDs"
-
-#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39 actions/emailsettings.php:39
-#: actions/imsettings.php:40 actions/smssettings.php:39
-#: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
-msgstr "Adreça"
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "No s'ha pogut guardar la teva configuració de Twitter!"
 
-#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-msgid "Addresses of friends to invite (one per line)"
-msgstr "Direccions d'amic per convidar (una per línia)"
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "No s'ha pogut actualitzar l'usuari."
 
-#: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
-msgid "All subscriptions"
-msgstr "Totes les subscripcions"
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "L'usuari no té perfil."
 
-#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
-#, php-format
-msgid "All updates for %s"
-msgstr "Totes les actualitzacions per a %s"
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "No s'ha pogut guardar el perfil."
 
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
-#, php-format
-msgid "All updates matching search term \"%s\""
-msgstr "Totes les actualitzacions que corresponen a la frase a cercar \"%s\" "
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
+msgstr "Ha fallat el bloqueig d'usuari."
 
-#: ../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
-#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
-msgid "Already logged in."
-msgstr "Ja estàs connectat."
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
+msgstr "Ha fallat el desbloqueig d'usuari."
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
-msgid "Already subscribed!."
-msgstr "Ja estàs subscrit!"
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "No hi ha text al missatge!"
 
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
-msgid "Are you sure you want to delete this notice?"
-msgstr "N'estàs segur que vols eliminar aquesta notificació?"
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "És massa llarg. Màxim del missatge és 140 caràcters."
 
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
-msgid "Authorize subscription"
-msgstr "Autoritzar subscripció"
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "No has escrit cap usuari receptor."
 
-#: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
-msgid "Automatically login in the future; not for shared computers!"
-msgstr ""
-"Iniciar sessió automàticament en el futur; no utilitzar en ordinadors "
-"compartits!"
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr "No pots enviar missatges directes a usuaris que no siguin amics teus."
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr ""
-"Automàticament subscriure's a qualsevol que ho estigui a tu mateix (ideal "
-"per no-humans)"
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "Missatges directes a %s"
 
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34 actions/avatarsettings.php:65
-#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
-msgid "Avatar"
-msgstr "Avatar"
+#: actions/apidirectmessage.php:93
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr "Tots els missatges directes enviats per %s"
 
-#: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
-msgid "Avatar updated."
-msgstr "Avatar actualitzat."
+#: actions/apidirectmessage.php:101
+#, php-format
+msgid "Direct messages to %s"
+msgstr "Missatges directes a %s"
 
-#: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/apidirectmessage.php:105
 #, 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 ""
-"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?)"
+msgid "All the direct messages sent to %s"
+msgstr "Tots els missatges directes enviats a %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 ""
-"Esperant a confirmar aquesta direcció. Revisa la teva safata d'entrada (i la "
-"carpeta de spam!) per al missatge amb les instruccions."
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "No s'ha trobat el mètode API!"
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
-msgid "Awaiting confirmation on this phone number."
-msgstr "Esperant confirmació per aquest número de telèfon."
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
+msgstr "No s'ha trobat cap estatus amb aquesta ID."
 
-#: ../lib/util.php:1318 lib/util.php:1452
-msgid "Before »"
-msgstr "Anterior »"
+#: actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+msgstr "Aquesta nota ja és favorita."
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
-#: actions/profilesettings.php:82 actions/register.php:184
-#: actions/profilesettings.php:112 actions/register.php:402
-msgid "Bio"
-msgstr "Biografia"
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+msgstr "No es pot crear favorit."
 
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
-#: actions/register.php:89 actions/updateprofile.php:104
-#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
-msgid "Bio is too long (max 140 chars)."
-msgstr "La biografia és massa llarga (màx. 140 caràcters)."
+#: actions/apifavoritedestroy.php:122
+#, fuzzy
+msgid "That status is not a favorite!"
+msgstr "Aquesta notificació no és un favorit!"
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
-msgid "Can't delete this notice."
-msgstr "No es pot esborrar la notificació."
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr "No pots eliminar favorits."
 
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
+msgstr "No pots subscriure't a aquest usuari: L'usuari no existeix."
+
+#: actions/apifriendshipscreate.php:118
 #, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr "No es pot llegir l'URL de l'avatar '%s'"
+msgid "Could not follow user: %s is already on your list."
+msgstr ""
+"No pots subscriure't de nou a aquest usuari: %s ja està a la teva llista."
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404 actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-msgid "Can't save new password."
-msgstr "No es pot guardar la nova contrasenya."
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "No pots subscriure't a aquest usuari: L'usuari no existeix."
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62 actions/emailsettings.php:58
-#: actions/imsettings.php:59 actions/smssettings.php:62
-#: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
-msgstr "Cancel·lar"
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
 
-#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Impossible crear una instància de l'objecte OpenID"
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
+msgstr "Dos ids d'usuari o screen_names has de ser substituïts."
 
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
-msgstr "Impossible normalitzar aquest Jabber ID"
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "No s'ha pogut recuperar la conversa pública."
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
-msgid "Cannot normalize that email address"
-msgstr "No es pot normalitzar aquesta direcció de correu electrònic"
+#: actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "No es pot trobar cap estatus."
 
-#: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
-msgstr "Canviar"
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
+msgid "Could not create group."
+msgstr "No s'ha pogut crear el grup."
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
-msgstr "Canviar correu electrònic"
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "No es pot crear favorit."
 
-#: ../actions/password.php:32 actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr "Canviar contrasenya"
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+msgid "Could not set group membership."
+msgstr "No s'ha pogut establir la pertinença d'aquest grup."
 
-#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
-msgid "Change your password"
-msgstr "Canviar la teva contrasenya"
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"El sobrenom ha de tenir només lletres minúscules i números i no pot tenir "
+"espais."
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-msgid "Change your profile settings"
-msgstr "Canviar les preferències del teu perfil"
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr "Aquest sobrenom ja existeix. Prova un altre. "
 
-#: ../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
-#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
-#: actions/register.php:376 actions/smssettings.php:122
-msgid "Confirm"
-msgstr "Confirmar"
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "Sobrenom no vàlid."
 
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "Confirmar adreça"
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "La pàgina personal no és un URL vàlid."
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245 actions/emailsettings.php:256
-#: actions/imsettings.php:230 actions/smssettings.php:253
-#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
-msgid "Confirmation cancelled."
-msgstr "Confirmació cancel·lada."
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "El teu nom és massa llarg (màx. 255 caràcters)."
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
-msgid "Confirmation code"
-msgstr "Codi de confirmació"
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "la descripció és massa llarga (màx. 140 caràcters)."
 
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-msgid "Confirmation code not found."
-msgstr "Codi de confirmació no trobat. "
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "La ubicació és massa llarga (màx. 255 caràcters)."
 
-#: ../actions/register.php:202
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
 #, 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."
+msgid "Too many aliases! Maximum %d."
 msgstr ""
-"Felicitats, %s! I benvingut/da a %%%%site.name%%%%. Des d'aquí, podries...\n"
-"\n"
-"* Anar al teu [teu perfil](%s) i publicar el teu primer missatge.\n"
-"* Afegir una [direcció Jabber/GTalk](%%%%action.imsettings%%%%) i així poder "
-"publicar les notificacions a través de missatgeria instantània.\n"
-"* [Buscar gent](%%%%action.peoplesearch%%%%) que puguis conèixer o que "
-"comparteixi els teus interessos. \n"
-"* Actualitzar les [preferències del teu "
-"perfil](%%%%action.profilesettings%%%%) per explicar als demés més sobre tu. "
-"* Llegir els [documents de la xarxa](%%%%doc.help%%%%) per conèixer les "
-"característiques del nostre servei. \n"
-"\n"
-"Gràcies per registrar-te i esperem que gaudeixis d'aquest servei."
-
-#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
-msgid "Connect"
-msgstr "Connectar-se"
 
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
-msgid "Connect existing account"
-msgstr "Connectar-se a un compte existent"
-
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
-msgid "Contact"
-msgstr "Posar-se en contacte"
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Etiqueta no vàlida: \"%s\""
 
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
-#, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "No s'ha pogut crear el formulari OpenID: %s"
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Aquest sobrenom ja existeix. Prova un altre. "
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
-#, php-format
-msgid "Could not follow user: %s is already on your list."
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
 msgstr ""
-"No pots subscriure't de nou a aquest usuari: %s ja està a la teva llista."
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
-msgid "Could not follow user: User not found."
-msgstr "No pots subscriure't a aquest usuari: L'usuari no existeix."
-
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr "No s'ha pogut redirigir al servidor: %s"
-
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
-msgid "Could not save avatar info"
-msgstr "No s'ha pogut guardar la informació de l'avatar"
-
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
-msgid "Could not save new profile info"
-msgstr "No s'ha pogut guardar la informació del nou perfil"
-
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
-msgid "Could not subscribe other to you."
-msgstr "No pots subscriure a un altre a tu mateix."
-
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
-msgid "Could not subscribe."
-msgstr "No pots subscriure."
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
-msgstr "No es pot actualitzar l'usuari amb el correu electrònic confirmat"
-
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-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/confirmaddress.php:84 actions/emailsettings.php:252
-#: actions/imsettings.php:226 actions/smssettings.php:249
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-msgid "Couldn't delete email confirmation."
-msgstr "No s'ha pogut eliminar la confirmació de correu electrònic."
-
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
-msgid "Couldn't delete subscription."
-msgstr "No s'ha pogut eliminar la subscripció."
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Ja ets membre d'aquest grup"
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
-msgid "Couldn't find any statuses."
-msgstr "No es pot trobar cap estatus."
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
 
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-msgid "Couldn't get a request token."
-msgstr "No s'ha pogut obtenir un senyal de petició."
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "No s'ha pogut afegir l'usuari %s al grup %s"
 
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206 actions/emailsettings.php:223
-#: actions/imsettings.php:195 actions/smssettings.php:214
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
-msgid "Couldn't insert confirmation code."
-msgstr "No s'ha pogut inserir el codi de confirmació."
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "No ets membre d'aquest grup."
 
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
-msgstr "No s'ha pogut inserir una nova subscripció."
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "No s'ha pogut eliminar l'usuari %s del grup %s"
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-msgid "Couldn't save profile."
-msgstr "No s'ha pogut guardar el perfil."
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "%s grups"
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
-msgstr "No es pot actualitzar l'usuari per autosubscriure."
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Accions del grup"
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
-msgid "Couldn't update user record."
-msgstr "No s'ha pogut actualitzar el registre de l'usuari."
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "%s grups"
 
-#: ../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
-#: actions/confirmaddress.php:114 actions/emailsettings.php:280
-#: actions/emailsettings.php:411 actions/imsettings.php:252
-#: actions/imsettings.php:395 actions/othersettings.php:162
-#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
-msgid "Couldn't update user."
-msgstr "No s'ha pogut actualitzar l'usuari."
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "%s grups són membres de"
 
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
-msgid "Create"
-msgstr "Crear"
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
+msgstr "Aquest mètode requereix POST o DELETE."
 
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
-msgid "Create a new user with this nickname."
-msgstr "Crear un nou usuari amb aquest sobrenom."
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
+msgstr "No pots eliminar l'estatus d'un altre usuari."
 
-#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
-msgid "Create new account"
-msgstr "Crear nou compte"
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "Avatar actualitzat."
 
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
-msgid "Creating new account for OpenID that already has a user."
-msgstr "Crear nou compte per a un OpenID que ja té un usuari."
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
+msgstr "No s'ha trobat cap estatus amb la ID trobada."
 
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "Adreça actual Jabber/Gtalk confirmada."
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "Massa llarg. La longitud màxima és de 140 caràcters."
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "Número de telèfon actualment confirmat i activat per SMS."
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
+msgstr "No s'ha trobat"
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-msgid "Current confirmed email address."
-msgstr "Correu electrònic confirmat actualment."
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
 
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
-msgstr "Actualment"
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Format d'imatge no suportat."
 
-#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: actions/apitimelinefavorites.php:107
 #, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "Hashtag de l'error de la base de dades:%s"
+msgid "%s / Favorites from %s"
+msgstr "%s / Favorits de %s"
 
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: actions/apitimelinefavorites.php:119
 #, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Error de BD en inserir resposta: %s"
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
-msgid "Delete notice"
-msgstr "Eliminar nota."
+msgid "%s updates favorited by %s / %s."
+msgstr "%s actualitzacions favorites per %s / %s."
 
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "Explica'ns alguna cosa sobre tu i els teus interessos en 140 caràcters"
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
+#, php-format
+msgid "%s timeline"
+msgstr "%s línia temporal"
 
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87 actions/register.php:172
-#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
-#: actions/register.php:385 lib/accountsettingsaction.php:113
-msgid "Email"
-msgstr "Correu electrònic"
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "Actualitzacions de %1$s a %2$s!"
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-msgid "Email Address"
-msgstr "Direcció de correu electrònic"
+#: actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Notificacions contestant a %2$s"
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
-msgstr "Configuració del correu electrònic"
+#: actions/apitimelinementions.php:126
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr "%1$s notificacions que responen a notificacions de %2$s / %3$s."
 
-#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-msgid "Email address already exists."
-msgstr "L'adreça de correu electrònic ja existeix."
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#, php-format
+msgid "%s public timeline"
+msgstr "%s línia temporal pública"
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
-msgid "Email address confirmation"
-msgstr "Confirmació de l'adreça de correu electrònic"
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#, php-format
+msgid "%s updates from everyone!"
+msgstr "%s notificacions de tots!"
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
-msgstr "Correu electrònic, com Email address, like \"UserName@example.org\""
+#: actions/apitimelinetag.php:101 actions/tag.php:66
+#, php-format
+msgid "Notices tagged with %s"
+msgstr "Aviso etiquetats amb %s"
 
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-msgid "Email addresses"
-msgstr "Direcció de correu electrònic"
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Actualitzacions de %1$s a %2$s!"
 
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
-msgid "Enter a nickname or email address."
-msgstr "Escriu un sobrenom o una adreça de correu electrònic."
+#: actions/apiusershow.php:96
+msgid "Not found."
+msgstr "No s'ha trobat."
 
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
-msgstr "Escriu el codi que has rebut en el teu telèfon mòbil."
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "No existeix aquest document."
 
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
-msgid "Error authorizing token"
-msgstr "Error en autoritzar senyal"
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+msgstr "Cap sobrenom."
 
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
-msgid "Error connecting user to OpenID."
-msgstr "Error en connectar usuari a OpenID."
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "Cap mida."
 
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
-msgstr "Error en connectar usuari."
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "Mida invàlida."
 
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
-msgstr "Error en inserir avatar"
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "Avatar"
 
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
-msgstr "Error en inserir el nou perfil"
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "Pots pujar el teu avatar personal."
 
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
-msgstr "Error en inserir perfil remot"
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
+msgstr "Usuari sense perfil coincident"
 
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
-msgid "Error saving address confirmation."
-msgstr "Error en guardar confirmació de l'adreça."
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+msgid "Avatar settings"
+msgstr "Configuració de l'avatar"
 
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
-msgid "Error saving remote profile"
-msgstr "Error en guardar perfil remot"
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr "Original"
 
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-msgid "Error saving the profile."
-msgstr "Error en guardar perfil."
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr "Previsualitzar"
 
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-msgid "Error saving the user."
-msgstr "Error en guardar l'usuari."
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+msgid "Delete"
+msgstr "Eliminar"
 
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
-msgid "Error saving user; invalid."
-msgstr "Error en guardar usuari; invàlid."
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+msgstr "Pujar"
 
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
-#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
-#: actions/register.php:108 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-msgid "Error setting user."
-msgstr "Error en configurar l'usuari."
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
+msgstr "Crop"
 
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr "Error en actualitzar el perfil"
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Sembla que hi ha hagut un problema amb la teva sessió. Prova-ho de nou, si "
+"us plau."
 
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
-msgstr "Error en actualitzar el perfil remot"
+#: actions/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Enviament de formulari inesperat."
 
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr "Error amb el codi de confirmació."
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
+msgstr ""
+"Selecciona un quadrat de l'àrea de la imatge que vols que sigui el teu "
+"avatar."
 
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
-msgid "Existing nickname"
-msgstr "Sobrenom ja existent."
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
+msgstr "S'ha perdut el nostre fitxer de dades."
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
-msgid "FAQ"
-msgstr "Preguntes freqüents"
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+msgstr "Avatar actualitzat."
 
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Error en actualitzar avatar."
 
-#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
-#, php-format
-msgid "Feed for friends of %s"
-msgstr "Feed per a amics de %s"
-
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
-#, php-format
-msgid "Feed for replies to %s"
-msgstr "Feed per a respostes a %s"
-
-#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
-#, php-format
-msgid "Feed for tag %s"
-msgstr "Feed per a l'etiqueta %s"
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
-msgstr "Trobar contingut de les notes"
+#: actions/avatarsettings.php:387
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Avatar actualitzat."
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
-msgstr "Trobar gent en aquest lloc"
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+msgid "No nickname"
+msgstr "Cap sobrenom."
 
-#: ../actions/login.php:122
-msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
-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/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
+msgstr "No existeix tal grup"
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
-#: actions/profilesettings.php:77 actions/register.php:178
-#: actions/profilesettings.php:103 actions/register.php:391
-#: actions/showgroup.php:235 actions/showstream.php:262
-#: actions/tagother.php:105 lib/groupeditform.php:142
-msgid "Full name"
-msgstr "Nom complet"
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "Perfil de l'usuari"
 
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
-#: actions/register.php:86 actions/updateprofile.php:94
-#: actions/editgroup.php:195 actions/newgroup.php:146
-#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
-msgid "Full name is too long (max 255 chars)."
-msgstr "El teu nom és massa llarg (màx. 255 caràcters)."
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s i amics, pàgina %d"
 
-#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
-msgid "Help"
-msgstr "Ajuda"
+#: actions/blockedfromgroup.php:108
+#, fuzzy
+msgid "A list of the users blocked from joining this group."
+msgstr "La llista dels usuaris d'aquest grup."
 
-#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
-msgid "Home"
-msgstr "Inici"
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Ha fallat el desbloqueig d'usuari."
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
-msgid "Homepage"
-msgstr "Pàgina personal"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
+msgstr "Desbloquejar"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
-msgid "Homepage is not a valid URL."
-msgstr "La pàgina personal no és un URL vàlid."
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+msgid "Unblock this user"
+msgstr "Desbloquejar aquest usuari"
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
-msgid "I want to post notices by email."
-msgstr "Vull publicar notificacions per correu electrònic."
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "No connectat."
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
-msgstr "Missatgeria Instantània"
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
+msgstr "No s'ha especificat perfil."
 
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
-msgstr "Adreça de missatgeria instantània"
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
+msgstr "No hi ha cap perfil amb aquesta ID."
 
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
-msgstr "Configuració de missatgeria instantània"
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Usuari bloquejat."
 
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/block.php:136
 msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
 msgstr ""
-"Si ja tens un compte, inicia una sessió amb el teu nom d'usuari i "
-"contrasenya per a connectar-lo al teu 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 ""
-"Si vols afegir un compte OpenID, introdueix-lo en el camp de sota i clica "
-"\"Afegir\"."
+#: actions/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
+msgid "No"
+msgstr "No"
 
-#: ../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 ""
-"Si has oblidat o has perdut la teva contrasenya, pots obtenir-ne una de nova "
-"que t'enviarem al correu electrònic que tinguis posat  al teu compte."
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Desbloquejar aquest usuari"
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-#: actions/emailsettings.php:127 actions/smssettings.php:140
-msgid "Incoming email"
-msgstr "Correu electrònic entrant"
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
+msgstr "Sí"
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
-msgid "Incoming email address removed."
-msgstr "Eliminat el correu electrònic entrant."
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+msgid "Block this user"
+msgstr "Bloquejar aquest usuari"
 
-#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
-msgid "Incorrect old password"
-msgstr "Contrasenya antiga incorrecta"
+#: actions/block.php:165
+msgid "You have already blocked this user."
+msgstr "Ja havies bloquejat aquest usuari."
 
-#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
-msgid "Incorrect username or password."
-msgstr "Nom d'usuari o contrasenya incorrectes."
+#: actions/block.php:170
+msgid "Failed to save block information."
+msgstr "Error al guardar la informació del block."
 
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
-msgstr ""
-"S'han enviat instruccions per a recuperar la teva contrasenya a l'adreça de "
-"correu electrònic registrada."
+#: actions/bookmarklet.php:50
+#, fuzzy
+msgid "Post to "
+msgstr "Foto"
 
-#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "L'URL de l'avatar '%s' és invàlid"
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+msgstr "Cap codi de confirmació."
 
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
-#, php-format
-msgid "Invalid email address: %s"
-msgstr "Correu electrònic invàlid: %s"
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "Codi de confirmació no trobat. "
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
-#, php-format
-msgid "Invalid homepage '%s'"
-msgstr "La pàgina personal '%s' és invàlida"
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "Aquest codi de confirmació no és per a tu!"
 
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/confirmaddress.php:90
 #, php-format
-msgid "Invalid license URL '%s'"
-msgstr "L'URL de la llicència '%s' és invàlid"
+msgid "Unrecognized address type %s"
+msgstr "Tipus d'adreça %s desconeguda"
 
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
-msgstr "El contingut de l'avís és invàlid"
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr "Aquesta adreça ja ha estat confirmada."
 
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
-msgstr "L'URI de l'avís '%s' és invàlid"
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "No s'ha pogut actualitzar l'usuari."
 
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
-msgstr "L'URL de l'avís '%s' és invàlid"
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr "No s'ha pogut eliminar la confirmació de correu electrònic."
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "L'URL del perfil '%s' és invàlid."
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "Confirmar adreça"
 
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
-msgstr "L'URL del perfil és invàlid (format incorrecte)"
+#: actions/confirmaddress.php:159
+#, 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/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
-msgstr "URL del perfil retornat pel servidor invàlid."
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Codi de confirmació"
 
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
-#: actions/avatarbynickname.php:69
-msgid "Invalid size."
-msgstr "Mida invàlida."
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
+msgstr "Avisos"
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111 actions/finishopenidlogin.php:241
-#: actions/register.php:103 actions/register.php:121
-#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
-msgid "Invalid username or password."
-msgstr "Nom d'usuari o contrasenya invàlids."
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
+msgstr "No existeix aquest avís."
 
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-msgid "Invitation(s) sent"
-msgstr "Invitació(ons) enviada(des)"
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "No es pot esborrar la notificació."
 
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-msgid "Invitation(s) sent to the following people:"
-msgstr "Invitació(ons) enviada(des) a la següent gent:"
+#: actions/deletenotice.php:103
+#, fuzzy
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+"Estàs a punt d'eliminar permanentment una notificació.  Una vegada ho facis, "
+"no ho podràs desfer."
 
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
-msgid "Invite"
-msgstr "Invitar"
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr "Eliminar nota."
 
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-msgid "Invite new users"
-msgstr "Invitar nous usuaris"
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr "N'estàs segur que vols eliminar aquesta notificació?"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
-#, php-format
-msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
-msgstr ""
-"Utilitza el software de microblogging [StatusNet](http://status.net), versió %"
-"s, disponible sota la [GNU Affero General Public License](http://www.fsf.org/"
-"licensing/licenses/agpl-3.0.html)."
+#: actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "No es pot esborrar la notificació."
 
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
-msgstr "Aquest Jabber ID ja està sent utilitzat per un altre usuari."
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+msgid "Delete this notice"
+msgstr "Eliminar aquesta nota"
 
-#: ../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."
+#: actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
 msgstr ""
-"Adreça Jabber o GTalk, per exemple \"NomUsuari@exemple.org\". Primer, "
-"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 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
-msgid "Language"
-msgstr "Idioma"
+"Sembla que hi ha hagut un problema amb la teva sessió. Prova-ho de nou, si "
+"us plau."
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
-msgid "Language is too long (max 50 chars)."
-msgstr "L'idioma és massa llarg (màx 50 caràcters)."
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr "Aquesta notificació no és un favorit!"
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
-msgid "Location"
-msgstr "Ubicació"
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "Afegir a favorits"
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
-#: actions/register.php:92 actions/updateprofile.php:109
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
-msgid "Location is too long (max 255 chars)."
-msgstr "La ubicació és massa llarga (màx. 255 caràcters)."
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "No existeix aquest document."
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
-#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
-#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
-#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: actions/editgroup.php:56
 #, php-format
-msgid "Login"
-msgstr "Inici de sessió"
+msgid "Edit %s group"
+msgstr "Editar el grup %s"
 
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Inici de sessió amb un compte [OpenID](%%doc.openid%%)."
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
+msgstr "Has d'haver entrat per crear un grup."
 
-#: ../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 ""
-"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%%)."
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+msgid "You must be an admin to edit the group"
+msgstr "Has de ser admin per editar aquest grup"
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
-msgid "Logout"
-msgstr "Sortir"
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
+msgstr "Utilitza aquest formulari per editar el grup."
 
-#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
-msgid "Longer name, preferably your \"real\" name"
-msgstr "Nom llarg, preferiblement el teu nom \"real\""
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "la descripció és massa llarga (màx. 140 caràcters)."
 
-#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
-msgid "Lost or forgotten password?"
-msgstr "Contrasenya oblidada o perduda?"
+#: actions/editgroup.php:253
+msgid "Could not update group."
+msgstr "No s'ha pogut actualitzar el grup."
 
-#: ../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 "Posar un nou correu electrònic per publicar; cancel·lar l'antic."
+#: actions/editgroup.php:269
+msgid "Options saved."
+msgstr "Configuració guardada."
+
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "Configuració del correu electrònic"
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
 #: actions/emailsettings.php:71
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Gestionar com reps correus de %%site.name%%."
 
-#: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
-msgid "Member since"
-msgstr "Membre des de"
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "Adreça"
 
-#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
-#, php-format
-msgid "Microblog by %s"
-msgstr "Microblog de %s"
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr "Correu electrònic confirmat actualment."
 
-#: ../actions/smssettings.php:304
-#, php-format
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "Eliminar"
+
+#: actions/emailsettings.php:113
 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."
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
 msgstr ""
-"Capacitat per al teu telèfon mòbil. Si vostè coneix una companyia que "
-"accepti SMS a través del correu electrònic, però no està a la llista, "
-"envia'ns un correu electrònic per fer-nos-ho saber %s."
-
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-msgid "My text and files are available under "
-msgstr "El meu text i els meus fitxers estan disponibles sota "
+"Esperant a confirmar aquesta direcció. Revisa la teva safata d'entrada (i la "
+"carpeta de spam!) per al missatge amb les instruccions."
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#: actions/emailsettings.php:142 actions/smssettings.php:152
-msgid "New"
-msgstr "Nou"
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "Cancel·lar"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
-#, php-format
-msgid "New email address for posting to %s"
-msgstr "Nou correu electrònic per publicar a %s"
+#: actions/emailsettings.php:121
+msgid "Email Address"
+msgstr "Direcció de correu electrònic"
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
-msgid "New incoming email address added."
-msgstr "Nou correu electrònic entrant afegit."
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr "Correu electrònic, com Email address, like \"UserName@example.org\""
 
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
-msgid "New nickname"
-msgstr "Nou sobrenom"
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "Afegir"
 
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
-msgstr "Nou avís"
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+msgstr "Correu electrònic entrant"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-msgid "New password"
-msgstr "Nova contrasenya"
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
+msgstr ""
+"Enviar correu electrònic a aquesta direcció per publicar noves notificacions."
 
-#: ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
-msgstr "Nova contrasenya guardada correctament. Has iniciat una sessió."
+#: actions/emailsettings.php:145 actions/smssettings.php:162
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr "Posar un nou correu electrònic per publicar; cancel·lar l'antic."
 
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151 actions/login.php:101
-#: actions/profilesettings.php:74 actions/register.php:165
-#: actions/login.php:228 actions/profilesettings.php:98
-#: actions/register.php:367 actions/showgroup.php:224
-#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
-msgid "Nickname"
-msgstr "Sobrenom"
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
+msgstr "Nou"
 
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69 actions/finishopenidlogin.php:181
-#: actions/profilesettings.php:225 actions/register.php:76
-#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
-msgid "Nickname already in use. Try another one."
-msgstr "Aquest sobrenom ja existeix. Prova un altre. "
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
+msgstr "Preferències"
 
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:67 ../actions/updateprofile.php:77
-#: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
-#: actions/register.php:74 actions/updateprofile.php:78
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
 msgstr ""
-"El sobrenom ha de tenir només lletres minúscules i números i no pot tenir "
-"espais."
-
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
-msgid "Nickname not allowed."
-msgstr "Sobrenom no permès."
-
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
-msgstr "Sobrenom de l'usuari que vols seguir"
+"Envia'm notificacions quan algú nou se'm subscrigui, al meu correu "
+"electrònic."
 
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
-msgid "Nickname or email"
-msgstr "Sobrenom o correu electrònic"
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+"Envia'm un correu electrònic quan algú afegeixi una nota meva com a favorit."
 
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
-msgid "No"
-msgstr "No"
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
+msgstr "Envia'm un correu electrònic quan algú m'envii un missatge privat."
 
-#: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
-msgstr "Cap Jabber ID."
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "Envia'm un correu electrònic quan algú m'envii un missatge privat."
 
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
-msgid "No authorization request!"
-msgstr "Cap petició d'autorització!"
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
+msgstr "Permetre que els amics em reclamin i m'enviïn un correu electrònic."
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
-msgid "No carrier selected."
-msgstr "No s'ha sel·leccionat cap transport."
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
+msgstr "Vull publicar notificacions per correu electrònic."
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
-msgstr "No hi ha cap codi entrat"
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
+msgstr "Publica una MicroID per al meu correu electrònic."
 
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
-#: actions/confirmaddress.php:75
-msgid "No confirmation code."
-msgstr "Cap codi de confirmació."
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Guardar"
 
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
-#: actions/newnotice.php:126 classes/Command.php:223
-msgid "No content!"
-msgstr "Cap contingut!"
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+msgstr "Preferències guardades."
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr "No hi ha cap direcció de correu electrònic."
 
-#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
-msgid "No id."
-msgstr "Cap identificador."
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
-msgid "No incoming email address."
-msgstr "No hi ha cap direcció de correu electrònic entrant."
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
+msgstr "No es pot normalitzar aquesta direcció de correu electrònic"
 
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr "Cap sobrenom retornat pel servidor remot."
+#: actions/emailsettings.php:330
+msgid "Not a valid email address"
+msgstr "No és una direcció de correu electrònic vàlida."
 
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
-msgid "No nickname."
-msgstr "Cap sobrenom."
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
+msgstr "Aquest ja és el teu correu electrònic."
 
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229 actions/emailsettings.php:240
-#: actions/imsettings.php:214 actions/smssettings.php:237
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
-msgid "No pending confirmation to cancel."
-msgstr "Cap confirmació pendent per a cancel·lar."
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another user."
+msgstr "Aquest correu electrònic pertany a un altre usuari."
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
-msgstr "No hi ha cap número de telèfon."
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+msgstr "No s'ha pogut inserir el codi de confirmació."
 
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
-msgstr "Cap URL de perfil retornar pel servidor."
+#: actions/emailsettings.php:358
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr ""
+"S'ha enviat un codi de confirmació al correu electrònic que has afegit. "
+"Revisa la teva safata d'entrada (i la carpeta de spam!) per veure aquest "
+"codi i les instruccions per utilitzar-lo."
 
-#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
-msgid "No registered email address for that user."
-msgstr "Cap adreça de correu electrònic registrada per aquest usuari."
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
+msgstr "Cap confirmació pendent per a cancel·lar."
 
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr "Cap petició trobada!"
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "Aquesta adreça de missatgeria instantània és incorrecta."
 
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
-msgid "No results"
-msgstr "Cap resultat"
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "Confirmació cancel·lada."
 
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
-msgstr "Cap mida."
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
+msgstr "Aquest no és el teu correu electrònic"
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
-msgid "No status found with that ID."
-msgstr "No s'ha trobat cap estatus amb aquesta ID."
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "L'adreça ha estat eliminada."
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
-msgid "No status with that ID found."
-msgstr "No s'ha trobat cap estatus amb la ID trobada."
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
+msgstr "No hi ha cap direcció de correu electrònic entrant."
 
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
-msgstr "No existeix aquest compte OpenID."
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
+msgstr "No s'ha pogut actualitzar el registre de l'usuari."
 
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
-msgid "No such document."
-msgstr "No existeix aquest document."
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
+msgstr "Eliminat el correu electrònic entrant."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30 actions/shownotice.php:32
-#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
-msgid "No such notice."
-msgstr "No existeix aquest avís."
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
+msgstr "Nou correu electrònic entrant afegit."
 
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr "No existeix aquest codi de recuperació."
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+msgid "Popular notices"
+msgstr "Notificacions populars"
 
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-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/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 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
-msgid "No such user."
-msgstr "No existeix aquest usuari."
+#: actions/favorited.php:67
+#, php-format
+msgid "Popular notices, page %d"
+msgstr "Notificacions populars, pàgina %d"
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-msgid "No user with that email address or username."
-msgstr "No hi ha cap usuari amb aquesta direcció o usuari."
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
+msgstr "Les notificacions més populars en aquest lloc ara mateix."
 
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
-msgstr "Ningú a mostrar!"
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
 
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr "No és un codi de recuperació."
+#: actions/favorited.php:153
+msgid ""
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
+msgstr ""
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
-msgstr "Usuari no registrat."
+#: actions/favorited.php:156
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
+msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
-msgid "Not a supported data format."
-msgstr "Format de data no suportat."
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
+msgstr "%s's notes favorites"
 
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
-msgstr "Jabber ID no vàlid"
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Actualitzacions de %1$s a %2$s!"
 
-#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-msgid "Not a valid OpenID."
-msgstr "OpenID no vàlid."
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Aquesta nota ja és favorita."
 
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
-msgid "Not a valid email address"
-msgstr "No és una direcció de correu electrònic vàlida."
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Desfavoritar favorit"
 
-#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-msgid "Not a valid email address."
-msgstr "Adreça de correu electrònic no vàlida."
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr "Usuaris destacats"
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-#: actions/editgroup.php:186 actions/newgroup.php:137
-#: actions/profilesettings.php:195 actions/register.php:161
-msgid "Not a valid nickname."
-msgstr "Sobrenom no vàlid."
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr "Usuaris destacats, pàgina %d"
 
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
-msgstr "URL de perfil no vàlid (serveis incorrectes)."
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
+msgstr "Una selecció d'alguns dels millors usuaris a %s"
 
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr "URL de perfil no vàlid (XRDS no definit)."
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "Nou avís"
 
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr "URL de perfil no vàlid (cap document YADIS)."
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Nou avís"
 
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
-msgid "Not an image or corrupt file."
-msgstr "No és una imatge o és un fitxer corrupte."
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
-msgid "Not authorized."
-msgstr "No autoritzat."
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Resposta inesperada!"
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
-msgid "Not found"
-msgstr "No s'ha trobat"
-
-#: ../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 actions/block.php:59 actions/disfavor.php:61
-#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
-#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
-#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
-#: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "No connectat."
-
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
-msgid "Not subscribed!."
-msgstr "No estàs subscrit!"
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
-msgstr "Cerca de notificacions"
-
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
-#, php-format
-msgid "Notice feed for %s"
-msgstr "Feed d'avisos de %s"
-
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
-msgstr "Avís sense perfil"
-
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
-msgid "Notices"
-msgstr "Avisos"
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
-#, php-format
-msgid "Notices tagged with %s"
-msgstr "Aviso etiquetats amb %s"
-
-#: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
-msgstr "Antiga contrasenya"
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "L'usuari que vols seguir no existeix."
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
-msgid "OpenID"
-msgstr "OpenID"
-
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
-msgid "OpenID Account Setup"
-msgstr "Configuració del compte OpenID"
-
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-msgid "OpenID Auto-Submit"
-msgstr "Auto-enviament d'OpenID"
-
-#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
-#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-msgid "OpenID Login"
-msgstr "Accés OpenID"
-
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-#: actions/openidlogin.php:102 actions/openidsettings.php:101
-msgid "OpenID URL"
-msgstr "URL OpenID"
-
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
-msgid "OpenID authentication cancelled."
-msgstr "Autenticació OpenID cancel·lada."
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr "Autenticació OpenID fallida: %s."
-
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "Error OpenID: %s"
-
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr "OpenID eliminat."
-
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
-msgstr "Configuració OpenID"
-
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-msgid "Optionally add a personal message to the invitation."
-msgstr "Opcionalment pots afegir un missatge a la invitació."
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+msgstr "Pots utilitzar la subscripció local!"
 
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
-msgid "Partial upload."
-msgstr "Càrrega parcial."
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
+msgstr "Aquest usuari t'ha bloquejat com a subscriptor."
 
-#: ../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 actions/finishopenidlogin.php:118
-#: actions/login.php:231 actions/register.php:372
-#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-msgid "Password"
-msgstr "Contrasenya"
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "No autoritzat."
 
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
-msgid "Password and confirmation do not match."
-msgstr "La contrasenya i la confirmació no coincideixen."
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "No s'han pogut convertir els senyals de petició a senyals d'accés."
 
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
-msgid "Password must be 6 chars or more."
-msgstr "La contrasenya ha de tenir 6 o més caràcters."
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Versió desconeguda del protocol OMB."
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-msgid "Password recovery requested"
-msgstr "Recuperació de contrasenya sol·licitada"
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "Error en actualitzar el perfil remot"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-msgid "Password saved."
-msgstr "Contrasenya guardada."
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+msgid "No such group."
+msgstr "No s'ha trobat el grup."
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-msgid "Passwords don't match."
-msgstr "Les contrasenyes no coincideixen."
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "No existeix aquest avís."
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
-msgstr "Gent"
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Hem perdut el nostre arxiu."
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
-msgstr "Cercar gent"
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "No s'ha especificat perfil."
 
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
-msgstr "Cerca de gent"
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
 
-#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
-msgid "Personal"
-msgstr "Personal"
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "Un usuari t'ha bloquejat."
 
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-msgid "Personal message"
-msgstr "Missatge personal"
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "No ets membre d'aquest grup."
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "Número de telèfon, no puntuació ni espais, en l'àrea del codi"
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "Usuari bloquejat."
 
-#: ../actions/userauthorization.php:78
+#: actions/groupblock.php:162
+#, php-format
 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\"."
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
 msgstr ""
-"Si us plau, revisa aquestes dades per a estar segur que desitges "
-"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
-#: actions/imsettings.php:142
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Enviar un avís quan el meu estat Jabber/GTalk canvii."
+#: actions/groupblock.php:178
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "La llista dels usuaris d'aquest grup."
 
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94 actions/emailsettings.php:86
-#: actions/imsettings.php:68 actions/smssettings.php:94
-#: actions/twittersettings.php:70 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
-msgid "Preferences"
-msgstr "Preferències"
+#: actions/groupblock.php:179
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "La llista dels usuaris d'aquest grup."
 
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163 actions/emailsettings.php:180
-#: actions/imsettings.php:152 actions/smssettings.php:171
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
-msgid "Preferences saved."
-msgstr "Preferències guardades."
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
+msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
-msgid "Preferred language"
-msgstr "Preferència d'idioma"
+#: actions/groupbyid.php:74
+msgid "No ID"
+msgstr "No ID"
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
-msgid "Privacy"
-msgstr "Privacitat"
+#: actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "Has d'haver entrat per crear un grup."
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-msgid "Problem saving notice."
-msgstr "Problema en guardar l'avís."
+#: actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "Grups"
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
-msgid "Profile"
-msgstr "Perfil"
+#: actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
 
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
-msgstr "URL del perfil"
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "No s'ha pogut actualitzar l'usuari."
 
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
-msgstr "Configuració del perfil"
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "No s'ha pogut guardar la teva configuració de Twitter!"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-msgid "Profile unknown"
-msgstr "Perfil desconegut"
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Preferències de sincronització guardades."
 
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
-msgid "Public Stream Feed"
-msgstr "Feed del flux públic"
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
+msgstr "Logo del grup"
 
-#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
-msgid "Public timeline"
-msgstr "Línia temporal pública"
+#: actions/grouplogo.php:150
+#, fuzzy, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr "Pots pujar una imatge de logo per al grup."
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Publica una MicroID per a la meva direcció de Jabber/GTalk."
+#: actions/grouplogo.php:362
+#, fuzzy
+msgid "Pick a square area of the image to be the logo."
+msgstr ""
+"Selecciona un quadrat de l'àrea de la imatge que vols que sigui el teu "
+"avatar."
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
-msgid "Publish a MicroID for my email address."
-msgstr "Publica una MicroID per al meu correu electrònic."
+#: actions/grouplogo.php:396
+msgid "Logo updated."
+msgstr "Logo actualitzat."
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr "Etiquetes recents"
+#: actions/grouplogo.php:398
+msgid "Failed updating logo."
+msgstr "Error en actualitzar logo."
 
-#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
-msgid "Recover"
-msgstr "Recuperar"
+#: actions/groupmembers.php:93 lib/groupnav.php:92
+#, php-format
+msgid "%s group members"
+msgstr "%s membre/s en el grup"
 
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
-msgid "Recover password"
-msgstr "Recuperar contrasenya"
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
+msgstr "%s membre/s en el grup, pàgina %d"
 
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-msgid "Recovery code for unknown user."
-msgstr "Codi de recuperació d'un usuari desconegut."
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr "La llista dels usuaris d'aquest grup."
 
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
-#: actions/register.php:152 actions/register.php:207 lib/util.php:328
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-msgid "Register"
-msgstr "Registrar-se"
+#: actions/groupmembers.php:175 lib/groupnav.php:107
+msgid "Admin"
+msgstr "Admin"
 
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
-msgid "Registration not allowed."
-msgstr "Registre no permès."
+#: actions/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
+msgstr "Bloquejar"
 
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
-msgid "Registration successful"
-msgstr "Registre satisfactori"
+#: actions/groupmembers.php:441
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "Has de ser admin per editar aquest grup"
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
-msgid "Reject"
-msgstr "Rebutjar"
+#: actions/groupmembers.php:473
+#, fuzzy
+msgid "Make Admin"
+msgstr "Admin"
 
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
-msgid "Remember me"
-msgstr "Recorda'm"
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
-msgid "Remote profile with no matching profile"
-msgstr "Perfil remot sense perfil corresponent"
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Actualitzacions de %1$s a %2$s!"
 
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
-msgstr "Subscripció remota"
+#: actions/groupsearch.php:52
+#, fuzzy, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"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/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 actions/emailsettings.php:101
-#: actions/emailsettings.php:134 actions/imsettings.php:102
-#: actions/openidsettings.php:166 actions/smssettings.php:103
-#: actions/smssettings.php:146 actions/twittersettings.php:115
-msgid "Remove"
-msgstr "Eliminar"
+#: actions/groupsearch.php:58
+msgid "Group search"
+msgstr "Cercar grup"
 
-#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
-msgstr "Eliminar OpenID"
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "Cap resultat"
 
-#: ../actions/openidsettings.php:73
+#: actions/groupsearch.php:82
+#, php-format
 msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
 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/personal.php:55 lib/personalgroupnav.php:103
-msgid "Replies"
-msgstr "Respostes"
-
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
-#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
-#: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: actions/groupsearch.php:85
 #, php-format
-msgid "Replies to %s"
-msgstr "Respostes a %s"
-
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
-msgid "Reset"
-msgstr "Restablir"
-
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
-msgid "Reset password"
-msgstr "Restablir contrasenya"
-
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-msgid "SMS"
-msgstr "SMS"
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
-msgid "SMS Phone number"
-msgstr "Número de telèfon pels SMS"
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Grups"
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
-msgstr "Configuració SMS"
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Grups, pàgina %d"
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
-msgid "SMS confirmation"
-msgstr "Confirmació SMS"
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
 
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
-msgid "Same as password above"
-msgstr "Igual a la contrasenya de dalt"
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Crear nou grup"
 
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
-msgid "Same as password above. Required."
-msgstr "Igual a la contrasenya de dalt. Requerit."
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+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 actions/emailsettings.php:182
-#: actions/facebooksettings.php:114 actions/imsettings.php:157
-#: actions/othersettings.php:117 actions/profilesettings.php:150
-#: actions/smssettings.php:169 actions/subscriptions.php:124
-#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
-msgid "Save"
-msgstr "Guardar"
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "Un usuari t'ha bloquejat."
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
-msgid "Search"
-msgstr "Cercar"
+#: actions/groupunblock.php:128 actions/unblock.php:108
+msgid "Error removing the block."
+msgstr "Error al moure el block."
 
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
-msgstr "Feed del flux de cerca"
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "Configuració de missatgeria instantània"
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/imsettings.php:70
 #, php-format
 msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 msgstr ""
-"Troba avisos a %%site.name%% per contingut. Separa els termes de cerca amb "
-"espais; han de ser majors a 3 caràcters."
+"Pots enviar i rebre avisos via [missatges instantanis](%%doc.im%%) de Jabber/"
+"GTalk. Configura la teva adreça i opcions a sota."
+
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Aquesta pàgina no està disponible en "
+
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Adreça actual Jabber/Gtalk confirmada."
 
-#: ../actions/peoplesearch.php:28
+#: actions/imsettings.php:114
 #, 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."
+"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 ""
-"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 actions/smssettings.php:304
-#: actions/smssettings.php:457
-msgid "Select a carrier"
-msgstr "Selecciona un transport"
-
-#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
-#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
-msgid "Send"
-msgstr "Enviar"
+"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/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
-msgstr ""
-"Enviar correu electrònic a aquesta direcció per publicar noves "
-"notificacions."
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "Adreça de missatgeria instantània"
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
+#: actions/imsettings.php:126
+#, 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 ""
-"Envia'm notificacions quan algú nou se'm subscrigui, al meu correu "
-"electrònic."
+"Adreça Jabber o GTalk, per exemple \"NomUsuari@exemple.org\". Primer, "
+"assegura't d'afegir a %s a la teva llista d'amics en el teu client de "
+"missatgeria instantània o a GTalk."
 
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Enviar-me avisos per 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 ""
-"Enviar-me avisos a través de SMS; puc entendre que això repercutirà en una "
-"exorbitant càrrega del meu transport."
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr "Enviar un avís quan el meu estat Jabber/GTalk canvii."
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Envia'm respostes a través de Jabber/GTalk de la gent a la que no estic "
 "subscrita."
 
-#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
-msgid "Settings"
-msgstr "Configuració"
-
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
-msgid "Settings saved."
-msgstr "Configuració guardada."
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr "Mostrant les etiquetes més populars de l'última setmana"
-
-#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:114
-msgid "Someone else already has this OpenID."
-msgstr "Algú ja té aquest OpenID."
-
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
-msgstr "Alguna cosa estranya ha passat."
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
-msgstr "Perdó, no hi ha un correu electrònic entrant permès."
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
-msgstr "Perdó, aquest no és el teu correu electrònic entrant permès."
-
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
-msgid "Source"
-msgstr "Font"
-
-#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
-msgid "Statistics"
-msgstr "Estadístiques"
-
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-msgid "Stored OpenID not found."
-msgstr "No s'ha trobat l'OpenID emmagatzemat."
-
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
-#: actions/showstream.php:197 actions/showstream.php:206
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
-msgid "Subscribe"
-msgstr "Subscriure's"
-
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
-msgid "Subscribers"
-msgstr "Subscriptors"
-
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
-msgid "Subscription authorized"
-msgstr "Subscripció autoritzada"
-
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
-msgid "Subscription rejected"
-msgstr "Subscripció rebutjada"
-
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27 actions/showstream.php:240
-#: actions/showstream.php:322 actions/subscriptions.php:27
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
-msgid "Subscriptions"
-msgstr "Subscripcions"
-
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
-msgid "System error uploading file."
-msgstr "Error del sistema en pujar el fitxer."
-
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
-#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
-msgid "Tags"
-msgstr "Etiquetes"
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "Text"
-
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
-msgid "Text search"
-msgstr "Cerca de text"
-
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
-msgstr "Aquest OpenID no és teu."
-
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
-msgstr "Aquesta adreça ja ha estat confirmada."
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Publica una MicroID per a la meva direcció de Jabber/GTalk."
 
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
-msgstr "Aquest codi de confirmació no és per a tu!"
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "Cap Jabber ID."
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr "Aquest correu electrònic pertany a un altre usuari."
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr "Impossible normalitzar aquest Jabber ID"
 
-#: ../actions/avatar.php:80 actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
-msgstr "Aquest fitxer és massa gran."
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "Jabber ID no vàlid"
 
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "Aquest ja és el teu Jabber ID."
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
-msgid "That is already your email address."
-msgstr "Aquest ja és el teu correu electrònic."
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr "Aquest Jabber ID ja està sent utilitzat per un altre usuari."
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
-msgid "That is already your phone number."
-msgstr "Aquest ja és el teu número de telèfon."
+#: actions/imsettings.php:327
+#, 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/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "Aquest no és el teu Jabber ID."
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
-msgid "That is not your email address."
-msgstr "Aquest no és el teu correu electrònic"
-
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
-msgstr "Aquest no és el teu número de telèfon."
-
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-#: actions/emailsettings.php:367 actions/imsettings.php:349
-msgid "That is the wrong IM address."
-msgstr "Aquesta adreça de missatgeria instantània és incorrecta."
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
-msgstr "Aquest és un número de confirmació incorrecte."
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-msgid "That phone number already belongs to another user."
-msgstr "Aquest número de telèfon pertany a un altre usuari."
-
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49 actions/twitapistatuses.php:330
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-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 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "Massa llarg. La longitud màxima és de 255 caràcters."
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr "Safata d'entrada per %s - pàgina %d"
 
-#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/inbox.php:62
 #, php-format
-msgid "The address \"%s\" has been confirmed for your account."
-msgstr "L'adreça \"%s\" ha estat confirmada per al teu compte."
+msgid "Inbox for %s"
+msgstr "Safata d'entrada per %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
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
-msgid "The address was removed."
-msgstr "L'adreça ha estat eliminada."
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+"Aquesta és la teva safata d'entrada, que et mostrarà els teus missatges "
+"privats."
 
-#: ../actions/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:"
+#: actions/invite.php:39
+msgid "Invites have been disabled."
 msgstr ""
-"S'ha autoritzat la subscripció, però no s'ha enviat un URL de retorn. "
-"Llegeix de nou les instruccions per a saber com autoritzar la subscripció. "
-"El teu identificador de subscripció és:"
 
-#: ../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."
+#: actions/invite.php:41
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
 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."
+"Has d'estar dins del servei per poder convidar altres usuaris a utilitzar-lo "
+"%s"
 
-#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/invite.php:72
 #, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr "Aquestes són les persones que escolten els avisos de %s."
+msgid "Invalid email address: %s"
+msgstr "Correu electrònic invàlid: %s"
 
-#: ../actions/subscribers.php:33 actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr "Aquestes són les persones que escolten els teus avisos."
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
+msgstr "Invitació(ons) enviada(des)"
 
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
-#, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr "Aquestes són les persones que %s escolta."
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr "Invitar nous usuaris"
 
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr "Aquestes són les persones que escoltes."
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr "Ja estàs subscrit a aquests usuaris:"
 
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:131 actions/invite.php:139
+#, php-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
 "Aquestes persona ja són usuaris i tu estàs subscrit automàticament a ells:"
 
-#: ../actions/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
-msgstr "Aquest codi de confirmació és massa vell. Si us plau comença de nou."
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
+msgstr "Invitació(ons) enviada(des) a la següent gent:"
 
-#: ../lib/openid.php:195
+#: actions/invite.php:150
 msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 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."
+"Seràs avisat quan les teves invitacions siguin acceptades i els teus "
+"convidats es registrin al lloc. Gràcies per fer créixer la comunitat."
 
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
-#, php-format
+#: actions/invite.php:162
 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 ""
-"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
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-msgid "This method requires a POST or DELETE."
-msgstr "Aquest mètode requereix POST o DELETE."
+"Use this form to invite your friends and colleagues to use this service."
+msgstr ""
+"Utilitza aquest formulari per convidar els teus amics i col·legues perquè "
+"utilitzin aquest servei."
 
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
-msgid "This method requires a POST."
-msgstr "Aquest mètode requereix POST."
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "Direcció de correu electrònic"
 
-#: ../lib/util.php:164 lib/util.php:246
-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/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr "Direccions d'amic per convidar (una per línia)"
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
-msgid "Timezone"
-msgstr "Franja horària"
+#: actions/invite.php:192
+msgid "Personal message"
+msgstr "Missatge personal"
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
-msgid "Timezone not selected."
-msgstr "Franja horària no seleccionada."
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
+msgstr "Opcionalment pots afegir un missatge a la invitació."
+
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
+msgstr "Enviar"
+
+#: actions/invite.php:226
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s t'ha convidat us ha convidat a unir-te al grup %2$s"
 
-#: ../actions/remotesubscribe.php:43
+#: actions/invite.php:228
 #, 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."
+"%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 ""
-"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."
+"%1$s us ha convidat a unir-vos a %2$s (%3$s).\n"
+"\n"
+"%2$s és un servei de micro-blogging que us permetrà estar al dia amb gent "
+"que conegueu i gent que us interessi.\n"
+"\n"
+"Podeu també compartir notícies sobre vosaltres mateixos, el que penseu, o la "
+"vostra vida a la xarxa amb gent que conegueu. És també força bo per conèixer "
+"nova gent amb qui compartir els vostres interessos.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
 
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
-msgid "Two user ids or screen_names must be supplied."
-msgstr "Dos ids d'usuari o screen_names has de ser substituïts."
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
+msgstr "Has d'haver entrat per participar en un grup."
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL del teu web, blog o perfil en un altre lloc"
+#: actions/joingroup.php:90 lib/command.php:217
+msgid "You are already a member of that group"
+msgstr "Ja ets membre d'aquest grup"
 
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-msgid "URL of your profile on another compatible microblogging service"
-msgstr "URL del teu perfil en un altre servei de microblogging compatible"
+#: actions/joingroup.php:128 lib/command.php:234
+#, php-format
+msgid "Could not join user %s to group %s"
+msgstr "No s'ha pogut afegir l'usuari %s al grup %s"
 
-#: ../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 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-msgid "Unexpected form submission."
-msgstr "Enviament de formulari inesperat."
+#: actions/joingroup.php:135 lib/command.php:239
+#, php-format
+msgid "%s joined group %s"
+msgstr "%s s'ha pogut afegir al grup %s"
 
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
-msgid "Unexpected password reset."
-msgstr "Restabliment de contrasenya inesperat."
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
+msgstr "Has d'haver entrat per a poder marxar d'un grup."
 
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-msgid "Unknown action"
-msgstr "Acció desconeguda"
+#: actions/leavegroup.php:90 lib/command.php:268
+msgid "You are not a member of that group."
+msgstr "No ets membre d'aquest grup."
 
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-msgid "Unknown version of OMB protocol."
-msgstr "Versió desconeguda del protocol OMB."
+#: actions/leavegroup.php:119 lib/command.php:278
+msgid "Could not find membership record."
+msgstr "No s'han trobat registres dels membres."
 
-#: ../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 ""
-"Tret que s'especifiqui el contrari, el contingut d'aquest web és propietat "
-"dels seus col·laboradors i està disponible sota la"
+#: actions/leavegroup.php:127 lib/command.php:284
+#, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "No s'ha pogut eliminar l'usuari %s del grup %s"
 
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
-msgid "Unrecognized address type %s"
-msgstr "Tipus d'adreça %s desconeguda"
+msgid "%s left group %s"
+msgstr "%s ha abandonat el grup %s"
 
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
-msgstr "Cancel·lar subscripció"
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "Ja estàs connectat."
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-msgid "Unsupported OMB version"
-msgstr "Versió OMB no suportada"
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "El contingut de l'avís és invàlid"
 
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
-msgid "Unsupported image file format."
-msgstr "Format d'imatge no suportat."
+#: actions/login.php:143
+msgid "Incorrect username or password."
+msgstr "Nom d'usuari o contrasenya incorrectes."
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
-msgstr "Actualitzacions per SMS"
+#: actions/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
+msgstr "Error en configurar l'usuari."
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
-msgstr "Actualitzacions per Missatgeria Instantània"
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "Inici de sessió"
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr "Actualitzacions de %1$s i amics a %2$s!"
+#: actions/login.php:243
+msgid "Login to site"
+msgstr "Accedir al lloc"
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr "Actualitzacions de %1$s a %2$s!"
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Sobrenom"
 
-#: ../actions/avatar.php:68 actions/profilesettings.php:161
-#: actions/avatarsettings.php:162 actions/grouplogo.php:232
-msgid "Upload"
-msgstr "Pujar"
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Contrasenya"
 
-#: ../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."
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "Recorda'm"
+
+#: actions/login.php:253 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
 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."
+"Iniciar sessió automàticament en el futur; no utilitzar en ordinadors "
+"compartits!"
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr "Carregar una nova imatge per al perfil"
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "Contrasenya oblidada o perduda?"
 
-#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/login.php:282
 msgid ""
-"Use this form to invite your friends and colleagues to use this service."
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
 msgstr ""
-"Utilitza aquest formulari per convidar els teus amics i col·legues perquè "
-"utilitzin aquest servei."
+"Per raons de seguretat, si us plau torna a escriure el teu nom d'usuari i "
+"contrasenya abans de canviar la teva configuració."
 
-#: ../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"
+#: actions/login.php:286
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
 msgstr ""
-"Utilitzat només per a actualitzacions, anuncis i recuperació de contrasenyes"
-
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
-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/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
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-msgid "User has no profile."
-msgstr "L'usuari no té perfil."
-
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
-msgstr "Sobrenom de l'usuari"
-
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr "No s'ha trobat l'usuari."
+"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%%)."
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
-msgid "What timezone are you normally in?"
-msgstr "Quina franja horària seria normal ser?"
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
 
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: actions/makeadmin.php:95
 #, php-format
-msgid "What's up, %s?"
-msgstr "Què tal, %s?"
-
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-#: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "On ets, per exemple \"Ciutat, Estat (o Regió), País\""
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/makeadmin.php:132
 #, php-format
-msgid "Wrong image type for '%s'"
-msgstr "Tipus d'imatge incorrecte per a '%s'"
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/makeadmin.php:145
 #, php-format
-msgid "Wrong size image at '%s'"
-msgstr "Mida d'imatge incorrecta per a '%s'"
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
-msgid "Yes"
-msgstr "Sí"
-
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-msgid "You already have this OpenID!"
-msgstr "Ja tens aquest 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."
+msgid "Can't make %s an admin for group %s"
 msgstr ""
-"Estàs a punt d'eliminar permanentment una notificació.  Una vegada ho facis, "
-"no ho podràs desfer."
 
-#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
-msgstr "Ja t'has connectat!"
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr "No té cap estatus ara mateix"
 
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-msgid "You are already subscribed to these users:"
-msgstr "Ja estàs subscrit a aquests usuaris:"
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr "Nou grup"
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
-msgid "You are not friends with the specified user."
-msgstr "No ets amic dels usuaris que has especificat."
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
+msgstr "Utilitza aquest formulari per crear un nou grup."
 
-#: ../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/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr "Nou missatge"
 
-#: ../actions/register.php:135 actions/register.php:145
-msgid "You can create a new account to start posting notices."
-msgstr "Pots crear un nou compte i començar a enviar avisos."
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
+msgstr "No pots enviar un missatge a aquest usuari."
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-"Pots rebre missatges SMS a través del teu coreu electrònic des de "
-"%%site.name%%."
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+msgstr "Cap contingut!"
 
-#: ../actions/openidsettings.php:86
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr "Pots eliminar un OpenID del teu compte clicant el botó \"Eliminar\"."
+#: actions/newmessage.php:158
+msgid "No recipient specified."
+msgstr "No has especificat el destinatari."
 
-#: ../actions/imsettings.php:28 actions/imsettings.php:28
-#, php-format
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
-"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."
+"Don't send a message to yourself; just say it to yourself quietly instead."
+msgstr "No t'enviïs missatges a tu mateix, simplement dir-te això."
 
-#: ../actions/profilesettings.php:27
-msgid ""
-"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."
+#: actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "Missatge"
 
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
-msgstr "Pots utilitzar la subscripció local!"
+#: actions/newmessage.php:185 lib/command.php:375
+#, php-format
+msgid "Direct message to %s sent"
+msgstr "Missatge directe per a %s enviat"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
-msgid "You can't register if you don't agree to the license."
-msgstr "No pots registrar-te si no estàs d'acord amb la llicència."
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
+msgstr "Ajax Error"
 
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
-msgid "You did not send us that profile"
-msgstr "No ens vas enviar aquest perfil"
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "Nou avís"
 
-#: ../lib/mail.php:147
+#: actions/newnotice.php:199
+msgid "Notice posted"
+msgstr "Notificació publicada"
+
+#: actions/noticesearch.php:68
 #, 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"
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
 msgstr ""
-"Tens una nova direcció per publicar a %1$s.\n"
-"\n"
-"Envia un correu electrònic a %2$s per publicar un nou missatge.\n"
-"\n"
-"Més instruccions per al correu electrònic a %3$s.\n"
-"\n"
-"Sincerament teus,\n"
-"%4$s"
+"Troba avisos a %%site.name%% per contingut. Separa els termes de cerca amb "
+"espais; han de ser majors a 3 caràcters."
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
-msgid "You may not delete another user's status."
-msgstr "No pots eliminar l'estatus d'un altre usuari."
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "Cerca de text"
 
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "Cerca \"%s\" al flux"
+
+#: actions/noticesearch.php:121
 #, php-format
-msgid "You must be logged in to invite other users to use %s"
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 msgstr ""
-"Has d'estar dins del servei per poder convidar altres usuaris a utilitzar-lo "
-"%s"
 
-#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/noticesearch.php:124
+#, php-format
 msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
-"Seràs avisat quan les teves invitacions siguin acceptades i els teus "
-"convidats es registrin al lloc. Gràcies per fer créixer la comunitat."
-
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr "T'has identificat. Escriu una nova contrasenya a continuació."
 
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
-msgid "Your OpenID URL"
-msgstr "El teu URL OpenID"
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Actualitzacions de %1$s a %2$s!"
 
-#: ../actions/recoverpassword.php:164
-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 "
-"electrònic registrada."
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Totes les actualitzacions que corresponen a la frase a cercar \"%s\" "
 
-#: ../actions/openidsettings.php:28
-#, php-format
+#: actions/nudge.php:85
 msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
-"account.  Manage your associated OpenIDs from here."
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
-"[OpenID](%%doc.openid%%) et permet accedir a molts llocs amb un mateix "
-"compte d'usuari. Administra els teus OpenID associats aquí."
+"Aquest usuari no permet reclamacions o no ha confirmar encara cap correu "
+"electrònic."
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
-msgid "a few seconds ago"
-msgstr "fa pocs segons"
+#: actions/nudge.php:94
+msgid "Nudge sent"
+msgstr "Reclamació enviada"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
-#, php-format
-msgid "about %d days ago"
-msgstr "fa %d dies"
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr "Reclamació enviada!"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
-#, php-format
-msgid "about %d hours ago"
-msgstr "fa %d hores"
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+msgstr "Avís sense perfil"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: actions/oembed.php:86 actions/shownotice.php:180
 #, php-format
-msgid "about %d minutes ago"
-msgstr "fa %d minuts"
+msgid "%1$s's status on %2$s"
+msgstr "estat de %1$s a %2$s"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
-#, php-format
-msgid "about %d months ago"
-msgstr "fa %d mesos"
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Connectar-se"
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
-msgid "about a day ago"
-msgstr "fa un dia"
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
-msgid "about a minute ago"
-msgstr "fa un minut"
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
+msgstr "Format de data no suportat."
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
-msgid "about a month ago"
-msgstr "fa un mes"
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "Cercar gent"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
-msgid "about a year ago"
-msgstr "fa un any"
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "Cerca de notificacions"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
-msgid "about an hour ago"
-msgstr "fa una hora"
+#: actions/othersettings.php:60
+msgid "Other Settings"
+msgstr "Altres configuracions"
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
-msgstr "eliminar"
-
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117 actions/noticesearch.php:136
-#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
-msgid "in reply to..."
-msgstr "en resposta a..."
-
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124 actions/noticesearch.php:143
-#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
-msgid "reply"
-msgstr "resposta"
-
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-msgid "same as password above"
-msgstr "repeteix la contrasenya anterior"
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr "Gestionar altres vàries opcions."
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
-msgid "unsupported file type"
-msgstr "tipus de fitxer no suportat"
-
-#: ../lib/util.php:1309 lib/util.php:1443
-msgid "« After"
-msgstr "« Posterior"
-
-#: 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
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-msgid "There was a problem with your session token. Try again, please."
+#: actions/othersettings.php:108
+msgid " (free service)"
 msgstr ""
-"Sembla que hi ha hagut un problema amb la teva sessió. Prova-ho de nou, si "
-"us plau."
 
-#: actions/disfavor.php:55 actions/disfavor.php:81
-msgid "This notice is not a favorite!"
-msgstr "Aquesta notificació no és un favorit!"
-
-#: actions/disfavor.php:63 actions/disfavor.php:87
-msgid "Could not delete favorite."
-msgstr "No pots eliminar favorits."
-
-#: actions/disfavor.php:72 lib/favorform.php:140
-msgid "Favor"
-msgstr "Favorit"
-
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
 msgstr ""
-"Envia'm un correu electrònic quan algú afegeixi una nota meva com a favorit."
 
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-msgid "Send me email when someone sends me a private message."
-msgstr "Envia'm un correu electrònic quan algú m'envii un missatge privat."
-
-#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
-msgid "This notice is already a favorite!"
-msgstr "Aquesta nota ja és favorita."
-
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132 actions/favor.php:86
-#: actions/twitapifavorites.php:125 classes/Command.php:152
-msgid "Could not create favorite."
-msgstr "No es pot crear favorit."
-
-#: actions/favor.php:70
-msgid "Disfavor"
-msgstr "Desfavorit"
-
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
-#, php-format
-msgid "%s favorite notices"
-msgstr "%s notificacions favorites"
-
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
-#, php-format
-msgid "Feed of favorite notices of %s"
-msgstr "Feed de notes favorites de %s"
-
-#: actions/inbox.php:28 actions/inbox.php:59
-#, php-format
-msgid "Inbox for %s - page %d"
-msgstr "Safata d'entrada per %s - pàgina %d"
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
+msgstr "Servei d'auto-escurçament a utilitzar."
 
-#: actions/inbox.php:30 actions/inbox.php:62
-#, php-format
-msgid "Inbox for %s"
-msgstr "Safata d'entrada per %s"
+#: actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "Configuració del perfil"
 
-#: actions/inbox.php:53 actions/inbox.php:115
-msgid "This is your inbox, which lists your incoming private messages."
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
 msgstr ""
-"Aquesta és la teva safata d'entrada, que et mostrarà els teus missatges "
-"privats."
 
-#: actions/invite.php:178 actions/invite.php:213
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+#: actions/othersettings.php:153
+msgid "URL shortening service is too long (max 50 chars)."
 msgstr ""
-"%1$s t'ha convidat a participar a %2$s (%3$s).\n"
-"\n"
-
-#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-msgid "Automatically login in the future; "
-msgstr "Accedir automàticament en el futur; "
-
-#: actions/login.php:122 actions/login.php:264
-msgid "For security reasons, please re-enter your "
-msgstr "Per raons de seguretat, si us plau torna a escriure la teva "
-
-#: actions/login.php:126 actions/login.php:268
-msgid "Login with your username and password. "
-msgstr "Entra amb el teu usuari i contrasenya. "
-
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
-msgid "That's too long. Max message size is 140 chars."
-msgstr "És massa llarg. Màxim del missatge és 140 caràcters."
-
-#: actions/newmessage.php:65 actions/newmessage.php:128
-msgid "No recipient specified."
-msgstr "No has especificat el destinatari."
-
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206 actions/newmessage.php:131
-#: actions/newmessage.php:168 classes/Command.php:237
-msgid "You can't send a message to this user."
-msgstr "No pots enviar un missatge a aquest usuari."
-
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "No t'enviïs missatges a tu mateix, simplement dir-te això."
-
-#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
-msgid "No such user"
-msgstr "Aquest usuari no existeix"
+"El servei d'auto-escurçament d'URL és massa llarga (màx. 50 caràcters)."
 
-#: actions/newmessage.php:117 actions/newmessage.php:67
-msgid "New message"
-msgstr "Nou missatge"
-
-#: actions/noticesearch.php:95 actions/noticesearch.php:146
-msgid "Notice without matching profile"
-msgstr "Notificar sense especificar perfil"
-
-#: actions/openidsettings.php:28 actions/openidsettings.php:70
-#, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr "[OpenID](%%doc.openid%%) et permet accedir a molts llocs web "
-
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
-msgstr "Si vols afegit un OpenID al teu compte, "
-
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr "Eliminant la teva única OpenID et serà impossible accedir-hi! "
-
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-msgid "You can remove an OpenID from your account "
-msgstr "Pots eliminar un OpenID del teu compte "
-
-#: actions/outbox.php:28 actions/outbox.php:58
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %s - page %d"
 msgstr "Safata de sortida per %s - pàgina %d"
 
-#: actions/outbox.php:30 actions/outbox.php:61
+#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Safata de sortida per %s"
 
-#: actions/outbox.php:53 actions/outbox.php:116
+#: actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Aquesta és la teva safata de sortida, que et mostrarà els missatges privats "
 "que has enviat."
 
-#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
-#, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
-msgstr "Cercar gent a %%site.name%% pel seu nom, localització, o interessos. "
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "Canviar contrasenya"
 
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
-msgid "You can update your personal profile info here "
-msgstr "Pots actualitzar la informació del teu perfil aquí "
+#: actions/passwordsettings.php:69
+msgid "Change your password."
+msgstr "Canviar contrasenya"
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
-msgid "User without matching profile"
-msgstr "Usuari sense perfil coincident"
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+msgid "Password change"
+msgstr "Contrasenya canviada."
 
-#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
-msgstr "El codi de confirmació és massa antic. "
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "Antiga contrasenya"
 
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
-msgstr "Si has oblidat o perdut el teu"
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "Nova contrasenya"
 
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a "
-msgstr "Has estat identificat. Entra "
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6 o més caràcters"
 
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-msgid "Your nickname on this server, "
-msgstr "El teu nom d'usuari en aquest servidor, "
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "Confirmar"
 
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-msgid "Instructions for recovering your password "
-msgstr "Instruccions per recuperar la teva contrasenya "
+#: actions/passwordsettings.php:113
+msgid "same as password above"
+msgstr "repeteix la contrasenya anterior"
 
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
-msgid "New password successfully saved. "
-msgstr "La nova contrasenya s'ha guardat satisfactòriament. "
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "Canviar"
 
-#: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:154 actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr "La contrasenya hauria de ser d'entre 6 a més caràcters."
 
-#: actions/register.php:216
-#, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
-msgstr ""
-"Felicitats, %s! I benvingut/da a %%%%site.name%%%%. Des d'aquí, potser "
-"vols..."
-
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
-msgstr ""
-"(Hauries de rebre un missatge per correu electrònic d'aquí uns moments, amb "
-
-#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
-#, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr "Per subscriure't, pots [accedir] (%%action.login%%),"
-
-#: actions/showfavorites.php:61 actions/showfavorites.php:145
-#, php-format
-msgid "Feed for favorites of %s"
-msgstr "Feed per favorits de %s"
-
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-msgid "Could not retrieve favorite notices."
-msgstr "No s'ha pogut recuperar els avisos de favorits."
-
-#: actions/showmessage.php:33 actions/showmessage.php:81
-msgid "No such message."
-msgstr "No existeix el missatge."
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "Les contrasenyes no coincideixen."
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
-msgstr "Només el remitent i el receptor poden llegir aquest missatge."
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "Contrasenya antiga incorrecta"
 
-#: actions/showmessage.php:61 actions/showmessage.php:108
-#, php-format
-msgid "Message to %1$s on %2$s"
-msgstr "Missatge per a %1$s a %2$s"
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "Error en guardar usuari; invàlid."
 
-#: actions/showmessage.php:66 actions/showmessage.php:113
-#, php-format
-msgid "Message from %1$s on %2$s"
-msgstr "Missatge de %1$s a %2$s"
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "No es pot guardar la nova contrasenya."
 
-#: actions/showstream.php:154
-msgid "Send a message"
-msgstr "Enviar un missatge"
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "Contrasenya guardada."
 
-#: actions/smssettings.php:312 actions/smssettings.php:464
+#: actions/peoplesearch.php:52
 #, php-format
-msgid "Mobile carrier for your phone. "
-msgstr "Transport per al teu telèfon. "
+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."
 
-#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
-#, php-format
-msgid "Direct messages to %s"
-msgstr "Missatges directes a %s"
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "Cerca de gent"
 
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/peopletag.php:70
 #, php-format
-msgid "All the direct messages sent to %s"
-msgstr "Tots els missatges directes enviats a %s"
-
-#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-msgid "Direct Messages You've Sent"
-msgstr "Missatges directes que has enviat"
+msgid "Not a valid people tag: %s"
+msgstr "Etiqueta no vàlida per a la gent: %s"
 
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/peopletag.php:144
 #, php-format
-msgid "All the direct messages sent from %s"
-msgstr "Tots els missatges directes enviats per %s"
-
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-msgid "No message text!"
-msgstr "No hi ha text al missatge!"
-
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-msgid "Recipient user not found."
-msgstr "No has escrit cap usuari receptor."
-
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr "No pots enviar missatges directes a usuaris que no siguin amics teus."
+msgid "Users self-tagged with %s - page %d"
+msgstr "Usuaris que s'han etiquetat %s - pàgina %d"
 
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
-#, php-format
-msgid "%s / Favorites from %s"
-msgstr "%s / Favorits de %s"
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "El contingut de l'avís és invàlid"
 
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/postnotice.php:90
 #, php-format
-msgid "%s updates favorited by %s / %s."
-msgstr "%s actualitzacions favorites per %s / %s."
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
-#, php-format
-msgid "%s added your notice as a favorite"
-msgstr "%s ha afegit la teva nota com a favorita"
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "Configuració del perfil"
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
-#, php-format
+#: actions/profilesettings.php:71
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+"You can update your personal profile info here so people know more about you."
 msgstr ""
-"%1$s acaba d'afegir la teva nota des de %2$s com a favorita.\n"
-"\n"
+"Pots actualitzar la informació del teu perfil personal per a que la gent "
+"sàpiga més sobre tu."
 
-#: actions/twittersettings.php:27
-msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+#: actions/profilesettings.php:99
+msgid "Profile information"
+msgstr "Informació del perfil"
+
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
-"Afegit el teu compte Twitter per tal d'enviar automàticament les teves notes "
-"a Twitter, "
+"1-64 lletres en minúscula o números, sense signes de puntuació o espais"
 
-#: actions/twittersettings.php:41 actions/twittersettings.php:60
-msgid "Twitter settings"
-msgstr "Configuració Twitter"
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full name"
+msgstr "Nom complet"
 
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-msgid "Twitter Account"
-msgstr "Compte Twitter"
+#: actions/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "Pàgina personal"
 
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-msgid "Current verified Twitter account."
-msgstr "Compte Twitter verificat actualment."
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "URL del teu web, blog o perfil en un altre lloc"
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr "Usuari Twitter"
+#: actions/profilesettings.php:122 actions/register.php:460
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Explica'ns alguna cosa sobre tu i els teus interessos en 140 caràcters"
 
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-msgid "No spaces, please."
-msgstr "No espais, si us plaus."
+#: actions/profilesettings.php:125 actions/register.php:463
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Explica'ns alguna cosa sobre tu "
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
-msgstr "Contrasenya Twitter"
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "Biografia"
 
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-msgid "Automatically send my notices to Twitter."
-msgstr "Automàticament envia les meves notes a Twitter."
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "Ubicació"
 
-#: actions/twittersettings.php:75 actions/twittersettings.php:146
-msgid "Send local \"@\" replies to Twitter."
-msgstr "Envia respostes locals '@' a Twitter."
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "On ets, per exemple \"Ciutat, Estat (o Regió), País\""
 
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-msgid "Subscribe to my Twitter friends here."
-msgstr "Subscriure'm als meus amics de Twitter aquí."
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
+msgstr "Etiquetes"
 
-#: actions/twittersettings.php:122
+#: actions/profilesettings.php:140
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
-"El nom d'usuari sols pot contenir números, lletres en majúscules i "
-"minúscules, i guions baixos (_). 15 caràcters màxim."
-
-#: actions/twittersettings.php:128 actions/twittersettings.php:334
-msgid "Could not verify your Twitter credentials!"
-msgstr "No es poden verificar les teves credencials de Twitter!"
-
-#: actions/twittersettings.php:137
-#, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr "No es pot recuperar la informació del compte per \"%s\" de Twitter."
-
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-msgid "Unable to save your Twitter settings!"
-msgstr "No s'ha pogut guardar la teva configuració de Twitter!"
-
-#: actions/twittersettings.php:174 actions/twittersettings.php:376
-msgid "Twitter settings saved."
-msgstr "Configuració de Twitter guardada."
-
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-msgid "That is not your Twitter account."
-msgstr "Aquest no és el teu compte de Twitter."
-
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
-msgid "Couldn't remove Twitter user."
-msgstr "No es pot eliminar aquest usuari de Twitter."
-
-#: actions/twittersettings.php:212 actions/twittersettings.php:407
-msgid "Twitter account removed."
-msgstr "Compte de Twitter eliminat."
-
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
-msgid "Couldn't save Twitter preferences."
-msgstr "No es poden guardar les preferències de Twitter."
+"Etiquetes per a tu mateix (lletres, números, -, ., i _), per comes o separat "
+"por espais"
 
-#: actions/twittersettings.php:245 actions/twittersettings.php:461
-msgid "Twitter preferences saved."
-msgstr "Preferències de Twitter guardades."
+#: actions/profilesettings.php:144
+msgid "Language"
+msgstr "Idioma"
 
-#: actions/userauthorization.php:84 actions/userauthorization.php:86
-msgid "Please check these details to make sure "
-msgstr "Si us plau verifica aquests detalls per estar-ne segur/a "
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr "Preferència d'idioma"
 
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
-msgid "The subscription has been authorized, but no "
-msgstr "La subscripció s'ha autoritzat, però no "
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr "Franja horària"
 
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-msgid "The subscription has been rejected, but no "
-msgstr "La subscripció ha estat rebutjada, però no "
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
+msgstr "Quina franja horària seria normal ser?"
 
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-msgid "Command results"
-msgstr "Resultats de les comandes"
+#: actions/profilesettings.php:160
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+"Automàticament subscriure's a qualsevol que ho estigui a tu mateix (ideal "
+"per no-humans)"
 
-#: classes/Channel.php:148 classes/Channel.php:204
-msgid "Command complete"
-msgstr "Comanda completada"
+#: actions/profilesettings.php:221 actions/register.php:223
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "La biografia és massa llarga (màx. 140 caràcters)."
 
-#: classes/Channel.php:158 classes/Channel.php:215
-msgid "Command failed"
-msgstr "Comanda fallida"
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr "Franja horària no seleccionada."
 
-#: classes/Command.php:39 classes/Command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Perdona, aquesta comanda no està implementada."
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr "L'idioma és massa llarg (màx 50 caràcters)."
 
-#: classes/Command.php:96 classes/Command.php:113
+#: actions/profilesettings.php:246 actions/tagother.php:178
 #, php-format
-msgid "Subscriptions: %1$s\n"
-msgstr "Subscripcions: %1$s\n"
-
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
-msgid "User has no last notice"
-msgstr "L'usuari no té última nota"
-
-#: classes/Command.php:146 classes/Command.php:166
-msgid "Notice marked as fave."
-msgstr "Nota marcada com a favorita."
+msgid "Invalid tag: \"%s\""
+msgstr "Etiqueta no vàlida: \"%s\""
 
-#: classes/Command.php:166 classes/Command.php:189
-#, php-format
-msgid "%1$s (%2$s)"
-msgstr "%1$s (%2$s)"
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
+msgstr "No es pot actualitzar l'usuari per autosubscriure."
 
-#: classes/Command.php:169 classes/Command.php:192
-#, php-format
-msgid "Fullname: %s"
-msgstr "Nom complet: %s"
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+msgstr "No s'ha pogut guardar el perfil."
 
-#: classes/Command.php:172 classes/Command.php:195
-#, php-format
-msgid "Location: %s"
-msgstr "Localització: %s"
+#: actions/profilesettings.php:336
+msgid "Couldn't save tags."
+msgstr "No s'han pogut guardar les etiquetes."
 
-#: classes/Command.php:175 classes/Command.php:198
-#, php-format
-msgid "Homepage: %s"
-msgstr "Pàgina web: %s"
+#: actions/profilesettings.php:344
+msgid "Settings saved."
+msgstr "Configuració guardada."
 
-#: classes/Command.php:178 classes/Command.php:201
+#: actions/public.php:83
 #, php-format
-msgid "About: %s"
-msgstr "Sobre tu: %s"
+msgid "Beyond the page limit (%s)"
+msgstr ""
 
-#: classes/Command.php:200 classes/Command.php:228
-#, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
-msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d"
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
+msgstr "No s'ha pogut recuperar la conversa pública."
 
-#: classes/Command.php:214 classes/Command.php:245
+#: actions/public.php:129
 #, php-format
-msgid "Direct message to %s sent"
-msgstr "Missatge directe per a %s enviat"
+msgid "Public timeline, page %d"
+msgstr "Línia temporal pública, pàgina %d"
 
-#: classes/Command.php:216 classes/Command.php:247
-msgid "Error sending direct message."
-msgstr "Error al enviar el missatge directe."
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr "Línia temporal pública"
 
-#: classes/Command.php:263 classes/Command.php:300
-msgid "Specify the name of the user to subscribe to"
-msgstr "Especifica el nom de l'usuari a que vols subscriure't"
+#: actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Feed del flux públic"
 
-#: classes/Command.php:270 classes/Command.php:307
-#, php-format
-msgid "Subscribed to %s"
-msgstr "Subscrit a %s"
+#: actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Feed del flux públic"
 
-#: classes/Command.php:288 classes/Command.php:328
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Especifica el nom de l'usuari del que vols deixar d'estar subscrit"
+#: actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Feed del flux públic"
 
-#: classes/Command.php:295 classes/Command.php:335
+#: actions/public.php:179
 #, php-format
-msgid "Unsubscribed from %s"
-msgstr "Has deixat d'estar subscrit a %s"
-
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
-msgid "Command not yet implemented."
-msgstr "Comanda encara no implementada."
-
-#: classes/Command.php:313 classes/Command.php:356
-msgid "Notification off."
-msgstr "Notificacions off."
-
-#: classes/Command.php:315 classes/Command.php:358
-msgid "Can't turn off notification."
-msgstr "No es poden posar en off les notificacions."
-
-#: classes/Command.php:333 classes/Command.php:379
-msgid "Notification on."
-msgstr "Notificacions on."
-
-#: classes/Command.php:335 classes/Command.php:381
-msgid "Can't turn on notification."
-msgstr "No es poden posar en on les notificacions."
-
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
-msgstr "Comandes:\n"
-
-#: classes/Message.php:53 classes/Message.php:56
-msgid "Could not insert message."
-msgstr "No s'ha pogut inserir el missatge."
-
-#: classes/Message.php:63 classes/Message.php:66
-msgid "Could not update message with new URI."
-msgstr "No s'ha pogut inserir el missatge amb la nova URI."
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
-msgstr "L'usuari no té cap perfil que coincideixi en aquest sistema."
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
 
-#: lib/mail.php:147 lib/mail.php:289
+#: actions/public.php:186
 #, php-format
 msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+"Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
-"Tens una nova direcció per publicar a %1$s.\n"
-"\n"
 
-#: lib/mail.php:249 lib/mail.php:508
-#, php-format
-msgid "New private message from %s"
-msgstr "Nou missatge privat de %s"
-
-#: lib/mail.php:253 lib/mail.php:512
+#: actions/public.php:233
 #, php-format
 msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
-"%1$s (%2$s) t'ha enviat un nou missatge privat:\n"
-"\n"
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "Només l'usuari pot llegir les seves safates de correu."
-
-#: lib/openid.php:195 lib/openid.php:203
-msgid "This form should automatically submit itself. "
-msgstr "Aquest formulari s'ha d'enviar automàticament. "
+#: actions/public.php:238
+#, fuzzy, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
+msgstr ""
+"Això és %%site.name%%, un servei de [microblogging](http://ca.wikipedia.org/"
+"wiki/Microblogging) "
 
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-msgid "Favorites"
-msgstr "Favorits"
+#: actions/publictagcloud.php:57
+msgid "Public tag cloud"
+msgstr "Núvol públic d'etiquetes"
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "%s's favorite notices"
-msgstr "%s's notes favorites"
-
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-msgid "User"
-msgstr "Usuari"
-
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-msgid "Inbox"
-msgstr "Safata d'entrada"
-
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-msgid "Your incoming messages"
-msgstr "Els teus missatges rebuts"
-
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-msgid "Outbox"
-msgstr "Safata de sortida"
-
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-msgid "Your sent messages"
-msgstr "Els teus missatges enviats"
-
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-msgid "Twitter"
-msgstr "Twitter"
-
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
-msgstr "Opcions d'integració amb Twitter"
-
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-msgid "To"
-msgstr "A"
-
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-msgid "Could not parse message."
-msgstr "No es pot analitzar el missatge."
+msgid "These are most popular recent tags on %s "
+msgstr "Aquestes són les etiquetes recents més populars a %s "
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/publictagcloud.php:69
 #, php-format
-msgid "%s and friends, page %d"
-msgstr "%s i amics, pàgina %d"
-
-#: actions/avatarsettings.php:76
-msgid "You can upload your personal avatar."
-msgstr "Pots pujar el teu avatar personal."
-
-#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
-msgid "Avatar settings"
-msgstr "Configuració de l'avatar"
-
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-msgid "Original"
-msgstr "Original"
-
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-msgid "Preview"
-msgstr "Previsualitzar"
-
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
-msgid "Crop"
-msgstr "Crop"
-
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-msgid "There was a problem with your session token. "
-msgstr "Ha ocorregut un error amb la teva sessió. "
-
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-msgid "Pick a square area of the image to be your avatar"
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
-"Selecciona un quadrat de l'àrea de la imatge que vols que sigui el teu "
-"avatar."
-
-#: actions/avatarsettings.php:327 actions/grouplogo.php:384
-msgid "Lost our file data."
-msgstr "S'ha perdut el nostre fitxer de dades."
-
-#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
-msgid "Lost our file."
-msgstr "Hem perdut el nostre arxiu."
-
-#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
-#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
-msgid "Unknown file type"
-msgstr "Tipus de fitxer desconegut"
-
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "No s'ha especificat perfil."
-
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "No hi ha cap perfil amb aquesta ID."
 
-#: actions/block.php:111
-msgid "Block user"
-msgstr "Usuari bloquejat."
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
+msgstr ""
 
-#: actions/block.php:129
-msgid "Are you sure you want to block this user? "
-msgstr "N'estàs segur/a que vols bloquejar aquest usuari? "
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
 
-#: actions/block.php:162
-msgid "You have already blocked this user."
-msgstr "Ja havies bloquejat aquest usuari."
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
+msgstr "Núvol d'etiquetes"
 
-#: actions/block.php:167
-msgid "Failed to save block information."
-msgstr "Error al guardar la informació del block."
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "Ja t'has connectat!"
 
-#: actions/confirmaddress.php:159
-#, php-format
-msgid "The address \"%s\" has been "
-msgstr "L'adreça \"%s\" ha estat eliminada "
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "No existeix aquest codi de recuperació."
 
-#: actions/deletenotice.php:73
-msgid "You are about to permanently delete a notice. "
-msgstr "Estàs a punt d'eliminar permanentment una notificació. "
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "No és un codi de recuperació."
 
-#: actions/disfavor.php:94
-msgid "Add to favorites"
-msgstr "Afegir a favorits"
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr "Codi de recuperació d'un usuari desconegut."
 
-#: actions/editgroup.php:54
-#, php-format
-msgid "Edit %s group"
-msgstr "Editar el grup %s"
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "Error amb el codi de confirmació."
 
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-msgid "Inboxes must be enabled for groups to work"
-msgstr "La safata d'entrada ha d'estar habilitat per als grups de treball"
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
+msgstr "Aquest codi de confirmació és massa vell. Si us plau comença de nou."
 
-#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-msgid "You must be logged in to create a group."
-msgstr "Has d'haver entrat per crear un grup."
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
+msgstr "No es pot actualitzar l'usuari amb el correu electrònic confirmat"
 
-#: actions/editgroup.php:87 actions/grouplogo.php:87
-#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
-msgid "No nickname"
-msgstr "Cap sobrenom."
+#: actions/recoverpassword.php:152
+msgid ""
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
+msgstr ""
 
-#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
-#: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
-msgid "No such group"
-msgstr "No existeix tal grup"
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
+msgstr ""
 
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
-msgid "You must be an admin to edit the group"
-msgstr "Has de ser admin per editar aquest grup"
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
+msgstr ""
 
-#: actions/editgroup.php:157
-msgid "Use this form to edit the group."
-msgstr "Utilitza aquest formulari per editar el grup."
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
+msgstr ""
 
-#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
-msgid "Nickname must have only lowercase letters "
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
 msgstr ""
-"El sobrenom ha de tenir només lletres minúscules i números i no pot tenir "
-"espais. "
+"El teu nom d'usuari en aquest servidor, o la teva adreça de correu "
+"electrònic registrada."
 
-#: actions/editgroup.php:198 actions/newgroup.php:149
-msgid "description is too long (max 140 chars)."
-msgstr "la descripció és massa llarga (màx. 140 caràcters)."
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
+msgstr "Recuperar"
 
-#: actions/editgroup.php:218
-msgid "Could not update group."
-msgstr "No s'ha pogut actualitzar el grup."
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "Restablir contrasenya"
 
-#: actions/editgroup.php:226
-msgid "Options saved."
-msgstr "Configuració guardada."
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr "Recuperar contrasenya"
 
-#: actions/emailsettings.php:107 actions/imsettings.php:108
-#, php-format
-msgid "Awaiting confirmation on this address. "
-msgstr "Esperant el codi de confirmació en aquesta direcció. "
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
+msgstr "Recuperació de contrasenya sol·licitada"
 
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-msgid "Make a new email address for posting to; "
-msgstr "Indicar una nova direcció de correu electrònic per publicar; "
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
+msgstr "Acció desconeguda"
 
-#: actions/emailsettings.php:157
-msgid "Send me email when someone "
-msgstr "Envia'm un correu electrònic quan algú "
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 o més caràcters, i no te n'oblidis!"
 
-#: actions/emailsettings.php:168
-msgid "Allow friends to nudge me and send me an email."
-msgstr "Permetre que els amics em reclamin i m'enviïn un correu electrònic."
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Igual a la contrasenya de dalt"
 
-#: actions/emailsettings.php:321
-msgid "That email address already belongs "
-msgstr "L'adreça de correu electrònic ja pertany "
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "Restablir"
 
-#: actions/emailsettings.php:343
-msgid "A confirmation code was sent to the email address you added. "
-msgstr ""
-"S'ha enviat un codi de confirmació a l'adreça de missatgeria instantània que "
-"has afegit. "
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "Escriu un sobrenom o una adreça de correu electrònic."
 
-#: actions/facebookhome.php:110
-msgid "Server error - couldn't get user!"
-msgstr "Error del servidor - no es pot obtenir l'usuari!"
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
+msgstr "No hi ha cap usuari amb aquesta direcció o usuari."
 
-#: actions/facebookhome.php:196
-#, php-format
-msgid "If you would like the %s app to automatically update "
-msgstr "Si vols l'aplicació %s per actualitzar automàticament "
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr "Cap adreça de correu electrònic registrada per aquest usuari."
 
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "Permetre %s actualitzar el meu estat a Facebook"
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "Error en guardar confirmació de l'adreça."
 
-#: actions/facebookhome.php:218
-msgid "Skip"
-msgstr "Saltar"
+#: actions/recoverpassword.php:325
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr ""
+"S'han enviat instruccions per a recuperar la teva contrasenya a l'adreça de "
+"correu electrònic registrada."
 
-#: actions/facebookhome.php:235
-msgid "No notice content!"
-msgstr "Cap contingut!"
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
+msgstr "Restabliment de contrasenya inesperat."
 
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-msgid "Pagination"
-msgstr "Paginació"
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "La contrasenya ha de tenir 6 o més caràcters."
 
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-msgid "After"
-msgstr "Posteriors"
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
+msgstr "La contrasenya i la confirmació no coincideixen."
 
-#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
-msgid "Before"
-msgstr "Anteriors"
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
+msgstr "Nova contrasenya guardada correctament. Has iniciat una sessió."
 
-#: actions/facebookinvite.php:70
-#, php-format
-msgid "Thanks for inviting your friends to use %s"
-msgstr "Gràcies per convidar els teus amics a utilitzar %s"
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
+msgstr "Ho senti, però només la gent convidada pot registrar-se."
 
-#: actions/facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Les invitacions han estat enviades als següents usuaris:"
+#: actions/register.php:92
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "Error amb el codi de confirmació."
 
-#: actions/facebookinvite.php:96
-#, php-format
-msgid "You have been invited to %s"
-msgstr "Has estat convidat a %s"
+#: actions/register.php:112
+msgid "Registration successful"
+msgstr "Registre satisfactori"
 
-#: actions/facebookinvite.php:105
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Convidar els teus amics a utilitzar %s"
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "Registrar-se"
 
-#: actions/facebookinvite.php:113
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Amics ja utilitzant %s:"
+#: actions/register.php:135
+msgid "Registration not allowed."
+msgstr "Registre no permès."
 
-#: actions/facebookinvite.php:130
-#, php-format
-msgid "Send invitations"
-msgstr "Enviar invitacions"
+#: actions/register.php:198
+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/facebookremove.php:56
-msgid "Couldn't remove Facebook user."
-msgstr "No s'ha pogut eliminar l'usuari de Facebook."
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "Adreça de correu electrònic no vàlida."
 
-#: actions/facebooksettings.php:65
-msgid "There was a problem saving your sync preferences!"
-msgstr "Ha ocorregut un problema al guardar les preferències de sincronització!"
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "L'adreça de correu electrònic ja existeix."
 
-#: actions/facebooksettings.php:67
-msgid "Sync preferences saved."
-msgstr "Preferències de sincronització guardades."
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "Nom d'usuari o contrasenya invàlids."
 
-#: actions/facebooksettings.php:90
-msgid "Automatically update my Facebook status with my notices."
+#: actions/register.php:342
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
 msgstr ""
-"Actualitzar automàticament el meu estat a Facebook amb les meves "
-"notificacions."
 
-#: actions/facebooksettings.php:97
-msgid "Send \"@\" replies to Facebook."
-msgstr "Envia \"@\" respostes a Facebook."
-
-#: actions/facebooksettings.php:106
-msgid "Prefix"
-msgstr "Prefix"
-
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
-msgstr "La frase que serveixi de prefix a les notes."
+#: actions/register.php:424
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+"1-64 lletres en minúscula o números, sense puntuacions ni espais. Requerit."
 
-#: actions/facebooksettings.php:124
-#, php-format
-msgid "If you would like %s to automatically update "
-msgstr "Si vols que %s s'actualitzi automàticament "
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr "6 o més caràcters. Requerit."
 
-#: actions/facebooksettings.php:147
-msgid "Sync preferences"
-msgstr "Preferències de sincronització"
+#: actions/register.php:433
+msgid "Same as password above. Required."
+msgstr "Igual a la contrasenya de dalt. Requerit."
 
-#: actions/favor.php:94 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "Desfavoritar favorit"
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "Correu electrònic"
 
-#: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
-msgid "Popular notices"
-msgstr "Notificacions populars"
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
+msgstr ""
+"Utilitzat només per a actualitzacions, anuncis i recuperació de contrasenyes"
 
-#: actions/favorited.php:67
-#, php-format
-msgid "Popular notices, page %d"
-msgstr "Notificacions populars, pàgina %d"
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
+msgstr "Nom llarg, preferiblement el teu nom \"real\""
 
-#: actions/favorited.php:79
-msgid "The most popular notices on the site right now."
-msgstr "Les notificacions més populars en aquest lloc ara mateix."
+#: actions/register.php:493
+msgid "My text and files are available under "
+msgstr "El meu text i els meus fitxers estan disponibles sota "
 
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
-msgid "Featured users"
-msgstr "Usuaris destacats"
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
 
-#: actions/featured.php:71
-#, php-format
-msgid "Featured users, page %d"
-msgstr "Usuaris destacats, pàgina %d"
+#: actions/register.php:496
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and 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/featured.php:99
+#: actions/register.php:537
 #, php-format
-msgid "A selection of some of the great users on %s"
-msgstr "Una selecció d'alguns dels millors usuaris a %s"
-
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
-msgstr "Aquest usuari t'ha bloquejat com a subscriptor."
-
-#: actions/groupbyid.php:79
-msgid "No ID"
-msgstr "No ID"
-
-#: actions/grouplogo.php:138 actions/grouplogo.php:191
-msgid "Group logo"
-msgstr "Logo del grup"
+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 ""
+"Felicitats, %s! I benvingut/da a %%%%site.name%%%%. Des d'aquí, podries...\n"
+"\n"
+"* Anar al teu [teu perfil](%s) i publicar el teu primer missatge.\n"
+"* Afegir una [direcció Jabber/GTalk](%%%%action.imsettings%%%%) i així poder "
+"publicar les notificacions a través de missatgeria instantània.\n"
+"* [Buscar gent](%%%%action.peoplesearch%%%%) que puguis conèixer o que "
+"comparteixi els teus interessos. \n"
+"* Actualitzar les [preferències del teu perfil](%%%%action.profilesettings%%%"
+"%) per explicar als demés més sobre tu. * Llegir els [documents de la xarxa]"
+"(%%%%doc.help%%%%) per conèixer les característiques del nostre servei. \n"
+"\n"
+"Gràcies per registrar-te i esperem que gaudeixis d'aquest servei."
 
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
-msgstr "Pots pujar una imatge de logo per al grup."
+#: actions/register.php:561
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+"(Hauries de rebre un missatge per correu electrònic d'aquí uns moments, amb "
+"instruccions sobre com confirmar la teva direcció de correu electrònic.)"
 
-#: actions/grouplogo.php:448
-msgid "Logo updated."
-msgstr "Logo actualitzat."
+#: actions/remotesubscribe.php:98
+#, php-format
+msgid ""
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
+msgstr ""
+"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/grouplogo.php:450
-msgid "Failed updating logo."
-msgstr "Error en actualitzar logo."
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr "Subscripció remota"
 
-#: actions/groupmembers.php:93 lib/groupnav.php:91
-#, php-format
-msgid "%s group members"
-msgstr "%s membre/s en el grup"
+#: actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Subscriure's a aquest usuari"
 
-#: actions/groupmembers.php:96
-#, php-format
-msgid "%s group members, page %d"
-msgstr "%s membre/s en el grup, pàgina %d"
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "Sobrenom de l'usuari"
 
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
-msgstr "La llista dels usuaris d'aquest grup."
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr "Sobrenom de l'usuari que vols seguir"
 
-#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
-msgid "Groups"
-msgstr "Grups"
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "URL del perfil"
 
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "Grups, pàgina %d"
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "URL del teu perfil en un altre servei de microblogging compatible"
 
-#: actions/groups.php:90
-#, php-format
-msgid "%%%%site.name%%%% groups let you find and talk with "
-msgstr "%%%%site.name%%%% grups amb qui pots trobar i parlar "
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
+msgstr "Subscriure's"
 
-#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-msgid "Create a new group"
-msgstr "Crear nou grup"
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr "L'URL del perfil és invàlid (format incorrecte)"
 
-#: actions/groupsearch.php:57
-#, php-format
+#: actions/remotesubscribe.php:168
+#, fuzzy
 msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-msgstr "Troba grups a %%site.name%% per nom, ubicació o descripció. "
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "URL de perfil no vàlid (cap document YADIS)."
 
-#: actions/groupsearch.php:63
-msgid "Group search"
-msgstr "Cercar grup"
+#: actions/remotesubscribe.php:176
+#, fuzzy
+msgid "That’s a local profile! Login to subscribe."
+msgstr "Aquest és un perfil local! Entra per subscriure-t'hi."
 
-#: actions/imsettings.php:70
-msgid "You can send and receive notices through "
-msgstr "Pots enviar i rebre notificacions a través de "
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "No s'ha pogut obtenir un senyal de petició."
 
-#: actions/imsettings.php:120
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
 #, php-format
-msgid "Jabber or GTalk address, "
-msgstr "Adreça Jabber o GTalk, "
-
-#: actions/imsettings.php:147
-msgid "Send me replies through Jabber/GTalk "
-msgstr "Enviar-me avisos per Jabber/GTalk."
+msgid "Replies to %s"
+msgstr "Respostes a %s"
 
-#: actions/imsettings.php:321
+#: actions/replies.php:127
 #, php-format
-msgid "A confirmation code was sent "
-msgstr "Un codi de confirmació ha estat enviat "
+msgid "Replies to %s, page %d"
+msgstr "Respostes a %s, pàgina %d"
 
-#: actions/joingroup.php:65
-msgid "You must be logged in to join a group."
-msgstr "Has d'haver entrat per participar en un grup."
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Feed d'avisos de %s"
 
-#: actions/joingroup.php:95
-msgid "You are already a member of that group"
-msgstr "Ja ets membre d'aquest grup"
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Feed d'avisos de %s"
 
-#: actions/joingroup.php:128
+#: actions/replies.php:158
 #, php-format
-msgid "Could not join user %s to group %s"
-msgstr "No s'ha pogut afegir l'usuari %s al grup %s"
+msgid "Replies feed for %s (Atom)"
+msgstr "Feed d'avisos de %s"
 
-#: actions/joingroup.php:135
+#: actions/replies.php:198
 #, php-format
-msgid "%s joined group %s"
-msgstr "%s s'ha pogut afegir al grup %s"
-
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
 msgstr ""
-"Les safates d'entrada han d'estar activades per entrar a formar part dels "
-"grups."
-
-#: actions/leavegroup.php:65
-msgid "You must be logged in to leave a group."
-msgstr "Has d'haver entrat per a poder marxar d'un grup."
-
-#: actions/leavegroup.php:88
-msgid "No such group."
-msgstr "No s'ha trobat el grup."
-
-#: actions/leavegroup.php:95
-msgid "You are not a member of that group."
-msgstr "No ets membre d'aquest grup."
-
-#: actions/leavegroup.php:100
-msgid "You may not leave a group while you are its administrator."
-msgstr "No pots abandonar aquest grup mentre en sigui l'administrador."
 
-#: actions/leavegroup.php:130
-msgid "Could not find membership record."
-msgstr "No s'han trobat registres dels membres."
-
-#: actions/leavegroup.php:138
+#: actions/replies.php:203
 #, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "No s'ha pogut eliminar l'usuari %s del grup %s"
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
 
-#: actions/leavegroup.php:145
+#: actions/replies.php:205
 #, php-format
-msgid "%s left group %s"
-msgstr "%s ha abandonat el grup %s"
-
-#: actions/login.php:225 lib/facebookaction.php:304
-msgid "Login to site"
-msgstr "Accedir al lloc"
-
-#: actions/microsummary.php:69
-msgid "No current status"
-msgstr "No té cap estatus ara mateix"
-
-#: actions/newgroup.php:53
-msgid "New group"
-msgstr "Nou grup"
-
-#: actions/newgroup.php:115
-msgid "Use this form to create a new group."
-msgstr "Utilitza aquest formulari per crear un nou grup."
-
-#: actions/newgroup.php:177
-msgid "Could not create group."
-msgstr "No s'ha pogut crear el grup."
-
-#: actions/newgroup.php:191
-msgid "Could not set group membership."
-msgstr "No s'ha pogut establir la pertinença d'aquest grup."
-
-#: actions/newmessage.php:119 actions/newnotice.php:132
-msgid "That's too long. "
-msgstr "Això és massa llarg. "
-
-#: actions/newmessage.php:134
-msgid "Don't send a message to yourself; "
-msgstr "No t'enviïs missatges a tu mateix; "
-
-#: actions/newnotice.php:166
-msgid "Notice posted"
-msgstr "Notificació publicada"
-
-#: actions/newnotice.php:200 classes/Channel.php:163
-msgid "Ajax Error"
-msgstr "Ajax Error"
-
-#: actions/nudge.php:85
 msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
-"Aquest usuari no permet reclamacions o no ha confirmar encara cap correu "
-"electrònic."
-
-#: actions/nudge.php:94
-msgid "Nudge sent"
-msgstr "Reclamació enviada"
-
-#: actions/nudge.php:97
-msgid "Nudge sent!"
-msgstr "Reclamació enviada!"
-
-#: actions/openidlogin.php:97
-msgid "OpenID login"
-msgstr "Accés OpenID"
-
-#: actions/openidsettings.php:128
-msgid "Removing your only OpenID "
-msgstr "Eliminar OpenID"
-
-#: actions/othersettings.php:60
-msgid "Other Settings"
-msgstr "Altres configuracions"
-
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Gestionar altres vàries opcions."
-
-#: actions/othersettings.php:93
-msgid "URL Auto-shortening"
-msgstr "Auto-escurçament de la URL"
-
-#: actions/othersettings.php:112
-msgid "Service"
-msgstr "Servei"
-
-#: actions/othersettings.php:113
-msgid "Automatic shortening service to use."
-msgstr "Servei d'auto-escurçament a utilitzar."
 
-#: actions/othersettings.php:144
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "El servei d'auto-escurçament d'URL és massa llarga (màx. 50 caràcters)."
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Missatge per a %1$s a %2$s"
 
-#: actions/passwordsettings.php:69
-msgid "Change your password."
-msgstr "Canviar contrasenya"
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "%s notificacions favorites, pàgina %d"
 
-#: actions/passwordsettings.php:89
-msgid "Password change"
-msgstr "Contrasenya canviada."
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
+msgstr "No s'ha pogut recuperar els avisos de favorits."
 
-#: actions/peopletag.php:35
+#: actions/showfavorites.php:170
 #, php-format
-msgid "Not a valid people tag: %s"
-msgstr "Etiqueta no vàlida per a la gent: %s"
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Feed per a amics de %s"
 
-#: actions/peopletag.php:47
+#: actions/showfavorites.php:177
 #, php-format
-msgid "Users self-tagged with %s - page %d"
-msgstr "Usuaris que s'han etiquetat %s - pàgina %d"
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Feed per a amics de %s"
 
-#: actions/peopletag.php:91
+#: actions/showfavorites.php:184
 #, php-format
-msgid "These are users who have tagged themselves \"%s\" "
-msgstr "Aquests són usuaris que s'han etiquetat ells mateixos \"%s\" "
-
-#: actions/profilesettings.php:91
-msgid "Profile information"
-msgstr "Informació del perfil"
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Feed per a amics de %s"
 
-#: actions/profilesettings.php:124
+#: actions/showfavorites.php:205
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""
-"Etiquetes per a tu mateix (lletres, números, -, ., i _), per comes o separat "
-"por espais"
 
-#: actions/profilesettings.php:144
-msgid "Automatically subscribe to whoever "
-msgstr "Automàticament subscriure's a tothom "
-
-#: actions/profilesettings.php:229 actions/tagother.php:176
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Etiqueta no vàlida: \"%s\""
-
-#: actions/profilesettings.php:311
-msgid "Couldn't save tags."
-msgstr "No s'han pogut guardar les etiquetes."
-
-#: actions/public.php:107
-#, php-format
-msgid "Public timeline, page %d"
-msgstr "Línia temporal pública, pàgina %d"
-
-#: actions/public.php:173
-msgid "Could not retrieve public stream."
-msgstr "No s'ha pogut recuperar la conversa pública."
-
-#: actions/public.php:220
+#: actions/showfavorites.php:207
 #, php-format
 msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
 msgstr ""
-"Això és %%site.name%%, un servei de "
-"[microblogging](http://ca.wikipedia.org/wiki/Microblogging) "
-
-#: actions/publictagcloud.php:57
-msgid "Public tag cloud"
-msgstr "Núvol públic d'etiquetes"
 
-#: actions/publictagcloud.php:63
+#: actions/showfavorites.php:211
 #, php-format
-msgid "These are most popular recent tags on %s "
-msgstr "Aquestes són les etiquetes recents més populars a %s "
-
-#: actions/publictagcloud.php:119
-msgid "Tag cloud"
-msgstr "Núvol d'etiquetes"
-
-#: actions/register.php:139 actions/register.php:349
-msgid "Sorry, only invited people can register."
-msgstr "Ho senti, però només la gent convidada pot registrar-se."
-
-#: actions/register.php:149
-msgid "You can't register if you don't "
-msgstr "No pots registrar-te si no "
-
-#: actions/register.php:286
-msgid "With this form you can create "
-msgstr "Amb aquest formulari pots crear "
-
-#: actions/register.php:368
-msgid "1-64 lowercase letters or numbers, "
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
 msgstr ""
-"1-64 lletres en minúscula o números, sense signes de puntuació o espais, "
-
-#: actions/register.php:382 actions/register.php:386
-msgid "Used only for updates, announcements, "
-msgstr "Utilitzat només per a actualitzacions, anuncis, "
-
-#: actions/register.php:398
-msgid "URL of your homepage, blog, "
-msgstr "URL del teu web, blog o perfil en un altre lloc, "
-
-#: actions/register.php:404
-msgid "Describe yourself and your "
-msgstr "Explica'ns alguna cosa sobre tu "
-
-#: actions/register.php:410
-msgid "Where you are, like \"City, "
-msgstr "On ets, per exemple \"Ciutat, "
-
-#: actions/register.php:432
-msgid " except this private data: password, "
-msgstr " excepte les següents dades privades: contrasenya, "
-
-#: actions/register.php:471
-#, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
-msgstr "Felicitats, %s! I benvingut/da a %%%%site.name%%%%. "
-
-#: actions/register.php:495
-msgid "(You should receive a message by email "
-msgstr "(Hauries de rebre un missatge per correu electrònic "
 
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
-msgstr "Aquest és un perfil local! Entra per subscriure-t'hi."
-
-#: actions/replies.php:118
-#, php-format
-msgid "Replies to %s, page %d"
-msgstr "Respostes a %s, pàgina %d"
-
-#: actions/showfavorites.php:79
-#, php-format
-msgid "%s favorite notices, page %d"
-msgstr "%s notificacions favorites, pàgina %d"
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:82 lib/groupnav.php:86
 #, php-format
 msgid "%s group"
 msgstr "%s grup"
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr "%s grup, pàgina %d"
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:218
 msgid "Group profile"
 msgstr "Perfil del grup"
 
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
 msgid "URL"
 msgstr "URL"
 
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
 msgid "Note"
 msgstr "Avisos"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:293
 msgid "Group actions"
 msgstr "Accions del grup"
 
-#: actions/showgroup.php:323
-#, php-format
-msgid "Notice feed for %s group"
+#: actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Feed d'avisos del grup %s"
+
+#: actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Feed d'avisos del grup %s"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Feed d'avisos del grup %s"
+
+#: actions/showgroup.php:345
+#, php-format
+msgid "FOAF for %s group"
+msgstr "Safata de sortida per %s"
+
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
 msgid "Members"
 msgstr "Membres"
 
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
 #: lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Cap)"
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:392
 msgid "All members"
 msgstr "Tots els membres"
 
-#: actions/showgroup.php:378
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "Estadístiques"
+
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Crear"
+
+#: actions/showgroup.php:448
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+
+#: actions/showgroup.php:454
+#, fuzzy, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
 msgstr ""
-"**%s** és un grup d'usuaris a %%%%site.name%%%%, un servei de "
-"[microblogging](http://ca.wikipedia.org/wiki/Microblogging)"
+"**%s** és un grup d'usuaris a %%%%site.name%%%%, un servei de [microblogging]"
+"(http://ca.wikipedia.org/wiki/Microblogging)"
+
+#: actions/showgroup.php:482
+#, fuzzy
+msgid "Admins"
+msgstr "Admin"
+
+#: actions/showmessage.php:81
+msgid "No such message."
+msgstr "No existeix el missatge."
 
 #: actions/showmessage.php:98
-msgid "Only the sender and recipient "
-msgstr "Només el remitent i el destinatari "
+msgid "Only the sender and recipient may read this message."
+msgstr "Només el remitent i el receptor poden llegir aquest missatge."
+
+#: actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr "Missatge per a %1$s a %2$s"
+
+#: actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr "Missatge de %1$s a %2$s"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Notificació publicada"
 
 #: actions/showstream.php:73
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "Aviso etiquetats amb %s"
+
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, pàgina %d"
 
-#: actions/showstream.php:143
-msgid "'s profile"
-msgstr "perfil"
+#: actions/showstream.php:122
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Feed d'avisos del grup %s"
 
-#: actions/showstream.php:236 actions/tagother.php:77
-msgid "User profile"
-msgstr "Perfil de l'usuari"
+#: actions/showstream.php:129
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Feed d'avisos de %s"
 
-#: actions/showstream.php:240 actions/tagother.php:81
-msgid "Photo"
-msgstr "Foto"
+#: actions/showstream.php:136
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Feed d'avisos de %s"
 
-#: actions/showstream.php:317
-msgid "User actions"
-msgstr "Accions de l'usuari"
+#: actions/showstream.php:143
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Feed d'avisos de %s"
 
-#: actions/showstream.php:342
-msgid "Send a direct message to this user"
-msgstr "Enviar un missatge directe a aquest usuari"
+#: actions/showstream.php:148
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Safata de sortida per %s"
 
-#: actions/showstream.php:343
-msgid "Message"
-msgstr "Missatge"
+#: actions/showstream.php:191
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
 
-#: actions/showstream.php:451
-msgid "All subscribers"
-msgstr "Tots els subscriptors"
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
 
-#: actions/showstream.php:533
-msgid "All groups"
-msgstr "Tots els grups"
+#: actions/showstream.php:198
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
 
-#: actions/showstream.php:542
+#: actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+
+#: actions/showstream.php:239
+#, fuzzy, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
 msgstr ""
-"**%s** té un compte a %%%%site.name%%%%, un servei de "
-"[microblogging](http://ca.wikipedia.org/wiki/Microblogging) "
+"**%s** té un compte a %%%%site.name%%%%, un servei de [microblogging](http://"
+"ca.wikipedia.org/wiki/Microblogging) "
+
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "Configuració SMS"
+
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+"Pots rebre missatges SMS a través del teu coreu electrònic des de %%site.name"
+"%%."
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Aquesta pàgina no està disponible en "
+
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Número de telèfon actualment confirmat i activat per SMS."
+
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
+msgstr "Esperant confirmació per aquest número de telèfon."
+
+#: actions/smssettings.php:130
+msgid "Confirmation code"
+msgstr "Codi de confirmació"
+
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
+msgstr "Escriu el codi que has rebut en el teu telèfon mòbil."
+
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
+msgstr "Número de telèfon pels SMS"
+
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "Número de telèfon, no puntuació ni espais, en l'àrea del codi"
+
+#: actions/smssettings.php:174
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+"Enviar-me avisos a través de SMS; puc entendre que això repercutirà en una "
+"exorbitant càrrega del meu transport."
 
-#: actions/smssettings.php:128
-msgid "Phone number, no punctuation or spaces, "
-msgstr "Número de telèfon, sense puntuacions ni espais, "
+#: actions/smssettings.php:306
+msgid "No phone number."
+msgstr "No hi ha cap número de telèfon."
 
-#: actions/smssettings.php:162
-msgid "Send me notices through SMS; "
-msgstr "Enviar-me avisos per SMS; "
+#: actions/smssettings.php:311
+msgid "No carrier selected."
+msgstr "No s'ha sel·leccionat cap transport."
 
-#: actions/smssettings.php:335
-msgid "A confirmation code was sent to the phone number you added. "
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
+msgstr "Aquest ja és el teu número de telèfon."
+
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
+msgstr "Aquest número de telèfon pertany a un altre usuari."
+
+#: actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
 msgstr ""
-"El codi de confirmació s'ha enviat al número de telèfon que tens afegit. "
+"S'ha enviat un codi de confirmació al número de telèfon has afegit. Revisa "
+"la teva safata d'entrada (i la carpeta de spam!) per veure aquest codi i les "
+"instruccions per utilitzar-lo."
+
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
+msgstr "Aquest és un número de confirmació incorrecte."
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
+msgstr "Aquest no és el teu número de telèfon."
+
+#: actions/smssettings.php:465
 msgid "Mobile carrier"
 msgstr "Transport mòbil"
 
+#: actions/smssettings.php:469
+msgid "Select a carrier"
+msgstr "Selecciona un transport"
+
+#: actions/smssettings.php:476
+#, 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 ""
+"Capacitat per al teu telèfon mòbil. Si vostè coneix una companyia que "
+"accepti SMS a través del correu electrònic, però no està a la llista, "
+"envia'ns un correu electrònic per fer-nos-ho saber %s."
+
+#: actions/smssettings.php:498
+msgid "No code entered"
+msgstr "No hi ha cap codi entrat"
+
 #: actions/subedit.php:70
 msgid "You are not subscribed to that profile."
 msgstr "No estàs subscrit a aquest perfil."
@@ -4287,13 +3051,31 @@ msgid "%s subscribers, page %d"
 msgstr "%s subscriptors, pàgina %d"
 
 #: actions/subscribers.php:63
-msgid "These are the people who listen to "
-msgstr "Aquestes són les persones que escolten "
+msgid "These are the people who listen to your notices."
+msgstr "Aquestes són les persones que escolten els teus avisos."
 
 #: actions/subscribers.php:67
 #, php-format
-msgid "These are the people who "
-msgstr "Aquestes són les persones que "
+msgid "These are the people who listen to %s's notices."
+msgstr "Aquestes són les persones que escolten els avisos de %s."
+
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
+msgstr ""
+
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr ""
+
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
 
 #: actions/subscriptions.php:52
 #, php-format
@@ -4306,27 +3088,36 @@ msgid "%s subscriptions, page %d"
 msgstr "%s subscripcions, pàgina %d"
 
 #: actions/subscriptions.php:65
-msgid "These are the people whose notices "
-msgstr "Aquestes són les persones les notícies dels quals "
+msgid "These are the people whose notices you listen to."
+msgstr "Aquestes són les persones que escoltes."
 
 #: actions/subscriptions.php:69
 #, php-format
-msgid "These are the people whose "
-msgstr "Aquestes són les persones les quals"
+msgid "These are the people whose notices %s listens to."
+msgstr "Aquestes són les persones que %s escolta."
+
+#: actions/subscriptions.php:121
+#, php-format
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
+msgstr ""
+
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s ara està escoltant "
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:194
 msgid "Jabber"
 msgstr "Jabber"
 
-#: actions/tag.php:43
-#, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Notificació etiquetada amb %s, pàgina %d"
-
-#: actions/tag.php:66
-#, php-format
-msgid "Messages tagged \"%s\", most recent first"
-msgstr "Missatges etiquetats \"%s\", més recents primer"
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
+msgstr "SMS"
 
 #: actions/tagother.php:33
 msgid "Not logged in"
@@ -4341,11 +3132,19 @@ msgstr "No argument de la id."
 msgid "Tag %s"
 msgstr "Etiqueta %s"
 
+#: actions/tagother.php:77 lib/userprofile.php:75
+msgid "User profile"
+msgstr "Perfil de l'usuari"
+
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
+msgstr "Foto"
+
 #: actions/tagother.php:141
 msgid "Tag user"
 msgstr "Etiqueta usuari"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4353,240 +3152,890 @@ msgstr ""
 "Etiquetes per aquest usuari (lletres, números,, -, ., i _), comes o separat "
 "per espais"
 
-#: actions/tagother.php:164
-msgid "There was a problem with your session token."
-msgstr "Ha ocorregut algun problema amb la teva sessió."
-
-#: actions/tagother.php:191
+#: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Només pots etiquetar gent a la que estiguis subscrit o que s'hagin subscrit "
 "a tu."
 
-#: actions/tagother.php:198
+#: actions/tagother.php:200
 msgid "Could not save tags."
 msgstr "No s'han pogut guardar les etiquetes."
 
-#: actions/tagother.php:233
+#: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Utilitza aquest formulari per afegir etiquetes als teus subscriptors i "
 "subscripcions."
 
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Notificació etiquetada amb %s, pàgina %d"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Feed d'avisos de %s"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Feed d'avisos de %s"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Feed d'avisos de %s"
+
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "No existeix aquesta etiqueta."
 
-#: actions/tagrss.php:66
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
+msgstr "Mètode API en construcció."
+
+#: actions/unsubscribe.php:77
+msgid "No profile id in request."
+msgstr "No id en el perfil sol·licitat."
+
+#: actions/unsubscribe.php:84
+msgid "No profile with that id."
+msgstr "No hi ha cap perfil amb aquesta id."
+
+#: actions/unsubscribe.php:98
+msgid "Unsubscribed"
+msgstr "No subscrit"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
 #, php-format
-msgid "Microblog tagged with %s"
-msgstr "Microblog etiquetat com %s"
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
 
-#: actions/twitapiblocks.php:47
-msgid "Block user failed."
-msgstr "Ha fallat el bloqueig d'usuari."
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "Autoritzar subscripció"
 
-#: actions/twitapiblocks.php:69
-msgid "Unblock user failed."
-msgstr "Ha fallat el desbloqueig d'usuari."
+#: actions/userauthorization.php:110
+#, fuzzy
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
+msgstr ""
+"Si us plau, revisa aquestes dades per a estar segur que desitges "
+"subscriure't als avisos d'aquest usuari. Si no has demanat subscriure't als "
+"avisos de ningú, clica \"Cancel·lar\"."
 
-#: actions/twitapiusers.php:48
-msgid "Not found."
-msgstr "No s'ha trobat."
+#: actions/userauthorization.php:188
+#, fuzzy
+msgid "License"
+msgstr "llicència."
 
-#: actions/twittersettings.php:71
-msgid "Add your Twitter account to automatically send "
-msgstr "Afegeix el teu compte Twitter per automàticament enviar "
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "Acceptar"
 
-#: actions/twittersettings.php:119
-msgid "Twitter user name"
-msgstr "Usuari Twitter"
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Subscriure's a aquest usuari"
 
-#: actions/twittersettings.php:126
-msgid "Twitter password"
-msgstr "Contrasenya Twitter"
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "Rebutjar"
 
-#: actions/twittersettings.php:228
-msgid "Twitter Friends"
-msgstr "Amics Twitter"
+#: actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "%s subscripcions"
 
-#: actions/twittersettings.php:327
-msgid "Username must have only numbers, "
-msgstr "Nom d'usuari sols pot contenir números, "
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
+msgstr "Cap petició d'autorització!"
 
-#: actions/twittersettings.php:341
-#, php-format
-msgid "Unable to retrieve account information "
-msgstr "No s'ha pogut obtenir informació del compte "
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+msgstr "Subscripció autoritzada"
 
-#: actions/unblock.php:108
-msgid "Error removing the block."
-msgstr "Error al moure el block."
+#: actions/userauthorization.php:249
+#, fuzzy
+msgid ""
+"The subscription has been authorized, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to authorize the "
+"subscription. Your subscription token is:"
+msgstr ""
+"S'ha autoritzat la subscripció, però no s'ha enviat un URL de retorn. "
+"Llegeix de nou les instruccions per a saber com autoritzar la subscripció. "
+"El teu identificador de subscripció és:"
 
-#: actions/unsubscribe.php:50
-msgid "No profile id in request."
-msgstr "No id en el perfil sol·licitat."
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
+msgstr "Subscripció rebutjada"
 
-#: actions/unsubscribe.php:57
-msgid "No profile with that id."
-msgstr "No hi ha cap perfil amb aquesta id."
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"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/unsubscribe.php:71
-msgid "Unsubscribed"
-msgstr "No subscrit"
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
 
-#: actions/usergroups.php:63
+#: actions/userauthorization.php:301
 #, php-format
-msgid "%s groups"
-msgstr "%s grups"
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
 
-#: actions/usergroups.php:65
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "No es pot llegir l'URL de l'avatar '%s'"
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Tipus d'imatge incorrecte per a '%s'"
+
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr "Cap identificador."
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "Configuració del perfil"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "%s grups, pàgina %d"
 
-#: classes/Notice.php:104
+#: actions/usergroups.php:130
+#, fuzzy
+msgid "Search for more groups"
+msgstr "Cercar gent o text"
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "No ets membre d'aquest grup."
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Message.php:55
+msgid "Could not insert message."
+msgstr "No s'ha pogut inserir el missatge."
+
+#: classes/Message.php:65
+msgid "Could not update message with new URI."
+msgstr "No s'ha pogut inserir el missatge amb la nova URI."
+
+#: classes/Notice.php:164
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "Hashtag de l'error de la base de dades:%s"
+
+#: classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Problema en guardar l'avís."
+
+#: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
 msgstr "Problema al guardar la notificació. Usuari desconegut."
 
-#: classes/Notice.php:109
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Masses notificacions massa ràpid; pren un respir i publica de nou en uns "
 "minuts."
 
-#: classes/Notice.php:116
+#: classes/Notice.php:194
+#, fuzzy
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+"Masses notificacions massa ràpid; pren un respir i publica de nou en uns "
+"minuts."
+
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr "Ha estat bandejat de publicar notificacions en aquest lloc."
 
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
+msgstr "Problema en guardar l'avís."
+
+#: classes/Notice.php:1120
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "Error de BD en inserir resposta: %s"
+
+#: classes/User.php:347
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Missatge per a %1$s a %2$s"
+
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Perfil"
+
 #: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
+msgstr "Canviar les preferències del teu perfil"
+
+#: lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "Pujar un avatar"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr "Canviar la teva contrasenya"
+
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
+msgstr "Canviar correu electrònic"
+
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:124
+#, fuzzy
+msgid "Design your profile"
+msgstr "Perfil de l'usuari"
+
+#: lib/accountsettingsaction.php:128
 msgid "Other"
 msgstr "Altres"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:128
 msgid "Other options"
 msgstr "Altres opcions"
 
-#: lib/action.php:130
+#: lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: lib/action.php:145
+#: lib/action.php:159
 msgid "Untitled page"
 msgstr "Pàgina sense titol"
 
-#: lib/action.php:316
+#: lib/action.php:424
 msgid "Primary site navigation"
 msgstr "Navegació primària del lloc"
 
-#: lib/action.php:322
+#: lib/action.php:430
+msgid "Home"
+msgstr "Inici"
+
+#: lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr "Perfil personal i línia temporal dels amics"
 
-#: lib/action.php:325
-msgid "Search for people or text"
-msgstr "Cercar gent o text"
-
-#: lib/action.php:328
+#: lib/action.php:432
 msgid "Account"
 msgstr "Compte"
 
-#: lib/action.php:328
+#: lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr "Canviar correu electrònic, avatar, contrasenya, perfil"
 
-#: lib/action.php:330
-msgid "Connect to IM, SMS, Twitter"
-msgstr "Connectar a missatgeria instantània, SMS, Twitter"
+#: lib/action.php:435
+msgid "Connect"
+msgstr "Connectar-se"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "No s'ha pogut redirigir al servidor: %s"
+
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
+msgstr "Invitar"
+
+#: lib/action.php:440 lib/subgroupnav.php:106
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr "Convidar amics i companys perquè participin a %s"
+
+#: lib/action.php:445
+msgid "Logout"
+msgstr "Sortir"
 
-#: lib/action.php:332
+#: lib/action.php:445
 msgid "Logout from the site"
 msgstr "Sortir d'aquest lloc"
 
-#: lib/action.php:335
-msgid "Login to the site"
-msgstr "Accedir a aquest lloc"
-
-#: lib/action.php:338
+#: lib/action.php:450
 msgid "Create an account"
 msgstr "Crear nou compte"
 
-#: lib/action.php:341
-msgid "Login with OpenID"
-msgstr "Accedir amb OpenID"
+#: lib/action.php:453
+msgid "Login to the site"
+msgstr "Accedir a aquest lloc"
 
-#: lib/action.php:344
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
+msgstr "Ajuda"
+
+#: lib/action.php:456
 msgid "Help me!"
 msgstr "Ajuda'm"
 
-#: lib/action.php:362
+#: lib/action.php:459
+msgid "Search"
+msgstr "Cercar"
+
+#: lib/action.php:459
+msgid "Search for people or text"
+msgstr "Cercar gent o text"
+
+#: lib/action.php:480
 msgid "Site notice"
 msgstr "Avís del lloc"
 
-#: lib/action.php:417
+#: lib/action.php:546
 msgid "Local views"
 msgstr "Vistes locals"
 
-#: lib/action.php:472
+#: lib/action.php:612
 msgid "Page notice"
 msgstr "Notificació pàgina"
 
-#: lib/action.php:562
+#: lib/action.php:714
 msgid "Secondary site navigation"
 msgstr "Navegació del lloc secundària"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:721
+msgid "About"
+msgstr "Sobre"
+
+#: lib/action.php:723
+msgid "FAQ"
+msgstr "Preguntes freqüents"
+
+#: lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/action.php:730
+msgid "Privacy"
+msgstr "Privacitat"
+
+#: lib/action.php:732
+msgid "Source"
+msgstr "Font"
+
+#: lib/action.php:734
+msgid "Contact"
+msgstr "Posar-se en contacte"
+
+#: lib/action.php:736
+#, fuzzy
+msgid "Badge"
+msgstr "Reclamar"
+
+#: lib/action.php:764
 msgid "StatusNet software license"
 msgstr "Llicència del programari StatusNet"
 
-#: lib/action.php:630
+#: lib/action.php:767
+#, php-format
+msgid ""
+"**%%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%%)."
+
+#: lib/action.php:769
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** és un servei de microblogging."
+
+#: lib/action.php:771
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+"Utilitza el software de microblogging [StatusNet](http://status.net), versió "
+"%s, disponible sota la [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "Llicència del programari StatusNet"
+
+#: lib/action.php:794
 msgid "All "
 msgstr "Tot "
 
-#: lib/action.php:635
+#: lib/action.php:799
 msgid "license."
 msgstr "llicència."
 
-#: lib/blockform.php:123 lib/blockform.php:153
-msgid "Block this user"
-msgstr "Bloquejar aquest usuari"
+#: lib/action.php:1052
+msgid "Pagination"
+msgstr "Paginació"
 
-#: lib/blockform.php:153
-msgid "Block"
-msgstr "Bloquejar"
+#: lib/action.php:1061
+msgid "After"
+msgstr "Posteriors"
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
-msgid "Disfavor this notice"
-msgstr "Deixar de tenir favorita aquesta notificació"
+#: lib/action.php:1069
+msgid "Before"
+msgstr "Anteriors"
+
+#: lib/action.php:1117
+msgid "There was a problem with your session token."
+msgstr "Ha ocorregut algun problema amb la teva sessió."
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "Perfil"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
+msgstr "Resultats de les comandes"
+
+#: lib/channel.php:210
+msgid "Command complete"
+msgstr "Comanda completada"
+
+#: lib/channel.php:221
+msgid "Command failed"
+msgstr "Comanda fallida"
+
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr "Perdona, aquesta comanda no està implementada."
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "No es pot actualitzar l'usuari amb el correu electrònic confirmat"
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "Reclamació enviada"
+
+#: lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
+msgstr "L'usuari no té última nota"
+
+#: lib/command.php:190
+msgid "Notice marked as fave."
+msgstr "Nota marcada com a favorita."
+
+#: lib/command.php:315
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#: lib/command.php:318
+#, php-format
+msgid "Fullname: %s"
+msgstr "Nom complet: %s"
+
+#: lib/command.php:321
+#, php-format
+msgid "Location: %s"
+msgstr "Localització: %s"
+
+#: lib/command.php:324
+#, php-format
+msgid "Homepage: %s"
+msgstr "Pàgina web: %s"
 
-#: lib/facebookaction.php:268
+#: lib/command.php:327
 #, php-format
-msgid "To use the %s Facebook Application you need to login "
-msgstr "Per utilitzar la Aplicació de Facebook %s necessites haver accedit "
+msgid "About: %s"
+msgstr "Sobre tu: %s"
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d"
+
+#: lib/command.php:377
+msgid "Error sending direct message."
+msgstr "Error al enviar el missatge directe."
+
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d"
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "respondre a aquesta nota"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Problema en guardar l'avís."
+
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
+msgstr "Especifica el nom de l'usuari a que vols subscriure't"
+
+#: lib/command.php:502
+#, php-format
+msgid "Subscribed to %s"
+msgstr "Subscrit a %s"
+
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
+msgstr "Especifica el nom de l'usuari del que vols deixar d'estar subscrit"
+
+#: lib/command.php:530
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr "Has deixat d'estar subscrit a %s"
+
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
+msgstr "Comanda encara no implementada."
+
+#: lib/command.php:551
+msgid "Notification off."
+msgstr "Notificacions off."
+
+#: lib/command.php:553
+msgid "Can't turn off notification."
+msgstr "No es poden posar en off les notificacions."
+
+#: lib/command.php:574
+msgid "Notification on."
+msgstr "Notificacions on."
+
+#: lib/command.php:576
+msgid "Can't turn on notification."
+msgstr "No es poden posar en on les notificacions."
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "No s'ha pogut crear el formulari OpenID: %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "No estàs subscrit a aquest perfil."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "No estàs subscrit a aquest perfil."
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "No pots subscriure a un altre a tu mateix."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Persones subscrites a %s"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "No ets membre d'aquest grup."
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "No ets membre d'aquest grup."
+
+#: lib/command.php:670
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+
+#: lib/common.php:192
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Cap codi de confirmació."
 
-#: lib/facebookaction.php:271
-msgid " a new account."
-msgstr " un nou compte."
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:195
+#, fuzzy
+msgid "Go to the installer."
+msgstr "Accedir a aquest lloc"
+
+#: lib/connectsettingsaction.php:110
+msgid "IM"
+msgstr "Missatgeria Instantània"
+
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Actualitzacions per Missatgeria Instantània"
+
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
+msgstr "Actualitzacions per SMS"
+
+#: lib/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Pujar"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Canviar la teva contrasenya"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Connectar-se"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Cercar"
+
+#: lib/designsettings.php:217
+msgid "Text"
+msgstr "Text"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Inici de sessió"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
+msgstr ""
 
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-msgid "Published"
-msgstr "Publicat"
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
+msgstr "Deixar de tenir favorita aquesta notificació"
 
 #: lib/favorform.php:114 lib/favorform.php:140
 msgid "Favor this notice"
 msgstr "Fer favorita aquesta notificació"
 
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr "Favorit"
+
 #: lib/feedlist.php:64
 msgid "Export data"
 msgstr "Exportar data"
 
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr ""
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr ""
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr ""
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Filtre d'etiquetes"
@@ -4595,57 +4044,85 @@ msgstr "Filtre d'etiquetes"
 msgid "All"
 msgstr "Tot"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Selecciona un transport"
+
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Etiqueta"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "Elegeix una etiqueta para reduir la llista"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "Anar"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "URL del teu web, blog del grup u tema"
 
-#: lib/groupeditform.php:151
-msgid "Description"
-msgstr "Descripció"
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Descriu el grup amb 140 caràcters"
 
-#: lib/groupeditform.php:153
-msgid "Describe the group or topic in 140 chars"
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
 msgstr "Descriu el grup amb 140 caràcters"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:172
+msgid "Description"
+msgstr "Descripció"
+
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr "Localització del grup, si n'hi ha, com \"Ciutat, Estat (o Regió), País\""
+msgstr ""
+"Localització del grup, si n'hi ha, com \"Ciutat, Estat (o Regió), País\""
+
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
 msgid "Group"
 msgstr "Grup"
 
-#: lib/groupnav.php:100
-msgid "Admin"
-msgstr "Admin"
-
 #: lib/groupnav.php:101
+#, fuzzy
+msgid "Blocked"
+msgstr "Bloquejar"
+
+#: lib/groupnav.php:102
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Usuari bloquejat."
+
+#: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
 msgstr "Editar propietats del grup %s"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:113
 msgid "Logo"
 msgstr "Logo"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:114
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "Afegir o editar logo %s"
 
+#: lib/groupnav.php:120
+#, fuzzy, php-format
+msgid "Add or edit %s design"
+msgstr "Afegir o editar logo %s"
+
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Grups amb més membres"
@@ -4660,8 +4137,42 @@ msgid "Tags in %s group's notices"
 msgstr "Etiquetes en les notificacions del grup %s"
 
 #: lib/htmloutputter.php:104
-msgid "This page is not available in a "
-msgstr "Aquesta pàgina no està disponible en "
+msgid "This page is not available in a media type you accept"
+msgstr "Aquesta pàgina no està disponible en un tipus de mèdia que acceptis."
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Pots pujar una imatge de logo per al grup."
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr "Càrrega parcial."
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr "Error del sistema en pujar el fitxer."
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr "No és una imatge o és un fitxer corrupte."
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr "Format d'imatge no suportat."
+
+#: lib/imagefile.php:118
+msgid "Lost our file."
+msgstr "Hem perdut el nostre arxiu."
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr "Tipus de fitxer desconegut"
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr ""
 
 #: lib/joinform.php:114
 msgid "Join"
@@ -4671,43 +4182,87 @@ msgstr "Inici de sessió"
 msgid "Leave"
 msgstr "Abandonar"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr "Accedir amb el nom d'usuari i contrasenya"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr "Crear nou compte"
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
-msgstr "Accedir o registrar-se amb OpenID"
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "Només l'usuari pot llegir les seves safates de correu."
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr " de "
+
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "Confirmació de l'adreça de correu electrònic"
 
-#: lib/mail.php:175
+#: lib/mail.php:174
 #, php-format
 msgid ""
 "Hey, %s.\n"
 "\n"
-msgstr ""
-"Ei, %s.\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
 "\n"
+"\t%s\n"
+"\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
+msgstr ""
 
-#: lib/mail.php:236
+#: lib/mail.php:235
 #, php-format
-msgid "%1$s is now listening to "
-msgstr "%1$s ara està escoltant "
+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:240
+#, fuzzy, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
+"%1$s ara està escoltant els teus avisos a %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Atentament,\n"
+"%4$s.\n"
 
-#: lib/mail.php:254
+#: lib/mail.php:253
 #, php-format
 msgid "Location: %s\n"
 msgstr "Ubicació: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:255
 #, php-format
 msgid "Homepage: %s\n"
 msgstr "Pàgina personal: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
@@ -4716,57 +4271,226 @@ msgstr ""
 "Biografia: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:285
+#, php-format
+msgid "New email address for posting to %s"
+msgstr "Nou correu electrònic per publicar a %s"
+
+#: lib/mail.php:288
+#, 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 ""
+"Tens una nova direcció per publicar a %1$s.\n"
+"\n"
+"Envia un correu electrònic a %2$s per publicar un nou missatge.\n"
+"\n"
+"Més instruccions per al correu electrònic a %3$s.\n"
+"\n"
+"Sincerament teus,\n"
+"%4$s"
+
+#: lib/mail.php:412
+#, php-format
+msgid "%s status"
+msgstr "%s estat"
+
+#: lib/mail.php:438
+msgid "SMS confirmation"
+msgstr "Confirmació SMS"
+
+#: lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "Has estat reclamat per %s"
 
-#: lib/mail.php:465
+#: lib/mail.php:466
 #, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
-msgstr "%1$s (%2$s) vol saber què estàs fent "
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
+msgstr ""
 
-#: lib/mail.php:555
+#: lib/mail.php:509
 #, php-format
-msgid "%1$s just added your notice from %2$s"
-msgstr "%1$s ha afegit la teva notificació des de %2$s."
+msgid "New private message from %s"
+msgstr "Nou missatge privat de %s"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
-msgid "From"
-msgstr "Des de"
+#: lib/mail.php:513
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%5$s\n"
+msgstr ""
+
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s ha afegit la teva nota com a favorita"
 
-#: lib/messageform.php:110
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, php-format
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+msgstr ""
+
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+msgid "Could not determine file's mime-type!"
+msgstr "No s'ha pogut recuperar la conversa pública."
+
+#: lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Enviar notificació directa"
 
-#: lib/noticeform.php:125
-msgid "Send a notice"
-msgstr "Enviar notificació"
+#: lib/messageform.php:146
+msgid "To"
+msgstr "A"
 
-#: lib/noticeform.php:152
+#: lib/messageform.php:162 lib/noticeform.php:173
 msgid "Available characters"
 msgstr "Caràcters disponibles"
 
-#: lib/noticelist.php:426
-msgid "in reply to"
-msgstr "en resposta a"
+#: lib/noticeform.php:145
+msgid "Send a notice"
+msgstr "Enviar notificació"
+
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
+msgstr "Què tal, %s?"
+
+#: lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "Cap contingut!"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr "respondre a aquesta nota"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "Respondre"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
-msgid "Delete this notice"
-msgstr "Eliminar aquesta nota"
-
-#: lib/noticelist.php:474
-msgid "Delete"
-msgstr "Eliminar"
-
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Reclamar aquest usuari"
@@ -4779,39 +4503,139 @@ msgstr "Reclamar"
 msgid "Send a nudge to this user"
 msgstr "Enviar una reclamació a aquest usuari"
 
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "Error en inserir el nou perfil"
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "Error en inserir avatar"
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "Error en inserir perfil remot"
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Eliminar nota."
+
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
+msgstr "No s'ha pogut inserir una nova subscripció."
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "Personal"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "Respostes"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr "Favorits"
+
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr "Usuari"
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr "Safata d'entrada"
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr "Els teus missatges rebuts"
+
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr "Safata de sortida"
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr "Els teus missatges enviats"
+
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Etiquetes en les notificacions de %s's"
 
-#: lib/profilelist.php:182
-msgid "(none)"
-msgstr "(cap)"
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "Subscripcions"
 
-#: lib/publicgroupnav.php:76
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "Totes les subscripcions"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "Subscriptors"
+
+#: lib/profileaction.php:157
+msgid "All subscribers"
+msgstr "Tots els subscriptors"
+
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "Usuari"
+
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "Membre des de"
+
+#: lib/profileaction.php:235
+msgid "All groups"
+msgstr "Tots els grups"
+
+#: lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Públic"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Grups d'usuaris"
 
-#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Etiquetes recents"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Destacat"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Popular"
 
+#: lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Cercar"
+
+#: lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Cercar"
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "Gent"
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr "Trobar gent en aquest lloc"
+
 #: lib/searchgroupnav.php:82
 msgid "Notice"
 msgstr "Avisos"
 
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr "Trobar contingut de les notes"
+
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Trobar un grup en aquest lloc"
@@ -4820,33 +4644,63 @@ msgstr "Trobar un grup en aquest lloc"
 msgid "Untitled section"
 msgstr "Secció sense títol"
 
-#: lib/subgroupnav.php:81
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Persones %s subscrites a"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:91
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Persones subscrites a %s"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "%s grups són membres de"
 
-#: lib/subgroupnav.php:104
-#, php-format
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Convidar amics i companys perquè participin a %s"
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(cap)"
+
+#: lib/subs.php:48
+msgid "Already subscribed!"
+msgstr ""
 
-#: lib/subs.php:53
+#: lib/subs.php:52
 msgid "User has blocked you."
 msgstr "Un usuari t'ha bloquejat."
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Subscriure's a aquest usuari"
+#: lib/subs.php:56
+msgid "Could not subscribe."
+msgstr "No pots subscriure."
+
+#: lib/subs.php:75
+msgid "Could not subscribe other to you."
+msgstr "No pots subscriure a un altre a tu mateix."
+
+#: lib/subs.php:124
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "No estàs subscrit!"
+
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
+msgstr "No s'ha pogut eliminar la subscripció."
 
 #: lib/tagcloudsection.php:56
 msgid "None"
@@ -4856,35 +4710,106 @@ msgstr "Cap"
 msgid "Top posters"
 msgstr "Que més publiquen"
 
-#: lib/unblockform.php:120 lib/unblockform.php:150
-msgid "Unblock this user"
-msgstr "Desbloquejar aquest usuari"
-
-#: lib/unblockform.php:150
-msgid "Unblock"
-msgstr "Desbloquejar"
-
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Deixar d'estar subscrit des d'aquest usuari"
 
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "Cancel·lar subscripció"
+
+#: lib/userprofile.php:116
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "Crear nou compte"
+msgid "Edit Avatar"
+msgstr "Avatar"
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "No s'ha pogut confirmar el correu electrònic."
+#: lib/userprofile.php:236
+msgid "User actions"
+msgstr "Accions de l'usuari"
 
-#~ msgid "Email address"
-#~ msgstr "Adreça de correu electrònic"
+#: lib/userprofile.php:248
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Configuració del perfil"
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Error en inserir avís"
+#: lib/userprofile.php:249
+msgid "Edit"
+msgstr ""
 
-#~ 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 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."
+#: lib/userprofile.php:272
+msgid "Send a direct message to this user"
+msgstr "Enviar un missatge directe a aquest usuari"
+
+#: lib/userprofile.php:273
+msgid "Message"
+msgstr "Missatge"
+
+#: lib/util.php:821
+msgid "a few seconds ago"
+msgstr "fa pocs segons"
+
+#: lib/util.php:823
+msgid "about a minute ago"
+msgstr "fa un minut"
+
+#: lib/util.php:825
+#, php-format
+msgid "about %d minutes ago"
+msgstr "fa %d minuts"
+
+#: lib/util.php:827
+msgid "about an hour ago"
+msgstr "fa una hora"
+
+#: lib/util.php:829
+#, php-format
+msgid "about %d hours ago"
+msgstr "fa %d hores"
+
+#: lib/util.php:831
+msgid "about a day ago"
+msgstr "fa un dia"
+
+#: lib/util.php:833
+#, php-format
+msgid "about %d days ago"
+msgstr "fa %d dies"
+
+#: lib/util.php:835
+msgid "about a month ago"
+msgstr "fa un mes"
+
+#: lib/util.php:837
+#, php-format
+msgid "about %d months ago"
+msgstr "fa %d mesos"
+
+#: lib/util.php:839
+msgid "about a year ago"
+msgstr "fa un any"
+
+#: lib/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "La pàgina personal no és un URL vàlid."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr "No es pot analitzar el missatge."
+
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr "Usuari no registrat."
+
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr "Perdó, aquest no és el teu correu electrònic entrant permès."
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr "Perdó, no hi ha un correu electrònic entrant permès."
diff --git a/locale/cs/LC_MESSAGES/statusnet.mo b/locale/cs/LC_MESSAGES/statusnet.mo
index 4618fd73d..449e93cdc 100644
--- a/locale/cs/LC_MESSAGES/statusnet.mo
+++ b/locale/cs/LC_MESSAGES/statusnet.mo
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index aee74f1af..6bba1da17 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -1,4539 +1,3955 @@
-# 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.
+# Translation of StatusNet to Czech
 #
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-07-07 22:07+0000\n"
-"Last-Translator: Tomas Kral <tomas.kral@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:42:56+0000\n"
+"Language-Team: Czech\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: cs\n"
+"X-Message-Group: out-statusnet\n"
 
-# jak přeložit stream?
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
-#, fuzzy, php-format
-msgid " Search Stream for \"%s\""
-msgstr " Hledej \"%s\" ve Streamu"
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "Žádné takové oznámení."
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-#: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
-msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr ""
-" až na tyto privátní data: heslo, emailová adresa, IM adresa, telefonní "
-"číslo."
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
+msgstr "Žádný takový uživatel."
 
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr " od "
+#: actions/all.php:84
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s a přátelé"
 
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
+msgid "%s and friends"
+msgstr "%s a přátelé"
 
-#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
+#: actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Feed přítel uživatele: %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 ""
+#: actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Feed přítel uživatele: %s"
 
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1 od teď naslouchá tvým sdělením v %2"
+#: actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Feed přítel uživatele: %s"
 
-#: ../lib/mail.php:126
+#: actions/all.php:127
 #, 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"
+"This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
-"%1 naslouchá vašim sdělením na %s. \n"
-"\n"
-"\t%3\n"
-"\n"
-"S úctou váš,\n"
-"%4$s.\n"
 
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/all.php:132
 #, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
 msgstr ""
 
-#: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/all.php:134
 #, php-format
-msgid "%1$s's status on %2$s"
-msgstr "%1 statusů na %2"
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
-#, php-format
-msgid "%s (%s)"
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
 #, php-format
-msgid "%s Public Stream"
-msgstr "Veřejný \"Stream\""
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+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
-#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
-#, php-format
-msgid "%s and friends"
+#: actions/all.php:165
+#, fuzzy
+msgid "You and friends"
 msgstr "%s a přátelé"
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
-#, php-format
-msgid "%s public timeline"
-msgstr ""
-
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
 #, php-format
-msgid "%s status"
+msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
-#, php-format
-msgid "%s timeline"
-msgstr ""
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
+msgstr "Potvrzující kód nebyl nalezen"
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
-#, php-format
-msgid "%s updates from everyone!"
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
 msgstr ""
 
-#: ../actions/register.php:213
+#: actions/apiaccountupdatedeliverydevice.php:105
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
 msgstr ""
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Nelze aktualizovat uživatele"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
 msgstr ""
-"**%%site.name%%** je služba microblogů, kterou pro vás poskytuje [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
-#, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** je služba mikroblogů."
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
+msgstr ""
 
-#: ../lib/util.php:274 lib/util.php:290
-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/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Nelze aktualizovat uživatele"
 
-#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
-#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer"
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Uživatel nemá profil."
 
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Nelze uložit profil"
 
-#: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr "6 a více znaků"
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
+msgstr ""
 
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
-msgid "6 or more characters, and don't forget it!"
-msgstr "6 a více znaků, a nezapomeňte"
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
+msgstr ""
 
-#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
-msgid "6 or more characters. Required."
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
 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."
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků"
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
 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 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."
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
 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 actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
-msgid "API method not found!"
+#: actions/apidirectmessage.php:89
+#, php-format
+msgid "Direct messages from %s"
 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 actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
-msgid "API method under construction."
+#: actions/apidirectmessage.php:93
+#, php-format
+msgid "All the direct messages sent from %s"
 msgstr ""
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
-msgid "About"
-msgstr "O nás"
+#: actions/apidirectmessage.php:101
+#, php-format
+msgid "Direct messages to %s"
+msgstr ""
 
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
-msgid "Accept"
-msgstr "Přijmout"
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
+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 actions/emailsettings.php:120
-#: actions/imsettings.php:127 actions/openidsettings.php:111
-#: actions/smssettings.php:133 actions/twittersettings.php:163
-msgid "Add"
-msgstr "Přidat"
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr ""
 
-#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
-msgstr "Přidej OpenID"
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
+msgstr ""
 
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-msgid "Add or remove OpenIDs"
+#: actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
 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
-#: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
-msgstr "Adresa"
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+msgstr ""
 
-#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-msgid "Addresses of friends to invite (one per line)"
+#: actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
 msgstr ""
 
-#: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
-msgid "All subscriptions"
-msgstr "Všechny odběry"
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr ""
 
-#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
-#, php-format
-msgid "All updates for %s"
-msgstr "Všechny aktualizace pro %s"
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
+msgstr ""
 
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/apifriendshipscreate.php:118
 #, php-format
-msgid "All updates matching search term \"%s\""
-msgstr "Všechny položky obsahující \"%s\""
+msgid "Could not follow user: %s is already on your list."
+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
-#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
-msgid "Already logged in."
-msgstr "Již přihlášen"
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "Nelze přesměrovat na server: %s"
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
-msgid "Already subscribed!."
-msgstr "Již přihlášeno"
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
 
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
-msgid "Are you sure you want to delete this notice?"
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
-msgid "Authorize subscription"
-msgstr "Autorizovaný odběr"
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Nelze aktualizovat uživatele"
 
-#: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
-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/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Nelze aktualizovat uživatele"
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr ""
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
+#, fuzzy
+msgid "Could not create group."
+msgstr "Nelze uložin informace o obrázku"
 
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34 actions/avatarsettings.php:65
-#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
-msgid "Avatar"
-msgstr "Obrázek"
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Nelze uložin informace o obrázku"
 
-#: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
-msgid "Avatar updated."
-msgstr "Obrázek nahrán"
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Nelze vytvořit odebírat"
 
-#: ../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 ""
-"Č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/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+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"
 
-#: ../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/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr "Přezdívku již někdo používá. Zkuste jinou"
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "Není platnou přezdívkou."
 
-#: ../lib/util.php:1318 lib/util.php:1452
-#, fuzzy
-msgid "Before »"
-msgstr "Starší »"
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "Stránka není platnou URL."
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
-#: actions/profilesettings.php:82 actions/register.php:184
-#: actions/profilesettings.php:112 actions/register.php:402
-msgid "Bio"
-msgstr "O mě"
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "Jméno je moc dlouhé (maximální délka je 255 znaků)"
 
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
-#: actions/register.php:89 actions/updateprofile.php:104
-#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
-msgid "Bio is too long (max 140 chars)."
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
 msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)"
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
-msgid "Can't delete this notice."
-msgstr ""
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "Umístění příliš dlouhé (maximálně 255 znaků)"
 
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
 #, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr "Nelze přečíst adresu obrázku '%s'"
+msgid "Too many aliases! Maximum %d."
+msgstr ""
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404 actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-msgid "Can't save new password."
-msgstr "Nelze uložit nové heslo"
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Neplatná adresa '%s'"
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62 actions/emailsettings.php:58
-#: actions/imsettings.php:59 actions/smssettings.php:62
-#: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
-msgstr "Zrušit"
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Přezdívku již někdo používá. Zkuste jinou"
 
-#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Nelze dolozit zákaznický objekt OpenID"
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
 
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
-msgstr "Nelze normalizovat JabberID"
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Již jste přihlášen"
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
-msgid "Cannot normalize that email address"
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
 msgstr ""
 
-#: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
-msgstr "Změnit"
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Nelze přesměrovat na server: %s"
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
-msgstr ""
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Neodeslal jste nám profil"
 
-#: ../actions/password.php:32 actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr "Změnit heslo"
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Nelze vytvořit OpenID z: %s"
 
-#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
-msgid "Change your password"
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
 msgstr ""
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-msgid "Change your profile settings"
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
 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
-#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
-#: actions/register.php:376 actions/smssettings.php:122
-msgid "Confirm"
-msgstr "Heslo znovu"
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "Profil"
 
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "Potvrď adresu"
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Neodeslal jste nám profil"
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245 actions/emailsettings.php:256
-#: actions/imsettings.php:230 actions/smssettings.php:253
-#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
-msgid "Confirmation cancelled."
-msgstr "Potvrď zrušení"
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
+msgstr ""
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
-msgid "Confirmation code"
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
 msgstr ""
 
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-msgid "Confirmation code not found."
-msgstr "Potvrzující kód nebyl nalezen"
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "Obrázek nahrán"
 
-#: ../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."
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
-msgid "Connect"
-msgstr "Připojit"
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků"
 
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
-msgid "Connect existing account"
-msgstr "Zruš existující účet"
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
+msgstr ""
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
-msgid "Contact"
-msgstr "Kontakt"
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Nepodporovaný formát obrázku."
 
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: actions/apitimelinefavorites.php:107
 #, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "Nelze vytvořit OpenID z: %s"
+msgid "%s / Favorites from %s"
+msgstr ""
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/apitimelinefavorites.php:119
 #, php-format
-msgid "Could not follow user: %s is already on your list."
+msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
-msgid "Could not follow user: User not found."
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
+#, php-format
+msgid "%s timeline"
 msgstr ""
 
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Nelze přesměrovat na server: %s"
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
 
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
-msgid "Could not save avatar info"
-msgstr "Nelze uložin informace o obrázku"
+#: actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1 statusů na %2"
 
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
-msgid "Could not save new profile info"
-msgstr "Nelze uložit nové informace do profilu"
+#: actions/apitimelinementions.php:126
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
-msgid "Could not subscribe other to you."
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#, php-format
+msgid "%s public timeline"
 msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
-msgid "Could not subscribe."
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#, php-format
+msgid "%s updates from everyone!"
 msgstr ""
 
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
+#: actions/apitimelinetag.php:101 actions/tag.php:66
+#, php-format
+msgid "Notices tagged with %s"
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-msgid "Couldn't convert request tokens to access tokens."
-msgstr "Nelze konvertovat řetězec požadavku na přístupový řetězec."
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Mikroblog od %s"
 
-#: ../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
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-msgid "Couldn't delete email confirmation."
-msgstr "Nelze smazat potvrzení emailu"
+#: actions/apiusershow.php:96
+#, fuzzy
+msgid "Not found."
+msgstr "Žádný požadavek nebyl nalezen!"
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
-msgid "Couldn't delete subscription."
-msgstr "Nelze smazat odebírání"
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "Žádný takový dokument."
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
-msgid "Couldn't find any statuses."
-msgstr ""
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+msgstr "Žádná přezdívka."
 
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-msgid "Couldn't get a request token."
-msgstr "Nelze získat řetězec požadavku."
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "Žádná velikost"
 
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206 actions/emailsettings.php:223
-#: actions/imsettings.php:195 actions/smssettings.php:214
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
-msgid "Couldn't insert confirmation code."
-msgstr "Nelze vložit potvrzující kód"
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "Neplatná velikost"
 
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
-msgstr "Nelze vložit odebírání"
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "Obrázek"
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-msgid "Couldn't save profile."
-msgstr "Nelze uložit profil"
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr ""
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
 msgstr ""
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
-msgid "Couldn't update user record."
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+#, fuzzy
+msgid "Avatar settings"
+msgstr "Nastavení"
+
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
 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
-#: actions/confirmaddress.php:114 actions/emailsettings.php:280
-#: actions/emailsettings.php:411 actions/imsettings.php:252
-#: actions/imsettings.php:395 actions/othersettings.php:162
-#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
-msgid "Couldn't update user."
-msgstr "Nelze aktualizovat uživatele"
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
-msgid "Create"
-msgstr "Vytvořit"
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+msgid "Delete"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
-msgid "Create a new user with this nickname."
-msgstr "Vytvořit nového uživatele s touto přezdívkou"
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+msgstr "Upload"
 
-#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
-msgid "Create new account"
-msgstr "Vytvořit nový účet"
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
-msgid "Creating new account for OpenID that already has a user."
-msgstr "Pro toto OpenID již uživatel existuje"
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
 
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "Potvrzené Jabber/GTalk adresy"
+#: actions/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Nečekaná forma submission."
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-msgid "Current confirmed email address."
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
 msgstr ""
 
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
-msgstr "Nyní"
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+msgstr "Obrázek nahrán"
 
-#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr ""
+#: actions/avatarsettings.php:363
+msgid "Failed updating avatar."
+msgstr "Nahrávání obrázku selhalo."
 
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Chyba v DB při vkládání odpovědi: %s"
+#: actions/avatarsettings.php:387
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Obrázek nahrán"
 
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
-msgid "Delete notice"
-msgstr ""
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+#, fuzzy
+msgid "No nickname"
+msgstr "Žádná přezdívka."
 
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "Popiš sebe a své zájmy ve 140 znacích"
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+#, fuzzy
+msgid "No such group"
+msgstr "Žádné takové oznámení."
 
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87 actions/register.php:172
-#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
-#: actions/register.php:385 lib/accountsettingsaction.php:113
-msgid "Email"
-msgstr "Email"
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "Uživatel nemá profil."
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-msgid "Email Address"
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s a přátelé"
+
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
 msgstr ""
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Žádný takový uživatel."
+
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
 msgstr ""
 
-#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-msgid "Email address already exists."
-msgstr "Emailová adresa již existuje"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+#, fuzzy
+msgid "Unblock this user"
+msgstr "Žádný takový uživatel."
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
-msgid "Email address confirmation"
-msgstr "Potvrzení emailové adresy"
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Nepřihlášen"
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
 msgstr ""
 
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-msgid "Email addresses"
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
 msgstr ""
 
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
-msgid "Enter a nickname or email address."
-msgstr "Zadej přezdívku nebo emailovou adresu"
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#, fuzzy
+msgid "Block user"
+msgstr "Žádný takový uživatel."
 
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
+#: actions/block.php:136
+msgid ""
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
 msgstr ""
 
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
-msgid "Error authorizing token"
-msgstr "Chyba potvrujícího řetězce"
-
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
-msgid "Error connecting user to OpenID."
-msgstr "Chyba při propojení uživatele na OpenID"
+#: actions/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
+msgid "No"
+msgstr ""
 
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
-msgstr "Chyba přihlašování uživatele"
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Žádný takový uživatel."
 
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
-msgstr "Chyba při kládání obrázku"
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
-msgstr "Chyba při vkládání nového profilu"
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "Žádný takový uživatel."
 
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
-msgstr "Chyba při vkládaní vzdáleného profilu"
+#: actions/block.php:165
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "Již jste přihlášen"
 
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
-msgid "Error saving address confirmation."
-msgstr "Chyba při ukládání potvrzení adresy"
+#: actions/block.php:170
+msgid "Failed to save block information."
+msgstr ""
 
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
-msgid "Error saving remote profile"
-msgstr "Chyba při ukládnání vzdáleného profilu"
+#: actions/bookmarklet.php:50
+msgid "Post to "
+msgstr ""
 
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-msgid "Error saving the profile."
-msgstr "Chyba při ukládaní profilu"
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+msgstr "Žádný potvrzující kód."
 
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-msgid "Error saving the user."
-msgstr "Chyba při ukládaní uživatele"
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "Potvrzující kód nebyl nalezen"
 
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
-msgid "Error saving user; invalid."
-msgstr "Chyba při ukládaní uživatele; neplatný"
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "Tento potvrzující kód vám nepatří!"
 
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
-#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
-#: actions/register.php:108 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-msgid "Error setting user."
-msgstr "Chyba nastavení uživatele"
+#: actions/confirmaddress.php:90
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr "Neznámý typ adresy %s"
 
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr "Chyba při aktualizaci profilu"
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr "Adresa již byla potvrzena"
 
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
-msgstr "Chyba při aktualizaci vzdáleného profilu"
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "Nelze aktualizovat uživatele"
 
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr "Chyba v ověřovacím kódu"
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr "Nelze smazat potvrzení emailu"
 
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
-msgid "Existing nickname"
-msgstr "Existující jméno"
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "Potvrď adresu"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
-msgid "FAQ"
-msgstr "FAQ"
+#: actions/confirmaddress.php:159
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "Adresa \"%s\" byla potvrzena pro váš účet"
 
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
-msgid "Failed updating avatar."
-msgstr "Nahrávání obrázku selhalo."
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Umístění"
 
-#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
-#, fuzzy, php-format
-msgid "Feed for friends of %s"
-msgstr "Feed přítel uživatele: %s"
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
+msgstr "Sdělení"
 
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
-#, fuzzy, php-format
-msgid "Feed for replies to %s"
-msgstr "Feed odpovědí na %s"
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
+msgstr "Žádné takové oznámení."
 
-#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
-#, php-format
-msgid "Feed for tag %s"
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
 msgstr ""
 
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
+#: actions/deletenotice.php:103
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
 msgstr ""
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
 msgstr ""
 
-#: ../actions/login.php:122
-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:77 actions/register.php:178
-#: actions/profilesettings.php:103 actions/register.php:391
-#: actions/showgroup.php:235 actions/showstream.php:262
-#: actions/tagother.php:105 lib/groupeditform.php:142
-msgid "Full name"
-msgstr "Celé jméno"
-
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
-#: actions/register.php:86 actions/updateprofile.php:94
-#: actions/editgroup.php:195 actions/newgroup.php:146
-#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
-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:338 lib/action.php:344 lib/action.php:566
-msgid "Help"
-msgstr "Nápověda"
-
-#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
-msgid "Home"
-msgstr "Domů"
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
-msgid "Homepage"
-msgstr "Moje stránky"
+#: actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "Žádné takové oznámení."
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
-msgid "Homepage is not a valid URL."
-msgstr "Stránka není platnou URL."
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+msgid "Delete this notice"
+msgstr ""
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
-msgid "I want to post notices by email."
+#: actions/deletenotice.php:157
+msgid "There was a problem with your session token.  Try again, please."
 msgstr ""
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
 msgstr ""
 
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
-msgstr "IM adresa"
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr ""
 
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
-msgstr "IM nastavení"
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "Žádný takový dokument."
 
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
+#: actions/editgroup.php:56
+#, php-format
+msgid "Edit %s group"
 msgstr ""
-"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\"."
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
 msgstr ""
-"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
-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."
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+msgid "You must be an admin to edit the group"
 msgstr ""
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-#: actions/emailsettings.php:127 actions/smssettings.php:140
-msgid "Incoming email"
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
 msgstr ""
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
-msgid "Incoming email address removed."
-msgstr ""
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)"
 
-#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
-msgid "Incorrect old password"
-msgstr "Neplatné heslo"
+#: actions/editgroup.php:253
+#, fuzzy
+msgid "Could not update group."
+msgstr "Nelze aktualizovat uživatele"
 
-#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
-msgid "Incorrect username or password."
-msgstr "Neplatné jméno nebo heslo"
+#: actions/editgroup.php:269
+#, fuzzy
+msgid "Options saved."
+msgstr "Nastavení uloženo"
 
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
+#: actions/emailsettings.php:60
+msgid "Email Settings"
 msgstr ""
-"Návod jak obnovit heslo byl odeslát na vaší emailovou adresu zaregistrovanou "
-"u vašeho účtu."
-
-#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "Neplatná adresa obrázku '%s'"
 
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/emailsettings.php:71
 #, php-format
-msgid "Invalid email address: %s"
+msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
-#, php-format
-msgid "Invalid homepage '%s'"
-msgstr "Neplatná adresa '%s'"
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "Adresa"
 
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
-#, php-format
-msgid "Invalid license URL '%s'"
-msgstr "Neplatná adresa licence '%s'"
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr ""
 
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
-msgstr "Neplatný obsah sdělení"
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "Odstranit"
 
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
-msgstr "Neplatná uri sdělení"
+#: actions/emailsettings.php:113
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
 
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
-msgstr "Neplatná url sdělení"
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "Zrušit"
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "Neplatná adresa profilu '%s'."
+#: actions/emailsettings.php:121
+msgid "Email Address"
+msgstr ""
 
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
-msgstr "Neplatná adresa profilu (špatný formát)"
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
-msgstr "Neplatná adresa profilu, vrácená serverem"
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "Přidat"
 
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
-#: actions/avatarbynickname.php:69
-msgid "Invalid size."
-msgstr "Neplatná velikost"
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+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
-#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
-msgid "Invalid username or password."
-msgstr "Neplatné jméno nebo heslo"
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
+msgstr ""
 
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-msgid "Invitation(s) sent"
+#: actions/emailsettings.php:145 actions/smssettings.php:162
+msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-msgid "Invitation(s) sent to the following people:"
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
 msgstr ""
 
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
-msgid "Invite"
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
+msgstr "Nastavení"
+
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-msgid "Invite new users"
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
-#, php-format
-msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
 msgstr ""
-"Běží na [StatusNet](http://status.net/) mikroblogovací program, verze %s, "
-"dostupná pod [GNU Affero General Public License](http://www.fsf.org/"
-"licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
-msgstr "Jabber ID již patří jinému uživateli"
+#: actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
+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."
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
 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 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
-msgid "Language"
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
 msgstr ""
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
-msgid "Language is too long (max 50 chars)."
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
 msgstr ""
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
-msgid "Location"
-msgstr "Umístění"
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Uložit"
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
-#: actions/register.php:92 actions/updateprofile.php:109
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
-msgid "Location is too long (max 255 chars)."
-msgstr "Umístění příliš dlouhé (maximálně 255 znaků)"
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+msgstr "Nastavení uloženo"
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
-#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
-#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
-#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
-#, php-format
-msgid "Login"
-msgstr "Přihlásit"
+#: actions/emailsettings.php:319
+msgid "No email address."
+msgstr ""
 
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Přihlaste se pomocí [OpenID](%%doc.openid%%) účtu."
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
+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%"
-"%). "
+#: actions/emailsettings.php:330
+msgid "Not a valid email address"
 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%%)."
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
-msgid "Logout"
-msgstr "Odhlásit"
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
+msgstr ""
 
-#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
-msgid "Longer name, preferably your \"real\" name"
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another user."
 msgstr ""
 
-#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
-msgid "Lost or forgotten password?"
-msgstr "Ztracené nebo zapomenuté heslo?"
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+msgstr "Nelze vložit potvrzující kód"
 
-#: ../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."
+#: actions/emailsettings.php:358
+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/emailsettings.php:27 actions/emailsettings.php:27
-#: actions/emailsettings.php:71
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr ""
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
+msgstr "Nečeká žádné potvrzení na zrušení."
 
-#: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
-msgid "Member since"
-msgstr "Členem od"
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "Toto je špatná IM adresa"
 
-#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
-#, php-format
-msgid "Microblog by %s"
-msgstr "Mikroblog od %s"
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "Potvrď zrušení"
 
-#: ../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."
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-msgid "My text and files are available under "
-msgstr "Mé texty a soubory jsou k dispozici pod"
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "Adresa byla odstraněna"
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#: actions/emailsettings.php:142 actions/smssettings.php:152
-msgid "New"
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
 msgstr ""
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
-#, php-format
-msgid "New email address for posting to %s"
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
 msgstr ""
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
-msgid "New incoming email address added."
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
-msgid "New nickname"
-msgstr "Nová přezdívka"
-
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
-msgstr "Nové sdělení"
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
+msgstr ""
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-msgid "New password"
-msgstr "Nové heslo"
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+#, fuzzy
+msgid "Popular notices"
+msgstr "Žádné takové oznámení."
 
-#: ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
-msgstr "Nové heslo bylo uloženo. Nyní jste přihlášen."
+#: actions/favorited.php:67
+#, fuzzy, php-format
+msgid "Popular notices, page %d"
+msgstr "Žádné takové oznámení."
 
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151 actions/login.php:101
-#: actions/profilesettings.php:74 actions/register.php:165
-#: actions/login.php:228 actions/profilesettings.php:98
-#: actions/register.php:367 actions/showgroup.php:224
-#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
-msgid "Nickname"
-msgstr "Přezdívka"
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
+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
-#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
-msgid "Nickname already in use. Try another one."
-msgstr "Přezdívku již někdo používá. Zkuste jinou"
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+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
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "Přezdívka může obsahovat pouze malá písmena a čísla bez mezer"
+#: actions/favorited.php:153
+msgid ""
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
-msgid "Nickname not allowed."
-msgstr "Přezdívka není povolena"
+#: actions/favorited.php:156
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
+msgstr ""
 
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
-msgstr "Přezdívka uživatele, kterého chcete sledovat"
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
 
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
-msgid "Nickname or email"
-msgstr "Přezdívka nebo email"
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Mikroblog od %s"
 
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
-msgid "No"
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
 msgstr ""
 
-#: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
-msgstr "Žádné Jabber ID."
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr ""
 
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
-msgid "No authorization request!"
-msgstr "Žádné potvrení!"
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr ""
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
-msgid "No carrier selected."
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
 msgstr ""
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
-#: actions/confirmaddress.php:75
-msgid "No confirmation code."
-msgstr "Žádný potvrzující kód."
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "Nové sdělení"
 
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
-#: actions/newnotice.php:126 classes/Command.php:223
-msgid "No content!"
-msgstr "Žádný obsah!"
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Nové sdělení"
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
-msgid "No email address."
+#: actions/file.php:42
+msgid "No attachments"
 msgstr ""
 
-#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
-msgid "No id."
-msgstr "Žádné id"
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
-msgid "No incoming email address."
+#: actions/file.php:51
+msgid "No uploaded attachments"
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr "Nebyla poskytnuta žádná přezdívka od servru."
+#: actions/finishremotesubscribe.php:69
+msgid "Not expecting this response!"
+msgstr "Nečekaná odpověď."
 
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
-msgid "No nickname."
-msgstr "Žádná přezdívka."
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "Úživatel, kterému nasloucháte neexistuje."
 
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229 actions/emailsettings.php:240
-#: actions/imsettings.php:214 actions/smssettings.php:237
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
-msgid "No pending confirmation to cancel."
-msgstr "Nečeká žádné potvrzení na zrušení."
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+msgstr "Můžete použít místní odebírání."
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
-msgstr "Nebylo vráceno žádné URL profilu od servu."
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "Neautorizován."
 
-#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
-msgid "No registered email address for that user."
-msgstr "Žádný registrovaný email pro tohoto uživatele."
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "Nelze konvertovat řetězec požadavku na přístupový řetězec."
 
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr "Žádný požadavek nebyl nalezen!"
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Neznámá verze OMB protokolu."
 
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
-msgid "No results"
-msgstr "Žádné výsledky."
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "Chyba při aktualizaci vzdáleného profilu"
 
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
-msgstr "Žádná velikost"
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+#, fuzzy
+msgid "No such group."
+msgstr "Žádné takové oznámení."
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
-msgid "No status found with that ID."
-msgstr ""
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "Žádné takové oznámení."
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
-msgid "No status with that ID found."
-msgstr ""
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Žádné takové oznámení."
 
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
-msgstr "Žádné takové OpenID"
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
+msgstr ""
 
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
-msgid "No such document."
-msgstr "Žádný takový dokument."
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+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 actions/shownotice.php:87
-#: lib/deleteaction.php:51
-msgid "No such notice."
-msgstr "Žádné takové oznámení."
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "Uživatel nemá profil."
 
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr "Žádný takový obnovující kód."
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "Neodeslal jste nám profil"
 
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-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/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 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
-msgid "No such user."
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
 msgstr "Žádný takový uživatel."
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-msgid "No user with that email address or username."
+#: actions/groupblock.php:162
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
 msgstr ""
 
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
-msgstr "Nikdo k zobrazení!"
+#: actions/groupblock.php:178
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "Nelze přesměrovat na server: %s"
 
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr "Není obnovujícím kódem"
+#: actions/groupblock.php:179
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "Žádný takový uživatel."
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
 msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
-msgid "Not a supported data format."
+#: actions/groupbyid.php:74
+msgid "No ID"
 msgstr ""
 
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
-msgstr "Není platným Jabber ID"
-
-#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-msgid "Not a valid OpenID."
-msgstr "Není platným OpenID."
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
-msgid "Not a valid email address"
+#: actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
 msgstr ""
 
-#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-msgid "Not a valid email address."
-msgstr "Není platnou mailovou adresou."
-
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-#: actions/editgroup.php:186 actions/newgroup.php:137
-#: actions/profilesettings.php:195 actions/register.php:161
-msgid "Not a valid nickname."
-msgstr "Není platnou přezdívkou."
-
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
-msgstr "Neplatný adresa profilu (nesprává služba)"
-
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr "Není platnou adresou profulu (XRDS nedefinováno)."
-
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr "Není platnou adresou profilu (není YADIS dokumentem)."
-
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
-msgid "Not an image or corrupt file."
-msgstr "Není obrázkem, nebo jde o poškozený soubor."
+#: actions/groupdesignsettings.php:141
+msgid "Group design"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
-msgid "Not authorized."
-msgstr "Neautorizován."
+#: actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
-msgid "Not expecting this response!"
-msgstr "Nečekaná odpověď."
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Nelze aktualizovat uživatele"
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
-msgid "Not found"
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+msgid "Unable to save your design settings!"
 msgstr ""
 
-#: ../actions/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 actions/block.php:59 actions/disfavor.php:61
-#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
-#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
-#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
-#: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Nepřihlášen"
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Nastavení uloženo"
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
-msgid "Not subscribed!."
-msgstr "Nepřihlášen!"
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
+msgstr ""
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
+#: actions/grouplogo.php:150
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
 msgstr ""
 
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
-#, fuzzy, php-format
-msgid "Notice feed for %s"
-msgstr "Feed sdělení pro %s"
+#: actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
+msgstr ""
 
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
-msgstr "Sdělení nemá profil"
+#: actions/grouplogo.php:396
+#, fuzzy
+msgid "Logo updated."
+msgstr "Obrázek nahrán"
 
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
-msgid "Notices"
-msgstr "Sdělení"
+#: actions/grouplogo.php:398
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "Nahrávání obrázku selhalo."
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/groupmembers.php:93 lib/groupnav.php:92
 #, php-format
-msgid "Notices tagged with %s"
+msgid "%s group members"
 msgstr ""
 
-#: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
-msgstr "Staré heslo"
-
-#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
-msgid "OpenID"
-msgstr "OpenID"
-
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
-msgid "OpenID Account Setup"
-msgstr "Nastavení OpenID účtu"
-
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-msgid "OpenID Auto-Submit"
-msgstr "Přihlásit automaticky pomocí OpenID"
-
-#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
-#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-msgid "OpenID Login"
-msgstr "OpenID přihlášení"
-
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-#: actions/openidlogin.php:102 actions/openidsettings.php:101
-msgid "OpenID URL"
-msgstr "OpenID adresa"
-
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
-msgid "OpenID authentication cancelled."
-msgstr "Přihlašovaní pomocí OpenID zrušeno"
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr "Přihlašovaní pomocí OpenID selhalo: %s"
-
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "OpenID selhalo: %s"
-
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr "OpenID odstraněno"
-
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
-msgstr "Nastavení OpenID"
-
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-msgid "Optionally add a personal message to the invitation."
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
 msgstr ""
 
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
-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:96 actions/login.php:102
-#: actions/register.php:167 actions/finishopenidlogin.php:118
-#: actions/login.php:231 actions/register.php:372
-#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-msgid "Password"
-msgstr "Heslo"
-
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
-msgid "Password and confirmation do not match."
-msgstr "Heslo a potvrzení nesouhlasí"
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr ""
 
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
-msgid "Password must be 6 chars or more."
-msgstr "Heslo musí být alespoň 6 znaků dlouhé"
+#: actions/groupmembers.php:175 lib/groupnav.php:107
+msgid "Admin"
+msgstr ""
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-msgid "Password recovery requested"
-msgstr "Žádost o obnovu hesla"
+#: actions/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
+msgstr ""
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-msgid "Password saved."
-msgstr "Heslo uloženo"
+#: actions/groupmembers.php:441
+msgid "Make user an admin of the group"
+msgstr ""
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-msgid "Passwords don't match."
-msgstr "Hesla nesouhlasí"
+#: actions/groupmembers.php:473
+msgid "Make Admin"
+msgstr ""
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
 msgstr ""
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Mikroblog od %s"
+
+#: actions/groupsearch.php:52
+#, fuzzy, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
+"Hledej uživatele na %%site.name%% podle jejich jména, místa, nebo zájmů. "
+"Minimální délka musí být alespoň 3 znaky"
 
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
+#: actions/groupsearch.php:58
+#, fuzzy
+msgid "Group search"
 msgstr "Hledání lidí"
 
-#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
-msgid "Personal"
-msgstr "Osobní"
-
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-msgid "Personal message"
-msgstr ""
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "Žádné výsledky."
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
+#: actions/groupsearch.php:82
+#, php-format
+msgid ""
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
 msgstr ""
 
-#: ../actions/userauthorization.php:78
+#: actions/groupsearch.php:85
+#, php-format
 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\"."
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
 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\""
 
-#: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
-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/emailsettings.php:86
-#: actions/imsettings.php:68 actions/smssettings.php:94
-#: actions/twittersettings.php:70 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
-msgid "Preferences"
-msgstr "Nastavení"
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
+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
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
-msgid "Preferences saved."
-msgstr "Nastavení uloženo"
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
-msgid "Preferred language"
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
 msgstr ""
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
-msgid "Privacy"
-msgstr "Soukromí"
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+#, fuzzy
+msgid "Create a new group"
+msgstr "Vytvořit nový účet"
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-msgid "Problem saving notice."
-msgstr "Problém při ukládání sdělení"
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
-msgid "Profile"
-msgstr "Profil"
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "Uživatel nemá profil."
 
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
-msgstr "Adresa Profilu"
+#: actions/groupunblock.php:128 actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Chyba při ukládaní uživatele"
 
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
-msgstr "Nastavené Profilu"
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "IM nastavení"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-msgid "Profile unknown"
-msgstr "Neznámý profil"
+#: actions/imsettings.php:70
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+"Můžete odesílat nebo přijámat sdělení pomocí Jabber/GTalk [zpráv](%%doc.im%"
+"%).Zadejte svou adresu níže."
 
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
+#: actions/imsettings.php:89
 #, fuzzy
-msgid "Public Stream Feed"
-msgstr "Veřejný Stream Feed"
+msgid "IM is not available."
+msgstr "Tato stránka není k dispozici v typu média která přijímáte."
 
-#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
-msgid "Public timeline"
-msgstr "Veřejné zprávy"
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Potvrzené Jabber/GTalk adresy"
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#: actions/imsettings.php:114
+#, 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 ""
+"Č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:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
-msgid "Publish a MicroID for my email address."
-msgstr ""
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "IM adresa"
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
+#: actions/imsettings.php:126
+#, 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/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
-msgid "Recover"
-msgstr "Obnovit"
-
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
-msgid "Recover password"
-msgstr "Obnovit"
-
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-msgid "Recovery code for unknown user."
-msgstr "Obnovyt kód pro neznámého uživatele"
+#: actions/imsettings.php:143
+msgid "Send me notices through Jabber/GTalk."
+msgstr "Zasílat oznámení pomocí Jabber/GTalk"
 
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
-#: actions/register.php:152 actions/register.php:207 lib/util.php:328
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-msgid "Register"
-msgstr "Registrovat"
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr "Poslat oznámení, když se změní můj Jabber/Gtalk status."
 
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
-msgid "Registration not allowed."
+#: actions/imsettings.php:153
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
-msgid "Registration successful"
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
-msgid "Reject"
-msgstr "Odmítnout"
-
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
-msgid "Remember me"
-msgstr "Zapamatuj si mě"
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "Žádné Jabber ID."
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
-msgid "Remote profile with no matching profile"
-msgstr "Vzdálený profil s nesouhlasícím profilem"
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr "Nelze normalizovat JabberID"
 
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
-msgstr "Vzdálený odběr"
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "Není platným Jabber ID"
 
-#: ../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 actions/emailsettings.php:101
-#: actions/emailsettings.php:134 actions/imsettings.php:102
-#: actions/openidsettings.php:166 actions/smssettings.php:103
-#: actions/smssettings.php:146 actions/twittersettings.php:115
-msgid "Remove"
-msgstr "Odstranit"
+#: actions/imsettings.php:299
+msgid "That is already your Jabber ID."
+msgstr "Toto je již vaše Jabber"
 
-#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
-msgstr "Odstranit OpenID"
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr "Jabber ID již patří jinému uživateli"
 
-#: ../actions/openidsettings.php:73
+#: actions/imsettings.php:327
+#, php-format
 msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
 msgstr ""
-"Odstranění jediného OpenID, bude mít za následek nemožnost dalšího "
-"přihlášení, nejprve přidejte jiné OpenID"
+"Ověřující kód byl poslán na vloženou IM adresu. Musíte prokázat %s pro "
+"posílání zpráv."
 
-#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
-msgid "Replies"
-msgstr "Odpovědi"
+#: actions/imsettings.php:387
+msgid "That is not your Jabber ID."
+msgstr "Toto není váš Jabber"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
-#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
-#: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: actions/inbox.php:59
 #, php-format
-msgid "Replies to %s"
-msgstr "Odpovědi na %s"
+msgid "Inbox for %s - page %d"
+msgstr ""
 
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
-msgid "Reset"
-msgstr "Reset"
+#: actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
 
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
-msgid "Reset password"
-msgstr "Resetovat heslo"
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-msgid "SMS"
+#: actions/invite.php:39
+msgid "Invites have been disabled."
 msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
-msgid "SMS Phone number"
+#: actions/invite.php:41
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
 msgstr ""
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
+#: actions/invite.php:72
+#, php-format
+msgid "Invalid email address: %s"
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
-msgid "SMS confirmation"
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
 msgstr ""
 
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
-msgid "Same as password above"
-msgstr "Stejné jako heslo výše"
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr ""
 
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
-msgid "Same as password above. Required."
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
 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 actions/emailsettings.php:182
-#: actions/facebooksettings.php:114 actions/imsettings.php:157
-#: actions/othersettings.php:117 actions/profilesettings.php:150
-#: actions/smssettings.php:169 actions/subscriptions.php:124
-#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
-msgid "Save"
-msgstr "Uložit"
+#: actions/invite.php:131 actions/invite.php:139
+#, php-format
+msgid "%s (%s)"
+msgstr ""
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
-msgid "Search"
-msgstr "Hledat"
+#: actions/invite.php:136
+msgid ""
+"These people are already users and you were automatically subscribed to them:"
+msgstr ""
 
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-#, fuzzy
-msgid "Search Stream Feed"
-msgstr "Hledat ve Stream Feed"
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
-#, php-format
+#: actions/invite.php:150
 msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 msgstr ""
-"Hledej sdělení na %%site.name%% podle obsahu. Minimální délka musí být "
-"alespoň 3 znaky"
 
-#: ../actions/peoplesearch.php:28
-#, php-format
+#: actions/invite.php:162
 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."
+"Use this form to invite your friends and colleagues to use this service."
 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 actions/smssettings.php:304
-#: actions/smssettings.php:457
-msgid "Select a carrier"
+#: actions/invite.php:187
+msgid "Email addresses"
 msgstr ""
 
-#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
-#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
-msgid "Send"
-msgstr "Odeslat"
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
+#: actions/invite.php:192
+msgid "Personal message"
 msgstr ""
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
-msgid "Send me notices through Jabber/GTalk."
-msgstr "Zasílat oznámení pomocí Jabber/GTalk"
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
+msgstr "Odeslat"
 
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
-msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
+#: actions/invite.php:226
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#: actions/invite.php:228
+#, 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/util.php:304 lib/util.php:320 lib/facebookaction.php:215
-msgid "Settings"
-msgstr "Nastavení"
-
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
-msgid "Settings saved."
-msgstr "Nastavení uloženo"
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
 msgstr ""
 
-#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:114
-msgid "Someone else already has this OpenID."
-msgstr "Někdo jiný již má toto OpenID"
+#: actions/joingroup.php:90 lib/command.php:217
+#, fuzzy
+msgid "You are already a member of that group"
+msgstr "Již jste přihlášen"
 
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
-msgstr "Něco zvláštního se stalo"
+#: actions/joingroup.php:128 lib/command.php:234
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s"
+msgstr "Nelze přesměrovat na server: %s"
 
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
+#: actions/joingroup.php:135 lib/command.php:239
+#, php-format
+msgid "%s joined group %s"
 msgstr ""
 
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
-msgid "Source"
-msgstr "Zdroj"
-
-#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
-msgid "Statistics"
-msgstr "Statistiky"
+#: actions/leavegroup.php:90 lib/command.php:268
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "Neodeslal jste nám profil"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-msgid "Stored OpenID not found."
-msgstr "Uložené OpenID nebylo nalezeno."
+#: actions/leavegroup.php:119 lib/command.php:278
+msgid "Could not find membership record."
+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
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
-msgid "Subscribe"
-msgstr "Odebírat"
+#: actions/leavegroup.php:127 lib/command.php:284
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "Nelze vytvořit OpenID z: %s"
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
-msgid "Subscribers"
-msgstr "Odběratelé"
+#: actions/leavegroup.php:134 lib/command.php:289
+#, php-format
+msgid "%s left group %s"
+msgstr ""
 
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
-msgid "Subscription authorized"
-msgstr "Odběr autorizován"
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "Již přihlášen"
 
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
-msgid "Subscription rejected"
-msgstr "Odběr odmítnut"
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Neplatný obsah sdělení"
 
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27 actions/showstream.php:240
-#: actions/showstream.php:322 actions/subscriptions.php:27
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
-msgid "Subscriptions"
-msgstr "Odběry"
+#: actions/login.php:143
+msgid "Incorrect username or password."
+msgstr "Neplatné jméno nebo heslo"
 
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
-msgid "System error uploading file."
-msgstr "Chyba systému při nahrávání souboru"
+#: actions/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
+msgstr "Chyba nastavení uživatele"
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
-#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
-msgid "Tags"
-msgstr ""
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "Přihlásit"
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
+#: actions/login.php:243
+msgid "Login to site"
 msgstr ""
 
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
-msgid "Text search"
-msgstr "Vyhledávání textu"
-
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
-msgstr "Toto OpenID vám nepatří"
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Přezdívka"
 
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
-msgstr "Adresa již byla potvrzena"
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Heslo"
 
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
-msgstr "Tento potvrzující kód vám nepatří!"
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "Zapamatuj si mě"
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr ""
+#: actions/login.php:253 actions/register.php:479
+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/avatar.php:80 actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
-msgstr "Soubor je příliš velký"
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "Ztracené nebo zapomenuté heslo?"
 
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
-msgid "That is already your Jabber ID."
-msgstr "Toto je již vaše Jabber"
+#: actions/login.php:282
+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/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
-msgid "That is already your email address."
+#: actions/login.php:286
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
 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%%)."
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
-msgid "That is already your phone number."
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
 msgstr ""
 
-#: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
-msgid "That is not your Jabber ID."
-msgstr "Toto není váš Jabber"
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
-msgid "That is not your email address."
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
 msgstr ""
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
 msgstr ""
 
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-#: actions/emailsettings.php:367 actions/imsettings.php:349
-msgid "That is the wrong IM address."
-msgstr "Toto je špatná IM adresa"
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr ""
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
+#: actions/newgroup.php:53
+msgid "New group"
 msgstr ""
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-msgid "That phone number already belongs to another user."
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
 msgstr ""
 
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49 actions/twitapistatuses.php:330
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-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/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr ""
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
-msgid "That's too long. Max notice size is 255 chars."
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
 msgstr ""
 
-#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
-#, php-format
-msgid "The address \"%s\" has been confirmed for your account."
-msgstr "Adresa \"%s\" byla potvrzena pro váš účet"
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+msgstr "Žádný obsah!"
 
-#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274 actions/emailsettings.php:282
-#: actions/imsettings.php:258 actions/smssettings.php:282
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
-msgid "The address was removed."
-msgstr "Adresa byla odstraněna"
+#: actions/newmessage.php:158
+msgid "No recipient specified."
+msgstr ""
 
-#: ../actions/userauthorization.php:312
+#: actions/newmessage.php:164 lib/command.php:370
 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:"
+"Don't send a message to yourself; just say it to yourself quietly instead."
 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:"
 
-#: ../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."
+#: actions/newmessage.php:181
+msgid "Message sent"
 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"
 
-#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/newmessage.php:185 lib/command.php:375
 #, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr "Toto jsou lidé, kteří naslouchají %s sdělením"
+msgid "Direct message to %s sent"
+msgstr ""
 
-#: ../actions/subscribers.php:33 actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr "Toto jsou lidé, kteří naslouchají vašim sdělením "
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
+msgstr ""
 
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
-#, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr "Toto jsou lidé, jejiž sdělením %s naslouchá"
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "Nové sdělení"
 
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr "Toto jsou lidé, jejiž sdělením nasloucháte"
+#: actions/newnotice.php:199
+#, fuzzy
+msgid "Notice posted"
+msgstr "Sdělení"
 
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/noticesearch.php:68
+#, php-format
 msgid ""
-"These people are already users and you were automatically subscribed to them:"
+"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"
 
-#: ../actions/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
-msgstr "Tento potvrzující kód je příliš starý Prosím zkuste znovu"
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "Vyhledávání textu"
 
-#: ../lib/openid.php:195
-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."
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr " Hledej \"%s\" ve Streamu"
 
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/noticesearch.php:121
 #, 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 ""
-"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
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-msgid "This method requires a POST or DELETE."
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 msgstr ""
 
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
-msgid "This method requires a POST."
+#: actions/noticesearch.php:124
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#: ../lib/util.php:164 lib/util.php:246
-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 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
-msgid "Timezone"
-msgstr ""
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Mikroblog od %s"
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
-msgid "Timezone not selected."
-msgstr ""
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Všechny položky obsahující \"%s\""
 
-#: ../actions/remotesubscribe.php:43
-#, php-format
+#: actions/nudge.php:85
 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."
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 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 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
-msgid "Two user ids or screen_names must be supplied."
+#: actions/nudge.php:94
+msgid "Nudge sent"
 msgstr ""
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách."
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr ""
 
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-msgid "URL of your profile on another compatible microblogging service"
-msgstr "Adresa profilu na jiných kompatibilních mikroblozích."
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+msgstr "Sdělení nemá profil"
 
-#: ../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 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-msgid "Unexpected form submission."
-msgstr "Nečekaná forma submission."
+#: actions/oembed.php:86 actions/shownotice.php:180
+#, php-format
+msgid "%1$s's status on %2$s"
+msgstr "%1 statusů na %2"
 
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
-msgid "Unexpected password reset."
-msgstr "Nečekané resetování hesla."
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Připojit"
 
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-msgid "Unknown action"
+#: actions/oembed.php:160
+msgid "Only "
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-msgid "Unknown version of OMB protocol."
-msgstr "Neznámá verze OMB protokolu."
-
-#: ../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 "
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
 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"
-
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
-#, php-format
-msgid "Unrecognized address type %s"
-msgstr "Neznámý typ adresy %s"
 
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
-msgstr "Odhlásit"
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr ""
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-msgid "Unsupported OMB version"
-msgstr "Nepodporovaná verze OMB."
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr ""
 
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
-msgid "Unsupported image file format."
-msgstr "Nepodporovaný formát obrázku."
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "Nastavení"
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
+#: actions/othersettings.php:71
+msgid "Manage various other options."
 msgstr ""
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
+#: actions/othersettings.php:108
+msgid " (free service)"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
-#, php-format
-msgid "Updates from %1$s on %2$s!"
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
 msgstr ""
 
-#: ../actions/avatar.php:68 actions/profilesettings.php:161
-#: actions/avatarsettings.php:162 actions/grouplogo.php:232
-msgid "Upload"
-msgstr "Upload"
+#: actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "Nastavené Profilu"
 
-#: ../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."
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
 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
-msgid "Upload a new profile image"
+#: actions/othersettings.php:153
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Umístění příliš dlouhé (maximálně 255 znaků)"
+
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %s - page %d"
 msgstr ""
 
-#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
+#: actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
 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 "Použije se pouze pro aktualizace, oznámení a obnovu hesla."
+#: actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
-msgid "User being listened to doesn't exist."
-msgstr "Úživatel, kterému nasloucháte neexistuje."
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "Změnit heslo"
 
-#: ../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
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-msgid "User has no profile."
-msgstr "Uživatel nemá profil."
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "Změnit heslo"
 
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
-msgstr "Přezdívka"
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#, fuzzy
+msgid "Password change"
+msgstr "Heslo uloženo"
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr ""
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "Staré heslo"
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
-msgid "What timezone are you normally in?"
-msgstr ""
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "Nové heslo"
 
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
-#, php-format
-msgid "What's up, %s?"
-msgstr "Co se děje %s?"
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6 a více znaků"
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-#: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Místo. Město, stát."
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "Heslo znovu"
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
-#, php-format
-msgid "Wrong image type for '%s'"
-msgstr "Neplatný typ obrázku pro '%s'"
+#: actions/passwordsettings.php:113
+msgid "same as password above"
+msgstr "stejné jako heslo výše"
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
-#, php-format
-msgid "Wrong size image at '%s'"
-msgstr "Neplatná velikost obrázku '%s'"
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "Změnit"
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
-msgid "Yes"
+#: actions/passwordsettings.php:154 actions/register.php:230
+msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-msgid "You already have this OpenID!"
-msgstr "Již máte toto OpenID!"
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "Hesla nesouhlasí"
 
-#: ../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/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "Neplatné heslo"
 
-#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
-msgstr "Již jste přihlášen"
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "Chyba při ukládaní uživatele; neplatný"
 
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-msgid "You are already subscribed to these users:"
-msgstr ""
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "Nelze uložit nové heslo"
+
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "Heslo uloženo"
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
-msgid "You are not friends with the specified user."
+#: actions/peoplesearch.php:52
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+"Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
+"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/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr "Zde můžeze změnit heslo."
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "Hledání lidí"
 
-#: ../actions/register.php:135 actions/register.php:145
-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/peopletag.php:70
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Není platnou mailovou adresou."
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
+#: actions/peopletag.php:144
 #, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
+msgid "Users self-tagged with %s - page %d"
 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\"."
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "Neplatný obsah sdělení"
 
-#: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/postnotice.php:90
 #, php-format
-msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
-"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
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "Nastavené Profilu"
+
+#: actions/profilesettings.php:71
 msgid ""
 "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."
 
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
-msgstr "Můžete použít místní odebírání."
+#: actions/profilesettings.php:99
+#, fuzzy
+msgid "Profile information"
+msgstr "Neznámý profil"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
-msgid "You can't register if you don't agree to the license."
-msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí."
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer"
 
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
-msgid "You did not send us that profile"
-msgstr "Neodeslal jste nám profil"
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full name"
+msgstr "Celé jméno"
 
-#: ../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/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "Moje stránky"
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
-msgid "You may not delete another user's status."
-msgstr ""
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách."
 
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr ""
+#: actions/profilesettings.php:122 actions/register.php:460
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Popiš sebe a své zájmy ve 140 znacích"
 
-#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
+#: actions/profilesettings.php:125 actions/register.php:463
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Popiš sebe a své zájmy ve 140 znacích"
 
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr "Byl jste identifikován. Zadejte nové heslo"
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "O mě"
 
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
-msgid "Your OpenID URL"
-msgstr "Vaše OpenID adresa"
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "Umístění"
 
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
-msgstr "Vaše přezdívka na tomto servu, nebo váš email zadaný při registraci"
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "Místo. Město, stát."
 
-#: ../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."
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
 msgstr ""
-"[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:992 lib/util.php:945
-msgid "a few seconds ago"
-msgstr "před pár sekundami"
+#: actions/profilesettings.php:140
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
-#, php-format
-msgid "about %d days ago"
-msgstr "před %d dny"
+#: actions/profilesettings.php:144
+msgid "Language"
+msgstr ""
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
-#, php-format
-msgid "about %d hours ago"
-msgstr "asi před %d hodinami"
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr ""
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
-#, php-format
-msgid "about %d minutes ago"
-msgstr "asi před %d minutami"
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr ""
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
-#, php-format
-msgid "about %d months ago"
-msgstr "asi před %d mesíci"
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
+msgstr ""
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
-msgid "about a day ago"
-msgstr "asi přede dnem"
+#: actions/profilesettings.php:160
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
-msgid "about a minute ago"
-msgstr "asi před minutou"
+#: actions/profilesettings.php:221 actions/register.php:223
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
-msgid "about a month ago"
-msgstr "asi před měsícem"
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr ""
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
-msgid "about a year ago"
-msgstr "asi před rokem"
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr ""
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
-msgid "about an hour ago"
-msgstr "asi před hodinou"
+#: actions/profilesettings.php:246 actions/tagother.php:178
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Neplatná adresa '%s'"
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
 msgstr ""
 
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117 actions/noticesearch.php:136
-#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
-msgid "in reply to..."
-msgstr "odpověd na ..."
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+msgstr "Nelze uložit profil"
 
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124 actions/noticesearch.php:143
-#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
-msgid "reply"
-msgstr "odpověď"
+#: actions/profilesettings.php:336
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Nelze uložit profil"
 
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-msgid "same as password above"
-msgstr "stejné jako heslo výše"
+#: actions/profilesettings.php:344
+msgid "Settings saved."
+msgstr "Nastavení uloženo"
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
-msgid "unsupported file type"
+#: actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
 msgstr ""
 
-#: ../lib/util.php:1309 lib/util.php:1443
-#, fuzzy
-msgid "« After"
-msgstr "« Novější"
-
-#: 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
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-msgid "There was a problem with your session token. Try again, please."
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
 msgstr ""
 
-#: actions/disfavor.php:55 actions/disfavor.php:81
-msgid "This notice is not a favorite!"
-msgstr ""
+#: actions/public.php:129
+#, fuzzy, php-format
+msgid "Public timeline, page %d"
+msgstr "Veřejné zprávy"
 
-#: actions/disfavor.php:63 actions/disfavor.php:87
-msgid "Could not delete favorite."
-msgstr ""
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr "Veřejné zprávy"
 
-#: actions/disfavor.php:72 lib/favorform.php:140
-msgid "Favor"
-msgstr ""
+#: actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Veřejný Stream Feed"
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
-msgstr ""
+#: actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Veřejný Stream Feed"
 
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-msgid "Send me email when someone sends me a private message."
-msgstr ""
+#: actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Veřejný Stream Feed"
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
-msgid "This notice is already a favorite!"
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
 msgstr ""
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132 actions/favor.php:86
-#: actions/twitapifavorites.php:125 classes/Command.php:152
-msgid "Could not create favorite."
+#: actions/public.php:182
+msgid "Be the first to post!"
 msgstr ""
 
-#: actions/favor.php:70
-msgid "Disfavor"
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/public.php:233
 #, php-format
-msgid "%s favorite notices"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/public.php:238
 #, php-format
-msgid "Feed of favorite notices of %s"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
 msgstr ""
 
-#: actions/inbox.php:28 actions/inbox.php:59
+#: actions/publictagcloud.php:57
+#, fuzzy
+msgid "Public tag cloud"
+msgstr "Veřejný Stream Feed"
+
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "Inbox for %s - page %d"
+msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/inbox.php:30 actions/inbox.php:62
+#: actions/publictagcloud.php:69
 #, php-format
-msgid "Inbox for %s"
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
 
-#: actions/inbox.php:53 actions/inbox.php:115
-msgid "This is your inbox, which lists your incoming private messages."
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
 msgstr ""
 
-#: actions/invite.php:178 actions/invite.php:213
+#: actions/publictagcloud.php:75
 #, php-format
 msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
 msgstr ""
 
-#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-msgid "Automatically login in the future; "
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
 msgstr ""
 
-#: actions/login.php:122 actions/login.php:264
-msgid "For security reasons, please re-enter your "
-msgstr ""
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "Již jste přihlášen"
 
-#: actions/login.php:126 actions/login.php:268
-msgid "Login with your username and password. "
-msgstr ""
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "Žádný takový obnovující kód."
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
-msgid "That's too long. Max message size is 140 chars."
-msgstr ""
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "Není obnovujícím kódem"
 
-#: actions/newmessage.php:65 actions/newmessage.php:128
-msgid "No recipient specified."
-msgstr ""
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr "Obnovyt kód pro neznámého uživatele"
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206 actions/newmessage.php:131
-#: actions/newmessage.php:168 classes/Command.php:237
-msgid "You can't send a message to this user."
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "Chyba v ověřovacím kódu"
+
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
+msgstr "Tento potvrzující kód je příliš starý Prosím zkuste znovu"
+
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
 msgstr ""
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: actions/recoverpassword.php:152
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
 msgstr ""
 
-#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
-msgid "No such user"
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
-#: actions/newmessage.php:117 actions/newmessage.php:67
-msgid "New message"
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
 msgstr ""
 
-#: actions/noticesearch.php:95 actions/noticesearch.php:146
-msgid "Notice without matching profile"
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
 msgstr ""
 
-#: actions/openidsettings.php:28 actions/openidsettings.php:70
-#, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr ""
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
+msgstr "Vaše přezdívka na tomto servu, nebo váš email zadaný při registraci"
 
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
-msgstr ""
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
+msgstr "Obnovit"
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr ""
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "Resetovat heslo"
 
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-msgid "You can remove an OpenID from your account "
-msgstr ""
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr "Obnovit"
 
-#: actions/outbox.php:28 actions/outbox.php:58
-#, php-format
-msgid "Outbox for %s - page %d"
-msgstr ""
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
+msgstr "Žádost o obnovu hesla"
 
-#: actions/outbox.php:30 actions/outbox.php:61
-#, php-format
-msgid "Outbox for %s"
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
 msgstr ""
 
-#: actions/outbox.php:53 actions/outbox.php:116
-msgid "This is your outbox, which lists private messages you have sent."
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 a více znaků, a nezapomeňte"
+
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Stejné jako heslo výše"
+
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "Reset"
+
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "Zadej přezdívku nebo emailovou adresu"
+
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
 msgstr ""
 
-#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
-#, php-format
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr "Žádný registrovaný email pro tohoto uživatele."
+
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "Chyba při ukládání potvrzení adresy"
+
+#: actions/recoverpassword.php:325
 msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+"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."
 
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
-msgid "You can update your personal profile info here "
-msgstr ""
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
+msgstr "Nečekané resetování hesla."
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
-msgid "User without matching profile"
-msgstr ""
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "Heslo musí být alespoň 6 znaků dlouhé"
 
-#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
-msgstr ""
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
+msgstr "Heslo a potvrzení nesouhlasí"
 
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
-msgstr ""
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
+msgstr "Nové heslo bylo uloženo. Nyní jste přihlášen."
 
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a "
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-msgid "Your nickname on this server, "
-msgstr ""
+#: actions/register.php:92
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "Chyba v ověřovacím kódu"
 
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-msgid "Instructions for recovering your password "
+#: actions/register.php:112
+msgid "Registration successful"
 msgstr ""
 
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
-msgid "New password successfully saved. "
-msgstr ""
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "Registrovat"
 
-#: actions/register.php:95 actions/register.php:180
-msgid "Password must be 6 or more characters."
+#: actions/register.php:135
+msgid "Registration not allowed."
 msgstr ""
 
-#: actions/register.php:216
-#, php-format
+#: actions/register.php:198
+msgid "You can't register if you don't agree to the license."
+msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí."
+
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "Není platnou mailovou adresou."
+
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "Emailová adresa již existuje"
+
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "Neplatné jméno nebo heslo"
+
+#: actions/register.php:342
 msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
 msgstr ""
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
+#: actions/register.php:424
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 
-#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
-#, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
+#: actions/register.php:429
+msgid "6 or more characters. Required."
 msgstr ""
 
-#: actions/showfavorites.php:61 actions/showfavorites.php:145
-#, php-format
-msgid "Feed for favorites of %s"
+#: actions/register.php:433
+msgid "Same as password above. Required."
 msgstr ""
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-msgid "Could not retrieve favorite notices."
-msgstr ""
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "Email"
 
-#: actions/showmessage.php:33 actions/showmessage.php:81
-msgid "No such message."
-msgstr ""
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
+msgstr "Použije se pouze pro aktualizace, oznámení a obnovu hesla."
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
-#: actions/showmessage.php:61 actions/showmessage.php:108
-#, php-format
-msgid "Message to %1$s on %2$s"
-msgstr ""
+#: actions/register.php:493
+msgid "My text and files are available under "
+msgstr "Mé texty a soubory jsou k dispozici pod"
 
-#: actions/showmessage.php:66 actions/showmessage.php:113
-#, php-format
-msgid "Message from %1$s on %2$s"
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
-#: actions/showstream.php:154
-msgid "Send a message"
+#: actions/register.php:496
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
 msgstr ""
+" až na tyto privátní data: heslo, emailová adresa, IM adresa, telefonní "
+"číslo."
 
-#: actions/smssettings.php:312 actions/smssettings.php:464
+#: actions/register.php:537
 #, php-format
-msgid "Mobile carrier for your phone. "
+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/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
-#, php-format
-msgid "Direct messages to %s"
+#: actions/register.php:561
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/remotesubscribe.php:98
 #, php-format
-msgid "All the direct messages sent to %s"
+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/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-msgid "Direct Messages You've Sent"
-msgstr ""
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr "Vzdálený odběr"
 
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
-#, php-format
-msgid "All the direct messages sent from %s"
-msgstr ""
+#: actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Odběr autorizován"
 
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-msgid "No message text!"
-msgstr ""
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "Přezdívka"
 
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-msgid "Recipient user not found."
-msgstr ""
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr "Přezdívka uživatele, kterého chcete sledovat"
 
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "Adresa Profilu"
 
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
-#, php-format
-msgid "%s / Favorites from %s"
-msgstr ""
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "Adresa profilu na jiných kompatibilních mikroblozích."
 
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
-#, php-format
-msgid "%s updates favorited by %s / %s."
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
+msgstr "Odebírat"
+
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr "Neplatná adresa profilu (špatný formát)"
+
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "Není platnou adresou profilu (není YADIS dokumentem)."
+
+#: actions/remotesubscribe.php:176
+msgid "That’s a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "Nelze získat řetězec požadavku."
+
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
 #, php-format
-msgid "%s added your notice as a favorite"
-msgstr ""
+msgid "Replies to %s"
+msgstr "Odpovědi na %s"
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %s, page %d"
+msgstr "Odpovědi na %s"
+
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Feed sdělení pro %s"
+
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Feed sdělení pro %s"
+
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Feed sdělení pro %s"
+
+#: actions/replies.php:198
 #, php-format
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/replies.php:203
+#, php-format
 msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
 msgstr ""
 
-#: actions/twittersettings.php:41 actions/twittersettings.php:60
-msgid "Twitter settings"
-msgstr ""
-
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-msgid "Twitter Account"
-msgstr ""
-
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-msgid "Current verified Twitter account."
+#: actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr ""
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Odpovědi na %s"
 
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-msgid "No spaces, please."
-msgstr ""
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "Žádné takové oznámení."
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
 msgstr ""
 
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-msgid "Automatically send my notices to Twitter."
-msgstr ""
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Feed přítel uživatele: %s"
 
-#: actions/twittersettings.php:75 actions/twittersettings.php:146
-msgid "Send local \"@\" replies to Twitter."
-msgstr ""
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Feed přítel uživatele: %s"
 
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-msgid "Subscribe to my Twitter friends here."
-msgstr ""
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Feed přítel uživatele: %s"
 
-#: actions/twittersettings.php:122
+#: actions/showfavorites.php:205
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""
 
-#: actions/twittersettings.php:128 actions/twittersettings.php:334
-msgid "Could not verify your Twitter credentials!"
+#: actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/showfavorites.php:211
 #, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
 msgstr ""
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-msgid "Unable to save your Twitter settings!"
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
 msgstr ""
 
-#: actions/twittersettings.php:174 actions/twittersettings.php:376
-msgid "Twitter settings saved."
+#: actions/showgroup.php:82 lib/groupnav.php:86
+#, php-format
+msgid "%s group"
 msgstr ""
 
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-msgid "That is not your Twitter account."
+#: actions/showgroup.php:84
+#, php-format
+msgid "%s group, page %d"
 msgstr ""
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
-msgid "Couldn't remove Twitter user."
-msgstr ""
+#: actions/showgroup.php:218
+#, fuzzy
+msgid "Group profile"
+msgstr "Žádné takové oznámení."
 
-#: actions/twittersettings.php:212 actions/twittersettings.php:407
-msgid "Twitter account removed."
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
+msgid "URL"
 msgstr ""
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
-msgid "Couldn't save Twitter preferences."
-msgstr ""
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
+#, fuzzy
+msgid "Note"
+msgstr "Sdělení"
 
-#: actions/twittersettings.php:245 actions/twittersettings.php:461
-msgid "Twitter preferences saved."
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
 msgstr ""
 
-#: actions/userauthorization.php:84 actions/userauthorization.php:86
-msgid "Please check these details to make sure "
+#: actions/showgroup.php:293
+msgid "Group actions"
 msgstr ""
 
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
-msgid "The subscription has been authorized, but no "
-msgstr ""
+#: actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Feed sdělení pro %s"
 
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-msgid "The subscription has been rejected, but no "
-msgstr ""
+#: actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Feed sdělení pro %s"
 
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-msgid "Command results"
-msgstr ""
+#: actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Feed sdělení pro %s"
 
-#: classes/Channel.php:148 classes/Channel.php:204
-msgid "Command complete"
-msgstr ""
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "Feed sdělení pro %s"
 
-#: classes/Channel.php:158 classes/Channel.php:215
-msgid "Command failed"
-msgstr ""
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
+#, fuzzy
+msgid "Members"
+msgstr "Členem od"
 
-#: classes/Command.php:39 classes/Command.php:44
-msgid "Sorry, this command is not yet implemented."
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/tagcloudsection.php:71
+msgid "(None)"
 msgstr ""
 
-#: classes/Command.php:96 classes/Command.php:113
-#, php-format
-msgid "Subscriptions: %1$s\n"
+#: actions/showgroup.php:392
+msgid "All members"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
-msgid "User has no last notice"
-msgstr ""
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "Statistiky"
 
-#: classes/Command.php:146 classes/Command.php:166
-msgid "Notice marked as fave."
-msgstr ""
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Vytvořit"
 
-#: classes/Command.php:166 classes/Command.php:189
+#: actions/showgroup.php:448
 #, php-format
-msgid "%1$s (%2$s)"
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: classes/Command.php:169 classes/Command.php:192
+#: actions/showgroup.php:454
 #, php-format
-msgid "Fullname: %s"
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
 msgstr ""
 
-#: classes/Command.php:172 classes/Command.php:195
-#, php-format
-msgid "Location: %s"
+#: actions/showgroup.php:482
+msgid "Admins"
 msgstr ""
 
-#: classes/Command.php:175 classes/Command.php:198
-#, php-format
-msgid "Homepage: %s"
+#: actions/showmessage.php:81
+msgid "No such message."
 msgstr ""
 
-#: classes/Command.php:178 classes/Command.php:201
-#, php-format
-msgid "About: %s"
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: classes/Command.php:200 classes/Command.php:228
+#: actions/showmessage.php:108
 #, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
+msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: classes/Command.php:214 classes/Command.php:245
+#: actions/showmessage.php:113
 #, php-format
-msgid "Direct message to %s sent"
-msgstr ""
-
-#: classes/Command.php:216 classes/Command.php:247
-msgid "Error sending direct message."
+msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: classes/Command.php:263 classes/Command.php:300
-msgid "Specify the name of the user to subscribe to"
-msgstr ""
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Sdělení"
 
-#: classes/Command.php:270 classes/Command.php:307
+#: actions/showstream.php:73
 #, php-format
-msgid "Subscribed to %s"
-msgstr ""
-
-#: classes/Command.php:288 classes/Command.php:328
-msgid "Specify the name of the user to unsubscribe from"
+msgid " tagged %s"
 msgstr ""
 
-#: classes/Command.php:295 classes/Command.php:335
+#: actions/showstream.php:79
 #, php-format
-msgid "Unsubscribed from %s"
-msgstr ""
-
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
-msgid "Command not yet implemented."
-msgstr ""
-
-#: classes/Command.php:313 classes/Command.php:356
-msgid "Notification off."
+msgid "%s, page %d"
 msgstr ""
 
-#: classes/Command.php:315 classes/Command.php:358
-msgid "Can't turn off notification."
-msgstr ""
+#: actions/showstream.php:122
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Feed sdělení pro %s"
 
-#: classes/Command.php:333 classes/Command.php:379
-msgid "Notification on."
-msgstr ""
+#: actions/showstream.php:129
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Feed sdělení pro %s"
 
-#: classes/Command.php:335 classes/Command.php:381
-msgid "Can't turn on notification."
-msgstr ""
+#: actions/showstream.php:136
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Feed sdělení pro %s"
 
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
-msgstr ""
+#: actions/showstream.php:143
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Feed sdělení pro %s"
 
-#: classes/Message.php:53 classes/Message.php:56
-msgid "Could not insert message."
+#: actions/showstream.php:148
+#, php-format
+msgid "FOAF for %s"
 msgstr ""
 
-#: classes/Message.php:63 classes/Message.php:66
-msgid "Could not update message with new URI."
+#: actions/showstream.php:191
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
 msgstr ""
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
 msgstr ""
 
-#: lib/mail.php:147 lib/mail.php:289
+#: actions/showstream.php:198
 #, php-format
 msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: lib/mail.php:249 lib/mail.php:508
+#: actions/showstream.php:234
 #, php-format
-msgid "New private message from %s"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: lib/mail.php:253 lib/mail.php:512
+#: actions/showstream.php:239
 #, php-format
 msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
 msgstr ""
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
+#: actions/smssettings.php:58
+msgid "SMS Settings"
 msgstr ""
 
-#: lib/openid.php:195 lib/openid.php:203
-msgid "This form should automatically submit itself. "
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-msgid "Favorites"
-msgstr ""
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Tato stránka není k dispozici v typu média která přijímáte."
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-#, php-format
-msgid "%s's favorite notices"
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-msgid "User"
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-msgid "Inbox"
+#: actions/smssettings.php:130
+msgid "Confirmation code"
 msgstr ""
 
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-msgid "Your incoming messages"
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
 msgstr ""
 
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-msgid "Outbox"
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
 msgstr ""
 
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-msgid "Your sent messages"
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-msgid "Twitter"
+#: actions/smssettings.php:174
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
 msgstr ""
 
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
+#: actions/smssettings.php:306
+msgid "No phone number."
 msgstr ""
 
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-msgid "To"
+#: actions/smssettings.php:311
+msgid "No carrier selected."
 msgstr ""
 
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-msgid "Could not parse message."
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
 msgstr ""
 
-#: actions/all.php:63 actions/facebookhome.php:162
-#, fuzzy, php-format
-msgid "%s and friends, page %d"
-msgstr "%s a přátelé"
-
-#: actions/avatarsettings.php:76
-msgid "You can upload your personal avatar."
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
 msgstr ""
 
-#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/smssettings.php:347
 #, fuzzy
-msgid "Avatar settings"
-msgstr "Nastavení"
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr "Tento potvrzující kód vám nepatří!"
 
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-msgid "Original"
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
 msgstr ""
 
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-msgid "Preview"
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
 msgstr ""
 
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
-msgid "Crop"
+#: actions/smssettings.php:465
+msgid "Mobile carrier"
 msgstr ""
 
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-msgid "There was a problem with your session token. "
+#: actions/smssettings.php:469
+msgid "Select a carrier"
 msgstr ""
 
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-msgid "Pick a square area of the image to be your avatar"
+#: actions/smssettings.php:476
+#, 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/avatarsettings.php:327 actions/grouplogo.php:384
-msgid "Lost our file data."
+#: actions/smssettings.php:498
+msgid "No code entered"
 msgstr ""
 
-#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: actions/subedit.php:70
 #, fuzzy
-msgid "Lost our file."
-msgstr "Žádné takové oznámení."
-
-#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
-#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
-msgid "Unknown file type"
-msgstr ""
-
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr ""
+msgid "You are not subscribed to that profile."
+msgstr "Neodeslal jste nám profil"
 
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr ""
+#: actions/subedit.php:83
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "Nelze vytvořit odebírat"
 
-#: actions/block.php:111
+#: actions/subscribe.php:55
 #, fuzzy
-msgid "Block user"
+msgid "Not a local user."
 msgstr "Žádný takový uživatel."
 
-#: actions/block.php:129
-msgid "Are you sure you want to block this user? "
-msgstr ""
-
-#: actions/block.php:162
+#: actions/subscribe.php:69
 #, fuzzy
-msgid "You have already blocked this user."
-msgstr "Již jste přihlášen"
-
-#: actions/block.php:167
-msgid "Failed to save block information."
-msgstr ""
+msgid "Subscribed"
+msgstr "Odebírat"
 
-#: actions/confirmaddress.php:159
+#: actions/subscribers.php:50
 #, fuzzy, php-format
-msgid "The address \"%s\" has been "
-msgstr "Adresa byla odstraněna"
+msgid "%s subscribers"
+msgstr "Odběratelé"
 
-#: actions/deletenotice.php:73
-msgid "You are about to permanently delete a notice. "
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %d"
 msgstr ""
 
-#: actions/disfavor.php:94
-msgid "Add to favorites"
-msgstr ""
+#: actions/subscribers.php:63
+msgid "These are the people who listen to your notices."
+msgstr "Toto jsou lidé, kteří naslouchají vašim sdělením "
 
-#: actions/editgroup.php:54
+#: actions/subscribers.php:67
 #, php-format
-msgid "Edit %s group"
+msgid "These are the people who listen to %s's notices."
+msgstr "Toto jsou lidé, kteří naslouchají %s sdělením"
+
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
 msgstr ""
 
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-msgid "Inboxes must be enabled for groups to work"
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
 
-#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-msgid "You must be logged in to create a group."
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
 msgstr ""
 
-#: actions/editgroup.php:87 actions/grouplogo.php:87
-#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
-#, fuzzy
-msgid "No nickname"
-msgstr "Žádná přezdívka."
+#: actions/subscriptions.php:52
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "Všechny odběry"
 
-#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
-#: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
-#, fuzzy
-msgid "No such group"
-msgstr "Žádné takové oznámení."
+#: actions/subscriptions.php:54
+#, fuzzy, php-format
+msgid "%s subscriptions, page %d"
+msgstr "Všechny odběry"
 
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
-msgid "You must be an admin to edit the group"
-msgstr ""
+#: actions/subscriptions.php:65
+msgid "These are the people whose notices you listen to."
+msgstr "Toto jsou lidé, jejiž sdělením nasloucháte"
 
-#: actions/editgroup.php:157
-msgid "Use this form to edit the group."
+#: actions/subscriptions.php:69
+#, php-format
+msgid "These are the people whose notices %s listens to."
+msgstr "Toto jsou lidé, jejiž sdělením %s naslouchá"
+
+#: actions/subscriptions.php:121
+#, php-format
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
 msgstr ""
 
-#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1 od teď naslouchá tvým sdělením v %2"
+
+#: actions/subscriptions.php:194
 #, fuzzy
-msgid "Nickname must have only lowercase letters "
-msgstr "Přezdívka může obsahovat pouze malá písmena a čísla bez mezer"
+msgid "Jabber"
+msgstr "Žádné Jabber ID."
+
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
+msgstr ""
 
-#: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/tagother.php:33
 #, fuzzy
-msgid "description is too long (max 140 chars)."
-msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)"
+msgid "Not logged in"
+msgstr "Nepřihlášen"
 
-#: actions/editgroup.php:218
+#: actions/tagother.php:39
 #, fuzzy
-msgid "Could not update group."
-msgstr "Nelze aktualizovat uživatele"
+msgid "No id argument."
+msgstr "Žádný takový dokument."
 
-#: actions/editgroup.php:226
+#: actions/tagother.php:65
+#, php-format
+msgid "Tag %s"
+msgstr ""
+
+#: actions/tagother.php:77 lib/userprofile.php:75
 #, fuzzy
-msgid "Options saved."
-msgstr "Nastavení uloženo"
+msgid "User profile"
+msgstr "Uživatel nemá profil."
 
-#: actions/emailsettings.php:107 actions/imsettings.php:108
-#, fuzzy, php-format
-msgid "Awaiting confirmation on this address. "
-msgstr "Chyba v ověřovacím kódu"
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
+msgstr ""
 
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-msgid "Make a new email address for posting to; "
+#: actions/tagother.php:141
+msgid "Tag user"
 msgstr ""
 
-#: actions/emailsettings.php:157
-msgid "Send me email when someone "
+#: actions/tagother.php:151
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
 msgstr ""
 
-#: actions/emailsettings.php:168
-msgid "Allow friends to nudge me and send me an email."
+#: actions/tagother.php:193
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/emailsettings.php:321
+#: actions/tagother.php:200
 #, fuzzy
-msgid "That email address already belongs "
-msgstr "Emailová adresa již existuje"
+msgid "Could not save tags."
+msgstr "Nelze uložin informace o obrázku"
 
-#: actions/emailsettings.php:343
-#, fuzzy
-msgid "A confirmation code was sent to the email address you added. "
+#: actions/tagother.php:236
+msgid "Use this form to add tags to your subscribers or subscriptions."
 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/facebookhome.php:110
-msgid "Server error - couldn't get user!"
-msgstr ""
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Mikroblog od %s"
 
-#: actions/facebookhome.php:196
-#, php-format
-msgid "If you would like the %s app to automatically update "
-msgstr ""
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Feed sdělení pro %s"
 
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr ""
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Feed sdělení pro %s"
 
-#: actions/facebookhome.php:218
-msgid "Skip"
-msgstr ""
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Feed sdělení pro %s"
 
-#: actions/facebookhome.php:235
+#: actions/tagrss.php:35
 #, fuzzy
-msgid "No notice content!"
-msgstr "Žádný obsah!"
+msgid "No such tag."
+msgstr "Žádné takové oznámení."
 
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-msgid "Pagination"
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
 msgstr ""
 
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/unsubscribe.php:77
 #, fuzzy
-msgid "After"
-msgstr "« Novější"
+msgid "No profile id in request."
+msgstr "Nebylo vráceno žádné URL profilu od servu."
 
-#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/unsubscribe.php:84
 #, fuzzy
-msgid "Before"
-msgstr "Starší »"
-
-#: actions/facebookinvite.php:70
-#, php-format
-msgid "Thanks for inviting your friends to use %s"
-msgstr ""
+msgid "No profile with that id."
+msgstr "Vzdálený profil s nesouhlasícím profilem"
 
-#: actions/facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr ""
+#: actions/unsubscribe.php:98
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Odhlásit"
 
-#: actions/facebookinvite.php:96
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
 #, php-format
-msgid "You have been invited to %s"
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
-#: actions/facebookinvite.php:105
-#, fuzzy, php-format
-msgid "Invite your friends to use %s"
-msgstr "Feed přítel uživatele: %s"
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "Autorizovaný odběr"
 
-#: actions/facebookinvite.php:113
-#, php-format
-msgid "Friends already using %s:"
+#: actions/userauthorization.php:110
+#, fuzzy
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
 msgstr ""
+"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/facebookinvite.php:130
-#, php-format
-msgid "Send invitations"
+#: actions/userauthorization.php:188
+msgid "License"
 msgstr ""
 
-#: actions/facebookremove.php:56
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "Přijmout"
+
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
 #, fuzzy
-msgid "Couldn't remove Facebook user."
-msgstr "Nelze aktualizovat uživatele"
+msgid "Subscribe to this user"
+msgstr "Odběr autorizován"
 
-#: actions/facebooksettings.php:65
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "Odmítnout"
 
-#: actions/facebooksettings.php:67
+#: actions/userauthorization.php:212
 #, fuzzy
-msgid "Sync preferences saved."
-msgstr "Nastavení uloženo"
+msgid "Reject this subscription"
+msgstr "Všechny odběry"
 
-#: actions/facebooksettings.php:90
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
+msgstr "Žádné potvrení!"
 
-#: actions/facebooksettings.php:97
-msgid "Send \"@\" replies to Facebook."
-msgstr ""
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+msgstr "Odběr autorizován"
 
-#: actions/facebooksettings.php:106
+#: actions/userauthorization.php:249
 #, fuzzy
-msgid "Prefix"
-msgstr "Profil"
-
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
+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:"
 
-#: actions/facebooksettings.php:124
-#, php-format
-msgid "If you would like %s to automatically update "
-msgstr ""
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
+msgstr "Odběr odmítnut"
 
-#: actions/facebooksettings.php:147
+#: actions/userauthorization.php:261
 #, fuzzy
-msgid "Sync preferences"
-msgstr "Nastavení"
-
-#: actions/favor.php:94 lib/disfavorform.php:140
-msgid "Disfavor favorite"
+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"
 
-#: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
-#, fuzzy
-msgid "Popular notices"
-msgstr "Žádné takové oznámení."
-
-#: actions/favorited.php:67
-#, fuzzy, php-format
-msgid "Popular notices, page %d"
-msgstr "Žádné takové oznámení."
-
-#: actions/favorited.php:79
-msgid "The most popular notices on the site right now."
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
 msgstr ""
 
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
-msgid "Featured users"
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
 msgstr ""
 
-#: actions/featured.php:71
+#: actions/userauthorization.php:307
 #, php-format
-msgid "Featured users, page %d"
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr ""
 
-#: actions/featured.php:99
+#: actions/userauthorization.php:322
 #, php-format
-msgid "A selection of some of the great users on %s"
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr ""
 
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr ""
 
-#: actions/groupbyid.php:79
-msgid "No ID"
-msgstr ""
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Nelze přečíst adresu obrázku '%s'"
 
-#: actions/grouplogo.php:138 actions/grouplogo.php:191
-msgid "Group logo"
-msgstr ""
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Neplatný typ obrázku pro '%s'"
 
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
-msgstr ""
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr "Žádné id"
 
-#: actions/grouplogo.php:448
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
 #, fuzzy
-msgid "Logo updated."
-msgstr "Obrázek nahrán"
+msgid "Profile design"
+msgstr "Nastavené Profilu"
 
-#: actions/grouplogo.php:450
-#, fuzzy
-msgid "Failed updating logo."
-msgstr "Nahrávání obrázku selhalo."
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
 
-#: actions/groupmembers.php:93 lib/groupnav.php:91
-#, php-format
-msgid "%s group members"
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
 msgstr ""
 
-#: actions/groupmembers.php:96
+#: actions/usergroups.php:64
 #, php-format
-msgid "%s group members, page %d"
+msgid "%s groups, page %d"
 msgstr ""
 
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
+#: actions/usergroups.php:130
+msgid "Search for more groups"
 msgstr ""
 
-#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
-msgid "Groups"
-msgstr ""
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "Neodeslal jste nám profil"
 
-#: actions/groups.php:64
+#: actions/usergroups.php:158
 #, php-format
-msgid "Groups, page %d"
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
 
-#: actions/groups.php:90
+#: classes/File.php:137
 #, php-format
-msgid "%%%%site.name%%%% groups let you find and talk with "
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
 msgstr ""
 
-#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-#, fuzzy
-msgid "Create a new group"
-msgstr "Vytvořit nový účet"
+#: classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
 
-#: actions/groupsearch.php:57
-#, fuzzy, php-format
-msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
+#: classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
 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/groupsearch.php:63
-#, fuzzy
-msgid "Group search"
-msgstr "Hledání lidí"
+#: classes/Message.php:55
+msgid "Could not insert message."
+msgstr ""
 
-#: actions/imsettings.php:70
-msgid "You can send and receive notices through "
+#: classes/Message.php:65
+msgid "Could not update message with new URI."
 msgstr ""
 
-#: actions/imsettings.php:120
+#: classes/Notice.php:164
 #, php-format
-msgid "Jabber or GTalk address, "
+msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: actions/imsettings.php:147
+#: classes/Notice.php:179
 #, fuzzy
-msgid "Send me replies through Jabber/GTalk "
-msgstr "Zasílat oznámení pomocí Jabber/GTalk"
+msgid "Problem saving notice. Too long."
+msgstr "Problém při ukládání sdělení"
 
-#: actions/imsettings.php:321
-#, fuzzy, php-format
-msgid "A confirmation code was sent "
-msgstr "Žádný potvrzující kód."
+#: classes/Notice.php:183
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Problém při ukládání sdělení"
 
-#: actions/joingroup.php:65
-msgid "You must be logged in to join a group."
+#: classes/Notice.php:188
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: actions/joingroup.php:95
-#, fuzzy
-msgid "You are already a member of that group"
-msgstr "Již jste přihlášen"
+#: classes/Notice.php:194
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
 
-#: actions/joingroup.php:128
-#, fuzzy, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Nelze přesměrovat na server: %s"
+#: classes/Notice.php:202
+msgid "You are banned from posting notices on this site."
+msgstr ""
 
-#: actions/joingroup.php:135
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
+msgstr "Problém při ukládání sdělení"
+
+#: classes/Notice.php:1120
 #, php-format
-msgid "%s joined group %s"
-msgstr ""
+msgid "DB error inserting reply: %s"
+msgstr "Chyba v DB při vkládání odpovědi: %s"
 
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 
-#: actions/leavegroup.php:65
-msgid "You must be logged in to leave a group."
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Profil"
+
+#: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
 msgstr ""
 
-#: actions/leavegroup.php:88
+#: lib/accountsettingsaction.php:112
 #, fuzzy
-msgid "No such group."
-msgstr "Žádné takové oznámení."
+msgid "Upload an avatar"
+msgstr "Nahrávání obrázku selhalo."
 
-#: actions/leavegroup.php:95
-#, fuzzy
-msgid "You are not a member of that group."
-msgstr "Neodeslal jste nám profil"
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr ""
 
-#: actions/leavegroup.php:100
-msgid "You may not leave a group while you are its administrator."
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
 msgstr ""
 
-#: actions/leavegroup.php:130
-msgid "Could not find membership record."
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
 msgstr ""
 
-#: actions/leavegroup.php:138
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "Nelze vytvořit OpenID z: %s"
+#: lib/accountsettingsaction.php:124
+#, fuzzy
+msgid "Design your profile"
+msgstr "Uživatel nemá profil."
 
-#: actions/leavegroup.php:145
-#, php-format
-msgid "%s left group %s"
+#: lib/accountsettingsaction.php:128
+msgid "Other"
 msgstr ""
 
-#: actions/login.php:225 lib/facebookaction.php:304
-msgid "Login to site"
+#: lib/accountsettingsaction.php:128
+msgid "Other options"
 msgstr ""
 
-#: actions/microsummary.php:69
-msgid "No current status"
+#: lib/action.php:144
+#, php-format
+msgid "%s - %s"
 msgstr ""
 
-#: actions/newgroup.php:53
-msgid "New group"
+#: lib/action.php:159
+msgid "Untitled page"
 msgstr ""
 
-#: actions/newgroup.php:115
-msgid "Use this form to create a new group."
+#: lib/action.php:424
+msgid "Primary site navigation"
 msgstr ""
 
-#: actions/newgroup.php:177
-#, fuzzy
-msgid "Could not create group."
-msgstr "Nelze uložin informace o obrázku"
+#: lib/action.php:430
+msgid "Home"
+msgstr "Domů"
 
-#: actions/newgroup.php:191
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "Nelze vytvořit odebírat"
+#: lib/action.php:430
+msgid "Personal profile and friends timeline"
+msgstr ""
 
-#: actions/newmessage.php:119 actions/newnotice.php:132
+#: lib/action.php:432
 #, fuzzy
-msgid "That's too long. "
-msgstr "Soubor je příliš velký"
+msgid "Account"
+msgstr "O nás"
 
-#: actions/newmessage.php:134
-msgid "Don't send a message to yourself; "
+#: lib/action.php:432
+msgid "Change your email, avatar, password, profile"
 msgstr ""
 
-#: actions/newnotice.php:166
+#: lib/action.php:435
+msgid "Connect"
+msgstr "Připojit"
+
+#: lib/action.php:435
 #, fuzzy
-msgid "Notice posted"
-msgstr "Sdělení"
+msgid "Connect to services"
+msgstr "Nelze přesměrovat na server: %s"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
-msgid "Ajax Error"
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
 msgstr ""
 
-#: actions/nudge.php:85
-msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+#: lib/action.php:440 lib/subgroupnav.php:106
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: actions/nudge.php:94
-msgid "Nudge sent"
-msgstr ""
+#: lib/action.php:445
+msgid "Logout"
+msgstr "Odhlásit"
 
-#: actions/nudge.php:97
-msgid "Nudge sent!"
+#: lib/action.php:445
+msgid "Logout from the site"
 msgstr ""
 
-#: actions/openidlogin.php:97
+#: lib/action.php:450
 #, fuzzy
-msgid "OpenID login"
-msgstr "OpenID přihlášení"
+msgid "Create an account"
+msgstr "Vytvořit nový účet"
 
-#: actions/openidsettings.php:128
-#, fuzzy
-msgid "Removing your only OpenID "
-msgstr "Odstranit OpenID"
+#: lib/action.php:453
+msgid "Login to the site"
+msgstr ""
 
-#: actions/othersettings.php:60
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
+msgstr "Nápověda"
+
+#: lib/action.php:456
 #, fuzzy
-msgid "Other Settings"
-msgstr "Nastavení"
+msgid "Help me!"
+msgstr "Nápověda"
 
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr ""
+#: lib/action.php:459
+msgid "Search"
+msgstr "Hledat"
 
-#: actions/othersettings.php:93
-msgid "URL Auto-shortening"
+#: lib/action.php:459
+msgid "Search for people or text"
 msgstr ""
 
-#: actions/othersettings.php:112
+#: lib/action.php:480
 #, fuzzy
-msgid "Service"
-msgstr "Hledat"
+msgid "Site notice"
+msgstr "Nové sdělení"
 
-#: actions/othersettings.php:113
-msgid "Automatic shortening service to use."
+#: lib/action.php:546
+msgid "Local views"
 msgstr ""
 
-#: actions/othersettings.php:144
+#: lib/action.php:612
 #, fuzzy
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "Umístění příliš dlouhé (maximálně 255 znaků)"
+msgid "Page notice"
+msgstr "Nové sdělení"
 
-#: actions/passwordsettings.php:69
+#: lib/action.php:714
 #, fuzzy
-msgid "Change your password."
-msgstr "Změnit heslo"
+msgid "Secondary site navigation"
+msgstr "Odběry"
 
-#: actions/passwordsettings.php:89
-#, fuzzy
-msgid "Password change"
-msgstr "Heslo uloženo"
+#: lib/action.php:721
+msgid "About"
+msgstr "O nás"
 
-#: actions/peopletag.php:35
-#, fuzzy, php-format
-msgid "Not a valid people tag: %s"
-msgstr "Není platnou mailovou adresou."
+#: lib/action.php:723
+msgid "FAQ"
+msgstr "FAQ"
 
-#: actions/peopletag.php:47
-#, php-format
-msgid "Users self-tagged with %s - page %d"
+#: lib/action.php:727
+msgid "TOS"
 msgstr ""
 
-#: actions/peopletag.php:91
-#, php-format
-msgid "These are users who have tagged themselves \"%s\" "
-msgstr ""
+#: lib/action.php:730
+msgid "Privacy"
+msgstr "Soukromí"
 
-#: actions/profilesettings.php:91
-#, fuzzy
-msgid "Profile information"
-msgstr "Neznámý profil"
+#: lib/action.php:732
+msgid "Source"
+msgstr "Zdroj"
 
-#: actions/profilesettings.php:124
-msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
-msgstr ""
+#: lib/action.php:734
+msgid "Contact"
+msgstr "Kontakt"
 
-#: actions/profilesettings.php:144
-msgid "Automatically subscribe to whoever "
+#: lib/action.php:736
+msgid "Badge"
 msgstr ""
 
-#: actions/profilesettings.php:229 actions/tagother.php:176
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Neplatná adresa '%s'"
-
-#: actions/profilesettings.php:311
-#, fuzzy
-msgid "Couldn't save tags."
-msgstr "Nelze uložit profil"
-
-#: actions/public.php:107
-#, fuzzy, php-format
-msgid "Public timeline, page %d"
-msgstr "Veřejné zprávy"
-
-#: actions/public.php:173
-msgid "Could not retrieve public stream."
+#: lib/action.php:764
+msgid "StatusNet software license"
 msgstr ""
 
-#: actions/public.php:220
+#: lib/action.php:767
 #, php-format
 msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
+"**%%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%%). "
 
-#: actions/publictagcloud.php:57
-#, fuzzy
-msgid "Public tag cloud"
-msgstr "Veřejný Stream Feed"
-
-#: actions/publictagcloud.php:63
+#: lib/action.php:769
 #, php-format
-msgid "These are most popular recent tags on %s "
-msgstr ""
-
-#: actions/publictagcloud.php:119
-msgid "Tag cloud"
-msgstr ""
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** je služba mikroblogů."
 
-#: actions/register.php:139 actions/register.php:349
-msgid "Sorry, only invited people can register."
+#: lib/action.php:771
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
+"Běží na [StatusNet](http://status.net/) mikroblogovací program, verze %s, "
+"dostupná pod [GNU Affero General Public License](http://www.fsf.org/"
+"licensing/licenses/agpl-3.0.html)."
 
-#: actions/register.php:149
+#: lib/action.php:785
 #, fuzzy
-msgid "You can't register if you don't "
-msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí."
+msgid "Site content license"
+msgstr "Nové sdělení"
 
-#: actions/register.php:286
-msgid "With this form you can create "
+#: lib/action.php:794
+msgid "All "
 msgstr ""
 
-#: actions/register.php:368
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, "
-msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer"
-
-#: actions/register.php:382 actions/register.php:386
-#, fuzzy
-msgid "Used only for updates, announcements, "
-msgstr "Použije se pouze pro aktualizace, oznámení a obnovu hesla."
-
-#: actions/register.php:398
-#, fuzzy
-msgid "URL of your homepage, blog, "
-msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách."
+#: lib/action.php:799
+msgid "license."
+msgstr ""
 
-#: actions/register.php:404
-#, fuzzy
-msgid "Describe yourself and your "
-msgstr "Popiš sebe a své zájmy ve 140 znacích"
+#: lib/action.php:1052
+msgid "Pagination"
+msgstr ""
 
-#: actions/register.php:410
+#: lib/action.php:1061
 #, fuzzy
-msgid "Where you are, like \"City, "
-msgstr "Místo. Město, stát."
+msgid "After"
+msgstr "« Novější"
 
-#: actions/register.php:432
+#: lib/action.php:1069
 #, fuzzy
-msgid " except this private data: password, "
-msgstr ""
-"až na tyto privátní data: heslo, emailová adresa, IM adresa, telefonní číslo."
+msgid "Before"
+msgstr "Starší »"
 
-#: actions/register.php:471
-#, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
+#: lib/action.php:1117
+msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/register.php:495
-msgid "(You should receive a message by email "
+#: lib/attachmentlist.php:87
+msgid "Attachments"
 msgstr ""
 
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
+#: lib/attachmentlist.php:265
+msgid "Author"
 msgstr ""
 
-#: actions/replies.php:118
-#, fuzzy, php-format
-msgid "Replies to %s, page %d"
-msgstr "Odpovědi na %s"
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "Profil"
 
-#: actions/showfavorites.php:79
-#, php-format
-msgid "%s favorite notices, page %d"
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
 msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
-#, php-format
-msgid "%s group"
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
 msgstr ""
 
-#: actions/showgroup.php:79
-#, php-format
-msgid "%s group, page %d"
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
 msgstr ""
 
-#: actions/showgroup.php:206
-#, fuzzy
-msgid "Group profile"
-msgstr "Žádné takové oznámení."
-
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
-msgid "URL"
+#: lib/channel.php:210
+msgid "Command complete"
 msgstr ""
 
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
-#, fuzzy
-msgid "Note"
-msgstr "Sdělení"
-
-#: actions/showgroup.php:270
-msgid "Group actions"
+#: lib/channel.php:221
+msgid "Command failed"
 msgstr ""
 
-#: actions/showgroup.php:323
-#, fuzzy, php-format
-msgid "Notice feed for %s group"
-msgstr "Feed sdělení pro %s"
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
-#, fuzzy
-msgid "Members"
-msgstr "Členem od"
+#: lib/command.php:88
+#, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Nelze aktualizovat uživatele"
 
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
-msgid "(None)"
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: actions/showgroup.php:370
-msgid "All members"
+#: lib/command.php:99
+#, php-format
+msgid "Nudge sent to %s"
 msgstr ""
 
-#: actions/showgroup.php:378
+#: lib/command.php:126
 #, php-format
 msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
 msgstr ""
 
-#: actions/showmessage.php:98
-msgid "Only the sender and recipient "
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
 msgstr ""
 
-#: actions/showstream.php:73
-#, php-format
-msgid "%s, page %d"
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
 msgstr ""
 
-#: actions/showstream.php:143
-#, fuzzy
-msgid "'s profile"
-msgstr "Profil"
-
-#: actions/showstream.php:236 actions/tagother.php:77
-#, fuzzy
-msgid "User profile"
-msgstr "Uživatel nemá profil."
-
-#: actions/showstream.php:240 actions/tagother.php:81
-msgid "Photo"
+#: lib/command.php:190
+msgid "Notice marked as fave."
 msgstr ""
 
-#: actions/showstream.php:317
-msgid "User actions"
+#: lib/command.php:315
+#, php-format
+msgid "%1$s (%2$s)"
 msgstr ""
 
-#: actions/showstream.php:342
-msgid "Send a direct message to this user"
+#: lib/command.php:318
+#, php-format
+msgid "Fullname: %s"
 msgstr ""
 
-#: actions/showstream.php:343
-msgid "Message"
+#: lib/command.php:321
+#, php-format
+msgid "Location: %s"
 msgstr ""
 
-#: actions/showstream.php:451
-#, fuzzy
-msgid "All subscribers"
-msgstr "Odběratelé"
-
-#: actions/showstream.php:533
-msgid "All groups"
+#: lib/command.php:324
+#, php-format
+msgid "Homepage: %s"
 msgstr ""
 
-#: actions/showstream.php:542
+#: lib/command.php:327
 #, php-format
-msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+msgid "About: %s"
 msgstr ""
 
-#: actions/smssettings.php:128
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, "
-msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer"
-
-#: actions/smssettings.php:162
-#, fuzzy
-msgid "Send me notices through SMS; "
-msgstr "Zasílat oznámení pomocí Jabber/GTalk"
-
-#: actions/smssettings.php:335
-#, fuzzy
-msgid "A confirmation code was sent to the phone number you added. "
-msgstr "Tento potvrzující kód vám nepatří!"
-
-#: actions/smssettings.php:453
-msgid "Mobile carrier"
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: actions/subedit.php:70
-#, fuzzy
-msgid "You are not subscribed to that profile."
-msgstr "Neodeslal jste nám profil"
-
-#: actions/subedit.php:83
-#, fuzzy
-msgid "Could not save subscription."
-msgstr "Nelze vytvořit odebírat"
-
-#: actions/subscribe.php:55
-#, fuzzy
-msgid "Not a local user."
-msgstr "Žádný takový uživatel."
-
-#: actions/subscribe.php:69
-#, fuzzy
-msgid "Subscribed"
-msgstr "Odebírat"
-
-#: actions/subscribers.php:50
-#, fuzzy, php-format
-msgid "%s subscribers"
-msgstr "Odběratelé"
+#: lib/command.php:377
+msgid "Error sending direct message."
+msgstr ""
 
-#: actions/subscribers.php:52
+#: lib/command.php:431
 #, php-format
-msgid "%s subscribers, page %d"
+msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: actions/subscribers.php:63
-#, fuzzy
-msgid "These are the people who listen to "
-msgstr "Toto jsou lidé, kteří naslouchají %s sdělením"
-
-#: actions/subscribers.php:67
-#, fuzzy, php-format
-msgid "These are the people who "
-msgstr "Toto jsou lidé, kteří naslouchají %s sdělením"
-
-#: actions/subscriptions.php:52
+#: lib/command.php:439
 #, fuzzy, php-format
-msgid "%s subscriptions"
-msgstr "Všechny odběry"
-
-#: actions/subscriptions.php:54
-#, fuzzy, php-format
-msgid "%s subscriptions, page %d"
-msgstr "Všechny odběry"
-
-#: actions/subscriptions.php:65
-#, fuzzy
-msgid "These are the people whose notices "
-msgstr "Toto jsou lidé, jejiž sdělením %s naslouchá"
-
-#: actions/subscriptions.php:69
-#, fuzzy, php-format
-msgid "These are the people whose "
-msgstr "Toto jsou lidé, kteří naslouchají %s sdělením"
+msgid "Reply to %s sent"
+msgstr "Odpovědi na %s"
 
-#: actions/subscriptions.php:122
+#: lib/command.php:441
 #, fuzzy
-msgid "Jabber"
-msgstr "Žádné Jabber ID."
-
-#: actions/tag.php:43
-#, fuzzy, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Mikroblog od %s"
+msgid "Error saving notice."
+msgstr "Problém při ukládání sdělení"
 
-#: actions/tag.php:66
-#, php-format
-msgid "Messages tagged \"%s\", most recent first"
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: actions/tagother.php:33
-#, fuzzy
-msgid "Not logged in"
-msgstr "Nepřihlášen"
-
-#: actions/tagother.php:39
-#, fuzzy
-msgid "No id argument."
-msgstr "Žádný takový dokument."
-
-#: actions/tagother.php:65
+#: lib/command.php:502
 #, php-format
-msgid "Tag %s"
+msgid "Subscribed to %s"
 msgstr ""
 
-#: actions/tagother.php:141
-msgid "Tag user"
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: actions/tagother.php:149
-msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+#: lib/command.php:530
+#, php-format
+msgid "Unsubscribed from %s"
 msgstr ""
 
-#: actions/tagother.php:164
-msgid "There was a problem with your session token."
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
 msgstr ""
 
-#: actions/tagother.php:191
-msgid ""
-"You can only tag people you are subscribed to or who are subscribed to you."
+#: lib/command.php:551
+msgid "Notification off."
 msgstr ""
 
-#: actions/tagother.php:198
-#, fuzzy
-msgid "Could not save tags."
-msgstr "Nelze uložin informace o obrázku"
-
-#: actions/tagother.php:233
-msgid "Use this form to add tags to your subscribers or subscriptions."
+#: lib/command.php:553
+msgid "Can't turn off notification."
 msgstr ""
 
-#: actions/tagrss.php:35
-#, fuzzy
-msgid "No such tag."
-msgstr "Žádné takové oznámení."
-
-#: actions/tagrss.php:66
-#, fuzzy, php-format
-msgid "Microblog tagged with %s"
-msgstr "Mikroblog od %s"
-
-#: actions/twitapiblocks.php:47
-msgid "Block user failed."
+#: lib/command.php:574
+msgid "Notification on."
 msgstr ""
 
-#: actions/twitapiblocks.php:69
-msgid "Unblock user failed."
+#: lib/command.php:576
+msgid "Can't turn on notification."
 msgstr ""
 
-#: actions/twitapiusers.php:48
-#, fuzzy
-msgid "Not found."
-msgstr "Žádný požadavek nebyl nalezen!"
-
-#: actions/twittersettings.php:71
-msgid "Add your Twitter account to automatically send "
-msgstr ""
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Nelze vytvořit OpenID z: %s"
 
-#: actions/twittersettings.php:119
-msgid "Twitter user name"
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: actions/twittersettings.php:126
+#: lib/command.php:618
 #, fuzzy
-msgid "Twitter password"
-msgstr "Nové heslo"
-
-#: actions/twittersettings.php:228
-msgid "Twitter Friends"
-msgstr ""
-
-#: actions/twittersettings.php:327
-msgid "Username must have only numbers, "
-msgstr ""
-
-#: actions/twittersettings.php:341
-#, fuzzy, php-format
-msgid "Unable to retrieve account information "
-msgstr "Nelze smazat potvrzení emailu"
+msgid "You are not subscribed to anyone."
+msgstr "Neodeslal jste nám profil"
 
-#: actions/unblock.php:108
+#: lib/command.php:620
 #, fuzzy
-msgid "Error removing the block."
-msgstr "Chyba při ukládaní uživatele"
+msgid "You are subscribed to these people: "
+msgstr "Neodeslal jste nám profil"
 
-#: actions/unsubscribe.php:50
+#: lib/command.php:637
 #, fuzzy
-msgid "No profile id in request."
-msgstr "Nebylo vráceno žádné URL profilu od servu."
+msgid "No one is subscribed to you."
+msgstr "Vzdálený odběr"
 
-#: actions/unsubscribe.php:57
+#: lib/command.php:639
 #, fuzzy
-msgid "No profile with that id."
-msgstr "Vzdálený profil s nesouhlasícím profilem"
+msgid "These people are subscribed to you: "
+msgstr "Vzdálený odběr"
 
-#: actions/unsubscribe.php:71
+#: lib/command.php:656
 #, fuzzy
-msgid "Unsubscribed"
-msgstr "Odhlásit"
-
-#: actions/usergroups.php:63
-#, php-format
-msgid "%s groups"
-msgstr ""
-
-#: actions/usergroups.php:65
-#, php-format
-msgid "%s groups, page %d"
-msgstr ""
+msgid "You are not a member of any groups."
+msgstr "Neodeslal jste nám profil"
 
-#: classes/Notice.php:104
+#: lib/command.php:658
 #, fuzzy
-msgid "Problem saving notice. Unknown user."
-msgstr "Problém při ukládání sdělení"
+msgid "You are a member of these groups: "
+msgstr "Neodeslal jste nám profil"
 
-#: classes/Notice.php:109
+#: lib/command.php:670
 msgid ""
-"Too many notices too fast; take a breather and post again in a few minutes."
-msgstr ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+
+#: lib/common.php:192
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Žádný potvrzující kód."
 
-#: classes/Notice.php:116
-msgid "You are banned from posting notices on this site."
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/accountsettingsaction.php:108
-#, fuzzy
-msgid "Upload an avatar"
-msgstr "Nahrávání obrázku selhalo."
-
-#: lib/accountsettingsaction.php:119
-msgid "Other"
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/accountsettingsaction.php:120
-msgid "Other options"
+#: lib/common.php:195
+msgid "Go to the installer."
 msgstr ""
 
-#: lib/action.php:130
-#, php-format
-msgid "%s - %s"
+#: lib/connectsettingsaction.php:110
+msgid "IM"
 msgstr ""
 
-#: lib/action.php:145
-msgid "Untitled page"
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
 msgstr ""
 
-#: lib/action.php:316
-msgid "Primary site navigation"
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
 msgstr ""
 
-#: lib/action.php:322
-msgid "Personal profile and friends timeline"
+#: lib/dberroraction.php:60
+msgid "Database error"
 msgstr ""
 
-#: lib/action.php:325
-msgid "Search for people or text"
+#: lib/designsettings.php:101
+msgid "Change background image"
 msgstr ""
 
-#: lib/action.php:328
+#: lib/designsettings.php:105
 #, fuzzy
-msgid "Account"
-msgstr "O nás"
+msgid "Upload file"
+msgstr "Upload"
 
-#: lib/action.php:328
-msgid "Change your email, avatar, password, profile"
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 
-#: lib/action.php:330
-msgid "Connect to IM, SMS, Twitter"
+#: lib/designsettings.php:139
+msgid "On"
 msgstr ""
 
-#: lib/action.php:332
-msgid "Logout from the site"
+#: lib/designsettings.php:155
+msgid "Off"
 msgstr ""
 
-#: lib/action.php:335
-msgid "Login to the site"
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
 msgstr ""
 
-#: lib/action.php:338
-#, fuzzy
-msgid "Create an account"
-msgstr "Vytvořit nový účet"
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
 
-#: lib/action.php:341
+#: lib/designsettings.php:170
 #, fuzzy
-msgid "Login with OpenID"
-msgstr "Žádné takové OpenID"
+msgid "Change colours"
+msgstr "Změnit heslo"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
 
-#: lib/action.php:344
+#: lib/designsettings.php:191
 #, fuzzy
-msgid "Help me!"
-msgstr "Nápověda"
+msgid "Content"
+msgstr "Připojit"
 
-#: lib/action.php:362
+#: lib/designsettings.php:204
 #, fuzzy
-msgid "Site notice"
-msgstr "Nové sdělení"
+msgid "Sidebar"
+msgstr "Hledat"
 
-#: lib/action.php:417
-msgid "Local views"
+#: lib/designsettings.php:217
+msgid "Text"
 msgstr ""
 
-#: lib/action.php:472
+#: lib/designsettings.php:230
 #, fuzzy
-msgid "Page notice"
-msgstr "Nové sdělení"
+msgid "Links"
+msgstr "Přihlásit"
 
-#: lib/action.php:562
-#, fuzzy
-msgid "Secondary site navigation"
-msgstr "Odběry"
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
 
-#: lib/action.php:602 lib/action.php:623
-msgid "StatusNet software license"
+#: lib/designsettings.php:248
+msgid "Restore default designs"
 msgstr ""
 
-#: lib/action.php:630
-msgid "All "
+#: lib/designsettings.php:254
+msgid "Reset back to default"
 msgstr ""
 
-#: lib/action.php:635
-msgid "license."
+#: lib/designsettings.php:257
+msgid "Save design"
 msgstr ""
 
-#: lib/blockform.php:123 lib/blockform.php:153
-#, fuzzy
-msgid "Block this user"
-msgstr "Žádný takový uživatel."
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
+msgstr ""
 
-#: lib/blockform.php:153
-msgid "Block"
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
 msgstr ""
 
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr ""
 
-#: lib/facebookaction.php:268
-#, php-format
-msgid "To use the %s Facebook Application you need to login "
-msgstr ""
-
-#: lib/facebookaction.php:271
-#, fuzzy
-msgid " a new account."
-msgstr "Vytvořit nový účet"
-
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-#, fuzzy
-msgid "Published"
-msgstr "Veřejné"
-
 #: lib/favorform.php:114 lib/favorform.php:140
 #, fuzzy
 msgid "Favor this notice"
 msgstr "Žádné takové oznámení."
 
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr ""
+
 #: lib/feedlist.php:64
 msgid "Export data"
 msgstr ""
 
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr ""
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr ""
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr ""
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr ""
@@ -4542,62 +3958,87 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
+msgstr ""
+
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr ""
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr ""
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:163
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách."
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:168
 #, fuzzy
-msgid "Description"
-msgstr "Odběry"
+msgid "Describe the group or topic"
+msgstr "Popiš sebe a své zájmy ve 140 znacích"
 
-#: lib/groupeditform.php:153
-#, fuzzy
-msgid "Describe the group or topic in 140 chars"
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
 msgstr "Popiš sebe a své zájmy ve 140 znacích"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:172
+#, fuzzy
+msgid "Description"
+msgstr "Odběry"
+
+#: lib/groupeditform.php:179
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr "Místo. Město, stát."
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
-msgid "Group"
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:100
-msgid "Admin"
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+msgid "Group"
 msgstr ""
 
 #: lib/groupnav.php:101
+#, fuzzy
+msgid "Blocked"
+msgstr "Žádný takový uživatel."
+
+#: lib/groupnav.php:102
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Žádný takový uživatel."
+
+#: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
 msgstr ""
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:113
 #, fuzzy
 msgid "Logo"
 msgstr "Odhlásit"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:114
 #, php-format
 msgid "Add or edit %s logo"
 msgstr ""
 
+#: lib/groupnav.php:120
+#, php-format
+msgid "Add or edit %s design"
+msgstr ""
+
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr ""
@@ -4612,10 +4053,44 @@ msgid "Tags in %s group's notices"
 msgstr ""
 
 #: lib/htmloutputter.php:104
-#, fuzzy
-msgid "This page is not available in a "
+msgid "This page is not available in a media type you accept"
 msgstr "Tato stránka není k dispozici v typu média která přijímáte."
 
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků"
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr "Částečné náhrání."
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr "Chyba systému při nahrávání souboru"
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr "Není obrázkem, nebo jde o poškozený soubor."
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr "Nepodporovaný formát obrázku."
+
+#: lib/imagefile.php:118
+#, fuzzy
+msgid "Lost our file."
+msgstr "Žádné takové oznámení."
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr ""
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr ""
+
 #: lib/joinform.php:114
 #, fuzzy
 msgid "Join"
@@ -4626,103 +4101,310 @@ msgstr "Přihlásit"
 msgid "Leave"
 msgstr "Uložit"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:80
 #, fuzzy
 msgid "Login with a username and password"
 msgstr "Neplatné jméno nebo heslo"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:86
 #, fuzzy
 msgid "Sign up for a new account"
 msgstr "Vytvořit nový účet"
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mail.php:175
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr " od "
+
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "Potvrzení emailové adresy"
+
+#: lib/mail.php:174
 #, php-format
 msgid ""
 "Hey, %s.\n"
 "\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%s\n"
+"\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
 msgstr ""
 
-#: lib/mail.php:236
-#, fuzzy, php-format
-msgid "%1$s is now listening to "
+#: lib/mail.php:235
+#, 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:254
+#: lib/mail.php:240
+#, fuzzy, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
+"%1 naslouchá vašim sdělením na %s. \n"
+"\n"
+"\t%3\n"
+"\n"
+"S úctou váš,\n"
+"%4$s.\n"
+
+#: lib/mail.php:253
 #, fuzzy, php-format
 msgid "Location: %s\n"
 msgstr "Umístění %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:255
 #, fuzzy, php-format
 msgid "Homepage: %s\n"
 msgstr "Moje stránky: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:461
+#: lib/mail.php:285
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: lib/mail.php:288
+#, 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 ""
+
+#: lib/mail.php:412
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: lib/mail.php:438
+msgid "SMS confirmation"
+msgstr ""
+
+#: lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr ""
 
-#: lib/mail.php:465
+#: lib/mail.php:466
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
+msgstr ""
+
+#: lib/mail.php:509
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:513
 #, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
+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 ""
 
-#: lib/mail.php:555
+#: lib/mail.php:554
 #, fuzzy, php-format
-msgid "%1$s just added your notice from %2$s"
+msgid "%s (@%s) added your notice as a favorite"
 msgstr "%1 od teď naslouchá tvým sdělením v %2"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
-msgid "From"
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
 msgstr ""
 
-#: lib/messageform.php:110
-msgid "Send a direct notice"
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, php-format
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+msgstr ""
+
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
 msgstr ""
 
-#: lib/noticeform.php:125
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
 #, fuzzy
-msgid "Send a notice"
-msgstr "Nové sdělení"
+msgid "Could not determine file's mime-type!"
+msgstr "Nelze aktualizovat uživatele"
+
+#: lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: lib/messageform.php:120
+msgid "Send a direct notice"
+msgstr ""
 
-#: lib/noticeform.php:152
+#: lib/messageform.php:146
+msgid "To"
+msgstr ""
+
+#: lib/messageform.php:162 lib/noticeform.php:173
 #, fuzzy
 msgid "Available characters"
 msgstr "6 a více znaků"
 
-#: lib/noticelist.php:426
+#: lib/noticeform.php:145
 #, fuzzy
-msgid "in reply to"
-msgstr "odpověd na ..."
+msgid "Send a notice"
+msgstr "Nové sdělení"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
-msgid "Reply to this notice"
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
+msgstr "Co se děje %s?"
+
+#: lib/noticeform.php:180
+msgid "Attach"
 msgstr ""
 
-#: lib/noticelist.php:451
+#: lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:478
 #, fuzzy
-msgid "Reply"
-msgstr "odpověď"
+msgid "in context"
+msgstr "Žádný obsah!"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
-msgid "Delete this notice"
+#: lib/noticelist.php:498
+msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:474
-msgid "Delete"
-msgstr ""
+#: lib/noticelist.php:499
+#, fuzzy
+msgid "Reply"
+msgstr "odpověď"
 
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
@@ -4736,41 +4418,141 @@ msgstr ""
 msgid "Send a nudge to this user"
 msgstr ""
 
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "Chyba při vkládání nového profilu"
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "Chyba při kládání obrázku"
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "Chyba při vkládaní vzdáleného profilu"
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Nové sdělení"
+
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
+msgstr "Nelze vložit odebírání"
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "Osobní"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "Odpovědi"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr ""
+
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr ""
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr ""
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr ""
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr ""
+
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/profilelist.php:182
-msgid "(none)"
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "Odběry"
+
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "Všechny odběry"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "Odběratelé"
+
+#: lib/profileaction.php:157
+#, fuzzy
+msgid "All subscribers"
+msgstr "Odběratelé"
+
+#: lib/profileaction.php:177
+msgid "User ID"
+msgstr ""
+
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "Členem od"
+
+#: lib/profileaction.php:235
+msgid "All groups"
 msgstr ""
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Veřejné"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr ""
 
-#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr ""
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr ""
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:92
 #, fuzzy
 msgid "Popular"
 msgstr "Hledání lidí"
 
+#: lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Hledat"
+
+#: lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Hledat"
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr ""
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr ""
+
 #: lib/searchgroupnav.php:82
 #, fuzzy
 msgid "Notice"
 msgstr "Sdělení"
 
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr ""
+
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr ""
@@ -4779,35 +4561,64 @@ msgstr ""
 msgid "Untitled section"
 msgstr ""
 
-#: lib/subgroupnav.php:81
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: lib/subgroupnav.php:83
 #, fuzzy, php-format
 msgid "People %s subscribes to"
 msgstr "Vzdálený odběr"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:91
 #, fuzzy, php-format
 msgid "People subscribed to %s"
 msgstr "Vzdálený odběr"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:104
-#, php-format
-msgid "Invite friends and colleagues to join you on %s"
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
 msgstr ""
 
-#: lib/subs.php:53
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr ""
+
+#: lib/subs.php:48
+msgid "Already subscribed!"
+msgstr ""
+
+#: lib/subs.php:52
 #, fuzzy
 msgid "User has blocked you."
 msgstr "Uživatel nemá profil."
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: lib/subs.php:56
+msgid "Could not subscribe."
+msgstr ""
+
+#: lib/subs.php:75
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: lib/subs.php:124
 #, fuzzy
-msgid "Subscribe to this user"
-msgstr "Odběr autorizován"
+msgid "Not subscribed!"
+msgstr "Nepřihlášen!"
+
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
+msgstr "Nelze smazat odebírání"
 
 #: lib/tagcloudsection.php:56
 msgid "None"
@@ -4817,35 +4628,106 @@ msgstr ""
 msgid "Top posters"
 msgstr ""
 
-#: lib/unblockform.php:120 lib/unblockform.php:150
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+msgid "Unsubscribe from this user"
+msgstr ""
+
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "Odhlásit"
+
+#: lib/userprofile.php:116
 #, fuzzy
-msgid "Unblock this user"
-msgstr "Žádný takový uživatel."
+msgid "Edit Avatar"
+msgstr "Obrázek"
 
-#: lib/unblockform.php:150
-msgid "Unblock"
+#: lib/userprofile.php:236
+msgid "User actions"
 msgstr ""
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
-msgid "Unsubscribe from this user"
+#: lib/userprofile.php:248
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Nastavené Profilu"
+
+#: lib/userprofile.php:249
+msgid "Edit"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "Vytvořit nový účet"
+#: lib/userprofile.php:272
+msgid "Send a direct message to this user"
+msgstr ""
+
+#: lib/userprofile.php:273
+msgid "Message"
+msgstr ""
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "Nelze potvrdit email"
+#: lib/util.php:821
+msgid "a few seconds ago"
+msgstr "před pár sekundami"
+
+#: lib/util.php:823
+msgid "about a minute ago"
+msgstr "asi před minutou"
 
-#~ msgid "Email address"
-#~ msgstr "Emailová adresa"
+#: lib/util.php:825
+#, php-format
+msgid "about %d minutes ago"
+msgstr "asi před %d minutami"
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Chyba při vkládání nového sdělení"
+#: lib/util.php:827
+msgid "about an hour ago"
+msgstr "asi před hodinou"
 
-#~ 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 ""
-#~ "Pokud jste zapomněl nebo stratil heslo, můžete si nechat zaslat nové na "
-#~ "vaší emailovou adresu uloženou u vašeho účtu."
+#: lib/util.php:829
+#, php-format
+msgid "about %d hours ago"
+msgstr "asi před %d hodinami"
+
+#: lib/util.php:831
+msgid "about a day ago"
+msgstr "asi přede dnem"
+
+#: lib/util.php:833
+#, php-format
+msgid "about %d days ago"
+msgstr "před %d dny"
+
+#: lib/util.php:835
+msgid "about a month ago"
+msgstr "asi před měsícem"
+
+#: lib/util.php:837
+#, php-format
+msgid "about %d months ago"
+msgstr "asi před %d mesíci"
+
+#: lib/util.php:839
+msgid "about a year ago"
+msgstr "asi před rokem"
+
+#: lib/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "Stránka není platnou URL."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr ""
+
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr ""
+
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr ""
diff --git a/locale/de/LC_MESSAGES/statusnet.mo b/locale/de/LC_MESSAGES/statusnet.mo
index 335b26715..358fc5be4 100644
--- a/locale/de/LC_MESSAGES/statusnet.mo
+++ b/locale/de/LC_MESSAGES/statusnet.mo
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index ed0252879..4480f68c1 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -1,4447 +1,3046 @@
-# 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.
+# Translation of StatusNet to German
 #
+# Author@translatewiki.net: Umherirrender
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-04-28 00:01+0000\n"
-"Last-Translator: Dawid Jan <dawidjan@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:12+0000\n"
+"Language-Team: German\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: de\n"
+"X-Message-Group: out-statusnet\n"
 
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
-#, php-format
-msgid " Search Stream for \"%s\""
-msgstr "Suche im Stream nach \"%s\""
-
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-#: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
-msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr ""
-"außer folgende private Daten: Passwort, E-Mail, Adresse, IM Adresse, "
-"Telefonnummer."
-
-#: ../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
-#: actions/twitapistatuses.php:347
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr "%1$s Antworten an %2$s"
-
-# Nedd a concrete example with full data
-#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s hat Dich eingeladen, auch bei %2$s mitzumachen."
-
-#: ../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 hat Dich eingeladen, auch bei %2$s mitzumachen. (%3$s).\n"
-"\n"
-"%2$s ist ein Microblogging-Service der Dich über Deine Freunde auf dem "
-"Laufenden hält und Deine Freunde über Dich informiert. \n"
-"\n"
-"Du kannst Neuigkeiten über Dich und Deine Gedanken verbreiten. Lerne neue "
-"Leute mit ähnlichen Interessen kennen. \n"
-"\n"
-"%1$s sagte:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Du kannst die Profilseite von  %1$s bei %2$s hier finden:\n"
-"\n"
-"%5$s\n"
-"\n"
-"Wenn Du den Service ausprobieren möchtest klicke den Link unten an, um die "
-"Einladung anzunehmen.\n"
-"\n"
-"%6$s\n"
-"\n"
-"Wenn nicht, ignoriere diese Nachricht. Danke für Deine Geduld und Deine Zeit\n"
-"\n"
-"Schöne Grüße von %2$s\n"
-
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s hat deine Nachrichten auf %2$s abonniert."
-
-#: ../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 hat deine Nachrichten auf %2$s abonniert.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Gruß,\n"
-"%4$s.\n"
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "Nachrichten von %1$, die auf Nachrichten von %2$ / %3$ antworten."
-
-#: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr "%1$s Status auf %2$s"
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "Tag nicht vorhanden."
 
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
-#, php-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
+msgstr "Unbekannter Benutzer."
 
-#: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/all.php:84
 #, php-format
-msgid "%s Public Stream"
-msgstr "%s öffentlicher Stream"
+msgid "%s and friends, page %d"
+msgstr "%s und Freunde, Seite %d"
 
-#: ../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
-#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s und Freunde"
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
-#, php-format
-msgid "%s public timeline"
-msgstr "%s öffentliche Zeitleiste"
+#: actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Feed der Freunde von %s"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
-#, php-format
-msgid "%s status"
-msgstr "%s Status"
+#: actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Feed der Freunde von %s"
 
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
-#, php-format
-msgid "%s timeline"
-msgstr "%s Zeitleiste"
+#: actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Feed der Freunde von %s"
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/all.php:127
 #, php-format
-msgid "%s updates from everyone!"
-msgstr "%s Nachrichten von allen!"
-
-#: ../actions/register.php:213
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
-"(Sie sollten in Kürze eine E-Mail mit der Anleitung zur Überprüfung Ihrer "
-"Mailadresse erhalten.)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: actions/all.php:132
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
 msgstr ""
-"**%%site.name%%** ist ein Microbloggingdienst von [%%site.broughtby%%](%%"
-"site.broughtbyurl%%)."
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: actions/all.php:134
 #, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** ist ein Microbloggingdienst."
-
-#: ../lib/util.php:274 lib/util.php:290
-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/finishopenidlogin.php:79 actions/profilesettings.php:76
-#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 Kleinbuchstaben oder Ziffern, keine Sonder- oder Leerzeichen"
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
-"1-64 kleingeschriebene Buchstaben oder Zahlen, keine Satz- oder Leerzeichen. "
-"Pflicht."
-
-#: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr "6 oder mehr Zeichen"
 
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
-msgid "6 or more characters, and don't forget it!"
-msgstr "6 oder mehr Zeichen, und nicht vergessen!"
-
-#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
-msgid "6 or more characters. Required."
-msgstr "6 oder mehr Buchstaben. Pflicht."
-
-#: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
 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 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/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s und Freunde"
 
-#: ../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/allrss.php:119 actions/apitimelinefriends.php:121
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr "Aktualisierungen von %1$s und Freunden auf %2$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 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 actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
-msgid "API method not found!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+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 actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
-msgid "API method under construction."
-msgstr "API-Methode im Aufbau."
-
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
-msgid "About"
-msgstr "Über"
-
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
-msgid "Accept"
-msgstr "Akzeptieren"
-
-#: ../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 actions/emailsettings.php:120
-#: actions/imsettings.php:127 actions/openidsettings.php:111
-#: actions/smssettings.php:133 actions/twittersettings.php:163
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
-msgstr "OpenID hinzufügen"
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-msgid "Add or remove OpenIDs"
-msgstr "OpenIDs hinzufügen oder löschen"
-
-#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39 actions/emailsettings.php:39
-#: actions/imsettings.php:40 actions/smssettings.php:39
-#: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
-msgstr "Adresse"
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
+msgstr "Diese Methode benötigt ein POST."
 
-#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-msgid "Addresses of friends to invite (one per line)"
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
 msgstr ""
-"Addressen von Freunden, die Du einladen möchtest. (Jeweils eine Addresse pro "
-"Zeile)"
-
-#: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
-msgid "All subscriptions"
-msgstr "Alle Abonnements"
 
-#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
-#, php-format
-msgid "All updates for %s"
-msgstr "Alle Aktualisierungen für %s"
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Konnte Benutzerdaten nicht aktualisieren."
 
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
 #, php-format
-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:31
-#: actions/openidlogin.php:29 actions/register.php:30
-#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
-msgid "Already logged in."
-msgstr "Bereits eingeloggt."
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
-msgid "Already subscribed!."
-msgstr "Bereits abonniert!"
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "Konnte Twitter Einstellungen nicht speichern!"
 
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
-msgid "Are you sure you want to delete this notice?"
-msgstr "Sind sie sicher, dass sie diese Nachricht löschen wollen?"
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Konnte Benutzerdaten nicht aktualisieren."
 
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
-msgid "Authorize subscription"
-msgstr "Abonnement bestätigen"
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Benutzer hat kein Profil."
 
-#: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
-msgid "Automatically login in the future; not for shared computers!"
-msgstr "Automatisch einloggen; nicht bei gemeinsam genutzten PCs einsetzen!"
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Konnte Profil nicht speichern."
 
-#: ../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/apiblockcreate.php:108
+msgid "Block user failed."
+msgstr "Blockieren des Benutzers fehlgeschlagen."
 
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34 actions/avatarsettings.php:65
-#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
-msgid "Avatar"
-msgstr "Avatar"
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
+msgstr "Freigeben des Benutzers fehlgeschlagen."
 
-#: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
-msgid "Avatar updated."
-msgstr "Avatar aktualisiert."
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "Fehlender Nachrichtentext!"
 
-#: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
 #, 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?)"
+msgid "That's too long. Max message size is %d chars."
 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?)"
+"Die Nachricht ist zu lang. Die maximale Nachrichtenlänge ist 140 Zeichen."
 
-#: ../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 ""
-"Warte auf die Bestätigung dieser Adresse. Prüfe Deinen Nachrichteneingang "
-"(auch den Spam-Ordner) auf eine Nachricht mit weiteren Instruktionen."
-
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
-msgid "Awaiting confirmation on this phone number."
-msgstr "Warte auf die Bestätigung dieser Telefonnummer."
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "Empfänger nicht gefunden."
 
-#: ../lib/util.php:1318 lib/util.php:1452
-msgid "Before »"
-msgstr "Ältere"
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+"Es können keine direkten Nachrichten an Benutzer geschickt werden mit denen "
+"du nicht befreundet bist."
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
-#: actions/profilesettings.php:82 actions/register.php:184
-#: actions/profilesettings.php:112 actions/register.php:402
-msgid "Bio"
-msgstr "Biografie"
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "Direkte Nachricht an %s"
 
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
-#: actions/register.php:89 actions/updateprofile.php:104
-#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
-msgid "Bio is too long (max 140 chars)."
-msgstr "Die Biografie ist zu lang (max. 140 Zeichen)"
+#: actions/apidirectmessage.php:93
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr "Alle von %s gesendeten direkten Nachrichten"
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
-msgid "Can't delete this notice."
-msgstr "Die Nachricht konnte nicht gelöscht werden."
+#: actions/apidirectmessage.php:101
+#, php-format
+msgid "Direct messages to %s"
+msgstr "Direkte Nachricht an %s"
 
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/apidirectmessage.php:105
 #, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr "Konnte Avatar-URL nicht öffnen '%s'"
+msgid "All the direct messages sent to %s"
+msgstr "Alle an %s gesendeten direkten Nachrichten"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404 actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-msgid "Can't save new password."
-msgstr "Konnte neues Passwort nicht speichern"
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "API-Methode nicht gefunden!"
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62 actions/emailsettings.php:58
-#: actions/imsettings.php:59 actions/smssettings.php:62
-#: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
-msgstr "Abbrechen"
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
+msgstr "Keine Nachricht mit dieser ID gefunden."
 
-#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Konnte kein OpenID consumer Objekt erzeugen."
+#: actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+msgstr "Diese Nachricht ist bereits ein Favorit!"
 
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
-msgstr "Konnte diese Jabber ID nicht normalisieren"
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+msgstr "Konnte keinen Favoriten erstellen."
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
-msgid "Cannot normalize that email address"
-msgstr "Konnte diese E-Mail-Adresse nicht normalisieren"
+#: actions/apifavoritedestroy.php:122
+#, fuzzy
+msgid "That status is not a favorite!"
+msgstr "Diese Nachricht ist kein Favorit!"
 
-#: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
-msgstr "Ändern"
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr "Konnte Favoriten nicht löschen."
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
-msgstr "Ändere die E-Mail Verarbeitung"
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
+msgstr "Kann Nutzer %s nicht folgen: Nutzer nicht gefunden"
 
-#: ../actions/password.php:32 actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr "Passwort ändern"
+#: actions/apifriendshipscreate.php:118
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr "Kann Nutzer %s nicht folgen: schon in deiner Kontaktliste eingetragen"
 
-#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
-msgid "Change your password"
-msgstr "Ändere dein Passwort"
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "Kann Nutzer %s nicht folgen: Nutzer nicht gefunden"
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-msgid "Change your profile settings"
-msgstr "Ändern der Profileinstellungen"
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+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
-#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
-#: actions/register.php:376 actions/smssettings.php:122
-msgid "Confirm"
-msgstr "Bestätigen"
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
+msgstr "Zwei IDs oder Benutzernamen müssen angegeben werden."
 
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "Adresse bestätigen"
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Konnte öffentlichen Stream nicht abrufen."
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245 actions/emailsettings.php:256
-#: actions/imsettings.php:230 actions/smssettings.php:253
-#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
-msgid "Confirmation cancelled."
-msgstr "Bestätigung abgebrochen."
+#: actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Konnte keine Statusmeldungen finden."
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
-msgid "Confirmation code"
-msgstr "Bestätigungscode"
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
+msgid "Could not create group."
+msgstr "Konnte Gruppe nicht erstellen."
 
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-msgid "Confirmation code not found."
-msgstr "Bestätigungscode nicht gefunden."
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Konnte keinen Favoriten erstellen."
 
-#: ../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."
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+msgid "Could not set group membership."
+msgstr "Konnte Gruppenmitgliedschaft nicht setzen."
+
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
-"Hallo %s, herzlich willkommen auf %%%%site.name%%%%.\n"
-"\n"
-"Danke für deine Anmeldung, wir hoffen das dir der Service gefällt.\n"
-"\n"
-"Als nächstes möchtest du eventuell ...\n"
-"\n"
-"* zu [deinem Profil gehen](%s) und deine erste Nachricht schreiben\n"
-"* deine [Jabber/GTalk Adresse](%%%%action.imsettings%%%%) eintragen damit du "
-"Nachrichten über diese Dienste schreiben kannst.\n"
-"* [Leute suchen](%%%%action.peoplesearch%%%%) die du kennst oder die "
-"gleichen Interessen wie du haben.\n"
-"* deine [Profildaten ergänzen](%%%%action.profilesettings%%%%) um mehr über "
-"dich zu veröffentlichen\n"
-"* die [Dokumentation](%%%%doc.help%%%%) lesen um mehr über weitere Features "
-"zu erfahren"
+"Der Nutzername darf nur aus Kleinbuchstaben und Ziffern bestehen. "
+"Leerzeichen sind nicht erlaubt."
 
-#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
-msgid "Connect"
-msgstr "Verbinden"
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr "Nutzername wird bereits verwendet. Suche dir einen anderen aus."
 
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
-msgid "Connect existing account"
-msgstr "Verbinde bestehendes Konto"
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "Ungültiger Nutzername."
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
-msgid "Contact"
-msgstr "Kontakt"
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr ""
+"Homepage ist kein gültiger URL. URL´s müssen ein Präfix wie http enthalten."
 
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
-#, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "Konnte OpenID-Formular nicht erstellen: %s"
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "Ihr vollständiger Name ist zu lang (maximal 255 Zeichen)."
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr "Kann Nutzer %s nicht folgen: schon in deiner Kontaktliste eingetragen"
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "Die Beschreibung ist zu lang (max. 140 Zeichen)."
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
-msgid "Could not follow user: User not found."
-msgstr "Kann Nutzer %s nicht folgen: Nutzer nicht gefunden"
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
 
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
 #, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Konnte nicht zum Server umleiten: %s"
-
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
-msgid "Could not save avatar info"
-msgstr "Konnte Avatarinfo nicht speichern"
-
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
-msgid "Could not save new profile info"
-msgstr "Neue Profildaten konnten nicht gespeichert werden."
-
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
-msgid "Could not subscribe other to you."
-msgstr "Die Gegenseite konnte Dich nicht abonnieren."
-
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
-msgid "Could not subscribe."
-msgstr "Konnte nicht abbonieren."
+msgid "Too many aliases! Maximum %d."
+msgstr ""
 
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
-msgstr "Die bestätigte Emailadresse konnte nicht gespeichert werden."
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Ungültiger Tag: \"%s\""
 
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-msgid "Couldn't convert request tokens to access tokens."
-msgstr "Konnte Anfrage-Token nicht in Zugriffs-Token umwandeln."
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Nutzername wird bereits verwendet. Suche dir einen anderen aus."
 
-#: ../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
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-msgid "Couldn't delete email confirmation."
-msgstr "Konnte E-Mailbestätigung nicht löschen."
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
-msgid "Couldn't delete subscription."
-msgstr "Konnte Abonnement nicht löschen."
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Du bist bereits Mitglied dieser Gruppe"
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
-msgid "Couldn't find any statuses."
-msgstr "Konnte keine Statusmeldungen finden."
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
 
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-msgid "Couldn't get a request token."
-msgstr "Konnte keinen Anfrage-Token bekommen."
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen"
 
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206 actions/emailsettings.php:223
-#: actions/imsettings.php:195 actions/smssettings.php:214
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
-msgid "Couldn't insert confirmation code."
-msgstr "Konnte keinen Bestätigungscode einfügen."
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Du bist kein Mitglied dieser Gruppe."
 
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
-msgstr "Konnte neues Abonnement nicht eintragen."
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Konnte Benutzer %s aus der Gruppe %s nicht entfernen"
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-msgid "Couldn't save profile."
-msgstr "Konnte Profil nicht speichern."
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "%s Gruppen"
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
-msgstr "Autosubscribe konnte nicht aktiviert werden."
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Gruppenaktionen"
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
-msgid "Couldn't update user record."
-msgstr "Konnte Nutzereintrag nicht schreiben"
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "%s Gruppen"
 
-#: ../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
-#: actions/confirmaddress.php:114 actions/emailsettings.php:280
-#: actions/emailsettings.php:411 actions/imsettings.php:252
-#: actions/imsettings.php:395 actions/othersettings.php:162
-#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
-msgid "Couldn't update user."
-msgstr "Konnte Benutzerdaten nicht aktualisieren."
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Gruppen zu denen %s gehört"
 
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
-msgid "Create"
-msgstr "Erstellen"
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
+msgstr "Diese Methode benötigt ein POST oder DELETE."
 
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
-msgid "Create a new user with this nickname."
-msgstr "Neuen Nutzer mit diesem Nicknamen erstellen."
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
+msgstr "Du kannst den Status eines anderen Benutzers nicht löschen."
 
-#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
-msgid "Create new account"
-msgstr "Neues Konto anlegen"
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "Avatar aktualisiert."
 
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
-msgid "Creating new account for OpenID that already has a user."
-msgstr "Erzeugen eines Kontos zu einer OpenID, die schon einem Nutzer gehört."
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
+msgstr "Keine Nachricht mit dieser ID gefunden."
 
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "Aktuelle bestätigte Jabber/GTalk-Adresse"
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr ""
+"Das war zu lang. Die Länge einer Nachricht ist auf 140 Zeichen beschränkt."
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "Aktuelle für den SMS Dienst bestätigte Telefon Nummer"
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
+msgstr "Nicht gefunden"
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-msgid "Current confirmed email address."
-msgstr "Aktuelle bestätigte E-Mail Adresse"
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
 
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
-msgstr "Momentan"
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Bildformat wird nicht unterstützt."
 
-#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: actions/apitimelinefavorites.php:107
 #, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "Datenbankfehler beim Einfügen des Hashtags: %s"
+msgid "%s / Favorites from %s"
+msgstr "%s / Favoriten von %s"
 
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: actions/apitimelinefavorites.php:119
 #, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Datenbankfehler beim Einfügen der Antwort: %s"
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
-msgid "Delete notice"
-msgstr "Notiz löschen"
+msgid "%s updates favorited by %s / %s."
+msgstr "%s Aktualisieurng in den Favoriten von %s / %s."
 
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "Beschreibe dich selbst in 140 Zeichen"
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
+#, php-format
+msgid "%s timeline"
+msgstr "%s Zeitleiste"
 
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87 actions/register.php:172
-#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
-#: actions/register.php:385 lib/accountsettingsaction.php:113
-msgid "Email"
-msgstr "E-Mail"
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "Aktualisierungen von %1$s auf %2$s!"
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-msgid "Email Address"
-msgstr "E-Mail Adresse"
+#: actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s Antworten an %2$s"
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
-msgstr "E-Mail Einstellungen"
+#: actions/apitimelinementions.php:126
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr "Nachrichten von %1$, die auf Nachrichten von %2$ / %3$ antworten."
 
-#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-msgid "Email address already exists."
-msgstr "Diese E-Mail Adresse existiert bereits."
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#, php-format
+msgid "%s public timeline"
+msgstr "%s öffentliche Zeitleiste"
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
-msgid "Email address confirmation"
-msgstr "Bestätigung der E-Mail Adresse"
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#, php-format
+msgid "%s updates from everyone!"
+msgstr "%s Nachrichten von allen!"
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
-msgstr "E-Mail Adresse, z.B. \"UserName@example.org\""
+#: actions/apitimelinetag.php:101 actions/tag.php:66
+#, php-format
+msgid "Notices tagged with %s"
+msgstr "Nachrichten, die mit %s getagt sind"
 
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-msgid "Email addresses"
-msgstr "E-Mail Adressen"
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Updates von %1$s auf %2$s!"
 
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
-msgid "Enter a nickname or email address."
-msgstr "Gib einen Spitznamen oder eine E-Mail Adresse ein."
+#: actions/apiusershow.php:96
+msgid "Not found."
+msgstr "Nicht gefunden."
 
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
-msgstr "Gib den Code ein, den du auf deinem Handy via SMS bekommen hast."
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "Unbekanntes Dokument."
 
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
-msgid "Error authorizing token"
-msgstr "Fehler beim Autorisieren des Tokens"
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+msgstr "Kein Nutzername."
 
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
-msgid "Error connecting user to OpenID."
-msgstr "Fehler beim Verbinden des Nutzers mit der OpenID."
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "Keine Größe."
 
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
-msgstr "Fehler beim Verbinden des Nutzers."
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "Ungültige Größe."
 
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
-msgstr "Fehler beim Einfügen des Avatars"
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "Avatar"
 
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
-msgstr "Neues Profil konnte nicht angelegt werden"
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "Du kannst dein persönliches Avatar hochladen."
 
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
-msgstr "Fehler beim Einfügen des entfernten Profils"
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
+msgstr "Benutzer ohne passendes Profil"
 
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
-msgid "Error saving address confirmation."
-msgstr "Fehler beim Speichern der Adressbestätigung."
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+msgid "Avatar settings"
+msgstr "Avatar-Einstellungen"
 
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
-msgid "Error saving remote profile"
-msgstr "Fehler beim Speichern des entfernten Profils"
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr "Original"
 
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-msgid "Error saving the profile."
-msgstr "Fehler bei Speichern des Profils."
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr "Vorschau"
 
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-msgid "Error saving the user."
-msgstr "Fehler beim Speichern des Nutzers."
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#, fuzzy
+msgid "Delete"
+msgstr "Löschen"
 
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
-msgid "Error saving user; invalid."
-msgstr "Fehler beim Speichern des Nutzers, ungültig."
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+msgstr "Hochladen"
 
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
-#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
-#: actions/register.php:108 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-msgid "Error setting user."
-msgstr "Fehler bei den Nutzereinstellungen."
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
+msgstr "Zuschneiden"
 
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr "Fehler beim Update des Profils"
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
 
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
-msgstr "Fehler beim Update des entfernten Profils"
+#: actions/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Unerwartete Formulareingabe."
 
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr "Fehler beim Bestätigungscode."
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
+msgstr ""
+"Wähle eine quadratische Fläche aus dem Bild, um dein Avatar zu speichern"
 
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
-msgid "Existing nickname"
-msgstr "Nick wird bereits verwendet"
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
+msgstr "Daten verloren."
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
-msgid "FAQ"
-msgstr "FAQ"
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+msgstr "Avatar aktualisiert."
 
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Aktualisierung des Avatars fehlgeschlagen."
 
-#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
-#, 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:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
-#, php-format
-msgid "Feed for replies to %s"
-msgstr "Feed der Antworten an %s"
-
-#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
-#, php-format
-msgid "Feed for tag %s"
-msgstr "Feed für den Tag %s"
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
-msgstr "Durchsuche den Inhalt der Notices"
+#: actions/avatarsettings.php:387
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Avatar aktualisiert."
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
-msgstr "Finde Leute auf dieser Seite"
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+msgid "No nickname"
+msgstr "Kein Benutzername"
 
-#: ../actions/login.php:122
-msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
-msgstr ""
-"Bitte geben Sie aus Sicherheitsgründen ihren Benutzernamen und ihr Passwort "
-"ein, bevor die Änderungen an ihren Einstellungen übernommen werden."
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
+msgstr "Keine derartige Gruppe"
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
-#: actions/profilesettings.php:77 actions/register.php:178
-#: actions/profilesettings.php:103 actions/register.php:391
-#: actions/showgroup.php:235 actions/showstream.php:262
-#: actions/tagother.php:105 lib/groupeditform.php:142
-msgid "Full name"
-msgstr "Vollständiger Name"
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "Benutzerprofil"
 
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
-#: actions/register.php:86 actions/updateprofile.php:94
-#: actions/editgroup.php:195 actions/newgroup.php:146
-#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
-msgid "Full name is too long (max 255 chars)."
-msgstr "Ihr vollständiger Name ist zu lang (maximal 255 Zeichen)."
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s und Freunde, Seite %d"
 
-#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
-msgid "Help"
-msgstr "Hilfe"
+#: actions/blockedfromgroup.php:108
+#, fuzzy
+msgid "A list of the users blocked from joining this group."
+msgstr "Liste der Benutzer in dieser Gruppe."
 
-#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
-msgid "Home"
-msgstr "Startseite"
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Freigeben des Benutzers fehlgeschlagen."
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
-msgid "Homepage"
-msgstr "Homepage"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
+msgstr "Freigeben"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
-msgid "Homepage is not a valid URL."
-msgstr ""
-"Homepage ist kein gültiger URL. URL´s müssen ein Präfix wie http enthalten."
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+#, fuzzy
+msgid "Unblock this user"
+msgstr "Benutzer freigeben"
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
-msgid "I want to post notices by email."
-msgstr "Ich möchte Einträge per E-Mail veröffentlichen."
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Nicht angemeldet."
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
-msgstr "IM"
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
+msgstr "Kein Profil angegeben."
 
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
-msgstr "IM Adresse"
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
+msgstr "Kein Benutzer-Profil mit dieser ID."
 
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
-msgstr "IM Einstellungen"
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Benutzer blockieren"
 
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/block.php:136
 msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
 msgstr ""
-"Wenn du schon ein Konto hast, dann melde dich mit Nutzernamen und Passwort "
-"an, um deine OpenID zu verknüpfen."
 
-#: ../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 ""
-"Wenn du deinem Konto eine OpenID hinzufügen möchtest, dann trage sie hier "
-"ein und klicke auf \"Hinzufügen\"."
+#: actions/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
+msgid "No"
+msgstr "Nein"
 
-#: ../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 ""
-"Wenn du dein Passwort vergessen oder verloren hast kannst du dir an die E-"
-"Mail Adresse, die in deinem Account eingetragen ist, ein neues zusenden "
-"lassen."
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Benutzer freigeben"
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-#: actions/emailsettings.php:127 actions/smssettings.php:140
-msgid "Incoming email"
-msgstr "Eingehende E-Mail"
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
+msgstr "Ja"
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
-msgid "Incoming email address removed."
-msgstr "Eingehende E-Mail Adresse entfernt"
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "Benutzer blockieren"
 
-#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
-msgid "Incorrect old password"
-msgstr "Altes Passwort falsch"
+#: actions/block.php:165
+msgid "You have already blocked this user."
+msgstr "Du hast diesen Benutzer bereits blockiert."
 
-#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
-msgid "Incorrect username or password."
-msgstr "Falscher Benutzername oder Passwort."
+#: actions/block.php:170
+msgid "Failed to save block information."
+msgstr "Konnte Blockierungsdaten nicht speichern."
 
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
-msgstr ""
-"Anweisungen für die Wiederherstellung deines Passworts wurden an deine "
-"hinterlegte E-Mailadresse geschickt."
+#: actions/bookmarklet.php:50
+#, fuzzy
+msgid "Post to "
+msgstr "Foto"
 
-#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "Ungültiger Avatar-URL '%s'"
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+msgstr "Kein Bestätigungs-Code."
 
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
-#, php-format
-msgid "Invalid email address: %s"
-msgstr "Ungültige E-Mail Adresse: %s"
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "Bestätigungscode nicht gefunden."
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
-#, php-format
-msgid "Invalid homepage '%s'"
-msgstr "Ungültige Homepage '%s'"
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "Dieser Bestätigungscode ist nicht für dich!"
 
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/confirmaddress.php:90
 #, php-format
-msgid "Invalid license URL '%s'"
-msgstr "Ungültige Lizenz-URL '%s'"
-
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
-msgstr "Ungültiger Nachrichteninhalt"
-
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
-msgstr "Ungülte Nachrichten-URI"
-
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
-msgstr "Ungültige Nachrichten-URL"
+msgid "Unrecognized address type %s"
+msgstr "Nicht erkannter Adresstyp %s"
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "Ungültige Profil-URL '%s'."
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr "Diese Adresse wurde bereits bestätigt."
 
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
-msgstr "Ungültige Profil-URL (falsches Format)"
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "Konnte Benutzerdaten nicht aktualisieren."
 
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
-msgstr "Server antwortete mit ungültiger Profil-URL."
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr "Konnte E-Mail-Bestätigung nicht löschen."
 
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
-#: actions/avatarbynickname.php:69
-msgid "Invalid size."
-msgstr "Ungültige Größe."
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "Adresse bestätigen"
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111 actions/finishopenidlogin.php:241
-#: actions/register.php:103 actions/register.php:121
-#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
-msgid "Invalid username or password."
-msgstr "Benutzername oder Passwort falsch."
+#: actions/confirmaddress.php:159
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "Die Adresse „%s“\" wurde für dein Konto bestätigt."
 
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-msgid "Invitation(s) sent"
-msgstr "Einladung(en) verschickt"
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Bestätigungscode"
 
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-msgid "Invitation(s) sent to the following people:"
-msgstr "Einladung(en) an folgende Personen geschickt:"
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
+msgstr "Nachrichten"
 
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
-msgid "Invite"
-msgstr "Einladen"
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
+msgstr "Unbekannte Nachricht."
 
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-msgid "Invite new users"
-msgstr "Lade neue Leute ein"
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "Die Nachricht konnte nicht gelöscht werden."
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
-#, php-format
+#: actions/deletenotice.php:103
+#, fuzzy
 msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
 msgstr ""
-" Es wird mit der Microbloggingsoftware [StatusNet](http://status.net/) "
-"(Version %s) betrieben, die unter der [GNU Affero General Public License]"
-"(http://www.fsf.org/licensing/licenses/agpl-3.0.html) erhältlich ist."
+"Du bist gerade dabei eine Nachricht unwiderruflich zu löschen. Diese Aktion "
+"ist irreversibel."
 
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
-msgstr "Diese Jabber ID wird bereits von einem anderen Benutzer verwendet."
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr "Notiz löschen"
 
-#: ../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- oder GoogleTalk-Adresse, z.B. \"UserName@example.org\". Aber "
-"versichere dich zuerst, dass du %s in deine Kontaktliste in deinem IM "
-"Programm oder GTalk aufgenommen hast."
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr "Sind sie sicher, dass sie diese Nachricht löschen wollen?"
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
-msgid "Language"
-msgstr "Sprache"
+#: actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "Die Nachricht konnte nicht gelöscht werden."
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
-msgid "Language is too long (max 50 chars)."
-msgstr "Die eingegebene Sprache ist zu lang (maximal 50 Zeichen)"
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+#, fuzzy
+msgid "Delete this notice"
+msgstr "Notiz löschen"
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
-msgid "Location"
-msgstr "Aufenthaltsort"
+#: actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
+msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
-#: actions/register.php:92 actions/updateprofile.php:109
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
-msgid "Location is too long (max 255 chars)."
-msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr "Diese Nachricht ist kein Favorit!"
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
-#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
-#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
-#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
-#, php-format
-msgid "Login"
-msgstr "Einloggen"
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "Zu Favoriten hinzufügen"
 
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Mit [OpenID](%%doc.openid%%) Konto einloggen"
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "Unbekanntes Dokument."
 
-#: ../actions/login.php:126
+#: actions/editgroup.php:56
 #, 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 ""
-"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%%)."
+msgid "Edit %s group"
+msgstr "Gruppe %s bearbeiten"
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
-msgid "Logout"
-msgstr "Abmelden"
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
+msgstr "Du musst angemeldet sein, um eine Gruppe zu erstellen."
 
-#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
-msgid "Longer name, preferably your \"real\" name"
-msgstr "Längerer Name, bevorzugt dein \"echter\" Name"
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+msgid "You must be an admin to edit the group"
+msgstr "Du musst ein Administrator sein, um die Gruppe zu bearbeiten"
 
-#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
-msgid "Lost or forgotten password?"
-msgstr "Passwort vergessen?"
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
+msgstr "Benutze dieses Formular, um die Gruppe zu bearbeiten."
 
-#: ../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 ""
-"Neue Mailadresse für Postings aktivieren; die alte wird automatisch "
-"deaktiviert."
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Die Beschreibung ist zu lang (max. 140 Zeichen)."
+
+#: actions/editgroup.php:253
+msgid "Could not update group."
+msgstr "Konnte Gruppe nicht aktualisieren."
+
+#: actions/editgroup.php:269
+msgid "Options saved."
+msgstr "Einstellungen gespeichert."
+
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "E-Mail-Einstellungen"
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
 #: actions/emailsettings.php:71
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
-msgstr "Einstellen, wie und wann du Emails von %%site.name%% bekommst."
+msgstr "Einstellen, wie und wann du E-Mails von %%site.name%% bekommst."
 
-#: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
-msgid "Member since"
-msgstr "Mitglied seit"
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "Adresse"
 
-#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
-#, php-format
-msgid "Microblog by %s"
-msgstr "Microblog von %s"
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr "Aktuelle bestätigte E-Mail Adresse"
 
-#: ../actions/smssettings.php:304
-#, php-format
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "Entfernen"
+
+#: actions/emailsettings.php:113
 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."
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
 msgstr ""
-"Netzbetreiber deines Telefons. Falls du einen Betreiber kennst, der SMS-via-"
-"Email beherrscht, aber noch in der Liste fehlt, schicke uns eine Mail unter "
-"%s."
+"Warte auf die Bestätigung dieser Adresse. Prüfe Deinen Nachrichteneingang "
+"(auch den Spam-Ordner) auf eine Nachricht mit weiteren Instruktionen."
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-msgid "My text and files are available under "
-msgstr "Meine Texte und Daten sind verfügbar unter"
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "Abbrechen"
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#: actions/emailsettings.php:142 actions/smssettings.php:152
-msgid "New"
-msgstr "Neu"
+#: actions/emailsettings.php:121
+msgid "Email Address"
+msgstr "E-Mail-Adresse"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
-#, php-format
-msgid "New email address for posting to %s"
-msgstr "Neue E-Mail Adresse um auf %s zu schreiben"
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr "E-Mail-Adresse, beispielsweise „Benutzername@example.org“"
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
-msgid "New incoming email address added."
-msgstr "Neue Eingangs-Emailadresse hinzugefügt."
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "Hinzufügen"
 
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
-msgid "New nickname"
-msgstr "Neuer Nutzername"
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+msgstr "Eingehende E-Mail"
 
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
-msgstr "Neue Nachricht"
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
+msgstr "Schicke ein E-Mail an diese Adresse um eine Nachricht zu posten."
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-msgid "New password"
-msgstr "Neues Passwort"
+#: actions/emailsettings.php:145 actions/smssettings.php:162
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr ""
+"Neue E-Mail-Adresse für Postings aktivieren; die alte wird automatisch "
+"deaktiviert."
 
-#: ../actions/recoverpassword.php:314
-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:101
-#: actions/profilesettings.php:74 actions/register.php:165
-#: actions/login.php:228 actions/profilesettings.php:98
-#: actions/register.php:367 actions/showgroup.php:224
-#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
-msgid "Nickname"
-msgstr "Nutzername"
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
+msgstr "Neu"
 
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69 actions/finishopenidlogin.php:181
-#: actions/profilesettings.php:225 actions/register.php:76
-#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
-msgid "Nickname already in use. Try another one."
-msgstr "Nutzername wird bereits verwendet. Suche dir einen anderen aus."
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
+msgstr "Einstellungen"
 
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:67 ../actions/updateprofile.php:77
-#: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
-#: actions/register.php:74 actions/updateprofile.php:78
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Der Nutzername darf nur aus Kleinbuchstaben und Ziffern bestehen. "
-"Leerzeichen sind nicht erlaubt."
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
+msgstr "Informiere mich über neues Abonnements per E-Mail."
 
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
-msgid "Nickname not allowed."
-msgstr "Nutzername nicht erlaubt."
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+"Mir eine E-Mail schicken, wenn jemand meine Nachricht als Favorit speichert."
 
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
-msgstr "Nutzername des Nutzers, dem du folgen möchtest"
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+"Mir eine E-Mail schicken, wenn mir jemand eine private Nachricht schickt."
 
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
-msgid "Nickname or email"
-msgstr "Nutzername oder E-Mail"
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr ""
+"Mir eine E-Mail schicken, wenn mir jemand eine private Nachricht schickt."
 
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
-msgid "No"
-msgstr "Nein"
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
+msgstr "Erlaube Freunden mich zu stupsen und mir E-Mails zu senden."
 
-#: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
-msgstr "Keine Jabber-ID"
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
+msgstr "Ich möchte Einträge per E-Mail veröffentlichen."
 
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
-msgid "No authorization request!"
-msgstr "Keine Bestätigungsanfrage!"
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
+msgstr "MicroID für meine E-Mail-Adresse veröffentlichen."
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
-msgid "No carrier selected."
-msgstr "Kein Netzanbieter ausgewählt."
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Speichern"
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
-msgstr "Kein Code eingegeben"
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+msgstr "Einstellungen gesichert."
 
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
-#: actions/confirmaddress.php:75
-msgid "No confirmation code."
-msgstr "Kein Bestätigungs-Code."
+#: actions/emailsettings.php:319
+msgid "No email address."
+msgstr "Keine E-Mail-Adresse."
 
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
-#: actions/newnotice.php:126 classes/Command.php:223
-msgid "No content!"
-msgstr "Kein Inhalt!"
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
+msgstr "Konnte diese E-Mail-Adresse nicht normalisieren"
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
-msgid "No email address."
-msgstr "Keine E-Mail Adresse."
+#: actions/emailsettings.php:330
+msgid "Not a valid email address"
+msgstr "Ungültige E-Mail-Adresse"
 
-#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
-msgid "No id."
-msgstr "Keine ID."
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
+msgstr "Dies ist bereits deine E-Mail-Adresse."
 
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
-msgid "No incoming email address."
-msgstr "Keine Eingangs-Emailadresse"
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another user."
+msgstr "Diese E-Mail-Adresse gehört einem anderen Nutzer."
 
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr "Der entferne Server hat keinen Nutzernamen geliefert."
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+msgstr "Konnte keinen Bestätigungscode einfügen."
 
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
-msgid "No nickname."
-msgstr "Kein Nutzername."
+#: actions/emailsettings.php:358
+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/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229 actions/emailsettings.php:240
-#: actions/imsettings.php:214 actions/smssettings.php:237
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr "Keine ausstehende Bestätigung, die abgebrochen werden kann."
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
-msgstr "Keine Telefonnummer."
-
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
-msgstr "Der entfernte Server hat keine Profil-URL geliefert."
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "Das ist die falsche IM Adresse."
 
-#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
-msgid "No registered email address for that user."
-msgstr "Der Nutzer hat keine registrierte E-Mailadresse."
-
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr "Keine Anfrage gefunden!"
-
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
-msgid "No results"
-msgstr "Keine Ergebnisse"
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "Bestätigung abgebrochen."
 
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
-msgstr "Keine Größe."
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
+msgstr "Dies ist nicht deine E-Mail-Adresse."
 
-# Duplicate with: "No status with that ID found."
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
-msgid "No status found with that ID."
-msgstr "Keine Nachricht mit dieser ID gefunden."
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "Die Adresse wurde entfernt."
 
-# Duplicate with: "No status found with that ID."
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
-msgid "No status with that ID found."
-msgstr "Keine Nachricht mit dieser ID gefunden."
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
+msgstr "Keine Eingangs-E-Mail-Adresse."
 
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
-msgstr "Diese OpenID ist nicht bekannt."
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
+msgstr "Konnte Nutzereintrag nicht schreiben"
 
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
-msgid "No such document."
-msgstr "Unbekanntes Dokument."
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
+msgstr "Eingehende E-Mail-Adresse entfernt"
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30 actions/shownotice.php:32
-#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
-msgid "No such notice."
-msgstr "Unbekannte Nachricht."
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
+msgstr "Neue Eingangs-E-Mail-Adresse hinzugefügt."
 
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr "Unbekannter Wiederherstellungscode."
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+msgid "Popular notices"
+msgstr "Beliebte Nachrichten"
 
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-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/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 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
-msgid "No such user."
-msgstr "Unbekannter Benutzer."
+#: actions/favorited.php:67
+#, php-format
+msgid "Popular notices, page %d"
+msgstr "Beliebte Nachrichten, Seite %d"
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-msgid "No user with that email address or username."
-msgstr "Kein Benutzer mit dieser E-Mail Adresse oder mit diesem Nutzernamen."
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
+msgstr "Die momentan beliebtesten Nachrichten auf dieser Seite."
 
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
-msgstr "Niemand anzuzeigen!"
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
 
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr "Kein Wiederherstellungscode."
+#: actions/favorited.php:153
+msgid ""
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
+msgstr ""
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
-msgstr "Kein registrierter Nutzer."
+#: actions/favorited.php:156
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
+msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
-msgid "Not a supported data format."
-msgstr "Kein unterstütztes Datenformat."
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
+msgstr "%ss favorisierte Nachrichten"
 
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
-msgstr "Ungültige Jabber-ID"
+#: actions/favoritesrss.php:115
+#, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Aktualisierungen von %1$s auf %2$s!"
 
-#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-msgid "Not a valid OpenID."
-msgstr "Ungültige OpenID."
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Diese Nachricht ist bereits ein Favorit!"
 
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
-msgid "Not a valid email address"
-msgstr "Ungültige E-Mail-Adresse"
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Aus Favoriten entfernen"
 
-#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-msgid "Not a valid email address."
-msgstr "Ungültige E-Mail-Adresse."
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr "Top-Benutzer"
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-#: actions/editgroup.php:186 actions/newgroup.php:137
-#: actions/profilesettings.php:195 actions/register.php:161
-msgid "Not a valid nickname."
-msgstr "Ungültiger Nutzername."
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr "Top-Benutzer, Seite %d"
 
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
-msgstr "Ungültige Profil-URL (falsche Dienste)."
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
+msgstr "Eine Auswahl der tollen Benutzer auf %s"
 
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr "Ungültige Profil-URL (XRDS nicht definiert)."
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "Neue Nachricht"
 
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr "Ungültige Profil-URL (kein YADIS-Dokument)."
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Neue Nachricht"
 
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
-msgid "Not an image or corrupt file."
-msgstr "Kein Bild oder defekte Datei."
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
-msgid "Not authorized."
-msgstr "Nicht autorisiert."
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Unerwartete Antwort!"
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
-msgid "Not found"
-msgstr "Nicht 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/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 actions/block.php:59 actions/disfavor.php:61
-#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
-#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
-#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
-#: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Nicht eingeloggt."
-
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
-msgid "Not subscribed!."
-msgstr "Nicht abonniert!"
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
-msgstr "Nachrichtensuche"
-
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
-#, php-format
-msgid "Notice feed for %s"
-msgstr "Feed der Nachrichten von %s"
-
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
-msgstr "Nachricht hat kein Profil"
-
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
-msgid "Notices"
-msgstr "Nachrichten"
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
-#, php-format
-msgid "Notices tagged with %s"
-msgstr "Nachrichten, die mit %s getagt sind"
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "Aufgeführte Nutzer existiert nicht."
 
-#: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
-msgstr "Altes Passwort"
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+msgstr "Du kannst ein lokales Abonnement erstellen!"
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
-msgid "OpenID"
-msgstr "OpenID"
-
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
-msgid "OpenID Account Setup"
-msgstr "OpenID Account erstellen"
-
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-msgid "OpenID Auto-Submit"
-msgstr "OpenID Automatische Übertragung"
-
-#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
-#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-msgid "OpenID Login"
-msgstr "OpenID Anmeldung"
-
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-#: actions/openidlogin.php:102 actions/openidsettings.php:101
-msgid "OpenID URL"
-msgstr "OpenID-URL"
-
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
-msgid "OpenID authentication cancelled."
-msgstr "OpenID-Authentifizierung abgebrochen."
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr "OpenID-Authentifizierung fehlgeschlagen: %s"
-
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "OpenID-Fehler: %s"
-
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr "OpenID entfernt."
-
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
-msgstr "OpenID-Einstellungen"
-
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-"Wenn du möchtest kannst du zu der Einladung eine persönliche Nachricht "
-"anfügen."
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
+msgstr "Dieser Benutzer erlaubt dir nicht ihn zu abonnieren."
 
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
-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:96 actions/login.php:102
-#: actions/register.php:167 actions/finishopenidlogin.php:118
-#: actions/login.php:231 actions/register.php:372
-#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-msgid "Password"
-msgstr "Passwort"
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "Nicht autorisiert."
 
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
-msgid "Password and confirmation do not match."
-msgstr "Passwort und seine Bestätigung stimmen nicht überein."
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "Konnte Anfrage-Token nicht in Zugriffs-Token umwandeln."
 
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
-msgid "Password must be 6 chars or more."
-msgstr "Passwort muss mehr als 6 Zeichen enthalten"
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Unbekannte OMB-Protokollversion."
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-msgid "Password recovery requested"
-msgstr "Wiederherstellung des Passworts angefordert"
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "Fehler beim Aktualisieren des entfernten Profils"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-msgid "Password saved."
-msgstr "Passwort gespeichert."
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+msgid "No such group."
+msgstr "Keine derartige Gruppe."
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-msgid "Passwords don't match."
-msgstr "Passwörter stimmen nicht überein."
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "Unbekannte Nachricht."
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
-msgstr "Leute"
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Daten verloren."
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
-msgstr "Suche nach Nutzern"
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "Kein Profil angegeben."
 
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
-msgstr "Suche nach anderen Nutzern"
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
 
-#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
-msgid "Personal"
-msgstr "Eigene"
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "Dieser Benutzer hat dich blockiert."
 
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-msgid "Personal message"
-msgstr "Private Nachricht"
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "Du bist kein Mitglied dieser Gruppe."
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "Telefonnummer, keine Sonder- oder Leerzeichen mit Vorwahl"
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "Benutzer blockieren"
 
-#: ../actions/userauthorization.php:78
+#: actions/groupblock.php:162
+#, php-format
 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\"."
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
 msgstr ""
-"Bitte überprüfe diese Angaben, um sicher zu gehen, dass du die Nachrichten "
-"dieses Nutzers abonnieren möchtest. Wenn du das nicht wolltest, klicke auf "
-"\"Abbrechen\"."
 
-#: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Schicke eine Nachricht, wenn sich mein Jabber/GTalk Status verändert."
+#: actions/groupblock.php:178
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "Liste der Benutzer in dieser Gruppe."
 
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94 actions/emailsettings.php:86
-#: actions/imsettings.php:68 actions/smssettings.php:94
-#: actions/twittersettings.php:70 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
-msgid "Preferences"
-msgstr "Einstellungen"
+#: actions/groupblock.php:179
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "Liste der Benutzer in dieser Gruppe."
 
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163 actions/emailsettings.php:180
-#: actions/imsettings.php:152 actions/smssettings.php:171
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
-msgid "Preferences saved."
-msgstr "Einstellungen gesichert."
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
+msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
-msgid "Preferred language"
-msgstr "Bevorzugte Sprache"
+#: actions/groupbyid.php:74
+msgid "No ID"
+msgstr "Keine ID"
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
-msgid "Privacy"
-msgstr "Privatsphäre"
+#: actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "Du musst angemeldet sein, um eine Gruppe zu erstellen."
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-msgid "Problem saving notice."
-msgstr "Problem bei Speichern der Nachricht."
+#: actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "Gruppen"
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
-msgid "Profile"
-msgstr "Profil"
+#: actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
 
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
-msgstr "Profil-URL"
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Konnte Benutzerdaten nicht aktualisieren."
 
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
-msgstr "Profil Einstellungen"
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "Konnte Twitter Einstellungen nicht speichern!"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-msgid "Profile unknown"
-msgstr "Profil unbekannt"
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Synchronisationseinstellungen gespeichert."
 
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
-msgid "Public Stream Feed"
-msgstr "Feed des öffentlichen Streams"
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
+msgstr "Gruppen-Logo"
 
-#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
-msgid "Public timeline"
-msgstr "Öffentliche Zeitleiste"
+#: actions/grouplogo.php:150
+#, fuzzy, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr "Du kannst ein Logo für Deine Gruppe hochladen."
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "MicroID für meine Jabber/GTalk-Adresse veröffentlichen."
+#: actions/grouplogo.php:362
+#, fuzzy
+msgid "Pick a square area of the image to be the logo."
+msgstr ""
+"Wähle eine quadratische Fläche aus dem Bild, um dein Avatar zu speichern"
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
-msgid "Publish a MicroID for my email address."
-msgstr "MicroID für meine Emailadresse veröffentlichen."
+#: actions/grouplogo.php:396
+msgid "Logo updated."
+msgstr "Logo aktualisiert."
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr "Neueste Tags"
+#: actions/grouplogo.php:398
+msgid "Failed updating logo."
+msgstr "Aktualisierung des Logos fehlgeschlagen."
 
-#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
-msgid "Recover"
-msgstr "Wiederherstellung"
+#: actions/groupmembers.php:93 lib/groupnav.php:92
+#, php-format
+msgid "%s group members"
+msgstr "%s Gruppen-Mitglieder"
 
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
-msgid "Recover password"
-msgstr "Stelle Passwort wieder her"
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
+msgstr "%s Gruppen-Mitglieder, Seite %d"
 
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-msgid "Recovery code for unknown user."
-msgstr "Wiederherstellungscode für unbekannten Nutzer."
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr "Liste der Benutzer in dieser Gruppe."
 
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
-#: actions/register.php:152 actions/register.php:207 lib/util.php:328
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-msgid "Register"
-msgstr "Registrieren"
+#: actions/groupmembers.php:175 lib/groupnav.php:107
+#, fuzzy
+msgid "Admin"
+msgstr "Admin"
 
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
-msgid "Registration not allowed."
-msgstr "Registrierung nicht gestattet"
+#: actions/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
+msgstr "Blockieren"
 
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
-msgid "Registration successful"
-msgstr "Registrierung erfolgreich"
+#: actions/groupmembers.php:441
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "Du musst ein Administrator sein, um die Gruppe zu bearbeiten"
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
-msgid "Reject"
-msgstr "Ablehnen"
+#: actions/groupmembers.php:473
+#, fuzzy
+msgid "Make Admin"
+msgstr "Admin"
 
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
-msgid "Remember me"
-msgstr "Anmeldedaten merken"
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
-msgid "Remote profile with no matching profile"
-msgstr "Entferntes Profil ohne ein passendes Profil"
+#: actions/grouprss.php:133
+#, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Aktualisierungen von %1$s auf %2$s!"
 
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
-msgstr "Entferntes Abonnement"
+#: actions/groupsearch.php:52
+#, fuzzy, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"Durchsuche die Namen, Orten oder Interessen der Nutzer von %%site.name%%. "
+"Trenne mehrere Suchbegriffe durch Leerzeichen. Ein Suchbegriff muss aus "
+"mindestens 3 Zeichen bestehen."
 
-#: ../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 actions/emailsettings.php:101
-#: actions/emailsettings.php:134 actions/imsettings.php:102
-#: actions/openidsettings.php:166 actions/smssettings.php:103
-#: actions/smssettings.php:146 actions/twittersettings.php:115
-msgid "Remove"
-msgstr "Entfernen"
+#: actions/groupsearch.php:58
+msgid "Group search"
+msgstr "Gruppen-Suche"
 
-#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
-msgstr "Entferne OpenID"
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "Keine Ergebnisse"
 
-#: ../actions/openidsettings.php:73
+#: actions/groupsearch.php:82
+#, php-format
 msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
 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/personal.php:55 lib/personalgroupnav.php:103
-msgid "Replies"
-msgstr "Antworten"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
-#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
-#: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: actions/groupsearch.php:85
 #, php-format
-msgid "Replies to %s"
-msgstr "Antworten an %s"
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
 
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
-msgid "Reset"
-msgstr "Zurücksetzen"
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Gruppen"
 
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
-msgid "Reset password"
-msgstr "Passwort zurücksetzen"
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Gruppen, Seite %d"
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-msgid "SMS"
-msgstr "SMS"
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
-msgid "SMS Phone number"
-msgstr "SMS Telefonnummer"
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Neue Gruppe erstellen"
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
-msgstr "SMS Einstellungen"
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
-msgid "SMS confirmation"
-msgstr "SMS Konfiguration"
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "Dieser Benutzer hat dich blockiert."
 
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
-msgid "Same as password above"
-msgstr "Gleiches Passwort wie zuvor"
+#: actions/groupunblock.php:128 actions/unblock.php:108
+msgid "Error removing the block."
+msgstr "Fehler beim Freigeben des Benutzers."
 
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
-msgid "Same as password above. Required."
-msgstr "Gleiches Passwort wie zuvor. Pflichteingabe."
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "IM Einstellungen"
 
-#: ../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 actions/emailsettings.php:182
-#: actions/facebooksettings.php:114 actions/imsettings.php:157
-#: actions/othersettings.php:117 actions/profilesettings.php:150
-#: actions/smssettings.php:169 actions/subscriptions.php:124
-#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
-msgid "Save"
-msgstr "Speichern"
+#: actions/imsettings.php:70
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+"Du kannst Nachrichten mittels [Jabber/GTalk IM](%%doc.im%%) empfangen und "
+"senden. Stelle deine Adresse und Einstellungen unten ein."
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
-msgid "Search"
-msgstr "Suchen"
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Diese Seite liegt in nicht verfügbar in einem "
 
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
-msgstr "Stream-Feed suchen"
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Aktuelle bestätigte Jabber/GTalk-Adresse"
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/imsettings.php:114
 #, php-format
 msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
+"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 ""
-"Dursuche den Inhalt der Nachrichten auf %%site.name%%. Trenne mehrere "
-"Suchbegriffe durch Leerzeichen. Ein Suchbegriff muss aus mindestens 3 "
-"Zeichen bestehen."
+"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/peoplesearch.php:28
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "IM Adresse"
+
+#: actions/imsettings.php:126
 #, 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."
+"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 ""
-"Durchsuche die Namen, Orten oder Interessen der Nutzer von %%site.name%%. "
-"Trenne mehrere Suchbegriffe durch Leerzeichen. Ein Suchbegriff muss aus "
-"mindestens 3 Zeichen bestehen."
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
-msgid "Select a carrier"
-msgstr "Wähle einen Netzanbieter"
-
-#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
-#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
-msgid "Send"
-msgstr "Senden"
-
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
-msgstr "Schicke ein Mail an diese Adresse um eine Nachricht zu posten."
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
-msgstr "Informiere mich über neues Abonnements per Mail."
+"Jabber- oder GoogleTalk-Adresse, z.B. \"UserName@example.org\". Aber "
+"versichere dich zuerst, dass du %s in deine Kontaktliste in deinem IM "
+"Programm oder GTalk aufgenommen hast."
 
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Schicke mir Nachrichten mittels 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 ""
-"Schicke mir Nachrichten per SMS; ich weiss, dass mir dadurch hohe Kosten bei "
-"meinem Netzbetreiber entstehen können."
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr "Schicke eine Nachricht, wenn sich mein Jabber/GTalk Status verändert."
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
-"Schicke mir Antworten von Leuten, die ich nicht abonniert habe, mit "
-"Jabber/GTalk."
-
-#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
-msgid "Settings"
-msgstr "Einstellungen"
-
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
-msgid "Settings saved."
-msgstr "Einstellungen gespeichert."
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr "Die populärsten Tags der letzten Woche"
-
-#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:114
-msgid "Someone else already has this OpenID."
-msgstr "Jemand anderes hat schon diese OpenID."
-
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
-msgstr "Etwas eigenartiges ist passiert."
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
-msgstr "Sorry, keinen eingehenden E-Mails gestattet."
+"Schicke mir Antworten von Leuten, die ich nicht abonniert habe, mit Jabber/"
+"GTalk."
 
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
-msgstr "Sorry, das ist nicht deine Addresse für eingehende E-Mails."
-
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
-msgid "Source"
-msgstr "Quellcode"
-
-#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
-msgid "Statistics"
-msgstr "Statistiken"
-
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-msgid "Stored OpenID not found."
-msgstr "Gespeicherte OpenID nicht gefunden."
-
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
-#: actions/showstream.php:197 actions/showstream.php:206
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
-msgid "Subscribe"
-msgstr "Abonnieren"
-
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
-msgid "Subscribers"
-msgstr "Abonnenten"
-
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
-msgid "Subscription authorized"
-msgstr "Abonnement autorisiert"
-
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
-msgid "Subscription rejected"
-msgstr "Abonnement abgelehnt"
-
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27 actions/showstream.php:240
-#: actions/showstream.php:322 actions/subscriptions.php:27
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
-msgid "Subscriptions"
-msgstr "Abonnements"
-
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
-msgid "System error uploading file."
-msgstr "Systemfehler beim hochladen der Datei."
-
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
-#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
-msgid "Tags"
-msgstr "Tags"
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "Text"
-
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
-msgid "Text search"
-msgstr "Volltextsuche"
-
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
-msgstr "Diese OpenID gehört dir nicht."
-
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
-msgstr "Diese Adresse wurde bereits bestätigt."
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "MicroID für meine Jabber/GTalk-Adresse veröffentlichen."
 
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
-msgstr "Dieser Bestätigungscode ist nicht für dich!"
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "Keine Jabber-ID"
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr "Diese E-Mail Adresse gehört einem anderen Nutzer."
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr "Konnte diese Jabber ID nicht normalisieren"
 
-#: ../actions/avatar.php:80 actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
-msgstr "Diese Datei ist zu groß."
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "Ungültige Jabber-ID"
 
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "Diese JabberID hast du schon angegeben."
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
-msgid "That is already your email address."
-msgstr "Dies ist bereits deine E-Mail Adresse."
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr "Diese Jabber ID wird bereits von einem anderen Benutzer verwendet."
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
-msgid "That is already your phone number."
-msgstr "Dies ist bereits deine Telefonnummer."
+#: actions/imsettings.php:327
+#, 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/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "Dies ist nicht deine JabberID."
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
-msgid "That is not your email address."
-msgstr "Dies ist nicht deine E-Mail Adresse."
-
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
-msgstr "Dies ist nicht deine Telefonnummer."
-
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-#: actions/emailsettings.php:367 actions/imsettings.php:349
-msgid "That is the wrong IM address."
-msgstr "Das ist die falsche IM Adresse."
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
-msgstr "Die Bestätigungsnummer ist falsch."
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr "Posteingang von %s - Seite %d"
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-msgid "That phone number already belongs to another user."
-msgstr "Diese Telefonnummer wird bereits von einem anderen Benutzer verwendet."
+#: actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr "Posteingang von %s"
 
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49 actions/twitapistatuses.php:330
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-msgid "That's too long. Max notice size is 140 chars."
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
-"Das war zu lang. Die Länge einer Nachricht ist auf 140 Zeichen beschränkt."
+"Das hier ist dein Posteingang, der deine eingehenden privaten Nachrichten "
+"enthält."
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
-msgid "That's too long. Max notice size is 255 chars."
+#: actions/invite.php:39
+msgid "Invites have been disabled."
 msgstr ""
-"Das war zu lang. Die Länge einer Nachricht ist auf 255 Zeichen beschränkt."
 
-#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/invite.php:41
 #, 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/emailsettings.php:282
-#: actions/imsettings.php:258 actions/smssettings.php:282
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
-msgid "The address was removed."
-msgstr "Die Adresse wurde entfernt."
+msgid "You must be logged in to invite other users to use %s"
+msgstr "Du musst angemeldet sein, um andere Benutzer zu %s einzuladen"
 
-#: ../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 ""
-"Das Abonnement wurde bestätigt, aber es wurde keine Callback-URL "
-"zurückgegeben. Lies nochmal die Anweisungen der Site, wie Abonnements "
-"bestätigt werden. Dein Abonnement-Token ist:"
+#: actions/invite.php:72
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "Ungültige E-Mail-Adresse: %s"
 
-#: ../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 ""
-"Das Abonnement wurde abgelehnt, aber es wurde keine Callback-URL "
-"zurückgegeben. Lies nochmal die Anweisungen der Site, wie Abonnements "
-"vollständig abgelehnt werden. Dein Abonnement-Token ist:"
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
+msgstr "Einladung(en) verschickt"
 
-#: ../actions/subscribers.php:35 actions/subscribers.php:35
-#, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr "Dies sind die Leute, die %ss Nachrichten lesen."
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr "Lade neue Leute ein"
 
-#: ../actions/subscribers.php:33 actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr "Dies sind die Leute, die deine Nachrichten lesen."
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr "Du hast diese Benutzer bereits abonniert:"
 
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/invite.php:131 actions/invite.php:139
 #, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr "Dies sind die Leute, deren Nachrichten %s liest."
-
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr "Dies sind die Leute, deren Nachrichten du liest."
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
 "Diese Leute sind bereits registrierte Benutzer und Du hast Sie automatisch "
 "abonniert."
 
-#: ../actions/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
-msgstr "Der Bestätigungscode ist zu alt. Bitte fange nochmal von vorne an."
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
+msgstr "Einladung(en) an folgende Personen geschickt:"
 
-#: ../lib/openid.php:195
+#: actions/invite.php:150
 msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 msgstr ""
-"Dieses Formular sollte automatisch übermittelt werden. Wenn nicht, dann "
-"klicke auf \"Senden\", um zu deinem OpenID-Anbieter zu gelangen."
+"Du wirst benachrichtigt, wenn deine Einladungen angenommen wurden und sich "
+"die Empfänger auf der Seite registriert haben. Danke, dass du uns hilfst zu "
+"wachsen!"
 
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
-#, php-format
+#: actions/invite.php:162
 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 ""
-"Dies ist das erste Mail, dass du dich bei %s einloggst. Deshalb müssen wir "
-"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
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-msgid "This method requires a POST or DELETE."
-msgstr "Diese Methode benötigt ein POST oder 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 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
-msgid "This method requires a POST."
-msgstr "Diese Methode benötigt ein POST."
-
-#: ../lib/util.php:164 lib/util.php:246
-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 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
-msgid "Timezone"
-msgstr "Zeitzone"
+"Use this form to invite your friends and colleagues to use this service."
+msgstr "Lade deine Freunde und Kollegen ein diesen Dienst zu nutzen."
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
-msgid "Timezone not selected."
-msgstr "Keine Zeitzone ausgewählt."
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "E-Mail-Adressen"
 
-#: ../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."
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
 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."
+"Addressen von Freunden, die Du einladen möchtest. (Jeweils eine Addresse pro "
+"Zeile)"
 
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
-msgid "Two user ids or screen_names must be supplied."
-msgstr "Zwei IDs oder Benutzernamen müssen angegeben werden."
+#: actions/invite.php:192
+msgid "Personal message"
+msgstr "Private Nachricht"
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
-msgid "URL of your homepage, blog, or profile on another site"
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
 msgstr ""
-"URL deiner Homepage, deines Blogs, oder deines Profils auf einer anderen Site"
-
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-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/emailsettings.php:144 actions/imsettings.php:118
-#: actions/recoverpassword.php:39 actions/smssettings.php:143
-#: actions/twittersettings.php:108 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-msgid "Unexpected form submission."
-msgstr "Unerwartete Formulareingabe."
-
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
-msgid "Unexpected password reset."
-msgstr "Unerwarteter Passwortreset."
+"Wenn du möchtest kannst du zu der Einladung eine persönliche Nachricht "
+"anfügen."
 
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-msgid "Unknown action"
-msgstr "Unbekannter Befehl"
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
+msgstr "Senden"
 
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-msgid "Unknown version of OMB protocol."
-msgstr "Unbekannte OMB-Protokollversion."
+#: actions/invite.php:226
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s hat Dich eingeladen, auch bei %2$s mitzumachen."
 
-#: ../lib/util.php:269 lib/util.php:285
+#: actions/invite.php:228
+#, php-format
 msgid ""
-"Unless otherwise specified, contents of this site are copyright by the "
-"contributors and available under the "
+"%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 ""
-"Wenn nicht anders angegeben unterstehen die Inhalte dieser Site dem "
-"Urheberrecht der Autoren und sind unter der"
-
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
-#, php-format
-msgid "Unrecognized address type %s"
-msgstr "Nicht erkannter Adresstyp %s"
-
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
-msgstr "Abbestellen"
-
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-msgid "Unsupported OMB version"
-msgstr "Nicht unterstützte OMB-Version"
-
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
-msgid "Unsupported image file format."
-msgstr "Bildformat wird nicht unterstützt."
+"%1$s hat Dich eingeladen, auch bei %2$s mitzumachen. (%3$s).\n"
+"\n"
+"%2$s ist ein Microblogging-Service der Dich über Deine Freunde auf dem "
+"Laufenden hält und Deine Freunde über Dich informiert. \n"
+"\n"
+"Du kannst Neuigkeiten über Dich und Deine Gedanken verbreiten. Lerne neue "
+"Leute mit ähnlichen Interessen kennen. \n"
+"\n"
+"%1$s sagte:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Du kannst die Profilseite von  %1$s bei %2$s hier finden:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Wenn Du den Service ausprobieren möchtest klicke den Link unten an, um die "
+"Einladung anzunehmen.\n"
+"\n"
+"%6$s\n"
+"\n"
+"Wenn nicht, ignoriere diese Nachricht. Danke für Deine Geduld und Deine "
+"Zeit\n"
+"\n"
+"Schöne Grüße von %2$s\n"
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
-msgstr "Updates via SMS"
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
+msgstr "Du musst angemeldet sein, um Mitglied einer Gruppe zu werden."
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
-msgstr "Updates via Instant Messenger (IM)"
+#: actions/joingroup.php:90 lib/command.php:217
+msgid "You are already a member of that group"
+msgstr "Du bist bereits Mitglied dieser Gruppe"
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/joingroup.php:128 lib/command.php:234
 #, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr "Updates von %1$s und Freunden auf %2$s!"
+msgid "Could not join user %s to group %s"
+msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen"
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/joingroup.php:135 lib/command.php:239
 #, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr "Updates von %1$s auf %2$s!"
-
-#: ../actions/avatar.php:68 actions/profilesettings.php:161
-#: actions/avatarsettings.php:162 actions/grouplogo.php:232
-msgid "Upload"
-msgstr "Hochladen"
-
-#: ../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 ""
-"Hier kannst du einen neuen \"Avatar\" (Nutzerbild) hochladen. Du kannst das "
-"Bild nach dem Hochladen nicht mehr verändern, also stell bitte sicher, dass "
-"es halbwegs quadratisch ist. Es muss auch unter der Lizenz der Site zur "
-"Verfügung gestellt werden. Nutze also ein Bild, das dir gehört und das du "
-"auch weitergeben möchtest."
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr "Neues Bild für dein Profil hochladen"
-
-#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
-msgstr "Lade deine Freunde und Kollegen ein diesen Dienst zu nutzen."
-
-#: ../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 ""
-"Wird nur für Updates, wichtige Mitteilungen und zur "
-"Passwortwiederherstellung verwendet"
-
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
-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/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
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-msgid "User has no profile."
-msgstr "Benutzer hat kein Profil."
+msgid "%s joined group %s"
+msgstr "%s ist der Gruppe %s beigetreten"
 
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
-msgstr "Benutzername"
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
+msgstr "Du musst angemeldet sein, um aus einer Gruppe auszutreten."
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr "Benutzer nicht gefunden."
+#: actions/leavegroup.php:90 lib/command.php:268
+msgid "You are not a member of that group."
+msgstr "Du bist kein Mitglied dieser Gruppe."
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
-msgid "What timezone are you normally in?"
-msgstr "In welcher Zeitzone befinden Sie sich üblicherweise?"
+#: actions/leavegroup.php:119 lib/command.php:278
+msgid "Could not find membership record."
+msgstr "Konnte Mitgliedseintrag nicht finden."
 
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: actions/leavegroup.php:127 lib/command.php:284
 #, php-format
-msgid "What's up, %s?"
-msgstr "Was ist los, %s?"
-
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-#: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Wo du bist, z.B. \"Stadt, Gebiet, Land\""
+msgid "Could not remove user %s to group %s"
+msgstr "Konnte Benutzer %s aus der Gruppe %s nicht entfernen"
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
-msgid "Wrong image type for '%s'"
-msgstr "Falscher Bildtyp für '%s'"
+msgid "%s left group %s"
+msgstr "%s hat die Gruppe %s verlassen"
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
-#, php-format
-msgid "Wrong size image at '%s'"
-msgstr "Falsche Bildgröße bei '%s'"
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "Bereits angemeldet."
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
-msgid "Yes"
-msgstr "Ja"
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Ungültiger Nachrichteninhalt"
 
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-msgid "You already have this OpenID!"
-msgstr "Diese OpenID hast du schon angegeben!"
+#: actions/login.php:143
+msgid "Incorrect username or password."
+msgstr "Falscher Benutzername oder Passwort."
 
-#: ../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 bist gerade dabei eine Nachricht unwiderruflich zu löschen. Diese Aktion "
-"ist irreversibel."
+#: actions/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
+msgstr "Fehler bei den Nutzereinstellungen."
 
-#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
-msgstr "Du bist bereits angemeldet!"
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "Einloggen"
 
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-msgid "You are already subscribed to these users:"
-msgstr "Du hast diese Benutzer bereits abonniert:"
+#: actions/login.php:243
+msgid "Login to site"
+msgstr "An Seite anmelden"
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
-msgid "You are not friends with the specified user."
-msgstr "Der angebene Benutzer gehört nicht zu Deinem Freunde-Netzwerk"
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Nutzername"
 
-#: ../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/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Passwort"
 
-#: ../actions/register.php:135 actions/register.php:145
-msgid "You can create a new account to start posting notices."
-msgstr "Du kannst ein neues Konto erstellen, um Nachrichten zu verschicken."
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "Anmeldedaten merken"
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "Du kannst SMS per Mail empfangen von %%site.name%%."
+#: actions/login.php:253 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
+msgstr "Automatisch anmelden; nicht bei gemeinsam genutzten PCs einsetzen!"
 
-#: ../actions/openidsettings.php:86
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr ""
-"Du kannst eine OpenID aus deinem Konto entfernen, indem du auf \"Entfernen\" "
-"klickst."
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "Passwort vergessen?"
 
-#: ../actions/imsettings.php:28 actions/imsettings.php:28
-#, php-format
+#: actions/login.php:282
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
 msgstr ""
-"Du kannst Nachrichten mittels [Jabber/GTalk IM](%%doc.im%%) empfangen und "
-"senden. Stelle deine Adresse und Einstellungen unten ein."
+"Bitte geben Sie aus Sicherheitsgründen ihren Benutzernamen und ihr Passwort "
+"ein, bevor die Änderungen an ihren Einstellungen übernommen werden."
 
-#: ../actions/profilesettings.php:27
+#: actions/login.php:286
+#, fuzzy, php-format
 msgid ""
-"You can update your personal profile info here so people know more about you."
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
 msgstr ""
-"Du kannst dein Profil auf den neusten Stand bringen, damit andere Leute mehr "
-"über dich erfahren können."
-
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
-msgstr "Du kannst ein lokales Abonnement erstellen!"
+"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%%)."
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
-msgid "You can't register if you don't agree to the license."
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
 msgstr ""
-"Du kannst dich nicht registrieren, wenn du die Lizenz nicht akzeptierst."
 
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
-msgid "You did not send us that profile"
-msgstr "Dieses Profil hast du uns nicht geschickt"
-
-#: ../lib/mail.php:147
+#: actions/makeadmin.php:95
 #, php-format
-#, fuzzy
-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"
+msgid "%s is already an admin for group \"%s\"."
 msgstr ""
-"Du hast eine neue Adresse zum Hinzufügen von Nachrichten auf %1$s.\n"
-"\n"
-"Schicke eine E-mail an %2$s um eine neue Nachricht hinzuzufügen.\n"
-"\n"
-"Weitere E-Mailanweisungen unter %3$s.\n"
-"\n"
-"Viele Grüße,\n"
-"%4$s"
-
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
-#, fuzzy
-msgid "You may not delete another user's status."
-msgstr "Du kannst den Status eines anderen Benutzers nicht löschen."
 
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/makeadmin.php:132
 #, php-format
-#, fuzzy
-msgid "You must be logged in to invite other users to use %s"
-msgstr "Du musst angemeldet sein, um andere Benutzer zu %s einzuladen"
-
-#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
-#, fuzzy
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+msgid "Can't get membership record for %s in group %s"
 msgstr ""
-"Du wirst benachrichtigt, wenn deine Einladungen angenommen wurden und sich "
-"die Empfänger auf der Seite registriert haben. Danke, dass du uns hilfst zu "
-"wachsen!"
-
-#: ../actions/recoverpassword.php:149
-#, fuzzy
-msgid "You've been identified. Enter a  new password below. "
-msgstr "Du wurdest indentifiziert. Bitte trage unten ein neues Passwort ein."
-
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
-msgid "Your OpenID URL"
-msgstr "Deine OpenID URL"
-
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
-msgstr "Dein Benutzername oder E-Mail Adresse auf diesem Server."
 
-#: ../actions/openidsettings.php:28
+#: actions/makeadmin.php:145
 #, php-format
-msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
-"account.  Manage your associated OpenIDs from here."
+msgid "Can't make %s an admin for group %s"
 msgstr ""
-"Mit [OpenID](%%doc.openid%%) kannst du dich bei mehreren Sites mit demselben "
-"Nutzerkonto anmelden. Hier kannst du deine verknüpften OpenIDs verwalten."
-
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
-msgid "a few seconds ago"
-msgstr "vor wenigen Sekunden"
-
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
-#, php-format
-msgid "about %d days ago"
-msgstr "vor %d Tagen"
-
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
-#, php-format
-msgid "about %d hours ago"
-msgstr "vor %d Stunden"
-
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
-#, php-format
-msgid "about %d minutes ago"
-msgstr "vor %d Minuten"
-
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
-#, php-format
-msgid "about %d months ago"
-msgstr "vor %d Monaten"
-
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
-msgid "about a day ago"
-msgstr "vor einem Tag"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
-msgid "about a minute ago"
-msgstr "vor einer Minute"
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr "Kein aktueller Status"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
-msgid "about a month ago"
-msgstr "vor einem Monat"
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr "Neue Gruppe"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
-msgid "about a year ago"
-msgstr "vor einem Jahr"
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
+msgstr "Benutzer dieses Formular, um eine neue Gruppe zu erstellen."
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
-msgid "about an hour ago"
-msgstr "vor einer Stunde"
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr "Neue Nachricht"
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
-msgstr "löschen"
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
+msgstr "Du kannst diesem Benutzer keine Nachricht schicken."
 
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117 actions/noticesearch.php:136
-#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
-#, fuzzy
-msgid "in reply to..."
-msgstr "als Antwort auf..."
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+msgstr "Kein Inhalt!"
 
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124 actions/noticesearch.php:143
-#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
-msgid "reply"
-msgstr "antworten"
+#: actions/newmessage.php:158
+msgid "No recipient specified."
+msgstr "Kein Empfänger angegeben."
 
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-#, fuzzy
-msgid "same as password above"
-msgstr "Gleiches Passwort wie oben"
+#: actions/newmessage.php:164 lib/command.php:370
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly instead."
+msgstr ""
+"Schicke dir selbst keine Nachrichten; sag es dir stattdessen einfach leise."
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
-msgid "unsupported file type"
-msgstr "Nicht unterstützter Dateityp"
-
-#: ../lib/util.php:1309 lib/util.php:1443
-msgid "« After"
-msgstr "Früher"
-
-#: 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
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
+#: actions/newmessage.php:181
 #, fuzzy
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
+msgid "Message sent"
+msgstr "Nachricht"
 
-#: actions/disfavor.php:55 actions/disfavor.php:81
-#, fuzzy
-msgid "This notice is not a favorite!"
-msgstr "Diese Nachricht ist kein Favorit!"
+#: actions/newmessage.php:185 lib/command.php:375
+#, php-format
+msgid "Direct message to %s sent"
+msgstr "Direkte Nachricht an %s abgeschickt"
 
-#: actions/disfavor.php:63 actions/disfavor.php:87
-msgid "Could not delete favorite."
-msgstr "Konnte Favoriten nicht löschen."
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
+msgstr "Ajax-Fehler"
 
-#: actions/disfavor.php:72 lib/favorform.php:140
-#, fuzzy
-msgid "Favor"
-msgstr "Zu Favoriten hinzufügen"
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "Neue Nachricht"
 
-#: actions/emailsettings.php:92
-#, fuzzy
-msgid "Send me email when someone adds my notice as a favorite."
-msgstr ""
-"Mir eine E-Mail schicken, wenn jemand meine Nachricht als Favorit speichert."
+#: actions/newnotice.php:199
+msgid "Notice posted"
+msgstr "Nachricht hinzugefügt"
 
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-#, fuzzy
-msgid "Send me email when someone sends me a private message."
+#: actions/noticesearch.php:68
+#, php-format
+msgid ""
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
 msgstr ""
-"Mir eine E-Mail schicken, wenn mir jemand eine private Nachricht schickt."
-
-#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
-#, fuzzy
-msgid "This notice is already a favorite!"
-msgstr "Diese Nachricht ist bereits ein Favorit!"
+"Dursuche den Inhalt der Nachrichten auf %%site.name%%. Trenne mehrere "
+"Suchbegriffe durch Leerzeichen. Ein Suchbegriff muss aus mindestens 3 "
+"Zeichen bestehen."
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132 actions/favor.php:86
-#: actions/twitapifavorites.php:125 classes/Command.php:152
-msgid "Could not create favorite."
-msgstr "Konnte keinen Favoriten erstellen."
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "Volltextsuche"
 
-#: actions/favor.php:70
-#, fuzzy
-msgid "Disfavor"
-msgstr "Aus Favoriten entfernen"
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "Suche im Stream nach \"%s\""
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/noticesearch.php:121
 #, php-format
-#, fuzzy
-msgid "%s favorite notices"
-msgstr "%ss Favoriten"
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
 
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/noticesearch.php:124
 #, php-format
-#, fuzzy
-msgid "Feed of favorite notices of %s"
-msgstr "Feed von %ss Favoriten"
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
+msgstr ""
 
-#: actions/inbox.php:28 actions/inbox.php:59
-#, php-format
-#, fuzzy
-msgid "Inbox for %s - page %d"
-msgstr "Posteingang von %s - Seite %d"
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Updates von %1$s auf %2$s!"
 
-#: actions/inbox.php:30 actions/inbox.php:62
+#: actions/noticesearchrss.php:91
 #, php-format
-#, fuzzy
-msgid "Inbox for %s"
-msgstr "Posteingang von %s"
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Alle Aktualisierungen, die den Suchbegriff „%s“ enthalten"
 
-#: actions/inbox.php:53 actions/inbox.php:115
-#, fuzzy
-msgid "This is your inbox, which lists your incoming private messages."
-msgstr ""
-"Das hier ist dein Posteingang, der deine eingehenden privaten Nachrichten "
-"enthält."
-
-#: actions/invite.php:178 actions/invite.php:213
-#, php-format
-#, fuzzy
+#: actions/nudge.php:85
 msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
-"%1$s hat dich zu %2$s (%3$s) eingeladen.\n"
-"\n"
+"Dieser Benutzer erlaubt keine Stupser oder hat seine E-Mail-Adresse noch "
+"nicht bestätigt."
 
-#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-#, fuzzy
-msgid "Automatically login in the future; "
-msgstr "In Zukunft automatisch anmelden; "
+#: actions/nudge.php:94
+msgid "Nudge sent"
+msgstr "Stups abgeschickt"
 
-#: actions/login.php:122 actions/login.php:264
-#, fuzzy
-msgid "For security reasons, please re-enter your "
-msgstr "Aus Sicherheitsgründen, bitte erneutes Eingeben des "
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr "Stups gesendet!"
 
-#: actions/login.php:126 actions/login.php:268
-#, fuzzy
-msgid "Login with your username and password. "
-msgstr "Anmelden mit deinem Benutzernamen und Passwort. "
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+msgstr "Nachricht hat kein Profil"
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
+#: actions/oembed.php:86 actions/shownotice.php:180
+#, php-format
+msgid "%1$s's status on %2$s"
+msgstr "%1$s Status auf %2$s"
+
+#: actions/oembed.php:157
 #, fuzzy
-msgid "That's too long. Max message size is 140 chars."
-msgstr "Das ist zu lang. Die maximale Nachrichtenlänge ist 140 Zeichen."
+msgid "content type "
+msgstr "Verbinden"
 
-#: actions/newmessage.php:65 actions/newmessage.php:128
-msgid "No recipient specified."
-msgstr "Kein Empfänger angegeben."
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206 actions/newmessage.php:131
-#: actions/newmessage.php:168 classes/Command.php:237
-msgid "You can't send a message to this user."
-msgstr "Du kannst diesem Benutzer keine Nachricht schicken."
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
+msgstr "Kein unterstütztes Datenformat."
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
-#, fuzzy
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr ""
-"Schicke dir selbst keine Nachrichten; sag es dir stattdessen einfach leise."
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "Suche nach Nutzern"
 
-#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
-msgid "No such user"
-msgstr "Kein solcher Benutzer"
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "Nachrichtensuche"
 
-#: actions/newmessage.php:117 actions/newmessage.php:67
-msgid "New message"
-msgstr "Neue Nachricht"
+#: actions/othersettings.php:60
+msgid "Other Settings"
+msgstr "Andere Einstellungen"
 
-#: actions/noticesearch.php:95 actions/noticesearch.php:146
-#, fuzzy
-msgid "Notice without matching profile"
-msgstr "Nachricht ohne entsprechendes Profil"
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr "Verwalte zahlreiche andere Einstellungen."
 
-#: actions/openidsettings.php:28 actions/openidsettings.php:70
-#, php-format
-#, fuzzy
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+#: actions/othersettings.php:108
+msgid " (free service)"
 msgstr ""
-"Mit [OpenID](%%doc.openid%%) kannst du dich auf mehreren Seiten anmelden "
 
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
-msgstr "Wenn du deinem Konto eine OpenID hinzufügen möchtest, "
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
+msgstr "URL-Auto-Kürzungs-Dienst."
 
-#: actions/openidsettings.php:74
+#: actions/othersettings.php:122
 #, fuzzy
-msgid "Removing your only OpenID would make it impossible to log in! "
+msgid "View profile designs"
+msgstr "Profil Einstellungen"
+
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
 msgstr ""
-"Das Entfernen deiner einzigen OpenID würde die Anmeldung unmöglich machen!"
 
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-#, fuzzy
-msgid "You can remove an OpenID from your account "
-msgstr "Du kannst eine OpenID von deinem Konto entfernen "
+#: actions/othersettings.php:153
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "URL-Auto-Kürzungs-Dienst ist zu lange (max. 50 Zeichen)"
 
-#: actions/outbox.php:28 actions/outbox.php:58
-#, fuzzy, php-format
+#: actions/outbox.php:58
+#, php-format
 msgid "Outbox for %s - page %d"
 msgstr "Postausgang von %s - Seite %d"
 
-#: actions/outbox.php:30 actions/outbox.php:61
-#, fuzzy, php-format
+#: actions/outbox.php:61
+#, php-format
 msgid "Outbox for %s"
 msgstr "Postausgang von %s"
 
-#: actions/outbox.php:53 actions/outbox.php:116
-#, fuzzy
+#: actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Das hier ist dein Postausgang, er beinhaltet deine gesendeten Nachrichten."
 
-#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
-#, php-format
-#, fuzzy
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
-msgstr "Suche nach Leuten auf %%site.name%% nach Name, Ort oder Interessen."
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "Passwort ändern"
 
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
-#, fuzzy
-msgid "You can update your personal profile info here "
-msgstr "Du kannst dein persönliches Profil hier aktualisieren "
+#: actions/passwordsettings.php:69
+msgid "Change your password."
+msgstr "Ändere dein Passwort."
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
-#, fuzzy
-msgid "User without matching profile"
-msgstr "Benutzer ohne passendes Profil"
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+msgid "Password change"
+msgstr "Passwort geändert"
 
-#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
-msgstr "Dieser Bestätigungscode ist zu alt. "
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "Altes Passwort"
 
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-#, fuzzy
-msgid "If you've forgotten or lost your"
-msgstr "Keine Erinnerung mehr an dein"
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "Neues Passwort"
 
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-#, fuzzy
-msgid "You've been identified. Enter a "
-msgstr "Du wurdest identifiziert. Eingabe eines "
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6 oder mehr Zeichen"
 
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-#, fuzzy
-msgid "Your nickname on this server, "
-msgstr "Dein Benutzername auf diesem Server, "
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "Bestätigen"
 
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-#, fuzzy
-msgid "Instructions for recovering your password "
-msgstr "Anweisungen zur Passwort-Wiederherstellung "
+#: actions/passwordsettings.php:113
+msgid "same as password above"
+msgstr "Gleiches Passwort wie oben"
 
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
-msgid "New password successfully saved. "
-msgstr "Neues Passwort erfolgreich gespeichert. "
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "Ändern"
 
-#: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:154 actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr "Das Passwort muss aus 6 oder mehr Zeichen bestehen."
 
-#: actions/register.php:216
-#, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
-msgstr ""
-"Gratuliere, %s! Und willkommen auf %%%%site.name%%%%. Jetzt möchtest du "
-"vielleicht..."
-
-#: actions/register.php:227
-#, fuzzy
-msgid "(You should receive a message by email momentarily, with "
-msgstr "(Du solltest jeden Moment eine E-Mail erhalten mit "
-
-#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
-#, php-format
-#, fuzzy
-msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr "Zum Abonnieren bitte [anmelden](%%action.login%%),"
-
-#: actions/showfavorites.php:61 actions/showfavorites.php:145
-#, php-format
-#, fuzzy
-msgid "Feed for favorites of %s"
-msgstr "Feed der Favoriten von %s"
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "Passwörter stimmen nicht überein."
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-#, fuzzy
-msgid "Could not retrieve favorite notices."
-msgstr "Konnte Favoriten nicht abrufen."
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "Altes Passwort falsch"
 
-#: actions/showmessage.php:33 actions/showmessage.php:81
-#, fuzzy
-msgid "No such message."
-msgstr "Keine derartige Nachricht."
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "Fehler beim Speichern des Nutzers, ungültig."
 
-#: actions/showmessage.php:42
-#, fuzzy
-msgid "Only the sender and recipient may read this message."
-msgstr "Nur der Absender und Empfänger können diese Nachricht lesen."
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "Konnte neues Passwort nicht speichern"
 
-#: actions/showmessage.php:61 actions/showmessage.php:108
-#, php-format
-#, fuzzy
-msgid "Message to %1$s on %2$s"
-msgstr "Nachricht an %1$s auf %2$s"
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "Passwort gespeichert."
 
-#: actions/showmessage.php:66 actions/showmessage.php:113
+#: actions/peoplesearch.php:52
 #, php-format
-#, fuzzy
-msgid "Message from %1$s on %2$s"
-msgstr "Nachricht von %1$s auf %2$s"
-
-#: actions/showstream.php:154
-#, fuzzy
-msgid "Send a message"
-msgstr "Eine Nachricht verschicken"
+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 ""
+"Durchsuche die Namen, Orten oder Interessen der Nutzer von %%site.name%%. "
+"Trenne mehrere Suchbegriffe durch Leerzeichen. Ein Suchbegriff muss aus "
+"mindestens 3 Zeichen bestehen."
 
-#: actions/smssettings.php:312 actions/smssettings.php:464
-#, php-format
-#, fuzzy
-msgid "Mobile carrier for your phone. "
-msgstr "Mobilfunkanbieter deines Telefons. "
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "Suche nach anderen Nutzern"
 
-#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/peopletag.php:70
 #, php-format
-msgid "Direct messages to %s"
-msgstr "Direkte Nachricht an %s"
+msgid "Not a valid people tag: %s"
+msgstr "Ungültiger Personen-Tag: %s"
 
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/peopletag.php:144
 #, php-format
-msgid "All the direct messages sent to %s"
-msgstr "Alle an %s gesendeten direkten Nachrichten"
+msgid "Users self-tagged with %s - page %d"
+msgstr "Benutzer die sich selbst mit %s getagged haben - Seite %d"
 
-#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-msgid "Direct Messages You've Sent"
-msgstr "Von dir gesendete direkte Nachrichten"
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "Ungültiger Nachrichteninhalt"
 
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/postnotice.php:90
 #, php-format
-msgid "All the direct messages sent from %s"
-msgstr "Alle von %s gesendeten direkten Nachrichten"
-
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-msgid "No message text!"
-msgstr "Fehlender Nachrichtentext!"
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
 
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-msgid "Recipient user not found."
-msgstr "Empfänger nicht gefunden."
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "Profil-Einstellungen"
 
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-#, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+#: actions/profilesettings.php:71
+msgid ""
+"You can update your personal profile info here so people know more about you."
 msgstr ""
-"Es können keine direkten Nachrichten an Benutzer geschickt werden mit denen "
-"du nicht befreundet bist."
+"Du kannst dein Profil auf den neusten Stand bringen, damit andere Leute mehr "
+"über dich erfahren können."
 
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
-#, php-format
-#, fuzzy
-msgid "%s / Favorites from %s"
-msgstr "%s / Favoriten von %s"
+#: actions/profilesettings.php:99
+msgid "Profile information"
+msgstr "Profilinformation"
 
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
-#, php-format
-#, fuzzy
-msgid "%s updates favorited by %s / %s."
-msgstr "%s Updates in den Favoriten von %s / %s."
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64 Kleinbuchstaben oder Ziffern, keine Sonder- oder Leerzeichen"
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
-#, php-format
-msgid "%s added your notice as a favorite"
-msgstr "%s hat deine Nachricht als Favorit gespeichert"
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full name"
+msgstr "Vollständiger Name"
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
-#, php-format
-#, fuzzy
-msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+#: actions/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "Homepage"
+
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
-"%1$s hat soeben deine Nachricht von %2$s zu seinen Favoriten hinzugefügt.\n"
-"\n"
+"URL deiner Homepage, deines Blogs, oder deines Profils auf einer anderen Site"
+
+#: actions/profilesettings.php:122 actions/register.php:460
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Beschreibe dich selbst in 140 Zeichen"
 
-#: actions/twittersettings.php:27
+#: actions/profilesettings.php:125 actions/register.php:463
 #, fuzzy
-msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
-msgstr ""
-"Füge dein Twitter-Konto hinzu, um automatisch deine Nachrichten an Twitter "
-"zu übermitteln, "
+msgid "Describe yourself and your interests"
+msgstr "Beschreibe dich selbst und deine "
 
-#: actions/twittersettings.php:41 actions/twittersettings.php:60
-msgid "Twitter settings"
-msgstr "Twitter Einstellungen"
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "Biografie"
 
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-msgid "Twitter Account"
-msgstr "Twitter Konto"
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "Aufenthaltsort"
 
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-msgid "Current verified Twitter account."
-msgstr "Derzeit bestätigter Twitter Account."
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "Wo du bist, beispielsweise „Stadt, Gebiet, Land“"
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr "Twitter Benutzername"
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
+msgstr "Tags"
 
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-msgid "No spaces, please."
-msgstr "Keine Leerzeichen, bitte."
+#: actions/profilesettings.php:140
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+"Tags über dich selbst (Buchstaben, Zahlen, -, ., und _) durch Kommas oder "
+"Leerzeichen getrennt"
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
-msgstr "Twitter Passwort"
+#: actions/profilesettings.php:144
+msgid "Language"
+msgstr "Sprache"
 
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-msgid "Automatically send my notices to Twitter."
-msgstr "Sende meine Nachrichten automatisch an Twitter."
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr "Bevorzugte Sprache"
 
-#: actions/twittersettings.php:75 actions/twittersettings.php:146
-#, fuzzy
-msgid "Send local \"@\" replies to Twitter."
-msgstr "Sende lokale \"@\" Antworten an Twitter."
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr "Zeitzone"
 
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-msgid "Subscribe to my Twitter friends here."
-msgstr "Hier meine Twitter Freunde abonnieren."
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
+msgstr "In welcher Zeitzone befinden Sie sich üblicherweise?"
 
-#: actions/twittersettings.php:122
-#, fuzzy
+#: actions/profilesettings.php:160
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
-"Der Benutzername darf nur Zahlen, Groß- und Kleinbuchstaben und Unterstriche "
-"(_) enthalten. Maximal 15 Zeichen."
-
-#: actions/twittersettings.php:128 actions/twittersettings.php:334
-#, fuzzy
-msgid "Could not verify your Twitter credentials!"
-msgstr "Das Überprüfen deiner Twitter Berechtigungen war nicht erfolgreich!"
+"Abonniere automatisch alle Kontakte, die mich abonnieren (sinnvoll für Nicht-"
+"Menschen)"
 
-#: actions/twittersettings.php:137
-#, php-format
-#, fuzzy
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr ""
-"Es konnten keine Kontoinformationen zu \"%s\" von Twitter empfangen werden."
+#: actions/profilesettings.php:221 actions/register.php:223
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Die Biografie ist zu lang (max. 140 Zeichen)"
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-msgid "Unable to save your Twitter settings!"
-msgstr "Konnte Twitter Einstellungen nicht speichern!"
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr "Keine Zeitzone ausgewählt."
 
-#: actions/twittersettings.php:174 actions/twittersettings.php:376
-msgid "Twitter settings saved."
-msgstr "Twitter Einstellungen gespeichert."
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr "Die eingegebene Sprache ist zu lang (maximal 50 Zeichen)"
 
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-msgid "That is not your Twitter account."
-msgstr "Das ist nicht dein Twitter Konto."
+#: actions/profilesettings.php:246 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Ungültiger Tag: „%s“"
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
-msgid "Couldn't remove Twitter user."
-msgstr "Konnte Twitter Benutzer nicht entfernen."
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
+msgstr "Autosubscribe konnte nicht aktiviert werden."
 
-#: actions/twittersettings.php:212 actions/twittersettings.php:407
-msgid "Twitter account removed."
-msgstr "Twitter Account entfernt."
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+msgstr "Konnte Profil nicht speichern."
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
-msgid "Couldn't save Twitter preferences."
-msgstr "Konnte Twitter Einstellungen nicht speichern."
+#: actions/profilesettings.php:336
+msgid "Couldn't save tags."
+msgstr "Konnte Tags nicht speichern."
 
-#: actions/twittersettings.php:245 actions/twittersettings.php:461
-msgid "Twitter preferences saved."
-msgstr "Twitter Einstellungen gespeichert."
+#: actions/profilesettings.php:344
+msgid "Settings saved."
+msgstr "Einstellungen gespeichert."
 
-#: actions/userauthorization.php:84 actions/userauthorization.php:86
-#, fuzzy
-msgid "Please check these details to make sure "
-msgstr "Bitte überprüfe die Details um sicherzustellen, dass "
+#: actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
 
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
-#, fuzzy
-msgid "The subscription has been authorized, but no "
-msgstr "Das Abonnement wurde genehmigt, aber kein "
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
+msgstr "Konnte öffentlichen Stream nicht abrufen."
 
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-#, fuzzy
-msgid "The subscription has been rejected, but no "
-msgstr "Das Abonnement wurde abgelehnt, aber kein "
+#: actions/public.php:129
+#, php-format
+msgid "Public timeline, page %d"
+msgstr "Öffentliche Zeitleiste, Seite %d"
 
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-#, fuzzy
-msgid "Command results"
-msgstr "Befehl Ausgabe"
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr "Öffentliche Zeitleiste"
 
-#: classes/Channel.php:148 classes/Channel.php:204
+#: actions/public.php:151
 #, fuzzy
-msgid "Command complete"
-msgstr "Befehl ausgeführt"
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Feed des öffentlichen Streams"
 
-#: classes/Channel.php:158 classes/Channel.php:215
+#: actions/public.php:155
 #, fuzzy
-msgid "Command failed"
-msgstr "Befehl fehlgeschlagen"
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Feed des öffentlichen Streams"
 
-#: classes/Command.php:39 classes/Command.php:44
+#: actions/public.php:159
 #, fuzzy
-msgid "Sorry, this command is not yet implemented."
-msgstr "Leider ist dieser Befehl noch nicht implementiert."
+msgid "Public Stream Feed (Atom)"
+msgstr "Feed des öffentlichen Streams"
 
-#: classes/Command.php:96 classes/Command.php:113
+#: actions/public.php:179
 #, php-format
-msgid "Subscriptions: %1$s\n"
-msgstr "Abonnements: %1$s\n"
-
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
-#, fuzzy
-msgid "User has no last notice"
-msgstr "Benutzer hat keine letzte Nachricht"
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
 
-#: classes/Command.php:146 classes/Command.php:166
-#, fuzzy
-msgid "Notice marked as fave."
-msgstr "Nachricht als Favorit markiert."
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
 
-#: classes/Command.php:166 classes/Command.php:189
+#: actions/public.php:186
 #, php-format
-msgid "%1$s (%2$s)"
-msgstr "%1$s (%2$s)"
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
 
-#: classes/Command.php:169 classes/Command.php:192
+#: actions/public.php:233
 #, php-format
-msgid "Fullname: %s"
-msgstr "Vollständiger Name: %s"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
+msgstr ""
 
-#: classes/Command.php:172 classes/Command.php:195
+#: actions/public.php:238
 #, fuzzy, php-format
-msgid "Location: %s"
-msgstr "Standort: %s"
-
-#: classes/Command.php:175 classes/Command.php:198
-#, php-format
-msgid "Homepage: %s"
-msgstr "Homepage: %s"
-
-#: classes/Command.php:178 classes/Command.php:201
-#, php-format
-msgid "About: %s"
-msgstr "Über: %s"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
+msgstr ""
+"Dies ist %%site.name%%, ein [mikro-blogging] (http://de.wikipedia.org/wiki/"
+"Mikro-blogging) Dienst "
 
-#: classes/Command.php:200 classes/Command.php:228
-#, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
-msgstr "Nachricht zu lange - maximal 140 Zeichen erlaubt, du hast %s gesendet"
+#: actions/publictagcloud.php:57
+msgid "Public tag cloud"
+msgstr "Öffentliche Tag-Wolke"
 
-#: classes/Command.php:214 classes/Command.php:245
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "Direct message to %s sent"
-msgstr "Direkte Nachricht an %s abgeschickt"
-
-#: classes/Command.php:216 classes/Command.php:247
-msgid "Error sending direct message."
-msgstr "Fehler beim Senden der Nachricht"
-
-#: classes/Command.php:263 classes/Command.php:300
-#, fuzzy
-msgid "Specify the name of the user to subscribe to"
-msgstr "Gib den Namen des Benutzers den du abonnieren möchtest an"
+msgid "These are most popular recent tags on %s "
+msgstr "Das sind die beliebtesten Tags auf %s "
 
-#: classes/Command.php:270 classes/Command.php:307
+#: actions/publictagcloud.php:69
 #, php-format
-msgid "Subscribed to %s"
-msgstr "%s abonniert"
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
+msgstr ""
 
-#: classes/Command.php:288 classes/Command.php:328
-#, fuzzy
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Gib den Namen des Benutzers ein, den du nicht mehr abonnieren möchtest"
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
+msgstr ""
 
-#: classes/Command.php:295 classes/Command.php:335
+#: actions/publictagcloud.php:75
 #, php-format
-#, fuzzy
-msgid "Unsubscribed from %s"
-msgstr "%s nicht mehr abonniert"
-
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
-#, fuzzy
-msgid "Command not yet implemented."
-msgstr "Befehl noch nicht implementiert."
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
 
-#: classes/Command.php:313 classes/Command.php:356
-msgid "Notification off."
-msgstr "Benachrichtigung deaktiviert."
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
+msgstr "Tag-Wolke"
 
-#: classes/Command.php:315 classes/Command.php:358
-msgid "Can't turn off notification."
-msgstr "Konnte Benachrichtigung nicht deaktivieren."
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "Du bist bereits angemeldet!"
 
-#: classes/Command.php:333 classes/Command.php:379
-msgid "Notification on."
-msgstr "Benachrichtigung aktiviert."
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "Unbekannter Wiederherstellungscode."
 
-#: classes/Command.php:335 classes/Command.php:381
-msgid "Can't turn on notification."
-msgstr "Konnte Benachrichtigung nicht aktivieren."
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "Kein Wiederherstellungscode."
 
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
-msgstr "Befehle:\n"
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr "Wiederherstellungscode für unbekannten Nutzer."
 
-#: classes/Message.php:53 classes/Message.php:56
-#, fuzzy
-msgid "Could not insert message."
-msgstr "Konnte Nachricht nicht einfügen."
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "Fehler beim Bestätigungscode."
 
-#: classes/Message.php:63 classes/Message.php:66
-#, fuzzy
-msgid "Could not update message with new URI."
-msgstr "Konnte Nachricht nicht mit neuer URI versehen."
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
+msgstr "Der Bestätigungscode ist zu alt. Bitte fange nochmal von vorne an."
 
-#: lib/gallery.php:46
-#, fuzzy
-msgid "User without matching profile in system."
-msgstr "Benutzer ohne entsprechendes Profil im System."
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
+msgstr "Die bestätigte E-Mail-Adresse konnte nicht gespeichert werden."
 
-#: lib/mail.php:147 lib/mail.php:289
-#, fuzzy, php-format
+#: actions/recoverpassword.php:152
 msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
 msgstr ""
-"Du hast eine neue Adresse zum Hinzufügen von Nachrichten auf %1$s.\n"
-"\n"
-
-#: lib/mail.php:249 lib/mail.php:508
-#, php-format
-msgid "New private message from %s"
-msgstr "Neue private Nachricht von %s"
 
-#: lib/mail.php:253 lib/mail.php:512
-#, php-format
-msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
 msgstr ""
-"%1$s (%2$s) hat dir einen private Nachricht geschickt:\n"
-"\n"
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
-#, fuzzy
-msgid "Only the user can read their own mailboxes."
-msgstr "Nur der Benutzer selbst kann seinen Posteingang lesen."
-
-#: lib/openid.php:195 lib/openid.php:203
-#, fuzzy
-msgid "This form should automatically submit itself. "
-msgstr "Dieses Formular sollte sich automatisch abschicken. "
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
+msgstr ""
 
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-msgid "Favorites"
-msgstr "Favoriten"
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
+msgstr ""
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-#, php-format
-#, fuzzy
-msgid "%s's favorite notices"
-msgstr "%ss favorisierte Nachrichten"
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
+msgstr "Dein Benutzername oder E-Mail-Adresse auf diesem Server."
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-msgid "User"
-msgstr "Benutzer"
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
+msgstr "Wiederherstellung"
 
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-msgid "Inbox"
-msgstr "Posteingang"
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "Passwort zurücksetzen"
 
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-msgid "Your incoming messages"
-msgstr "Deine eingehenden Nachrichten"
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr "Stelle Passwort wieder her"
 
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-msgid "Outbox"
-msgstr "Postausgang"
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
+msgstr "Wiederherstellung des Passworts angefordert"
 
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-msgid "Your sent messages"
-msgstr "Deine gesendeten Nachrichten"
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
+msgstr "Unbekannter Befehl"
 
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-msgid "Twitter"
-msgstr "Twitter"
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 oder mehr Zeichen, und nicht vergessen!"
 
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
-msgstr "Twitter Integrationseinstellungen"
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Gleiches Passwort wie zuvor"
 
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-msgid "To"
-msgstr "An"
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "Zurücksetzen"
 
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-#, fuzzy
-msgid "Could not parse message."
-msgstr "Konnte Nachricht nicht parsen."
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "Gib einen Spitznamen oder eine E-Mail-Adresse ein."
 
-#: actions/all.php:63 actions/facebookhome.php:162
-#, fuzzy, php-format
-msgid "%s and friends, page %d"
-msgstr "%s und Freunde, Seite %d"
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
+msgstr "Kein Benutzer mit dieser E-Mail-Adresse oder mit diesem Nutzernamen."
 
-#: actions/avatarsettings.php:76
-msgid "You can upload your personal avatar."
-msgstr "Du kannst dein persönliches Avatar hochladen."
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr "Der Nutzer hat keine registrierte E-Mail-Adresse."
 
-#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
-msgid "Avatar settings"
-msgstr "Avatar Einstellungen"
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "Fehler beim Speichern der Adressbestätigung."
 
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-msgid "Original"
-msgstr "Original"
+#: actions/recoverpassword.php:325
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr ""
+"Anweisungen für die Wiederherstellung deines Passworts wurden an deine "
+"hinterlegte E-Mail-Adresse geschickt."
 
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-msgid "Preview"
-msgstr "Vorschau"
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
+msgstr "Unerwarteter Passwortreset."
 
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
-msgid "Crop"
-msgstr "Zuschneiden"
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "Passwort muss mehr als 6 Zeichen enthalten"
 
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-#, fuzzy
-msgid "There was a problem with your session token. "
-msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
+msgstr "Passwort und seine Bestätigung stimmen nicht überein."
 
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-#, fuzzy
-msgid "Pick a square area of the image to be your avatar"
-msgstr ""
-"Wähle eine quadratische Fläche aus dem Bild, um dein Avatar zu speichern"
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
+msgstr "Neues Passwort erfolgreich gespeichert. Du bist jetzt angemeldet."
 
-#: actions/avatarsettings.php:327 actions/grouplogo.php:384
-#, fuzzy
-msgid "Lost our file data."
-msgstr "Daten verloren."
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
+msgstr "Es tut uns leid, zum Registrieren benötigst du eine Einladung."
 
-#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: actions/register.php:92
 #, fuzzy
-msgid "Lost our file."
-msgstr "Daten verloren."
-
-#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
-#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
-msgid "Unknown file type"
-msgstr "Unbekannter Dateityp"
+msgid "Sorry, invalid invitation code."
+msgstr "Fehler beim Bestätigungscode."
 
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "Kein Profil angegeben."
+#: actions/register.php:112
+msgid "Registration successful"
+msgstr "Registrierung erfolgreich"
 
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "Kein Benutzer-Profil mit dieser ID."
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "Registrieren"
 
-#: actions/block.php:111
-msgid "Block user"
-msgstr "Benutzer blockieren"
+#: actions/register.php:135
+msgid "Registration not allowed."
+msgstr "Registrierung nicht gestattet"
 
-#: actions/block.php:129
-msgid "Are you sure you want to block this user? "
-msgstr "Bist du sicher, dass du diesen Benutzer blockieren möchtest? "
+#: actions/register.php:198
+msgid "You can't register if you don't agree to the license."
+msgstr ""
+"Du kannst dich nicht registrieren, wenn du die Lizenz nicht akzeptierst."
 
-#: actions/block.php:162
-msgid "You have already blocked this user."
-msgstr "Du hast diesen Benutzer bereits blockiert."
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "Ungültige E-Mail-Adresse."
 
-#: actions/block.php:167
-#, fuzzy
-msgid "Failed to save block information."
-msgstr "Konnte Blockierungsdaten nicht speichern."
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "Diese E-Mail-Adresse existiert bereits."
 
-#: actions/confirmaddress.php:159
-#, fuzzy, php-format
-msgid "The address \"%s\" has been "
-msgstr "Die Adresse \"%s\" wurde "
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "Benutzername oder Passwort falsch."
 
-#: actions/deletenotice.php:73
-#, fuzzy
-msgid "You are about to permanently delete a notice. "
-msgstr "Du bist dabei diese Nachricht dauerhaft zu entfernen. "
+#: actions/register.php:342
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
 
-#: actions/disfavor.php:94
-#, fuzzy
-msgid "Add to favorites"
-msgstr "Zu Favoriten hinzufügen"
+#: actions/register.php:424
+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/editgroup.php:54
-#, php-format
-msgid "Edit %s group"
-msgstr "Gruppe %s bearbeiten"
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr "6 oder mehr Buchstaben. Pflicht."
 
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-#, fuzzy
-msgid "Inboxes must be enabled for groups to work"
-msgstr "Posteingänge müssen aktiviert sein, damit Gruppen funktionieren"
+#: actions/register.php:433
+msgid "Same as password above. Required."
+msgstr "Gleiches Passwort wie zuvor. Pflichteingabe."
 
-#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-msgid "You must be logged in to create a group."
-msgstr "Du musst angemeldet sein, um eine Gruppe zu erstellen."
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "E-Mail"
 
-#: actions/editgroup.php:87 actions/grouplogo.php:87
-#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
-#, fuzzy
-msgid "No nickname"
-msgstr "Kein Benutzername"
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
+msgstr ""
+"Wird nur für Updates, wichtige Mitteilungen und zur "
+"Passwortwiederherstellung verwendet"
 
-#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
-#: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
-#, fuzzy
-msgid "No such group"
-msgstr "Keine derartige Gruppe"
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
+msgstr "Längerer Name, bevorzugt dein „echter“ Name"
 
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
-msgid "You must be an admin to edit the group"
-msgstr "Du musst ein Administrator sein, um die Gruppe zu bearbeiten"
+#: actions/register.php:493
+msgid "My text and files are available under "
+msgstr "Meine Texte und Daten sind verfügbar unter"
 
-#: actions/editgroup.php:157
-msgid "Use this form to edit the group."
-msgstr "Benutze dieses Formular, um die Gruppe zu bearbeiten."
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
 
-#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+#: actions/register.php:496
 #, fuzzy
-msgid "Nickname must have only lowercase letters "
-msgstr "Der Benutzername darf nur aus Kleinbuchstaben bestehen "
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+"außer folgende private Daten: Passwort, E-Mail, Adresse, IM Adresse, "
+"Telefonnummer."
 
-#: actions/editgroup.php:198 actions/newgroup.php:149
-msgid "description is too long (max 140 chars)."
-msgstr "Die Beschreibung ist zu lang (max. 140 Zeichen)."
+#: actions/register.php:537
+#, 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 ""
+"Hallo %s, herzlich willkommen auf %%%%site.name%%%%.\n"
+"\n"
+"Danke für deine Anmeldung, wir hoffen das dir der Service gefällt.\n"
+"\n"
+"Als nächstes möchtest du eventuell …\n"
+"\n"
+"* zu [deinem Profil gehen](%s) und deine erste Nachricht schreiben\n"
+"* deine [Jabber/GTalk Adresse](%%%%action.imsettings%%%%) eintragen damit du "
+"Nachrichten über diese Dienste schreiben kannst.\n"
+"* [Leute suchen](%%%%action.peoplesearch%%%%) die du kennst oder die "
+"gleichen Interessen wie du haben.\n"
+"* deine [Profildaten ergänzen](%%%%action.profilesettings%%%%) um mehr über "
+"dich zu veröffentlichen\n"
+"* die [Dokumentation](%%%%doc.help%%%%) lesen um mehr über weitere Features "
+"zu erfahren"
 
-#: actions/editgroup.php:218
-msgid "Could not update group."
-msgstr "Konnte Gruppe nicht aktualisieren."
+#: actions/register.php:561
+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/editgroup.php:226
-#, fuzzy
-msgid "Options saved."
-msgstr "Einstellungen gespeichert."
+#: actions/remotesubscribe.php:98
+#, php-format
+msgid ""
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
+msgstr ""
+"Für ein Abonnement kannst du dich entweder [anmelden](%%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/emailsettings.php:107 actions/imsettings.php:108
-#, fuzzy, php-format
-msgid "Awaiting confirmation on this address. "
-msgstr "Warte auf die Bestätigung dieser Adresse. "
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr "Entferntes Abonnement"
 
-#: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/remotesubscribe.php:124
 #, fuzzy
-msgid "Make a new email address for posting to; "
-msgstr "Neue E-Mailadresse um Nachrichten auf %s hinzuzufügen; "
-
-#: actions/emailsettings.php:157
-msgid "Send me email when someone "
-msgstr "Schicke mir eine E-Mail, wenn jemand "
-
-#: actions/emailsettings.php:168
-msgid "Allow friends to nudge me and send me an email."
-msgstr "Erlaube Freunden mich zu stupsen und mir E-Mails zu senden."
+msgid "Subscribe to a remote user"
+msgstr "Abonniere diesen Benutzer"
 
-#: actions/emailsettings.php:321
-#, fuzzy
-msgid "That email address already belongs "
-msgstr "Diese E-Mailadresse gehört "
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "Benutzername"
 
-#: actions/emailsettings.php:343
-msgid "A confirmation code was sent to the email address you added. "
-msgstr ""
-"Ein Bestätigungscode wurde an die E-Mailadresse geschickt, die du "
-"hinzugefügt hast."
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr "Nutzername des Nutzers, dem du folgen möchtest"
 
-#: actions/facebookhome.php:110
-#, fuzzy
-msgid "Server error - couldn't get user!"
-msgstr "Serverfehler - Benutzer nicht gefunden!"
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "Profil-URL"
 
-#: actions/facebookhome.php:196
-#, php-format
-#, fuzzy
-msgid "If you would like the %s app to automatically update "
-msgstr "Wenn du automatische Aktualisierungen der Anwendung %s möchtest "
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "Profil-URL bei einem anderen kompatiblen Microbloggingdienst"
 
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "Erlaube %s meinen Facebook Status zu aktualisieren"
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
+msgstr "Abonnieren"
 
-#: actions/facebookhome.php:218
-msgid "Skip"
-msgstr "Überspringen"
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr "Ungültige Profil-URL (falsches Format)"
 
-#: actions/facebookhome.php:235
+#: actions/remotesubscribe.php:168
 #, fuzzy
-msgid "No notice content!"
-msgstr "Kein Inhalt!"
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "Ungültige Profil-URL (kein YADIS-Dokument)."
 
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#: actions/remotesubscribe.php:176
 #, fuzzy
-msgid "Pagination"
-msgstr "Seitenerstellung"
-
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-msgid "After"
-msgstr "Später"
+msgid "That’s a local profile! Login to subscribe."
+msgstr "Das ist ein lokales Profil! Zum Abonnieren anmelden."
 
-#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/remotesubscribe.php:183
 #, fuzzy
-msgid "Before"
-msgstr "Vorher"
+msgid "Couldn’t get a request token."
+msgstr "Konnte keinen Anfrage-Token bekommen."
 
-#: actions/facebookinvite.php:70
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
 #, php-format
-#, fuzzy
-msgid "Thanks for inviting your friends to use %s"
-msgstr "Danke, dass du deine Freunde zu %s einlädst"
+msgid "Replies to %s"
+msgstr "Antworten an %s"
 
-#: actions/facebookinvite.php:72
-#, fuzzy
-msgid "Invitations have been sent to the following users:"
-msgstr "Einladung(en) an folgende Personen geschickt:"
+#: actions/replies.php:127
+#, php-format
+msgid "Replies to %s, page %d"
+msgstr "Antworten an %s, Seite %d"
 
-#: actions/facebookinvite.php:96
+#: actions/replies.php:144
 #, fuzzy, php-format
-msgid "You have been invited to %s"
-msgstr "Du wurdest von %s angestupst"
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Feed der Nachrichten von %s"
 
-#: actions/facebookinvite.php:105
+#: actions/replies.php:151
 #, fuzzy, php-format
-msgid "Invite your friends to use %s"
-msgstr "Lade deine Freunde ein %s zu nutzen"
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Feed der Nachrichten von %s"
 
-#: actions/facebookinvite.php:113
+#: actions/replies.php:158
 #, php-format
-msgid "Friends already using %s:"
-msgstr "Freunde, die %s bereits benutzen:"
+msgid "Replies feed for %s (Atom)"
+msgstr "Feed der Nachrichten von %s"
 
-#: actions/facebookinvite.php:130
+#: actions/replies.php:198
 #, php-format
-msgid "Send invitations"
-msgstr "Einladungen versenden"
-
-#: actions/facebookremove.php:56
-msgid "Couldn't remove Facebook user."
-msgstr "Konnte Facebook Benutzer nicht entfernen."
-
-#: actions/facebooksettings.php:65
-#, fuzzy
-msgid "There was a problem saving your sync preferences!"
-msgstr "Es gab ein Problem beim Speichern deiner Synchronisationseinstellungen."
-
-#: actions/facebooksettings.php:67
-#, fuzzy
-msgid "Sync preferences saved."
-msgstr "Synchronisationseinstellungen gespeichert."
-
-#: actions/facebooksettings.php:90
-#, fuzzy
-msgid "Automatically update my Facebook status with my notices."
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
 msgstr ""
-"Meinen Facebook Status automatisch über meine Nachrichten aktualisieren."
-
-#: actions/facebooksettings.php:97
-#, fuzzy
-msgid "Send \"@\" replies to Facebook."
-msgstr "Schicke \"@\" Antworten an Facebook."
 
-#: actions/facebooksettings.php:106
-#, fuzzy
-msgid "Prefix"
-msgstr "Prefix"
-
-#: actions/facebooksettings.php:108
-#, fuzzy
-msgid "A string to prefix notices with."
-msgstr "Eine Zeichenfolge, die deinen Nachrichten vorangestellt wird."
+#: actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
 
-#: actions/facebooksettings.php:124
+#: actions/replies.php:205
 #, php-format
-msgid "If you would like %s to automatically update "
-msgstr "Wenn du %s automatisch aktualisieren lassen möchtest "
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
 
-#: actions/facebooksettings.php:147
-#, fuzzy
-msgid "Sync preferences"
-msgstr "Synchronisationseinstellungen"
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Nachricht an %1$s auf %2$s"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
-#, fuzzy
-msgid "Disfavor favorite"
-msgstr "Aus Favoriten entfernen"
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "%ss favorisierte Nachrichten, Seite %d"
 
-#: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
-msgid "Popular notices"
-msgstr "Beliebte Nachrichten"
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
+msgstr "Konnte Favoriten nicht abrufen."
 
-#: actions/favorited.php:67
+#: actions/showfavorites.php:170
 #, php-format
-msgid "Popular notices, page %d"
-msgstr "Beliebte Nachrichten, Seite %d"
-
-#: actions/favorited.php:79
-msgid "The most popular notices on the site right now."
-msgstr "Die momentan beliebtesten Nachrichten auf dieser Seite."
-
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
-#, fuzzy
-msgid "Featured users"
-msgstr "Featured Benutzer"
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Feed der Freunde von %s"
 
-#: actions/featured.php:71
+#: actions/showfavorites.php:177
 #, php-format
-#, fuzzy
-msgid "Featured users, page %d"
-msgstr "Featured Benutzer, Seite %d"
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Feed der Freunde von %s"
 
-#: actions/featured.php:99
+#: actions/showfavorites.php:184
 #, php-format
-#, fuzzy
-msgid "A selection of some of the great users on %s"
-msgstr "Eine Auswahl der tollen Benutzer auf %s"
-
-#: actions/finishremotesubscribe.php:188
-#, fuzzy
-msgid "That user has blocked you from subscribing."
-msgstr "Dieser Benutzer erlaubt dir nicht ihn zu abonnieren."
-
-#: actions/groupbyid.php:79
-msgid "No ID"
-msgstr "Keine ID"
-
-#: actions/grouplogo.php:138 actions/grouplogo.php:191
-msgid "Group logo"
-msgstr "Gruppen-Logo"
-
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
-msgstr "Du kannst ein Logo für Deine Gruppe hochladen."
-
-#: actions/grouplogo.php:448
-#, fuzzy
-msgid "Logo updated."
-msgstr "Logo aktualisiert."
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Feed der Freunde von %s"
 
-#: actions/grouplogo.php:450
-#, fuzzy
-msgid "Failed updating logo."
-msgstr "Aktualisierung des Logos fehlgeschlagen."
+#: actions/showfavorites.php:205
+msgid ""
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
+msgstr ""
 
-#: actions/groupmembers.php:93 lib/groupnav.php:91
+#: actions/showfavorites.php:207
 #, php-format
-msgid "%s group members"
-msgstr "%s Gruppen-Mitglieder"
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
 
-#: actions/groupmembers.php:96
+#: actions/showfavorites.php:211
 #, php-format
-msgid "%s group members, page %d"
-msgstr "%s Gruppen-Mitglieder, Seite %d"
-
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
-msgstr "Liste der Benutzer in dieser Gruppe."
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
 
-#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
-msgid "Groups"
-msgstr "Gruppen"
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
 
-#: actions/groups.php:64
+#: actions/showgroup.php:82 lib/groupnav.php:86
 #, php-format
-msgid "Groups, page %d"
-msgstr "Gruppen, Seite %d"
+msgid "%s group"
+msgstr "%s Gruppe"
 
-#: actions/groups.php:90
+#: actions/showgroup.php:84
 #, php-format
-#, fuzzy
-msgid "%%%%site.name%%%% groups let you find and talk with "
-msgstr "%%%%site.name%%%% Gruppen - finde und tausche dich aus mit "
-
-#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-msgid "Create a new group"
-msgstr "Neue Gruppe erstellen"
+msgid "%s group, page %d"
+msgstr "%s Gruppe, Seite %d"
 
-# Suche nach "Nutzern" stimmt ja nicht, es ist die Gruppensuche.
-#: actions/groupsearch.php:57
-#, fuzzy, php-format
-msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-msgstr "Suche nach Gruppen auf %%site.name%% nach Name, Ort oder Beschreibung. "
+#: actions/showgroup.php:218
+msgid "Group profile"
+msgstr "Gruppenprofil"
 
-#: actions/groupsearch.php:63
-#, fuzzy
-msgid "Group search"
-msgstr "Gruppen-Suche"
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
+msgid "URL"
+msgstr "URL"
 
-#: actions/imsettings.php:70
-#, fuzzy
-msgid "You can send and receive notices through "
-msgstr "Du kannst Nachrichten senden und empfangen über "
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
+msgid "Note"
+msgstr "Nachricht"
 
-#: actions/imsettings.php:120
-#, php-format
-msgid "Jabber or GTalk address, "
-msgstr "Jabber oder GTalk Adressen, "
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
 
-#: actions/imsettings.php:147
-#, fuzzy
-msgid "Send me replies through Jabber/GTalk "
-msgstr "Schicke mir Nachrichten mittels Jabber/GTalk."
+#: actions/showgroup.php:293
+msgid "Group actions"
+msgstr "Gruppenaktionen"
 
-#: actions/imsettings.php:321
+#: actions/showgroup.php:328
 #, fuzzy, php-format
-msgid "A confirmation code was sent "
-msgstr "Es wurde ein Bestätigungscode gesendet "
-
-#: actions/joingroup.php:65
-msgid "You must be logged in to join a group."
-msgstr "Du musst angemeldet sein, um Mitglied einer Gruppe zu werden."
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Nachrichtenfeed der Gruppe %s"
 
-#: actions/joingroup.php:95
-#, fuzzy
-msgid "You are already a member of that group"
-msgstr "Du bist bereits Mitglied dieser Gruppe"
+#: actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Nachrichtenfeed der Gruppe %s"
 
-#: actions/joingroup.php:128
+#: actions/showgroup.php:340
 #, fuzzy, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen"
+msgid "Notice feed for %s group (Atom)"
+msgstr "Nachrichtenfeed der Gruppe %s"
 
-#: actions/joingroup.php:135
+#: actions/showgroup.php:345
 #, php-format
-msgid "%s joined group %s"
-msgstr "%s ist der Gruppe %s beigetreten"
-
-#: actions/leavegroup.php:60
-#, fuzzy
-msgid "Inboxes must be enabled for groups to work."
-msgstr "Damit Gruppen funktionieren müssen Posteingänge aktiviert sein."
+msgid "FOAF for %s group"
+msgstr "Postausgang von %s"
 
-#: actions/leavegroup.php:65
-msgid "You must be logged in to leave a group."
-msgstr "Du musst angemeldet sein, um aus einer Gruppe auszutreten."
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
+msgid "Members"
+msgstr "Mitglieder"
 
-#: actions/leavegroup.php:88
-#, fuzzy
-msgid "No such group."
-msgstr "Keine derartige Gruppe."
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/tagcloudsection.php:71
+msgid "(None)"
+msgstr "(Kein)"
 
-#: actions/leavegroup.php:95
-#, fuzzy
-msgid "You are not a member of that group."
-msgstr "Du bist kein Mitglied dieser Gruppe."
+#: actions/showgroup.php:392
+msgid "All members"
+msgstr "Alle Mitglieder"
 
-#: actions/leavegroup.php:100
-#, fuzzy
-msgid "You may not leave a group while you are its administrator."
-msgstr ""
-"Du kannst eine Gruppe nicht verlassen solange du der Administrator bist."
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "Statistiken"
 
-#: actions/leavegroup.php:130
+#: actions/showgroup.php:432
 #, fuzzy
-msgid "Could not find membership record."
-msgstr "Konnte Mitgliedseintrag nicht finden."
-
-#: actions/leavegroup.php:138
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "Konnte Benutzer %s aus der Gruppe %s nicht entfernen"
+msgid "Created"
+msgstr "Erstellen"
 
-#: actions/leavegroup.php:145
+#: actions/showgroup.php:448
 #, php-format
-msgid "%s left group %s"
-msgstr "%s hat die Gruppe %s verlassen"
-
-#: actions/login.php:225 lib/facebookaction.php:304
-#, fuzzy
-msgid "Login to site"
-msgstr "An Seite anmelden"
-
-#: actions/microsummary.php:69
-msgid "No current status"
-msgstr "Kein aktueller Status"
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
 
-#: actions/newgroup.php:53
-msgid "New group"
-msgstr "Neue Gruppe"
+#: actions/showgroup.php:454
+#, fuzzy, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
+msgstr ""
+"**%s** ist eine Benutzergruppe auf %%site.name%%, einem [mikro-blogging] "
+"(http://de.wikipedia.org/wiki/Mikro-blogging) Dienst "
 
-#: actions/newgroup.php:115
+#: actions/showgroup.php:482
 #, fuzzy
-msgid "Use this form to create a new group."
-msgstr "Benutzer dieses Formular, um eine neue Gruppe zu erstellen."
+msgid "Admins"
+msgstr "Admin"
 
-#: actions/newgroup.php:177
-#, fuzzy
-msgid "Could not create group."
-msgstr "Konnte Gruppe nicht erstellen."
+#: actions/showmessage.php:81
+msgid "No such message."
+msgstr "Keine derartige Nachricht."
 
-#: actions/newgroup.php:191
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "Konnte Gruppenmitgliedschaft nicht setzen."
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient may read this message."
+msgstr "Nur der Absender und der Empfänger können diese Nachricht lesen."
 
-#: actions/newmessage.php:119 actions/newnotice.php:132
-#, fuzzy
-msgid "That's too long. "
-msgstr "Das ist zu lang. "
+#: actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr "Nachricht an %1$s auf %2$s"
 
-#: actions/newmessage.php:134
-msgid "Don't send a message to yourself; "
-msgstr "Schreibe dir selbst keine Nachrichten; "
+#: actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr "Nachricht von %1$s auf %2$s"
 
-#: actions/newnotice.php:166
+#: actions/shownotice.php:90
 #, fuzzy
-msgid "Notice posted"
+msgid "Notice deleted."
 msgstr "Nachricht hinzugefügt"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
-msgid "Ajax Error"
-msgstr "Ajax Fehler"
-
-#: actions/nudge.php:85
-msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
-msgstr ""
-"Dieser Benutzer erlaubt keine Stupser oder hat seine E-Mailadresse noch "
-"nicht bestätigt."
-
-#: actions/nudge.php:94
-msgid "Nudge sent"
-msgstr "Stups abgeschickt"
-
-#: actions/nudge.php:97
-msgid "Nudge sent!"
-msgstr "Stups gesendet!"
-
-#: actions/openidlogin.php:97
-#, fuzzy
-msgid "OpenID login"
-msgstr "OpenID Anmeldung"
-
-#: actions/openidsettings.php:128
-#, fuzzy
-msgid "Removing your only OpenID "
-msgstr "Entfernen deiner einzigen OpenID "
-
-#: actions/othersettings.php:60
-#, fuzzy
-msgid "Other Settings"
-msgstr "Andere Einstellungen"
-
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Verwalte zahlreiche andere Einstellungen."
-
-#: actions/othersettings.php:93
-msgid "URL Auto-shortening"
-msgstr "URL Auto-Verkürzung"
-
-#: actions/othersettings.php:112
-msgid "Service"
-msgstr "Dienst"
+#: actions/showstream.php:73
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "Nachrichten, die mit %s getagt sind"
 
-#: actions/othersettings.php:113
-msgid "Automatic shortening service to use."
-msgstr "URL Auto-Kürzungs Dienst."
+#: actions/showstream.php:79
+#, php-format
+msgid "%s, page %d"
+msgstr "%s, Seite %d"
 
-#: actions/othersettings.php:144
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "URL Auto-Kürzungs Dienst ist zu lange (max. 50 Zeichen)"
+#: actions/showstream.php:122
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Nachrichtenfeed der Gruppe %s"
 
-#: actions/passwordsettings.php:69
-#, fuzzy
-msgid "Change your password."
-msgstr "Ändere dein Passwort,"
+#: actions/showstream.php:129
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Feed der Nachrichten von %s"
 
-#: actions/passwordsettings.php:89
-#, fuzzy
-msgid "Password change"
-msgstr "Passwort gespeichert"
+#: actions/showstream.php:136
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Feed der Nachrichten von %s"
 
-#: actions/peopletag.php:35
+#: actions/showstream.php:143
 #, fuzzy, php-format
-msgid "Not a valid people tag: %s"
-msgstr "Ungültiger Tag: %s"
+msgid "Notice feed for %s (Atom)"
+msgstr "Feed der Nachrichten von %s"
 
-#: actions/peopletag.php:47
-#, php-format
-msgid "Users self-tagged with %s - page %d"
-msgstr "Benutzer die sich selbst mit %s getagged haben - Seite %d"
+#: actions/showstream.php:148
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Postausgang von %s"
 
-#: actions/peopletag.php:91
+#: actions/showstream.php:191
 #, php-format
-msgid "These are users who have tagged themselves \"%s\" "
-msgstr "Benutzer die sich selbst mit \"%s\" getagged haben "
-
-#: actions/profilesettings.php:91
-#, fuzzy
-msgid "Profile information"
-msgstr "Profilinformation"
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
 
-#: actions/profilesettings.php:124
+#: actions/showstream.php:196
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
 msgstr ""
-"Tags über dich selbst (Buchstaben, Zahlen, -, ., und _) durch Kommas oder "
-"Leerzeichen getrennt"
-
-#: actions/profilesettings.php:144
-#, fuzzy
-msgid "Automatically subscribe to whoever "
-msgstr "Abonniere automatisch alle Kontakte, die mich abonnieren "
 
-#: actions/profilesettings.php:229 actions/tagother.php:176
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Ungültiger Tag: \"%s\""
-
-#: actions/profilesettings.php:311
-msgid "Couldn't save tags."
-msgstr "Konnte Tags nicht speichern."
-
-#: actions/public.php:107
-#, fuzzy, php-format
-msgid "Public timeline, page %d"
-msgstr "Öffentliche Zeitleiste, Seite %d"
-
-#: actions/public.php:173
-msgid "Could not retrieve public stream."
-msgstr "Konnte öffentlichen Stream nicht abrufen."
-
-#: actions/public.php:220
+#: actions/showstream.php:198
 #, php-format
 msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
-"Dies ist %%site.name%%, ein [mikro-blogging] (http://de.wikipedia.org/wiki/"
-"Mikro-blogging) Dienst "
-
-#: actions/publictagcloud.php:57
-#, fuzzy
-msgid "Public tag cloud"
-msgstr "Öffentliche Tag-Wolke"
 
-#: actions/publictagcloud.php:63
+#: actions/showstream.php:234
 #, php-format
-msgid "These are most popular recent tags on %s "
-msgstr "Das sind die beliebtesten Tags auf %s "
-
-#: actions/publictagcloud.php:119
-msgid "Tag cloud"
-msgstr "Tag-Wolke"
-
-#: actions/register.php:139 actions/register.php:349
-msgid "Sorry, only invited people can register."
-msgstr "Es tut uns leid, zum Registrieren benötigst du eine Einladung."
-
-#: actions/register.php:149
-#, fuzzy
-msgid "You can't register if you don't "
-msgstr "Du kannst dich nicht registrieren, wenn du nicht "
-
-#: actions/register.php:286
-#, fuzzy
-msgid "With this form you can create "
-msgstr "Dieses Formular hilft die beim Erstellen von "
-
-#: actions/register.php:368
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, "
-msgstr "1-64 Kleinbuchstaben oder Ziffern, "
-
-#: actions/register.php:382 actions/register.php:386
-#, fuzzy
-msgid "Used only for updates, announcements, "
-msgstr "Verwendet nur für Updates und wichtige Mitteilungen, "
-
-#: actions/register.php:398
-#, fuzzy
-msgid "URL of your homepage, blog, "
-msgstr "URL deiner Homepage, Blogs, "
-
-#: actions/register.php:404
-#, fuzzy
-msgid "Describe yourself and your "
-msgstr "Beschreibe dich selbst und deine "
-
-#: actions/register.php:410
-#, fuzzy
-msgid "Where you are, like \"City, "
-msgstr "Wo du bist, z.B. \"Stadt, "
-
-#: actions/register.php:432
-#, fuzzy
-msgid " except this private data: password, "
-msgstr " außer folgende private Daten: Passwort, "
-
-#: actions/register.php:471
-#, fuzzy, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
-msgstr "Gratuliere, %s! Und willkommen auf %%%%site.name%%%%. "
-
-#: actions/register.php:495
-#, fuzzy
-msgid "(You should receive a message by email "
-msgstr "(Du solltest eine Nachricht per E-Mail erhalten "
-
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-#, fuzzy
-msgid "That's a local profile! Login to subscribe."
-msgstr "Das ist ein lokales Profil! Zum Abonnieren anmelden."
-
-#: actions/replies.php:118
-#, fuzzy, php-format
-msgid "Replies to %s, page %d"
-msgstr "Antworten an %s, Seite %d"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
 
-#: actions/showfavorites.php:79
+#: actions/showstream.php:239
 #, fuzzy, php-format
-msgid "%s favorite notices, page %d"
-msgstr "%ss favorisierte Nachrichten, Seite %d"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
+msgstr ""
+"**%s** hat ein Konto auf %%site.name%%, einem [mikro-blogging] (http://de."
+"wikipedia.org/wiki/Mikro-blogging) Dienst "
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
-#, php-format
-msgid "%s group"
-msgstr "%s Gruppe"
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "SMS-Einstellungen"
 
-#: actions/showgroup.php:79
+#: actions/smssettings.php:69
 #, php-format
-msgid "%s group, page %d"
-msgstr "%s Gruppe, Seite %d"
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr "Du kannst SMS per E-Mail empfangen von %%site.name%%."
 
-#: actions/showgroup.php:206
+#: actions/smssettings.php:91
 #, fuzzy
-msgid "Group profile"
-msgstr "Gruppenprofil"
-
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
-msgid "URL"
-msgstr "URL"
+msgid "SMS is not available."
+msgstr "Diese Seite liegt in nicht verfügbar in einem "
 
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
-#, fuzzy
-msgid "Note"
-msgstr "Nachricht"
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Aktuelle für den SMS-Dienst bestätigte Telefon-Nummer."
 
-#: actions/showgroup.php:270
-#, fuzzy
-msgid "Group actions"
-msgstr "Gruppenaktionen"
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
+msgstr "Warte auf die Bestätigung dieser Telefonnummer."
 
-#: actions/showgroup.php:323
-#, fuzzy, php-format
-msgid "Notice feed for %s group"
-msgstr "Nachrichtenfeed der Gruppe %s"
+#: actions/smssettings.php:130
+msgid "Confirmation code"
+msgstr "Bestätigungscode"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
-#, fuzzy
-msgid "Members"
-msgstr "Mitglieder"
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
+msgstr "Gib den Code ein, den du auf deinem Handy via SMS bekommen hast."
 
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
-#, fuzzy
-msgid "(None)"
-msgstr "(Kein)"
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
+msgstr "SMS-Telefonnummer"
 
-#: actions/showgroup.php:370
-msgid "All members"
-msgstr "Alle Mitglieder"
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "Telefonnummer, keine Sonder- oder Leerzeichen mit Vorwahl"
 
-#: actions/showgroup.php:378
-#, fuzzy, php-format
+#: actions/smssettings.php:174
 msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
 msgstr ""
-"**%s** ist eine Benutzergruppe auf %%site.name%%, einem [mikro-blogging] "
-"(http://de.wikipedia.org/wiki/Mikro-blogging) Dienst "
-
-#: actions/showmessage.php:98
-msgid "Only the sender and recipient "
-msgstr "Nur der Absender und Empfänger "
+"Schicke mir Nachrichten per SMS; ich weiss, dass mir dadurch hohe Kosten bei "
+"meinem Netzbetreiber entstehen können."
 
-#: actions/showstream.php:73
-#, php-format
-msgid "%s, page %d"
-msgstr "%s, Seite %d"
+#: actions/smssettings.php:306
+msgid "No phone number."
+msgstr "Keine Telefonnummer."
 
-#: actions/showstream.php:143
-#, fuzzy
-msgid "'s profile"
-msgstr "s Profil"
+#: actions/smssettings.php:311
+msgid "No carrier selected."
+msgstr "Kein Netzanbieter ausgewählt."
 
-#: actions/showstream.php:236 actions/tagother.php:77
-#, fuzzy
-msgid "User profile"
-msgstr "Benutzerprofil"
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
+msgstr "Dies ist bereits deine Telefonnummer."
 
-#: actions/showstream.php:240 actions/tagother.php:81
-msgid "Photo"
-msgstr "Foto"
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
+msgstr "Diese Telefonnummer wird bereits von einem anderen Benutzer verwendet."
 
-#: actions/showstream.php:317
+#: actions/smssettings.php:347
 #, fuzzy
-msgid "User actions"
-msgstr "Benutzeraktionen"
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"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/showstream.php:342
-#, fuzzy
-msgid "Send a direct message to this user"
-msgstr "Direkte Nachricht an Benutzer verschickt"
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
+msgstr "Die Bestätigungsnummer ist falsch."
 
-#: actions/showstream.php:343
-#, fuzzy
-msgid "Message"
-msgstr "Nachricht"
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
+msgstr "Dies ist nicht deine Telefonnummer."
 
-#: actions/showstream.php:451
-#, fuzzy
-msgid "All subscribers"
-msgstr "Alle Abonnenten"
+#: actions/smssettings.php:465
+msgid "Mobile carrier"
+msgstr "Netzanbieter"
 
-#: actions/showstream.php:533
-msgid "All groups"
-msgstr "Alle Gruppen"
+#: actions/smssettings.php:469
+msgid "Select a carrier"
+msgstr "Wähle einen Netzanbieter"
 
-#: actions/showstream.php:542
-#, fuzzy, php-format
+#: actions/smssettings.php:476
+#, php-format
 msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
-msgstr ""
-"**%s** hat ein Konto auf %%site.name%%, einem [mikro-blogging] "
-"(http://de.wikipedia.org/wiki/Mikro-blogging) Dienst "
-
-#: actions/smssettings.php:128
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, "
-msgstr "Telefonnummer, keine Satz- oder Leerzeichen, "
-
-#: actions/smssettings.php:162
-#, fuzzy
-msgid "Send me notices through SMS; "
-msgstr "Schicke mir Nachrichten per SMS; "
-
-#: actions/smssettings.php:335
-#, fuzzy
-msgid "A confirmation code was sent to the phone number you added. "
+"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 ""
-"Ein Bestätigungscode wurde an die Telefonnummer gesendet, die du hinzugefügt "
-"hast. "
+"Netzbetreiber deines Telefons. Falls du einen Betreiber kennst, der SMS-via-"
+"Email beherrscht, aber noch in der Liste fehlt, schicke uns eine Mail unter %"
+"s."
 
-#: actions/smssettings.php:453
-#, fuzzy
-msgid "Mobile carrier"
-msgstr "Netzanbieter"
+#: actions/smssettings.php:498
+msgid "No code entered"
+msgstr "Kein Code eingegeben"
 
 #: actions/subedit.php:70
-#, fuzzy
 msgid "You are not subscribed to that profile."
 msgstr "Du hast dieses Profil nicht abonniert."
 
 #: actions/subedit.php:83
-#, fuzzy
 msgid "Could not save subscription."
 msgstr "Konnte Abonnement nicht erstellen."
 
 #: actions/subscribe.php:55
-#, fuzzy
 msgid "Not a local user."
 msgstr "Kein lokaler Benutzer."
 
@@ -4450,82 +3049,110 @@ msgid "Subscribed"
 msgstr "Abonniert"
 
 #: actions/subscribers.php:50
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscribers"
 msgstr "%s Abonnenten"
 
 #: actions/subscribers.php:52
 #, php-format
-#, fuzzy
 msgid "%s subscribers, page %d"
 msgstr "%s Abonnenten, Seite %d"
 
 #: actions/subscribers.php:63
-#, fuzzy
-msgid "These are the people who listen to "
-msgstr "Folgende Leute lesen "
+msgid "These are the people who listen to your notices."
+msgstr "Dies sind die Leute, die deine Nachrichten lesen."
 
 #: actions/subscribers.php:67
-#, fuzzy, php-format
-msgid "These are the people who "
-msgstr "Folgende Leute "
+#, php-format
+msgid "These are the people who listen to %s's notices."
+msgstr "Dies sind die Leute, die %ss Nachrichten lesen."
+
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
+msgstr ""
+
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr ""
+
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
 
 #: actions/subscriptions.php:52
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscriptions"
 msgstr "%s Abonnements"
 
 #: actions/subscriptions.php:54
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscriptions, page %d"
 msgstr "%s Abonnements, Seite %d"
 
 #: actions/subscriptions.php:65
-#, fuzzy
-msgid "These are the people whose notices "
-msgstr "Dies sind die Leute, deren Nachrichten "
+msgid "These are the people whose notices you listen to."
+msgstr "Dies sind die Leute, deren Nachrichten du liest."
 
 #: actions/subscriptions.php:69
+#, php-format
+msgid "These are the people whose notices %s listens to."
+msgstr "Dies sind die Leute, deren Nachrichten %s liest."
+
+#: actions/subscriptions.php:121
+#, php-format
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
+msgstr ""
+
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
 #, fuzzy, php-format
-msgid "These are the people whose "
-msgstr "Dies sind die Leute, deren "
+msgid "%s is not listening to anyone."
+msgstr "%1$s liest ab sofort "
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:194
 msgid "Jabber"
 msgstr "Jabber"
 
-#: actions/tag.php:43
-#, fuzzy, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Nachrichten, die mit %s getagt sind, Seite %d"
-
-#: actions/tag.php:66
-#, php-format
-#, fuzzy
-msgid "Messages tagged \"%s\", most recent first"
-msgstr "Nachrichten getagt mit \"%s\", neueste zuerst"
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
+msgstr "SMS"
 
 #: actions/tagother.php:33
-#, fuzzy
 msgid "Not logged in"
 msgstr "Nicht angemeldet"
 
 #: actions/tagother.php:39
-#, fuzzy
 msgid "No id argument."
 msgstr "Kein id Argument."
 
 #: actions/tagother.php:65
-#, fuzzy, php-format
+#, php-format
 msgid "Tag %s"
 msgstr "Tag %s"
 
+#: actions/tagother.php:77 lib/userprofile.php:75
+msgid "User profile"
+msgstr "Benutzerprofil"
+
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
+msgstr "Foto"
+
 #: actions/tagother.php:141
-#, fuzzy
 msgid "Tag user"
 msgstr "Benutzer taggen"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4533,274 +3160,896 @@ msgstr ""
 "Tags für diesen Benutzer (Buchstaben, Nummer, -, ., und _), durch Komma oder "
 "Leerzeichen getrennt"
 
-#: actions/tagother.php:164
-#, fuzzy
-msgid "There was a problem with your session token."
-msgstr "Es gab ein Problem mit deinem Sessiontoken."
-
-#: actions/tagother.php:191
+#: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Du kannst nur Benutzer taggen, die du abonniert hast oder die dich abonniert "
 "haben."
 
-#: actions/tagother.php:198
+#: actions/tagother.php:200
 msgid "Could not save tags."
 msgstr "Konnte Tags nicht speichern."
 
-#: actions/tagother.php:233
-#, fuzzy
+#: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Benutze dieses Formular, um Tags zu deinen Abonnenten oder Abonnements "
 "hinzuzufügen."
 
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Nachrichten, die mit %s getagt sind, Seite %d"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Feed der Nachrichten von %s"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Feed der Nachrichten von %s"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Feed der Nachrichten von %s"
+
 #: actions/tagrss.php:35
-#, fuzzy
 msgid "No such tag."
 msgstr "Tag nicht vorhanden."
 
-#: actions/tagrss.php:66
-#, fuzzy, php-format
-msgid "Microblog tagged with %s"
-msgstr "Microblog getaggt mit %s"
-
-#: actions/twitapiblocks.php:47
-msgid "Block user failed."
-msgstr "Blockieren des Benutzers fehlgeschlagen."
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
+msgstr "API-Methode im Aufbau."
 
-#: actions/twitapiblocks.php:69
-#, fuzzy
-msgid "Unblock user failed."
-msgstr "Freigeben des Benutzers fehlgeschlagen."
+#: actions/unsubscribe.php:77
+msgid "No profile id in request."
+msgstr "Keine Profil-ID in der Anfrage."
 
-#: actions/twitapiusers.php:48
-msgid "Not found."
-msgstr "Nicht gefunden."
+#: actions/unsubscribe.php:84
+msgid "No profile with that id."
+msgstr "Kein Profil mit dieser ID."
 
-#: actions/twittersettings.php:71
-#, fuzzy
-msgid "Add your Twitter account to automatically send "
-msgstr "Füge dein Twitter Konto hinzu zum automatischen Versenden von "
+#: actions/unsubscribe.php:98
+msgid "Unsubscribed"
+msgstr "Abbestellt"
 
-#: actions/twittersettings.php:119
-msgid "Twitter user name"
-msgstr "Twitter Benutzername"
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
 
-#: actions/twittersettings.php:126
-msgid "Twitter password"
-msgstr "Twitter Passwort"
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "Abonnement bestätigen"
 
-#: actions/twittersettings.php:228
-msgid "Twitter Friends"
-msgstr "Twitter Freunde"
+#: actions/userauthorization.php:110
+#, fuzzy
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
+msgstr ""
+"Bitte überprüfe diese Angaben, um sicher zu gehen, dass du die Nachrichten "
+"dieses Nutzers abonnieren möchtest. Wenn du das nicht wolltest, klicke auf "
+"\"Abbrechen\"."
 
-#: actions/twittersettings.php:327
+#: actions/userauthorization.php:188
 #, fuzzy
-msgid "Username must have only numbers, "
-msgstr "Für den Benutzernamen gelten nur Nummern, "
+msgid "License"
+msgstr "Lizenz."
 
-#: actions/twittersettings.php:341
-#, fuzzy, php-format
-msgid "Unable to retrieve account information "
-msgstr "Konnte Kontoinformationen nicht abrufen "
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "Akzeptieren"
 
-#: actions/unblock.php:108
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
 #, fuzzy
-msgid "Error removing the block."
-msgstr "Fehler beim Freigeben des Benutzers."
+msgid "Subscribe to this user"
+msgstr "Abonniere diesen Benutzer"
+
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "Ablehnen"
 
-#: actions/unsubscribe.php:50
+#: actions/userauthorization.php:212
 #, fuzzy
-msgid "No profile id in request."
-msgstr "Der entfernte Server hat keine Profil-ID geliefert."
+msgid "Reject this subscription"
+msgstr "%s Abonnements"
+
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
+msgstr "Keine Bestätigungsanfrage!"
+
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+msgstr "Abonnement autorisiert"
 
-#: actions/unsubscribe.php:57
+#: actions/userauthorization.php:249
 #, fuzzy
-msgid "No profile with that id."
-msgstr "Kein Profil mit dieser ID."
+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 ""
+"Das Abonnement wurde bestätigt, aber es wurde keine Callback-URL "
+"zurückgegeben. Lies nochmal die Anweisungen der Site, wie Abonnements "
+"bestätigt werden. Dein Abonnement-Token ist:"
+
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
+msgstr "Abonnement abgelehnt"
 
-#: actions/unsubscribe.php:71
+#: actions/userauthorization.php:261
 #, fuzzy
-msgid "Unsubscribed"
-msgstr "Abbestellt"
+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 ""
+"Das Abonnement wurde abgelehnt, aber es wurde keine Callback-URL "
+"zurückgegeben. Lies nochmal die Anweisungen der Site, wie Abonnements "
+"vollständig abgelehnt werden. Dein Abonnement-Token ist:"
 
-#: actions/usergroups.php:63
+#: actions/userauthorization.php:296
 #, php-format
-msgid "%s groups"
-msgstr "%s Gruppen"
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
 
-#: actions/usergroups.php:65
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Konnte Avatar-URL nicht öffnen „%s“"
+
+#: actions/userauthorization.php:348
+#, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Falscher Bildtyp für „%s“"
+
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr "Keine ID."
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "Profil Einstellungen"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "%s Gruppen, Seite %d"
 
-#: classes/Notice.php:104
+#: actions/usergroups.php:130
+#, fuzzy
+msgid "Search for more groups"
+msgstr "Suche nach Leuten oder Text"
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "Du bist kein Mitglied dieser Gruppe."
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Message.php:55
+msgid "Could not insert message."
+msgstr "Konnte Nachricht nicht einfügen."
+
+#: classes/Message.php:65
+msgid "Could not update message with new URI."
+msgstr "Konnte Nachricht nicht mit neuer URI versehen."
+
+#: classes/Notice.php:164
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "Datenbankfehler beim Einfügen des Hashtags: %s"
+
+#: classes/Notice.php:179
 #, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Problem bei Speichern der Nachricht."
+
+#: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
 msgstr "Problem bei Speichern der Nachricht. Unbekannter Benutzer."
 
-#: classes/Notice.php:109
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Zu schnell zu viele Nachrichten; atme kurz durch und schicke sie erneut in "
 "ein paar Minuten ab."
 
-#: classes/Notice.php:116
+#: classes/Notice.php:194
+#, fuzzy
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+"Zu schnell zu viele Nachrichten; atme kurz durch und schicke sie erneut in "
+"ein paar Minuten ab."
+
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
-msgstr "Du wurdest für das Schreiben von Nachrichten auf dieser Seite gesperrt."
+msgstr ""
+"Du wurdest für das Schreiben von Nachrichten auf dieser Seite gesperrt."
+
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
+msgstr "Problem bei Speichern der Nachricht."
+
+#: classes/Notice.php:1120
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "Datenbankfehler beim Einfügen der Antwort: %s"
+
+#: classes/User.php:347
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Nachricht an %1$s auf %2$s"
+
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Profil"
 
 #: lib/accountsettingsaction.php:108
-#, fuzzy
+msgid "Change your profile settings"
+msgstr "Ändern der Profileinstellungen"
+
+#: lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "Avatar hochladen"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr "Ändere dein Passwort"
+
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
+msgstr "Ändere die E-Mail Verarbeitung"
+
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:124
 #, fuzzy
+msgid "Design your profile"
+msgstr "Benutzerprofil"
+
+#: lib/accountsettingsaction.php:128
 msgid "Other"
 msgstr "Sonstige"
 
-#: lib/accountsettingsaction.php:120
-#, fuzzy
+#: lib/accountsettingsaction.php:128
 msgid "Other options"
 msgstr "Sonstige Optionen"
 
-#: lib/action.php:130
-#, fuzzy, php-format
+#: lib/action.php:144
+#, php-format
 msgid "%s - %s"
-msgstr "%s (%s)"
+msgstr "%s - %s"
 
-#: lib/action.php:145
+#: lib/action.php:159
 msgid "Untitled page"
 msgstr "Seite ohne Titel"
 
-#: lib/action.php:316
+#: lib/action.php:424
 msgid "Primary site navigation"
 msgstr "Hauptnavigation"
 
-#: lib/action.php:322
-#, fuzzy
+#: lib/action.php:430
+msgid "Home"
+msgstr "Startseite"
+
+#: lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr "Persönliches Profil und Freundes-Zeitleiste"
 
-#: lib/action.php:325
-#, fuzzy
-msgid "Search for people or text"
-msgstr "Suche nach Leuten oder Text"
-
-#: lib/action.php:328
+#: lib/action.php:432
 msgid "Account"
 msgstr "Konto"
 
-#: lib/action.php:328
-#, fuzzy
+#: lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr "Ändere deine E-Mail, dein Avatar, Passwort, Profil"
 
-#: lib/action.php:330
-#, fuzzy
-msgid "Connect to IM, SMS, Twitter"
-msgstr "Verbinde zu IM, SMS, Twitter"
+#: lib/action.php:435
+msgid "Connect"
+msgstr "Verbinden"
 
-#: lib/action.php:332
+#: lib/action.php:435
 #, fuzzy
+msgid "Connect to services"
+msgstr "Konnte nicht zum Server umleiten: %s"
+
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
+msgstr "Einladen"
+
+#: lib/action.php:440 lib/subgroupnav.php:106
+#, fuzzy, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr "Lade Freunde und Kollegen ein dir auf %s beizutreten"
+
+#: lib/action.php:445
+msgid "Logout"
+msgstr "Abmelden"
+
+#: lib/action.php:445
 msgid "Logout from the site"
 msgstr "Von der Seite abmelden"
 
-#: lib/action.php:335
-#, fuzzy
-msgid "Login to the site"
-msgstr "Auf der Seite anmelden"
-
-#: lib/action.php:338
+#: lib/action.php:450
 msgid "Create an account"
 msgstr "Neues Konto erstellen"
 
-#: lib/action.php:341
-#, fuzzy
-msgid "Login with OpenID"
-msgstr "Mit OpenID anmelden"
+#: lib/action.php:453
+msgid "Login to the site"
+msgstr "Auf der Seite anmelden"
 
-#: lib/action.php:344
-#, fuzzy
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
+msgstr "Hilfe"
+
+#: lib/action.php:456
 msgid "Help me!"
 msgstr "Hilf mir!"
 
-#: lib/action.php:362
-#, fuzzy
+#: lib/action.php:459
+msgid "Search"
+msgstr "Suchen"
+
+#: lib/action.php:459
+msgid "Search for people or text"
+msgstr "Suche nach Leuten oder Text"
+
+#: lib/action.php:480
 msgid "Site notice"
-msgstr "Neue Nachricht"
+msgstr "Seitennachricht"
 
-#: lib/action.php:417
-#, fuzzy
+#: lib/action.php:546
 msgid "Local views"
 msgstr "Lokale Ansichten"
 
-#: lib/action.php:472
-#, fuzzy
+#: lib/action.php:612
 msgid "Page notice"
 msgstr "Neue Nachricht"
 
-#: lib/action.php:562
-#, fuzzy
+#: lib/action.php:714
 msgid "Secondary site navigation"
 msgstr "Unternavigation"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:721
+msgid "About"
+msgstr "Über"
+
+#: lib/action.php:723
+msgid "FAQ"
+msgstr "FAQ"
+
+#: lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/action.php:730
+msgid "Privacy"
+msgstr "Privatsphäre"
+
+#: lib/action.php:732
+msgid "Source"
+msgstr "Quellcode"
+
+#: lib/action.php:734
+msgid "Contact"
+msgstr "Kontakt"
+
+#: lib/action.php:736
 #, fuzzy
+msgid "Badge"
+msgstr "Stups"
+
+#: lib/action.php:764
 msgid "StatusNet software license"
-msgstr "StatusNet Software Lizenz"
+msgstr "StatusNet-Software-Lizenz"
+
+#: lib/action.php:767
+#, php-format
+msgid ""
+"**%%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%%)."
+
+#: lib/action.php:769
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** ist ein Microbloggingdienst."
+
+#: lib/action.php:771
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+" Es wird mit der Microbloggingsoftware [StatusNet](http://status.net/) "
+"(Version %s) betrieben, die unter der [GNU Affero General Public License]"
+"(http://www.fsf.org/licensing/licenses/agpl-3.0.html) erhältlich ist."
 
-#: lib/action.php:630
+#: lib/action.php:785
+msgid "Site content license"
+msgstr "StatusNet-Software-Lizenz"
+
+#: lib/action.php:794
 #, fuzzy
 msgid "All "
 msgstr "Alle "
 
-#: lib/action.php:635
+#: lib/action.php:799
 #, fuzzy
 msgid "license."
 msgstr "Lizenz."
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/action.php:1052
+msgid "Pagination"
+msgstr "Seitenerstellung"
+
+#: lib/action.php:1061
+msgid "After"
+msgstr "Später"
+
+#: lib/action.php:1069
+msgid "Before"
+msgstr "Vorher"
+
+#: lib/action.php:1117
+msgid "There was a problem with your session token."
+msgstr "Es gab ein Problem mit deinem Sessiontoken."
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
 #, fuzzy
-msgid "Block this user"
-msgstr "Benutzer blockieren"
+msgid "Provider"
+msgstr "Profil"
 
-#: lib/blockform.php:153
-msgid "Block"
-msgstr "Blockieren"
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
+msgstr "Befehl-Ergebnisse"
+
+#: lib/channel.php:210
+msgid "Command complete"
+msgstr "Befehl ausgeführt"
+
+#: lib/channel.php:221
+msgid "Command failed"
+msgstr "Befehl fehlgeschlagen"
+
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr "Leider ist dieser Befehl noch nicht implementiert."
+
+#: lib/command.php:88
+#, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Die bestätigte E-Mail-Adresse konnte nicht gespeichert werden."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "Stups abgeschickt"
+
+#: lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
+msgstr "Benutzer hat keine letzte Nachricht"
+
+#: lib/command.php:190
+msgid "Notice marked as fave."
+msgstr "Nachricht als Favorit markiert."
+
+#: lib/command.php:315
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#: lib/command.php:318
+#, php-format
+msgid "Fullname: %s"
+msgstr "Vollständiger Name: %s"
+
+#: lib/command.php:321
+#, php-format
+msgid "Location: %s"
+msgstr "Standort: %s"
+
+#: lib/command.php:324
+#, php-format
+msgid "Homepage: %s"
+msgstr "Homepage: %s"
+
+#: lib/command.php:327
+#, php-format
+msgid "About: %s"
+msgstr "Über: %s"
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr "Nachricht zu lange - maximal 140 Zeichen erlaubt, du hast %s gesendet"
+
+#: lib/command.php:377
+msgid "Error sending direct message."
+msgstr "Fehler beim Senden der Nachricht"
+
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "Nachricht zu lange - maximal 140 Zeichen erlaubt, du hast %s gesendet"
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Auf diese Nachricht antworten"
+
+#: lib/command.php:441
 #, fuzzy
-msgid "Disfavor this notice"
-msgstr "Aus Favoriten entfernen"
+msgid "Error saving notice."
+msgstr "Problem bei Speichern der Nachricht."
+
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
+msgstr "Gib den Namen des Benutzers an, den du abonnieren möchtest"
+
+#: lib/command.php:502
+#, php-format
+msgid "Subscribed to %s"
+msgstr "%s abonniert"
+
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
+msgstr "Gib den Namen des Benutzers ein, den du nicht mehr abonnieren möchtest"
 
-#: lib/facebookaction.php:268
+#: lib/command.php:530
 #, php-format
-msgid "To use the %s Facebook Application you need to login "
-msgstr "Um die %s Facebookanwendung zu benutzen, musst du dich anmelden "
+msgid "Unsubscribed from %s"
+msgstr "%s nicht mehr abonniert"
+
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
+msgstr "Befehl noch nicht implementiert."
+
+#: lib/command.php:551
+msgid "Notification off."
+msgstr "Benachrichtigung deaktiviert."
+
+#: lib/command.php:553
+msgid "Can't turn off notification."
+msgstr "Konnte Benachrichtigung nicht deaktivieren."
+
+#: lib/command.php:574
+msgid "Notification on."
+msgstr "Benachrichtigung aktiviert."
+
+#: lib/command.php:576
+msgid "Can't turn on notification."
+msgstr "Konnte Benachrichtigung nicht aktivieren."
 
-#: lib/facebookaction.php:271
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Konnte OpenID-Formular nicht erstellen: %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/command.php:618
 #, fuzzy
-msgid " a new account."
-msgstr " ein neues Konto."
+msgid "You are not subscribed to anyone."
+msgstr "Du hast dieses Profil nicht abonniert."
 
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/command.php:620
 #, fuzzy
-msgid "Published"
-msgstr "Öffentlich"
+msgid "You are subscribed to these people: "
+msgstr "Du hast dieses Profil nicht abonniert."
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Die Gegenseite konnte Dich nicht abonnieren."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Leute, die %s abonniert haben"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Du bist kein Mitglied dieser Gruppe."
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "Du bist kein Mitglied dieser Gruppe."
+
+#: lib/command.php:670
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+
+#: lib/common.php:192
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Kein Bestätigungs-Code."
+
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:195
+#, fuzzy
+msgid "Go to the installer."
+msgstr "Auf der Seite anmelden"
+
+#: lib/connectsettingsaction.php:110
+msgid "IM"
+msgstr "IM"
+
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Aktualisierungen via Instant Messenger (IM)"
+
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
+msgstr "Aktualisierungen via SMS"
+
+#: lib/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Hochladen"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Ändere dein Passwort"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Verbinden"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Suchen"
+
+#: lib/designsettings.php:217
+msgid "Text"
+msgstr "Text"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Liste"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+#, fuzzy
+msgid "Disfavor this notice"
+msgstr "Aus Favoriten entfernen"
 
 #: lib/favorform.php:114 lib/favorform.php:140
 #, fuzzy
 msgid "Favor this notice"
 msgstr "Zu den Favoriten hinzufügen"
 
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr "Zu Favoriten hinzufügen"
+
 #: lib/feedlist.php:64
 msgid "Export data"
 msgstr "Daten exportieren"
 
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr ""
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr ""
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr ""
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Tags filtern"
@@ -4809,67 +4058,90 @@ msgstr "Tags filtern"
 msgid "All"
 msgstr "Alle"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Wähle einen Netzanbieter"
+
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Tag"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:141
 #, fuzzy
 msgid "Choose a tag to narrow list"
 msgstr "Wähle einen Tag, um die Liste einzuschränken"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:143
 #, fuzzy
 msgid "Go"
 msgstr "Los"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:163
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "URL der Homepage oder Blogs der Gruppe oder des Themas"
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:168
 #, fuzzy
-msgid "Description"
-msgstr "Beschreibung"
+msgid "Describe the group or topic"
+msgstr "Beschreibe die Gruppe oder das Thema in 140 Zeichen"
 
-#: lib/groupeditform.php:153
-#, fuzzy
-msgid "Describe the group or topic in 140 chars"
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
 msgstr "Beschreibe die Gruppe oder das Thema in 140 Zeichen"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:172
+#, fuzzy
+msgid "Description"
+msgstr "Beschreibung"
+
+#: lib/groupeditform.php:179
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr "Ort der Gruppe, optional, z.B. \"Stadt, Gebiet (oder Region), Land\""
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
 msgid "Group"
 msgstr "Gruppe"
 
-#: lib/groupnav.php:100
-#, fuzzy
-msgid "Admin"
-msgstr "Admin"
-
 #: lib/groupnav.php:101
-#, php-format
 #, fuzzy
+msgid "Blocked"
+msgstr "Blockieren"
+
+#: lib/groupnav.php:102
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Benutzer blockieren"
+
+#: lib/groupnav.php:108
+#, fuzzy, php-format
 msgid "Edit %s group properties"
 msgstr "%s Gruppeneinstellungen bearbeiten"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:113
 #, fuzzy
 msgid "Logo"
 msgstr "Logo"
 
-#: lib/groupnav.php:107
-#, php-format
-#, fuzzy
+#: lib/groupnav.php:114
+#, fuzzy, php-format
 msgid "Add or edit %s logo"
 msgstr "%s Logo hinzufügen oder bearbeiten"
 
+#: lib/groupnav.php:120
+#, fuzzy, php-format
+msgid "Add or edit %s design"
+msgstr "%s Logo hinzufügen oder bearbeiten"
+
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Gruppen mit den meisten Mitgliedern"
@@ -4879,15 +4151,47 @@ msgid "Groups with most posts"
 msgstr "Gruppen mit den meisten Beiträgen"
 
 #: lib/grouptagcloudsection.php:56
-#, php-format
-#, fuzzy
+#, fuzzy, php-format
 msgid "Tags in %s group's notices"
 msgstr "Tags in den Nachrichten der Gruppe %s"
 
 #: lib/htmloutputter.php:104
-#, fuzzy
-msgid "This page is not available in a "
-msgstr "Diese Seite liegt in nicht verfügbar in einem "
+msgid "This page is not available in a media type you accept"
+msgstr "Dies Seite liegt in keinem von dir akzeptierten Mediatype vor."
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Du kannst ein Logo für Deine Gruppe hochladen."
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr "Unvollständiges Hochladen."
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr "Systemfehler beim hochladen der Datei."
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr "Kein Bild oder defekte Datei."
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr "Bildformat wird nicht unterstützt."
+
+#: lib/imagefile.php:118
+msgid "Lost our file."
+msgstr "Daten verloren."
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr "Unbekannter Dateityp"
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr ""
 
 #: lib/joinform.php:114
 #, fuzzy
@@ -4899,48 +4203,90 @@ msgstr "Beitreten"
 msgid "Leave"
 msgstr "Verlassen"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:80
 #, fuzzy
 msgid "Login with a username and password"
 msgstr "Anmelden mit einem Benutzernamen und Passwort"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:86
 #, fuzzy
 msgid "Sign up for a new account"
 msgstr "Für ein neues Konto registrieren"
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
-msgstr "Anmelden oder registrieren mit OpenID"
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "Nur der Benutzer selbst kann seinen Posteingang lesen."
 
-#: lib/mail.php:175
-#, php-format
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
 #, fuzzy
+msgid "from"
+msgstr "von"
+
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "Bestätigung der E-Mail-Adresse"
+
+#: lib/mail.php:174
+#, php-format
 msgid ""
 "Hey, %s.\n"
 "\n"
-msgstr ""
-"Hallo, %s.\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
 "\n"
+"\t%s\n"
+"\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
+msgstr ""
 
-#: lib/mail.php:236
+#: lib/mail.php:235
+#, 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:240
 #, fuzzy, php-format
-msgid "%1$s is now listening to "
-msgstr "%1$s liest ab sofort "
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
+"%1$s hat deine Nachrichten auf %2$s abonniert.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Gruß,\n"
+"%4$s.\n"
 
-#: lib/mail.php:254
+#: lib/mail.php:253
 #, fuzzy, php-format
 msgid "Location: %s\n"
 msgstr "Standort: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:255
 #, fuzzy, php-format
 msgid "Homepage: %s\n"
 msgstr "Homepage: %s\n"
 
-#: lib/mail.php:258
-#, php-format
-#, fuzzy
+#: lib/mail.php:257
+#, fuzzy, php-format
 msgid ""
 "Bio: %s\n"
 "\n"
@@ -4948,66 +4294,231 @@ msgstr ""
 "Biografie: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:285
+#, php-format
+msgid "New email address for posting to %s"
+msgstr "Neue E-Mail-Adresse um auf %s zu schreiben"
+
+#: lib/mail.php:288
+#, 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 hast eine neue Adresse zum Hinzufügen von Nachrichten auf %1$s.\n"
+"\n"
+"Schicke eine E-Mail an %2$s um eine neue Nachricht hinzuzufügen.\n"
+"\n"
+"Weitere E-Mail-Anweisungen unter %3$s.\n"
+"\n"
+"Viele Grüße,\n"
+"%4$s"
+
+#: lib/mail.php:412
+#, php-format
+msgid "%s status"
+msgstr "%s Status"
+
+#: lib/mail.php:438
+msgid "SMS confirmation"
+msgstr "SMS-Konfiguration"
+
+#: lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "Du wurdest von %s angestupst"
 
-#: lib/mail.php:465
-#, fuzzy, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
-msgstr "%s$s (%2$s) fragt sich was du so machst "
+#: lib/mail.php:466
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
+msgstr ""
+
+#: lib/mail.php:509
+#, php-format
+msgid "New private message from %s"
+msgstr "Neue private Nachricht von %s"
 
-#: lib/mail.php:555
+#: lib/mail.php:513
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%5$s\n"
+msgstr ""
+
+#: lib/mail.php:554
 #, fuzzy, php-format
-msgid "%1$s just added your notice from %2$s"
-msgstr "%1$s hat deine Nachrichten von %2$s hinzugefügt"
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s hat deine Nachricht als Favorit gespeichert"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
-#, fuzzy
-msgid "From"
-msgstr "Von"
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, php-format
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+msgstr ""
+
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+msgid "Could not determine file's mime-type!"
+msgstr "Konnte öffentlichen Stream nicht abrufen."
+
+#: lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
 
-#: lib/messageform.php:110
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: lib/messageform.php:120
 #, fuzzy
 msgid "Send a direct notice"
 msgstr "Versende eine direkte Nachricht"
 
-#: lib/noticeform.php:125
-#, fuzzy
-msgid "Send a notice"
-msgstr "Nachricht versenden"
+#: lib/messageform.php:146
+msgid "To"
+msgstr "An"
 
-#: lib/noticeform.php:152
+#: lib/messageform.php:162 lib/noticeform.php:173
 #, fuzzy
 msgid "Available characters"
 msgstr "Verfügbare Zeichen"
 
-#: lib/noticelist.php:426
+#: lib/noticeform.php:145
 #, fuzzy
-msgid "in reply to"
-msgstr "als Antwort auf"
+msgid "Send a notice"
+msgstr "Nachricht versenden"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
+msgstr "Was ist los, %s?"
+
+#: lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "Kein Inhalt!"
+
+#: lib/noticelist.php:498
 #, fuzzy
 msgid "Reply to this notice"
 msgstr "Auf diese Nachricht antworten"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:499
 #, fuzzy
 msgid "Reply"
 msgstr "Antworten"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
-#, fuzzy
-msgid "Delete this notice"
-msgstr "Notiz löschen"
-
-#: lib/noticelist.php:474
-#, fuzzy
-msgid "Delete"
-msgstr "Löschen"
-
 #: lib/nudgeform.php:116
 #, fuzzy
 msgid "Nudge this user"
@@ -5023,42 +4534,140 @@ msgstr "Stups"
 msgid "Send a nudge to this user"
 msgstr "Sende diesem Benutzer einen Stupser"
 
-#: lib/personaltagcloudsection.php:56
-#, php-format
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "Neues Profil konnte nicht angelegt werden"
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "Fehler beim Einfügen des Avatars"
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "Fehler beim Einfügen des entfernten Profils"
+
+#: lib/oauthstore.php:345
 #, fuzzy
+msgid "Duplicate notice"
+msgstr "Notiz löschen"
+
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
+msgstr "Konnte neues Abonnement nicht eintragen."
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "Eigene"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "Antworten"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr "Favoriten"
+
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr "Benutzer"
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr "Posteingang"
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr "Deine eingehenden Nachrichten"
+
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr "Postausgang"
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr "Deine gesendeten Nachrichten"
+
+#: lib/personaltagcloudsection.php:56
+#, fuzzy, php-format
 msgid "Tags in %s's notices"
 msgstr "Tags in %ss Nachrichten"
 
-#: lib/profilelist.php:182
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "Abonnements"
+
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "Alle Abonnements"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "Abonnenten"
+
+#: lib/profileaction.php:157
+msgid "All subscribers"
+msgstr "Alle Abonnenten"
+
+#: lib/profileaction.php:177
 #, fuzzy
-msgid "(none)"
-msgstr "(leer)"
+msgid "User ID"
+msgstr "Benutzer"
 
-#: lib/publicgroupnav.php:76
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "Mitglied seit"
+
+#: lib/profileaction.php:235
+msgid "All groups"
+msgstr "Alle Gruppen"
+
+#: lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Öffentlich"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Benutzer-Gruppen"
 
-#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Aktuelle Tags"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Featured"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Beliebt"
 
+#: lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Suchen"
+
+#: lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Suchen"
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "Leute"
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr "Finde Leute auf dieser Seite"
+
 #: lib/searchgroupnav.php:82
 #, fuzzy
 msgid "Notice"
 msgstr "Nachricht"
 
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr "Durchsuche den Inhalt der Notices"
+
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Finde Gruppen auf dieser Seite"
@@ -5067,35 +4676,64 @@ msgstr "Finde Gruppen auf dieser Seite"
 msgid "Untitled section"
 msgstr "Abschnitt ohne Titel"
 
-#: lib/subgroupnav.php:81
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: lib/subgroupnav.php:83
 #, fuzzy, php-format
 msgid "People %s subscribes to"
 msgstr "Leute, die %s abonniert hat"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:91
 #, fuzzy, php-format
 msgid "People subscribed to %s"
 msgstr "Leute, die %s abonniert haben"
 
-#: lib/subgroupnav.php:97
-#, php-format
-#, fuzzy
+#: lib/subgroupnav.php:99
+#, fuzzy, php-format
 msgid "Groups %s is a member of"
 msgstr "Gruppen zu denen %s gehört"
 
-#: lib/subgroupnav.php:104
-#, fuzzy, php-format
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Lade Freunde und Kollegen ein dir auf %s beizutreten"
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
 
-#: lib/subs.php:53
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+#, fuzzy
+msgid "(none)"
+msgstr "(leer)"
+
+#: lib/subs.php:48
+msgid "Already subscribed!"
+msgstr ""
+
+#: lib/subs.php:52
 msgid "User has blocked you."
 msgstr "Dieser Benutzer hat dich blockiert."
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: lib/subs.php:56
+msgid "Could not subscribe."
+msgstr "Konnte nicht abbonieren."
+
+#: lib/subs.php:75
+msgid "Could not subscribe other to you."
+msgstr "Die Gegenseite konnte Dich nicht abonnieren."
+
+#: lib/subs.php:124
 #, fuzzy
-msgid "Subscribe to this user"
-msgstr "Abonniere diesen Benutzer"
+msgid "Not subscribed!"
+msgstr "Nicht abonniert!"
+
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
+msgstr "Konnte Abonnement nicht löschen."
 
 #: lib/tagcloudsection.php:56
 msgid "None"
@@ -5105,61 +4743,107 @@ msgstr "Nichts"
 msgid "Top posters"
 msgstr "Top-Schreiber"
 
-#: lib/unblockform.php:120 lib/unblockform.php:150
-#, fuzzy
-msgid "Unblock this user"
-msgstr "Benutzer freigeben"
-
-#: lib/unblockform.php:150
-msgid "Unblock"
-msgstr "Freigeben"
-
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Lösche dein Abonnement von diesem Benutzer"
 
-#~ msgid "Code not yet ready."
-#~ msgstr "Code noch nicht fertig."
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "Abbestellen"
 
-#~ msgid "Export and delete your user information."
-#~ msgstr "Exportiere und lösche deine Benutzer Daten."
+#: lib/userprofile.php:116
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "Avatar"
 
-#~ msgid "Delete my account"
-#~ msgstr "Lösche meinen Account"
+#: lib/userprofile.php:236
+msgid "User actions"
+msgstr "Benutzeraktionen"
 
+#: lib/userprofile.php:248
 #, fuzzy
-#~ msgid "Delete my account confirmation"
-#~ msgstr "Konnte E-Mailbestätigung nicht löschen."
+msgid "Edit profile settings"
+msgstr "Profil Einstellungen"
 
-#, fuzzy
-#~ msgid "Check if you are sure you want to delete your account."
-#~ msgstr "Sind sie sicher, dass sie diese Nachricht löschen wollen?"
+#: lib/userprofile.php:249
+msgid "Edit"
+msgstr ""
 
-#~ msgid "Showing recently popular notices"
-#~ msgstr "Kürzlich populäre Nachrichten"
+#: lib/userprofile.php:272
+msgid "Send a direct message to this user"
+msgstr "Direkte Nachricht an Benutzer verschickt"
 
-#~ msgid "Tag a person"
-#~ msgstr "Tagge eine Person"
+#: lib/userprofile.php:273
+msgid "Message"
+msgstr "Nachricht"
 
-#, fuzzy
-#~ msgid "List"
-#~ msgstr "Liste"
+#: lib/util.php:821
+msgid "a few seconds ago"
+msgstr "vor wenigen Sekunden"
 
-#~ msgid "Icons"
-#~ msgstr "Icons"
+#: lib/util.php:823
+msgid "about a minute ago"
+msgstr "vor einer Minute"
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "E-Mail konnte nicht bestätigt werden."
+#: lib/util.php:825
+#, php-format
+msgid "about %d minutes ago"
+msgstr "vor %d Minuten"
 
-#~ msgid "Email address"
-#~ msgstr "E-Mail Adresse "
+#: lib/util.php:827
+msgid "about an hour ago"
+msgstr "vor einer Stunde"
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Fehler beim Einfügen der Nachricht"
+#: lib/util.php:829
+#, php-format
+msgid "about %d hours ago"
+msgstr "vor %d Stunden"
+
+#: lib/util.php:831
+msgid "about a day ago"
+msgstr "vor einem Tag"
+
+#: lib/util.php:833
+#, php-format
+msgid "about %d days ago"
+msgstr "vor %d Tagen"
 
-#~ 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 ""
-#~ "Wenn du deine Passwort verlegt hast, kannst du dir ein Neues an die E-"
-#~ "Mailadresse schicken lasssen, die für dein Konto eingetragen ist."
+#: lib/util.php:835
+msgid "about a month ago"
+msgstr "vor einem Monat"
+
+#: lib/util.php:837
+#, php-format
+msgid "about %d months ago"
+msgstr "vor %d Monaten"
+
+#: lib/util.php:839
+msgid "about a year ago"
+msgstr "vor einem Jahr"
+
+#: lib/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr ""
+"Homepage ist kein gültiger URL. URL´s müssen ein Präfix wie http enthalten."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr "Konnte Nachricht nicht parsen."
+
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr "Kein registrierter Nutzer."
+
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr "Sorry, das ist nicht deine Adresse für eingehende E-Mails."
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr "Sorry, keinen eingehenden E-Mails gestattet."
diff --git a/locale/el/LC_MESSAGES/statusnet.mo b/locale/el/LC_MESSAGES/statusnet.mo
index 184639963..464aca5ea 100644
--- a/locale/el/LC_MESSAGES/statusnet.mo
+++ b/locale/el/LC_MESSAGES/statusnet.mo
diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po
index 4a54996a8..f8fa1eb63 100644
--- a/locale/el/LC_MESSAGES/statusnet.po
+++ b/locale/el/LC_MESSAGES/statusnet.po
@@ -1,4470 +1,3897 @@
-# 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.
+# Translation of StatusNet to Greek
 #
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-09-08 20:21+0000\n"
-"Last-Translator: Giannis Pappas <papasj@mailinator.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:15+0000\n"
+"Language-Team: Greek\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: el\n"
+"X-Message-Group: out-statusnet\n"
 
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
-#, php-format
-msgid " Search Stream for \"%s\""
-msgstr "Αναζήτηση ροής για \"%s\""
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "Αδύνατη η αποθήκευση του προφίλ."
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-#: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
-msgid ""
-" except this private data: password, email address, IM address, phone number."
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
 msgstr ""
-"εκτός από τα εξής προσωπικά δεδομένα: κωδικός πρόσβασης, διεύθυνση email, "
-"διεύθυνση IM, τηλεφωνικό νούμερο."
 
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr "από"
+#: actions/all.php:84
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s και οι φίλοι του/της"
 
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
+msgid "%s and friends"
+msgstr "%s και οι φίλοι του/της"
 
-#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
+#: actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Ροή φίλων του/της %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 ""
+#: actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Ροή φίλων του/της %s"
 
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr ""
+#: actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Ροή φίλων του/της %s"
 
-#: ../lib/mail.php:126
+#: actions/all.php:127
 #, 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"
+"This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/all.php:132
 #, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
 msgstr ""
 
-#: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/all.php:134
 #, php-format
-msgid "%1$s's status on %2$s"
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
 #, php-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
-
-#: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
-#, php-format
-msgid "%s Public Stream"
-msgstr "Δημόσια ροή %s"
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+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
-#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
-#, php-format
-msgid "%s and friends"
+#: actions/all.php:165
+#, fuzzy
+msgid "You and friends"
 msgstr "%s και οι φίλοι του/της"
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
 #, php-format
-msgid "%s public timeline"
+msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
-#, php-format
-msgid "%s status"
-msgstr "Κατάσταση του/της %s"
-
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
-#, php-format
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
 #, fuzzy
-msgid "%s timeline"
-msgstr "Χρονοδιάγραμμα του χρήστη %s"
+msgid "API method not found."
+msgstr "Η μέθοδος του ΑΡΙ δε βρέθηκε!"
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
-#, php-format
-msgid "%s updates from everyone!"
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
 msgstr ""
 
-#: ../actions/register.php:213
+#: actions/apiaccountupdatedeliverydevice.php:105
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
 msgstr ""
-"(Σύντομα θα λάβετε μέσω ηλεκτρονικού ταχυδρομείου ένα μήνυμα με οδηγίες για "
-"την επιβεβαίωση της ηλεκτρονικής σας διεύθυνσης.)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
-#, php-format
+#: actions/apiaccountupdatedeliverydevice.php:132
 #, fuzzy
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
-msgstr ""
-"To **%%site.name%%** είναι μία υπηρεσία microblogging (μικρο-ιστολογίου) που "
-"έφερε κοντά σας το  [%%site.broughtby%%](%%site.broughtbyurl%%). "
+msgid "Could not update user."
+msgstr "Απέτυχε η ενημέρωση του χρήστη."
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
 #, php-format
-#, fuzzy
-msgid "**%%site.name%%** is a microblogging service. "
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
 msgstr ""
-"Το **%%site.name%%** είναι μία υπηρεσία microblogging (μικρο-ιστολογίου). "
 
-#: ../lib/util.php:274 lib/util.php:290
-msgid ". Contributors should be attributed by full name or nickname."
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
-#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 μικρά γράμματα ή αριθμοί, χωρίς σημεία στίξης ή κενά"
-
-#: ../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
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr "6 ή περισσότεροι χαρακτήρες"
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Απέτυχε η ενημέρωση του χρήστη."
 
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
-msgid "6 or more characters, and don't forget it!"
-msgstr "6 ή περισσότεροι χαρακτήρες και μην το ξεχάσετε!"
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr ""
 
-#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
-msgid "6 or more characters. Required."
-msgstr "6 ή περισσότεροι χαρακτήρες. Απαραίτητο."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+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."
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
 msgstr ""
-"Έχει αποσταλεί ένας κωδικός επιβεβαίωσης στην διεύθυνση IM που προσθέσατε. "
-"Πρέπει να αποδεχτείτε τον/την %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."
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
 msgstr ""
-"Έχει αποσταλεί ένας κωδικός επιβεβαίωσης στην διεύθυνση email που "
-"προσθέσατε. Ελέγξτε τα εισερχόμενα (και τον φάκελο ανεπιθύμητης "
-"αλληλογραφίας) για τον κωδικό και για το πως να τον χρησιμοποιήσετε."
 
-#: ../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."
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
 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 actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
-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 actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
-msgid "API method under construction."
-msgstr "Η μέθοδος του ΑΡΙ είναι υπό κατασκευή."
-
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
-msgid "About"
-msgstr "Περί"
-
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
-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 actions/emailsettings.php:120
-#: actions/imsettings.php:127 actions/openidsettings.php:111
-#: actions/smssettings.php:133 actions/twittersettings.php:163
-msgid "Add"
-msgstr "Προσθήκη"
-
-#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
-msgstr "Προσθήκη OpenID"
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-msgid "Add or remove OpenIDs"
-msgstr "Προσθήκη ή διαγραφή OpenIDs"
-
-#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39 actions/emailsettings.php:39
-#: actions/imsettings.php:40 actions/smssettings.php:39
-#: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
-msgstr "Διεύθυνση"
 
-#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-msgid "Addresses of friends to invite (one per line)"
-msgstr "Διευθύνσεις φίλων σου που θες να προσκαλέσεις (μία ανά γραμμή)"
-
-#: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
-msgid "All subscriptions"
-msgstr "Όλες οι συνδρομές"
-
-#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
 #, php-format
-msgid "All updates for %s"
-msgstr "Όλες οι ενημερώσεις για %s"
-
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
-#, 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
-#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
-msgid "Already logged in."
-msgstr "Ήδη συνδεδεμένος."
-
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
-msgid "Already subscribed!."
-msgstr "Είσαι ήδη συνδρομητής!."
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
-msgid "Are you sure you want to delete this notice?"
-msgstr "Είσαι σίγουρος ότι θες να διαγράψεις αυτό το μήνυμα;"
-
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
-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
-#, fuzzy
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgid "That's too long. Max message size is %d chars."
 msgstr ""
-"Αυτόματα γίνε συνδρομητής σε όσους γίνονται συνδρομητές σε μένα  (χρήση "
-"κυρίως από λογισμικό και όχι ανθρώπους)"
 
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34 actions/avatarsettings.php:65
-#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
-msgid "Avatar"
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
 msgstr ""
 
-#: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
-msgid "Avatar updated."
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/apidirectmessage.php:89
 #, php-format
-#, fuzzy
-msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+msgid "Direct messages from %s"
 msgstr ""
-"Αναμένωντας επιβεβαίωση σε αυτή τη διεύθυνση. Έλεγξε το Jabber/GTalk "
-"λογαριασμό σου για μήνυμα με περαιτέρω οδηγίες. (Πρόσθεσες το χρήστη %s στη "
-"λίστα φίλων?)"
 
-#: ../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."
+#: actions/apidirectmessage.php:93
+#, php-format
+msgid "All the direct messages sent from %s"
 msgstr ""
-"Αναμένωντας επιβεβαίωση σε αυτή τη διεύθυνση. Έλεγξε το mail σου (και το "
-"φάκελο spam!) για μήνυμα με περαιτέρω οδηγίες. "
-
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
-msgid "Awaiting confirmation on this phone number."
-msgstr "Αναμένωντας επιβεβαίωση σ' αυτό το νούμερο τηλεφώνου."
-
-#: ../lib/util.php:1318 lib/util.php:1452
-#, fuzzy
-msgid "Before »"
-msgstr "Προηγούμενο »"
-
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
-#: actions/profilesettings.php:82 actions/register.php:184
-#: actions/profilesettings.php:112 actions/register.php:402
-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
-#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
-msgid "Bio is too long (max 140 chars)."
-msgstr "Το βιογραφικό είναι πολύ μεγάλο (μέγιστο 140 χαρακτ.)."
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
-#, fuzzy
-msgid "Can't delete this notice."
-msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
-
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/apidirectmessage.php:101
 #, php-format
-msgid "Can't read avatar URL '%s'"
+msgid "Direct messages to %s"
 msgstr ""
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404 actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-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
-#: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
-msgstr "Ακύρωση"
-
-#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Απέτυχη η χρήση αντικειμένου OpenID consumer."
-
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
-msgstr "Αδυναμία κανονικοποίησης του Jabber ID"
-
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
-msgid "Cannot normalize that email address"
-msgstr "Αδυναμία κανονικοποίησης αυτής της email διεύθυνσης"
-
-#: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
-msgstr "Αλλαγή"
-
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: ../actions/password.php:32 actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr "Αλλαγή κωδικού"
-
-#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
-msgid "Change your password"
-msgstr "Αλλάξτε τον κωδικό σας"
-
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-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
-#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
-#: actions/register.php:376 actions/smssettings.php:122
-msgid "Confirm"
-msgstr "Επιβεβαίωση"
-
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-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
-#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
-msgid "Confirmation cancelled."
-msgstr "Η επιβεβαίωση ακυρώθηκε."
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "Η μέθοδος του ΑΡΙ δε βρέθηκε!"
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
-msgid "Confirmation code"
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
 msgstr ""
 
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-msgid "Confirmation code not found."
-msgstr "Ο κωδικός επιβεβαίωσης δεν βρέθηκε."
-
-#: ../actions/register.php:202
-#, php-format
-#, fuzzy
-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."
+#: actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
 msgstr ""
-"Συγχαρητήρια, %s! και καλωσήρθες στο %%%%site.name%%%%. Από εδώ μπορείς "
-"να...\n"
-"\n"
-"* Πας στο [your profile](%s) και να στείλεις το πρώτο σου μήνυμα.\n"
-"* Προσθέσεις ένα [Jabber/GTalk address](%%%%action.imsettings%%%%) ώστε να "
-"δέχεσε μηνύματα στο instant messager σου.\n"
-"* [Search for people](%%%%action.peoplesearch%%%%) που μπορεί να ξέρεις ή "
-"που έχουν τα ίδια ενδιαφέροντα με σένα. \n"
-"* Ενημερώσεις το προφίλ σου [profile "
-"settings](%%%%action.profilesettings%%%%) για να μάθουν οι άλλοι περισσότερα "
-"για σένα. \n"
-"* Διαβάσεις τα [online docs](%%%%doc.help%%%%) για λειτουργίες που μπορεί να "
-"μην έχεις μάθει ακόμα. \n"
-"\n"
-"Ευχαριστούμε που εγγράφηκες και ευχόμαστε να περάσεις καλά με την υπηρεσία "
-"μας."
-
-#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
-msgid "Connect"
-msgstr "Σύνδεση"
 
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
-msgid "Connect existing account"
-msgstr "Σύνδεση με υπάρχων λογαριασμό"
-
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
-msgid "Contact"
-msgstr "Επικοινωνία"
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+msgstr ""
 
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
-#, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "Αδυναμία δημιουργίας φόρμας OpenID: %s "
+#: actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
+msgstr ""
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr "Δε μπορώ να ακολουθήσω το χρήστη: ο χρήστης %s είναι ήδη στη λίστα σου."
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr ""
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
+#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
 msgstr "Δε μπορώ να ακολουθήσω το χρήστη: ο χρήστης δε βρέθηκε."
 
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: actions/apifriendshipscreate.php:118
 #, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Αδυναμία ανακατεύθηνσης στο διακομιστή: %s"
-
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
-msgid "Could not save avatar info"
-msgstr "Δε μπόρεσα να σώσω την πληροφορία του avatar"
-
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
-msgid "Could not save new profile info"
-msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ"
-
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
-msgid "Could not subscribe other to you."
-msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
-
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
-msgid "Could not subscribe."
-msgstr "Απέτυχε η συνδρομή."
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
-msgstr "Απέτυχε η ενημέρωση χρήστη μέσω επιβεβαιωμένης email διεύθυνσης."
-
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-msgid "Couldn't convert request tokens to access tokens."
-msgstr "Απέτυχε η μετατροπή αιτούμενων tokens σε tokens πρόσβασης."
-
-#: ../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
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-msgid "Couldn't delete email confirmation."
-msgstr "Απέτυχε η διαγραφή email επιβεβαίωσης."
-
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
-msgid "Couldn't delete subscription."
-msgstr "Απέτυχε η διαγραφή συνδρομής."
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
-msgid "Couldn't find any statuses."
-msgstr "Απέτυχε η εύρεση οποιασδήποτε κατάστασης."
-
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-msgid "Couldn't get a request token."
+msgid "Could not follow user: %s is already on your list."
 msgstr ""
+"Δε μπορώ να ακολουθήσω το χρήστη: ο χρήστης %s είναι ήδη στη λίστα σου."
 
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206 actions/emailsettings.php:223
-#: actions/imsettings.php:195 actions/smssettings.php:214
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
-msgid "Couldn't insert confirmation code."
-msgstr "Απέτυχε η εισαγωγή κωδικού επιβεβαίωσης."
-
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
-msgstr "Απέτυχε η εισαγωγή νέας συνδρομής."
-
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-msgid "Couldn't save profile."
-msgstr "Απέτυχε η αποθήκευση του προφίλ."
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "Δε μπορώ να ακολουθήσω το χρήστη: ο χρήστης δε βρέθηκε."
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
-msgstr "Απέτυχε η ενημέρωση του χρήστη για την αυτόματη συνδρομή."
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
-msgid "Couldn't update user record."
-msgstr "Απέτυχε η ενημέρωση εγγραφής του χρήστη."
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
+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
-#: actions/confirmaddress.php:114 actions/emailsettings.php:280
-#: actions/emailsettings.php:411 actions/imsettings.php:252
-#: actions/imsettings.php:395 actions/othersettings.php:162
-#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
-msgid "Couldn't update user."
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
 msgstr "Απέτυχε η ενημέρωση του χρήστη."
 
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
-msgid "Create"
-msgstr "Δημιουργία"
-
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
-msgid "Create a new user with this nickname."
-msgstr "Δημιουργία νέου χρήστη με αυτό το ψευδώνυμο."
+#: actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Απέτυχε η εύρεση οποιασδήποτε κατάστασης."
 
-#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
-msgid "Create new account"
-msgstr "Δημιουργία νέου λογαριασμού"
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
+#, fuzzy
+msgid "Could not create group."
+msgstr "Αδύνατη η αποθήκευση του προφίλ."
 
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
 #, fuzzy
-msgid "Creating new account for OpenID that already has a user."
-msgstr "Μετατροπή υπάρχοντος λογαριασμού σε λογαριασμό OpenID."
+msgid "Could not create aliases."
+msgstr "Αδύνατη η αποθήκευση του προφίλ."
 
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "Τρέχουσα επιβεβαιωμένη Jabber/GTalk διεύθυνση."
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ"
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "Τρέχων επιβεβαιωμένο, μέσω SMS, νούμερο κινητού τηλεφώνου."
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "Το ψευδώνυμο πρέπει να έχει μόνο πεζούς χαρακτήρες και χωρίς κενά."
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-msgid "Current confirmed email address."
-msgstr "Τρέχουσα επιβεβαιωμένη email διεύθυνση."
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr "Το ψευδώνυμο είναι ήδη σε χρήση. Δοκιμάστε κάποιο άλλο."
 
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
 msgstr ""
 
-#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "Σφάλμα στη βάση δεδομένων κατά την εισαγωγή hashtag: %s"
-
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Σφάλμα βάσης δεδομένων κατά την εισαγωγή απάντησης: %s"
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
-msgid "Delete notice"
-msgstr "Διαγραφή μηνύματος"
-
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "Περιέγραψε τον εαυτό σου και τα ενδιαφέροντά σου σε 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 actions/register.php:381
-#: actions/register.php:385 lib/accountsettingsaction.php:113
-msgid "Email"
-msgstr "Email"
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-msgid "Email Address"
-msgstr "Διεύθυνση Email"
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
-msgstr "Ρυθμίσεις Email"
-
-#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-msgid "Email address already exists."
-msgstr "Η διεύθυνση email υπάρχει ήδη."
-
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
-msgid "Email address confirmation"
-msgstr "Επιβεβαίωση διεύθυνσης email"
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
-msgstr "Διεύθυνση email, π.χ: \"UserName@example.org\""
-
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-msgid "Email addresses"
-msgstr "Διευθύνσεις email"
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL."
 
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
-msgid "Enter a nickname or email address."
-msgstr "Εισάγετε ψευδώνυμο ή διεύθυνση email."
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "Το ονοματεπώνυμο είναι πολύ μεγάλο (μέγιστο 255 χαρακτ.)."
 
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
-msgstr ""
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "Το βιογραφικό είναι πολύ μεγάλο (μέγιστο 140 χαρακτ.)."
 
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
-msgid "Error authorizing token"
-msgstr ""
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "Η τοποθεσία είναι πολύ μεγάλη (μέγιστο 255 χαρακτ.)."
 
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
-msgid "Error connecting user to OpenID."
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
 msgstr ""
 
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, php-format
+msgid "Invalid alias: \"%s\""
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
-msgstr ""
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Το ψευδώνυμο είναι ήδη σε χρήση. Δοκιμάστε κάποιο άλλο."
 
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
+#: actions/apigroupjoin.php:110
+msgid "You are already a member of that group."
 msgstr ""
 
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
-msgid "Error saving address confirmation."
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
 msgstr ""
 
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
-msgid "Error saving remote profile"
-msgstr ""
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ"
 
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-msgid "Error saving the profile."
+#: actions/apigroupleave.php:114
+msgid "You are not a member of this group."
 msgstr ""
 
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-msgid "Error saving the user."
-msgstr ""
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Αδύνατη η αποθήκευση του προφίλ."
 
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
-msgid "Error saving user; invalid."
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
 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 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-msgid "Error setting user."
-msgstr ""
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Βρες ομάδες στο site"
 
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr ""
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "Ομάδες χρηστών"
 
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
-msgstr ""
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Ομάδες με τα περισσότερα μέλη"
 
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
-msgid "Existing nickname"
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
 msgstr ""
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
-msgid "FAQ"
-msgstr "Συχνές ερωτήσεις"
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "Ρυθμίσεις OpenID"
 
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
-msgid "Failed updating avatar."
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
 msgstr ""
 
-#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
-#, 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 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
 #, php-format
-msgid "Feed for replies to %s"
-msgstr "Ροή απαντήσεων προς τον/την %s"
-
-#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
-#, php-format
-msgid "Feed for tag %s"
+msgid "That's too long. Max notice size is %d chars."
 msgstr ""
 
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
 msgstr ""
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
 
-#: ../actions/login.php:122
-msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+msgid "Unsupported format."
 msgstr ""
-"Για λόγους ασφαλείας, παρακαλώ εισάγετε ξανά το όνομα χρήστη και τον κωδικό "
-"σας, πριν αλλάξετε τις ρυθμίσεις σας."
-
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
-#: actions/profilesettings.php:77 actions/register.php:178
-#: actions/profilesettings.php:103 actions/register.php:391
-#: actions/showgroup.php:235 actions/showstream.php:262
-#: actions/tagother.php:105 lib/groupeditform.php:142
-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
-#: actions/editgroup.php:195 actions/newgroup.php:146
-#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
-msgid "Full name is too long (max 255 chars)."
-msgstr "Το ονοματεπώνυμο είναι πολύ μεγάλο (μέγιστο 255 χαρακτ.)."
-
-#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
-msgid "Help"
-msgstr "Βοήθεια"
-
-#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
-msgid "Home"
-msgstr "Αρχή"
-
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
-msgid "Homepage"
-msgstr "Αρχική σελίδα"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
-msgid "Homepage is not a valid URL."
-msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL."
-
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
-msgid "I want to post notices by email."
-msgstr "Θέλω να δημοσιεύω ενημερώσεις μέσω email"
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
-msgstr "ΙΜ"
-
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
-msgstr "Διεύθυνση ΙΜ"
-
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
-msgstr "Ρυθμίσεις ΙΜ"
-
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
-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\"."
+#: actions/apitimelinefavorites.php:107
+#, php-format
+msgid "%s / Favorites from %s"
 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."
+#: actions/apitimelinefavorites.php:119
+#, php-format
+msgid "%s updates favorited by %s / %s."
 msgstr ""
-"Εάν έχετε ξεχάσει ή χάσει τον κωδικό σας, μπορεί να σας αποσταλλεί "
-"καινούριος στην διεύθυνση email που έχετε καταχωρήσει στον λογαριασμό σας."
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-#: actions/emailsettings.php:127 actions/smssettings.php:140
-msgid "Incoming email"
-msgstr "Εισερχόμενο email"
-
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
-msgid "Incoming email address removed."
-msgstr "Η διεύθυνση του εισερχόμενου email αφαιρέθηκε."
-
-#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
-msgid "Incorrect old password"
-msgstr "Λάθος παλιός κωδικός"
 
-#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
-msgid "Incorrect username or password."
-msgstr "Λάθος όνομα χρήστη ή κωδικός"
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
+#, fuzzy, php-format
+msgid "%s timeline"
+msgstr "Χρονοδιάγραμμα του χρήστη %s"
 
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
+#, php-format
+msgid "Updates from %1$s on %2$s!"
 msgstr ""
-"Οδηγίες για την ανάκτηση του κωδικού σας έχουν σταλεί στην διεύθυνση email "
-"που έχετε καταχωρίσει στον λογαριασμό σας."
 
-#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/apitimelinementions.php:116
 #, php-format
-msgid "Invalid avatar URL '%s'"
+msgid "%1$s / Updates mentioning %2$s"
 msgstr ""
 
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/apitimelinementions.php:126
 #, php-format
-msgid "Invalid email address: %s"
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
 #, php-format
-msgid "Invalid homepage '%s'"
+msgid "%s public timeline"
 msgstr ""
 
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
 #, php-format
-msgid "Invalid license URL '%s'"
+msgid "%s updates from everyone!"
 msgstr ""
 
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
+#: actions/apitimelinetag.php:101 actions/tag.php:66
+#, php-format
+msgid "Notices tagged with %s"
 msgstr ""
 
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, php-format
+msgid "Updates tagged with %1$s on %2$s!"
 msgstr ""
 
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
+#: actions/apiusershow.php:96
+msgid "Not found."
 msgstr ""
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
-#, php-format
-msgid "Invalid profile URL '%s'."
+#: actions/attachment.php:73
+msgid "No such attachment."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
+#: actions/avatarbynickname.php:64
+msgid "No size."
 msgstr ""
 
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 #: actions/avatarbynickname.php:69
 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
-#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
-msgid "Invalid username or password."
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
 msgstr ""
 
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-msgid "Invitation(s) sent"
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-msgid "Invitation(s) sent to the following people:"
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
 msgstr ""
 
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
-msgid "Invite"
-msgstr ""
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+#, fuzzy
+msgid "Avatar settings"
+msgstr "Ρυθμίσεις OpenID"
 
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-msgid "Invite new users"
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
 msgstr ""
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
-#, php-format
-msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
 msgstr ""
 
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+msgid "Delete"
 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."
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
 msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
-msgid "Language"
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
 msgstr ""
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
-msgid "Language is too long (max 50 chars)."
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
-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
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
-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
-#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
-#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
-#, php-format
-msgid "Login"
-msgstr "Σύνδεση"
+#: actions/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr ""
 
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Συνδεθείτε με έναν λογαριασμό [OpenID](%%doc.openid%%)."
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
+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%"
-"%). "
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
 msgstr ""
-"Συνδεθείτε με το όνομα χρήστη και τον κωδικό σας. Δεν έχετε όνομα χρήστη "
-"ακόμα; Κάντε [εγγραφή](%%action.register%%) για ένα νέο λογαριασμό ή "
-"δοκιμάστε το [OpenID](%%action.openidlogin%%). "
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
-msgid "Logout"
-msgstr "Αποσύνδεση"
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+msgstr ""
 
-#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
-msgid "Longer name, preferably your \"real\" name"
+#: actions/avatarsettings.php:363
+msgid "Failed updating avatar."
 msgstr ""
 
-#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
-msgid "Lost or forgotten password?"
-msgstr "Χάσατε ή ξεχάσατε τον κωδικό σας;"
+#: actions/avatarsettings.php:387
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Ρυθμίσεις OpenID"
 
-#: ../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/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+#, fuzzy
+msgid "No nickname"
+msgstr "Νέο ψευδώνυμο"
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#: actions/emailsettings.php:71
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr ""
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+#, fuzzy
+msgid "No such group"
+msgstr "Αδύνατη η αποθήκευση του προφίλ."
 
-#: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
-msgid "Member since"
-msgstr "Μέλος από"
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "Αδύνατη η αποθήκευση του προφίλ."
 
-#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
-#, php-format
-msgid "Microblog by %s"
-msgstr ""
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+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."
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-msgid "My text and files are available under "
+#: actions/blockedfromgroup.php:281
+msgid "Unblock user from group"
 msgstr ""
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#: actions/emailsettings.php:142 actions/smssettings.php:152
-msgid "New"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
 msgstr ""
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
-#, php-format
-msgid "New email address for posting to %s"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+msgid "Unblock this user"
 msgstr ""
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
-msgid "New incoming email address added."
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
+#: lib/settingsaction.php:72
+msgid "Not logged in."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
-msgid "New nickname"
-msgstr "Νέο ψευδώνυμο"
-
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
 msgstr ""
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-msgid "New password"
-msgstr "Νέος κωδικός"
-
-#: ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
 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
-#: actions/login.php:228 actions/profilesettings.php:98
-#: actions/register.php:367 actions/showgroup.php:224
-#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
-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
-#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
-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
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "Το ψευδώνυμο πρέπει να έχει μόνο πεζούς χαρακτήρες και χωρίς κενά."
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+msgid "Block user"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
-msgid "Nickname not allowed."
-msgstr "Το ψευδώνυμο αυτό δεν επιτρέπεται."
+#: actions/block.php:136
+msgid ""
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
+msgstr ""
 
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
-msgstr "Το ψευδώνυμο του χρήστη που θέλετε να παρακολουθήσετε"
+#: actions/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
+msgid "No"
+msgstr ""
 
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
-msgid "Nickname or email"
-msgstr "Ψευδώνυμο ή email"
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
 
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
-msgid "No"
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
 msgstr ""
 
-#: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+msgid "Block this user"
 msgstr ""
 
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
-msgid "No authorization request!"
+#: actions/block.php:165
+msgid "You have already blocked this user."
 msgstr ""
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
-msgid "No carrier selected."
+#: actions/block.php:170
+msgid "Failed to save block information."
 msgstr ""
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
+#: actions/bookmarklet.php:50
+msgid "Post to "
 msgstr ""
 
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 #: actions/confirmaddress.php:75
 msgid "No confirmation code."
 msgstr ""
 
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
-#: actions/newnotice.php:126 classes/Command.php:223
-msgid "No content!"
-msgstr ""
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "Ο κωδικός επιβεβαίωσης δεν βρέθηκε."
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
-msgid "No email address."
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
 msgstr ""
 
-#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
-msgid "No id."
+#: actions/confirmaddress.php:90
+#, php-format
+msgid "Unrecognized address type %s"
 msgstr ""
 
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
-msgid "No incoming email address."
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr ""
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "Απέτυχε η ενημέρωση του χρήστη."
 
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
-msgid "No nickname."
-msgstr ""
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr "Απέτυχε η διαγραφή email επιβεβαίωσης."
 
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229 actions/emailsettings.php:240
-#: actions/imsettings.php:214 actions/smssettings.php:237
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
-msgid "No pending confirmation to cancel."
-msgstr ""
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "Επιβεβαίωση διεύθυνσης"
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
+#: actions/confirmaddress.php:159
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
-msgstr ""
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Τοποθεσία"
 
-#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
-msgid "No registered email address for that user."
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
 msgstr ""
 
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
 msgstr ""
 
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
-msgid "No results"
+#: actions/deletenotice.php:71
+#, fuzzy
+msgid "Can't delete this notice."
+msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
+
+#: actions/deletenotice.php:103
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
 msgstr ""
 
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr "Διαγραφή μηνύματος"
+
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr "Είσαι σίγουρος ότι θες να διαγράψεις αυτό το μήνυμα;"
+
+#: actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
+
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+msgid "Delete this notice"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
-msgid "No status found with that ID."
+#: actions/deletenotice.php:157
+msgid "There was a problem with your session token.  Try again, please."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
-msgid "No status with that ID found."
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
 msgstr ""
 
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
+#: actions/disfavor.php:94
+msgid "Add to favorites"
 msgstr ""
 
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 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 actions/shownotice.php:87
-#: lib/deleteaction.php:51
-msgid "No such notice."
+#: actions/editgroup.php:56
+#, php-format
+msgid "Edit %s group"
 msgstr ""
 
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
 msgstr ""
 
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-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 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
-msgid "No such user."
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+msgid "You must be an admin to edit the group"
 msgstr ""
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-msgid "No user with that email address or username."
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
 msgstr ""
 
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
-msgstr ""
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Το βιογραφικό είναι πολύ μεγάλο (μέγιστο 140 χαρακτ.)."
 
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr ""
+#: actions/editgroup.php:253
+#, fuzzy
+msgid "Could not update group."
+msgstr "Αδύνατη η αποθήκευση του προφίλ."
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
+#: actions/editgroup.php:269
+msgid "Options saved."
 msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
-msgid "Not a supported data format."
-msgstr ""
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "Ρυθμίσεις Email"
 
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
+#: actions/emailsettings.php:71
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
-#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-msgid "Not a valid OpenID."
-msgstr ""
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "Διεύθυνση"
 
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
-msgid "Not a valid email address"
-msgstr ""
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr "Τρέχουσα επιβεβαιωμένη email διεύθυνση."
 
-#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-msgid "Not a valid email address."
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
 msgstr ""
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-#: actions/editgroup.php:186 actions/newgroup.php:137
-#: actions/profilesettings.php:195 actions/register.php:161
-msgid "Not a valid nickname."
+#: actions/emailsettings.php:113
+#, fuzzy
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
 msgstr ""
+"Αναμένωντας επιβεβαίωση σε αυτή τη διεύθυνση. Έλεγξε το mail σου (και το "
+"φάκελο spam!) για μήνυμα με περαιτέρω οδηγίες. "
 
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
-msgstr ""
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "Ακύρωση"
 
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr ""
+#: actions/emailsettings.php:121
+msgid "Email Address"
+msgstr "Διεύθυνση Email"
 
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr ""
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr "Διεύθυνση email, π.χ: \"UserName@example.org\""
 
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
-msgid "Not an image or corrupt file."
-msgstr ""
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "Προσθήκη"
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
-msgid "Not authorized."
-msgstr ""
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+msgstr "Εισερχόμενο email"
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
-msgid "Not expecting this response!"
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
-msgid "Not found"
+#: actions/emailsettings.php:145 actions/smssettings.php:162
+msgid "Make a new email address for posting to; cancels the old one."
 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 actions/block.php:59 actions/disfavor.php:61
-#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
-#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
-#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
-#: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
-msgid "Not logged in."
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
 msgstr ""
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
-msgid "Not subscribed!."
-msgstr ""
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
+msgstr "Προτιμήσεις"
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
-#, php-format
-msgid "Notice feed for %s"
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
-msgid "Notices"
+#: actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
-#, php-format
-msgid "Notices tagged with %s"
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
-msgstr ""
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
+msgstr "Θέλω να δημοσιεύω ενημερώσεις μέσω email"
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
-msgid "OpenID"
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
-msgid "OpenID Account Setup"
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
 msgstr ""
 
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-msgid "OpenID Auto-Submit"
-msgstr ""
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+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
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-msgid "OpenID Login"
+#: actions/emailsettings.php:319
+msgid "No email address."
 msgstr ""
 
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-#: actions/openidlogin.php:102 actions/openidsettings.php:101
-msgid "OpenID URL"
-msgstr ""
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
+msgstr "Αδυναμία κανονικοποίησης αυτής της email διεύθυνσης"
 
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
-msgid "OpenID authentication cancelled."
+#: actions/emailsettings.php:330
+msgid "Not a valid email address"
 msgstr ""
 
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
-#, php-format
-msgid "OpenID authentication failed: %s"
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
 msgstr ""
 
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
-#, php-format
-msgid "OpenID failure: %s"
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another user."
 msgstr ""
 
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr "Το OpenID αφαιρέθηκε."
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+msgstr "Απέτυχε η εισαγωγή κωδικού επιβεβαίωσης."
 
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
-msgstr "Ρυθμίσεις OpenID"
+#: actions/emailsettings.php:358
+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 ""
+"Έχει αποσταλεί ένας κωδικός επιβεβαίωσης στην διεύθυνση email που "
+"προσθέσατε. Ελέγξτε τα εισερχόμενα (και τον φάκελο ανεπιθύμητης "
+"αλληλογραφίας) για τον κωδικό και για το πως να τον χρησιμοποιήσετε."
 
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-msgid "Optionally add a personal message to the invitation."
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
 msgstr ""
 
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
-msgid "Partial upload."
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
 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 actions/finishopenidlogin.php:118
-#: actions/login.php:231 actions/register.php:372
-#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-msgid "Password"
-msgstr "Κωδικός"
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "Η επιβεβαίωση ακυρώθηκε."
 
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
-msgid "Password and confirmation do not match."
-msgstr "Ο κωδικός και η επιβεβαίωση του δεν ταυτίζονται."
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
+msgstr ""
 
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
-msgid "Password must be 6 chars or more."
-msgstr "Ο κωδικός πρέπει να είναι 6 χαρακτήρες ή περισσότεροι."
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr ""
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-msgid "Password recovery requested"
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
 msgstr ""
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-msgid "Password saved."
-msgstr "Ο κωδικός αποθηκεύτηκε."
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
+msgstr "Απέτυχε η ενημέρωση εγγραφής του χρήστη."
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-msgid "Passwords don't match."
-msgstr "Οι κωδικοί δεν ταυτίζονται."
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
+msgstr "Η διεύθυνση του εισερχόμενου email αφαιρέθηκε."
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
 msgstr ""
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+msgid "Popular notices"
 msgstr ""
 
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
+#: actions/favorited.php:67
+#, php-format
+msgid "Popular notices, page %d"
 msgstr ""
 
-#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
-msgid "Personal"
-msgstr "Προσωπικά"
-
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-msgid "Personal message"
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
 msgstr ""
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 
-#: ../actions/userauthorization.php:78
+#: actions/favorited.php:153
 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\"."
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
 msgstr ""
 
-#: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
-msgid "Post a notice when my Jabber/GTalk status changes."
+#: actions/favorited.php:156
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
 msgstr ""
 
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94 actions/emailsettings.php:86
-#: actions/imsettings.php:68 actions/smssettings.php:94
-#: actions/twittersettings.php:70 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
-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
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
-msgid "Preferences saved."
-msgstr "Οι προτιμήσεις αποθηκεύτηκαν"
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
-msgid "Preferred language"
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
 msgstr ""
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
-msgid "Privacy"
+#: actions/favoritesrss.php:115
+#, php-format
+msgid "Updates favored by %1$s on %2$s!"
 msgstr ""
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-msgid "Problem saving notice."
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
 msgstr ""
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
-msgid "Profile"
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
 msgstr ""
 
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
 msgstr ""
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-msgid "Profile unknown"
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
-msgid "Public Stream Feed"
-msgstr ""
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "Μήνυμα"
 
-#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
-msgid "Public timeline"
-msgstr ""
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Μήνυμα"
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#: actions/file.php:42
+msgid "No attachments"
 msgstr ""
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
-msgid "Publish a MicroID for my email address."
+#: actions/file.php:51
+msgid "No uploaded attachments"
 msgstr ""
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
+#: actions/finishremotesubscribe.php:69
+msgid "Not expecting this response!"
 msgstr ""
 
-#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
-msgid "Recover"
+#: actions/finishremotesubscribe.php:80
+msgid "User being listened to does not exist."
 msgstr ""
 
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
-msgid "Recover password"
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
 msgstr ""
 
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-msgid "Recovery code for unknown user."
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
 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
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-msgid "Register"
+#: actions/finishremotesubscribe.php:106
+msgid "You are not authorized."
 msgstr ""
 
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
-msgid "Registration not allowed."
-msgstr ""
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "Απέτυχε η μετατροπή αιτούμενων tokens σε tokens πρόσβασης."
 
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
-msgid "Registration successful"
+#: actions/finishremotesubscribe.php:114
+msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
-msgid "Reject"
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
 msgstr ""
 
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
-msgid "Remember me"
-msgstr ""
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+#, fuzzy
+msgid "No such group."
+msgstr "Αδύνατη η αποθήκευση του προφίλ."
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
-msgid "Remote profile with no matching profile"
-msgstr ""
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "Αδύνατη η αποθήκευση του προφίλ."
 
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Αδύνατη η αποθήκευση του προφίλ."
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
 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 actions/emailsettings.php:101
-#: actions/emailsettings.php:134 actions/imsettings.php:102
-#: actions/openidsettings.php:166 actions/smssettings.php:103
-#: actions/smssettings.php:146 actions/twittersettings.php:115
-msgid "Remove"
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
 msgstr ""
 
-#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
+#: actions/groupblock.php:95
+msgid "User is already blocked from group."
 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."
+#: actions/groupblock.php:100
+msgid "User is not a member of group."
 msgstr ""
 
-#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
-msgid "Replies"
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+msgid "Block user from group"
 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
-#: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: actions/groupblock.php:162
 #, php-format
-msgid "Replies to %s"
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
 msgstr ""
 
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
-msgid "Reset"
+#: actions/groupblock.php:178
+msgid "Do not block this user from this group"
 msgstr ""
 
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
-msgid "Reset password"
+#: actions/groupblock.php:179
+msgid "Block this user from this group"
 msgstr ""
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-msgid "SMS"
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
 msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
-msgid "SMS Phone number"
+#: actions/groupbyid.php:74
+msgid "No ID"
 msgstr ""
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
+#: actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
-msgid "SMS confirmation"
+#: actions/groupdesignsettings.php:141
+msgid "Group design"
 msgstr ""
 
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
-msgid "Same as password above"
+#: actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
 msgstr ""
 
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
-msgid "Same as password above. Required."
-msgstr ""
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+#, fuzzy
+msgid "Couldn't update your design."
+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 actions/emailsettings.php:182
-#: actions/facebooksettings.php:114 actions/imsettings.php:157
-#: actions/othersettings.php:117 actions/profilesettings.php:150
-#: actions/smssettings.php:169 actions/subscriptions.php:124
-#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
-msgid "Save"
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+msgid "Unable to save your design settings!"
 msgstr ""
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
-msgid "Search"
-msgstr ""
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Οι προτιμήσεις αποθηκεύτηκαν"
 
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
 msgstr ""
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/grouplogo.php:150
 #, php-format
 msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
+"You can upload a logo image for your group. The maximum file size is %s."
 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."
+#: actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
-msgid "Select a carrier"
-msgstr ""
+#: actions/grouplogo.php:396
+#, fuzzy
+msgid "Logo updated."
+msgstr "Αποσύνδεση"
 
-#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
-#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
-msgid "Send"
+#: actions/grouplogo.php:398
+msgid "Failed updating logo."
 msgstr ""
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
+#: actions/groupmembers.php:93 lib/groupnav.php:92
+#, php-format
+msgid "%s group members"
 msgstr ""
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
 msgstr ""
 
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
-msgid "Send me notices through Jabber/GTalk."
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
 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/groupmembers.php:175 lib/groupnav.php:107
+msgid "Admin"
+msgstr "Διαχειριστής"
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#: actions/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
 msgstr ""
 
-#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
-msgid "Settings"
+#: actions/groupmembers.php:441
+msgid "Make user an admin of the group"
 msgstr ""
 
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
-msgid "Settings saved."
-msgstr ""
+#: actions/groupmembers.php:473
+#, fuzzy
+msgid "Make Admin"
+msgstr "Διαχειριστής"
 
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
 msgstr ""
 
-#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:114
-msgid "Someone else already has this OpenID."
+#: actions/grouprss.php:133
+#, php-format
+msgid "Updates from members of %1$s on %2$s!"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
+#: actions/groupsearch.php:52
+#, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
+#: actions/groupsearch.php:58
+msgid "Group search"
 msgstr ""
 
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+msgid "No results."
 msgstr ""
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
-msgid "Source"
+#: actions/groupsearch.php:82
+#, php-format
+msgid ""
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
 msgstr ""
 
-#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
-msgid "Statistics"
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-msgid "Stored OpenID not found."
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
 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
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
-msgid "Subscribe"
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
 msgstr ""
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
-msgid "Subscribers"
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
 msgstr ""
 
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
-msgid "Subscription authorized"
-msgstr ""
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+#, fuzzy
+msgid "Create a new group"
+msgstr "Δημιουργία νέου λογαριασμού"
 
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
-msgid "Subscription rejected"
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
 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
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
-msgid "Subscriptions"
+#: actions/groupunblock.php:95
+msgid "User is not blocked from group."
 msgstr ""
 
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
-msgid "System error uploading file."
+#: actions/groupunblock.php:128 actions/unblock.php:108
+msgid "Error removing the block."
 msgstr ""
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
-#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
-msgid "Tags"
-msgstr ""
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "Ρυθμίσεις ΙΜ"
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
+#: actions/imsettings.php:70
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 msgstr ""
 
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
-msgid "Text search"
-msgstr ""
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL."
 
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
-msgstr ""
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Τρέχουσα επιβεβαιωμένη Jabber/GTalk διεύθυνση."
 
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
+#: actions/imsettings.php:114
+#, fuzzy, php-format
+msgid ""
+"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
+"message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
+"Αναμένωντας επιβεβαίωση σε αυτή τη διεύθυνση. Έλεγξε το Jabber/GTalk "
+"λογαριασμό σου για μήνυμα με περαιτέρω οδηγίες. (Πρόσθεσες το χρήστη %s στη "
+"λίστα φίλων?)"
 
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
-msgstr ""
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "Διεύθυνση ΙΜ"
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
+#: actions/imsettings.php:126
+#, 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/avatar.php:80 actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
+#: actions/imsettings.php:143
+msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
-msgid "That is already your Jabber ID."
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
-msgid "That is already your email address."
+#: actions/imsettings.php:153
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
-msgid "That is already your phone number."
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
-#: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
-msgid "That is not your Jabber ID."
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
 msgstr ""
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
-msgid "That is not your email address."
-msgstr ""
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr "Αδυναμία κανονικοποίησης του Jabber ID"
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
 msgstr ""
 
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-#: actions/emailsettings.php:367 actions/imsettings.php:349
-msgid "That is the wrong IM address."
+#: actions/imsettings.php:299
+msgid "That is already your Jabber ID."
 msgstr ""
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
 msgstr ""
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-msgid "That phone number already belongs to another user."
+#: actions/imsettings.php:327
+#, 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/newnotice.php:49 ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49 actions/twitapistatuses.php:330
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-msgid "That's too long. Max notice size is 140 chars."
+#: actions/imsettings.php:387
+msgid "That is not your Jabber ID."
 msgstr ""
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
-msgid "That's too long. Max notice size is 255 chars."
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
 msgstr ""
 
-#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/inbox.php:62
 #, php-format
-msgid "The address \"%s\" has been confirmed for your account."
+msgid "Inbox for %s"
 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
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
-msgid "The address was removed."
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
 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:"
+#: actions/invite.php:39
+msgid "Invites have been disabled."
 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."
+#: actions/invite.php:41
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
 msgstr ""
 
-#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/invite.php:72
 #, php-format
-msgid "These are the people who listen to %s's notices."
+msgid "Invalid email address: %s"
 msgstr ""
 
-#: ../actions/subscribers.php:33 actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
 msgstr ""
 
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
-#, php-format
-msgid "These are the people whose notices %s listens to."
+#: actions/invite.php:112
+msgid "Invite new users"
 msgstr ""
 
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
 msgstr ""
 
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:131 actions/invite.php:139
+#, php-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: actions/invite.php:136
 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."
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
 msgstr ""
 
-#: ../lib/openid.php:195
+#: actions/invite.php:150
 msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
-#, php-format
+#: actions/invite.php:162
 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."
+"Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-msgid "This method requires a POST or DELETE."
-msgstr ""
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "Διευθύνσεις email"
 
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
-msgid "This method requires a POST."
-msgstr ""
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr "Διευθύνσεις φίλων σου που θες να προσκαλέσεις (μία ανά γραμμή)"
 
-#: ../lib/util.php:164 lib/util.php:246
-msgid "This page is not available in a media type you accept"
+#: actions/invite.php:192
+msgid "Personal message"
 msgstr ""
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
-msgid "Timezone"
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
-msgid "Timezone not selected."
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:43
+#: actions/invite.php:226
 #, 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."
+msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
-msgid "Two user ids or screen_names must be supplied."
+#: actions/invite.php:228
+#, 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/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
-msgid "URL of your homepage, blog, or profile on another site"
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-msgid "URL of your profile on another compatible microblogging service"
+#: actions/joingroup.php:90 lib/command.php:217
+msgid "You are already a member of that group"
 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 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-msgid "Unexpected form submission."
+#: actions/joingroup.php:128 lib/command.php:234
+#, php-format
+msgid "Could not join user %s to group %s"
 msgstr ""
 
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
-msgid "Unexpected password reset."
+#: actions/joingroup.php:135 lib/command.php:239
+#, php-format
+msgid "%s joined group %s"
 msgstr ""
 
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-msgid "Unknown action"
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-msgid "Unknown version of OMB protocol."
+#: actions/leavegroup.php:90 lib/command.php:268
+msgid "You are not a member of that group."
 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 "
+#: actions/leavegroup.php:119 lib/command.php:278
+msgid "Could not find membership record."
 msgstr ""
 
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
+#: actions/leavegroup.php:127 lib/command.php:284
 #, php-format
-msgid "Unrecognized address type %s"
-msgstr ""
-
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
+msgid "Could not remove user %s to group %s"
 msgstr ""
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-msgid "Unsupported OMB version"
+#: actions/leavegroup.php:134 lib/command.php:289
+#, php-format
+msgid "%s left group %s"
 msgstr ""
 
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
-msgid "Unsupported image file format."
-msgstr ""
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "Ήδη συνδεδεμένος."
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
+#: actions/login.php:110 actions/login.php:120
+msgid "Invalid or expired token."
 msgstr ""
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
-msgstr ""
+#: actions/login.php:143
+msgid "Incorrect username or password."
+msgstr "Λάθος όνομα χρήστη ή κωδικός"
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
+#: actions/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "Σύνδεση"
 
-#: ../actions/avatar.php:68 actions/profilesettings.php:161
-#: actions/avatarsettings.php:162 actions/grouplogo.php:232
-msgid "Upload"
+#: actions/login.php:243
+msgid "Login to site"
 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/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Ψευδώνυμο"
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr ""
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Κωδικός"
 
-#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
 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/login.php:253 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
+msgstr "Αυτόματη σύνδεση στο μέλλον. ΟΧΙ για κοινόχρηστους υπολογιστές!"
 
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
-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
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-msgid "User has no profile."
-msgstr ""
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "Χάσατε ή ξεχάσατε τον κωδικό σας;"
 
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
+#: actions/login.php:282
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
 msgstr ""
+"Για λόγους ασφαλείας, παρακαλώ εισάγετε ξανά το όνομα χρήστη και τον κωδικό "
+"σας, πριν αλλάξετε τις ρυθμίσεις σας."
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
+#: actions/login.php:286
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
 msgstr ""
+"Συνδεθείτε με το όνομα χρήστη και τον κωδικό σας. Δεν έχετε όνομα χρήστη "
+"ακόμα; Κάντε [εγγραφή](%%action.register%%) για ένα νέο λογαριασμό ή "
+"δοκιμάστε το [OpenID](%%action.openidlogin%%). "
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
-msgid "What timezone are you normally in?"
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
 msgstr ""
 
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: actions/makeadmin.php:95
 #, php-format
-msgid "What's up, %s?"
+msgid "%s is already an admin for group \"%s\"."
 msgstr ""
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-#: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
-msgid "Where you are, like \"City, State (or Region), Country\""
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
 msgstr ""
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/makeadmin.php:145
 #, php-format
-msgid "Wrong image type for '%s'"
+msgid "Can't make %s an admin for group %s"
 msgstr ""
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
-#, php-format
-msgid "Wrong size image at '%s'"
+#: actions/microsummary.php:69
+msgid "No current status"
 msgstr ""
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
-msgid "Yes"
+#: actions/newgroup.php:53
+msgid "New group"
 msgstr ""
 
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-msgid "You already have this OpenID!"
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
 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."
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
 msgstr ""
 
-#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
 msgstr ""
 
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-msgid "You are already subscribed to these users:"
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
-msgid "You are not friends with the specified user."
+#: actions/newmessage.php:158
+msgid "No recipient specified."
 msgstr ""
 
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
+#: actions/newmessage.php:164 lib/command.php:370
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: ../actions/register.php:135 actions/register.php:145
-msgid "You can create a new account to start posting notices."
+#: actions/newmessage.php:181
+msgid "Message sent"
 msgstr ""
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
+#: actions/newmessage.php:185 lib/command.php:375
 #, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
+msgid "Direct message to %s sent"
 msgstr ""
 
-#: ../actions/openidsettings.php:86
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
 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."
+#: actions/newnotice.php:69
+msgid "New notice"
 msgstr ""
 
-#: ../actions/profilesettings.php:27
-msgid ""
-"You can update your personal profile info here so people know more about you."
+#: actions/newnotice.php:199
+msgid "Notice posted"
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
+#: actions/noticesearch.php:68
+#, php-format
+msgid ""
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
-msgid "You can't register if you don't agree to the license."
+#: actions/noticesearch.php:78
+msgid "Text search"
 msgstr ""
 
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
-msgid "You did not send us that profile"
-msgstr ""
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "Αναζήτηση ροής για \"%s\""
 
-#: ../lib/mail.php:147
+#: actions/noticesearch.php:121
 #, 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"
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
-msgid "You may not delete another user's status."
+#: actions/noticesearch.php:124
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/noticesearchrss.php:89
 #, php-format
-msgid "You must be logged in to invite other users to use %s"
+msgid "Updates with \"%s\""
 msgstr ""
 
-#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Όλες οι ενημερώσεις που ταιριάζουν με τον όρο αναζήτησης \"%s\""
+
+#: actions/nudge.php:85
 msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
 
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
+#: actions/nudge.php:94
+msgid "Nudge sent"
 msgstr ""
 
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
-msgid "Your OpenID URL"
+#: actions/nudge.php:97
+msgid "Nudge sent!"
 msgstr ""
 
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
 msgstr ""
 
-#: ../actions/openidsettings.php:28
+#: actions/oembed.php:86 actions/shownotice.php:180
 #, php-format
-msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
-"account.  Manage your associated OpenIDs from here."
+msgid "%1$s's status on %2$s"
 msgstr ""
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
-msgid "a few seconds ago"
-msgstr ""
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Σύνδεση"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
-#, php-format
-msgid "about %d days ago"
+#: actions/oembed.php:160
+msgid "Only "
 msgstr ""
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
-#, php-format
-msgid "about %d hours ago"
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
 msgstr ""
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
-#, php-format
-msgid "about %d minutes ago"
+#: actions/opensearch.php:64
+msgid "People Search"
 msgstr ""
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
-#, php-format
-msgid "about %d months ago"
+#: actions/opensearch.php:67
+msgid "Notice Search"
 msgstr ""
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
-msgid "about a day ago"
-msgstr ""
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "Ρυθμίσεις OpenID"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
-msgid "about a minute ago"
+#: actions/othersettings.php:71
+msgid "Manage various other options."
 msgstr ""
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
-msgid "about a month ago"
+#: actions/othersettings.php:108
+msgid " (free service)"
 msgstr ""
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
-msgid "about a year ago"
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
 msgstr ""
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
-msgid "about an hour ago"
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
 msgstr ""
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
+#: actions/othersettings.php:122
+msgid "View profile designs"
 msgstr ""
 
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117 actions/noticesearch.php:136
-#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
-msgid "in reply to..."
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
 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 actions/noticesearch.php:194
-msgid "reply"
-msgstr ""
+#: actions/othersettings.php:153
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Η τοποθεσία είναι πολύ μεγάλη (μέγιστο 255 χαρακτ.)."
 
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-msgid "same as password above"
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %s - page %d"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
-msgid "unsupported file type"
+#: actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
 msgstr ""
 
-#: ../lib/util.php:1309 lib/util.php:1443
-msgid "« After"
+#: actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
 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
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "Αλλαγή κωδικού"
 
-#: actions/disfavor.php:55 actions/disfavor.php:81
-msgid "This notice is not a favorite!"
-msgstr ""
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "Αλλαγή κωδικού"
 
-#: actions/disfavor.php:63 actions/disfavor.php:87
-msgid "Could not delete favorite."
-msgstr ""
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#, fuzzy
+msgid "Password change"
+msgstr "Ο κωδικός αποθηκεύτηκε."
 
-#: actions/disfavor.php:72 lib/favorform.php:140
-msgid "Favor"
+#: actions/passwordsettings.php:104
+msgid "Old password"
 msgstr ""
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
-msgstr ""
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "Νέος κωδικός"
 
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-msgid "Send me email when someone sends me a private message."
-msgstr ""
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6 ή περισσότεροι χαρακτήρες"
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
-msgid "This notice is already a favorite!"
-msgstr ""
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "Επιβεβαίωση"
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132 actions/favor.php:86
-#: actions/twitapifavorites.php:125 classes/Command.php:152
-msgid "Could not create favorite."
+#: actions/passwordsettings.php:113
+msgid "same as password above"
 msgstr ""
 
-#: actions/favor.php:70
-msgid "Disfavor"
-msgstr ""
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "Αλλαγή"
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
-#, php-format
-msgid "%s favorite notices"
+#: actions/passwordsettings.php:154 actions/register.php:230
+msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
-#, php-format
-msgid "Feed of favorite notices of %s"
-msgstr ""
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "Οι κωδικοί δεν ταυτίζονται."
 
-#: actions/inbox.php:28 actions/inbox.php:59
-#, php-format
-msgid "Inbox for %s - page %d"
-msgstr ""
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "Λάθος παλιός κωδικός"
 
-#: actions/inbox.php:30 actions/inbox.php:62
-#, php-format
-msgid "Inbox for %s"
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
 msgstr ""
 
-#: actions/inbox.php:53 actions/inbox.php:115
-msgid "This is your inbox, which lists your incoming private messages."
-msgstr ""
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "Αδύνατη η αποθήκευση του νέου κωδικού"
+
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "Ο κωδικός αποθηκεύτηκε."
 
-#: actions/invite.php:178 actions/invite.php:213
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+"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/login.php:104 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-msgid "Automatically login in the future; "
+#: actions/peoplesearch.php:58
+msgid "People search"
 msgstr ""
 
-#: actions/login.php:122 actions/login.php:264
-msgid "For security reasons, please re-enter your "
+#: actions/peopletag.php:70
+#, php-format
+msgid "Not a valid people tag: %s"
 msgstr ""
 
-#: actions/login.php:126 actions/login.php:268
-msgid "Login with your username and password. "
+#: actions/peopletag.php:144
+#, php-format
+msgid "Users self-tagged with %s - page %d"
 msgstr ""
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
-msgid "That's too long. Max message size is 140 chars."
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
 msgstr ""
 
-#: actions/newmessage.php:65 actions/newmessage.php:128
-msgid "No recipient specified."
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206 actions/newmessage.php:131
-#: actions/newmessage.php:168 classes/Command.php:237
-msgid "You can't send a message to this user."
+#: actions/profilesettings.php:60
+msgid "Profile settings"
 msgstr ""
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: actions/profilesettings.php:71
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
+"You can update your personal profile info here so people know more about you."
 msgstr ""
 
-#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
-msgid "No such user"
+#: actions/profilesettings.php:99
+msgid "Profile information"
 msgstr ""
 
-#: actions/newmessage.php:117 actions/newmessage.php:67
-msgid "New message"
-msgstr ""
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64 μικρά γράμματα ή αριθμοί, χωρίς σημεία στίξης ή κενά"
 
-#: actions/noticesearch.php:95 actions/noticesearch.php:146
-msgid "Notice without matching profile"
-msgstr ""
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full name"
+msgstr "Ονοματεπώνυμο"
 
-#: actions/openidsettings.php:28 actions/openidsettings.php:70
-#, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr ""
+#: actions/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "Αρχική σελίδα"
 
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr ""
+#: actions/profilesettings.php:122 actions/register.php:460
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Περιέγραψε τον εαυτό σου και τα ενδιαφέροντά σου σε 140 χαρακτήρες"
 
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-msgid "You can remove an OpenID from your account "
-msgstr ""
+#: actions/profilesettings.php:125 actions/register.php:463
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Περιέγραψε τον εαυτό σου και τα ενδιαφέροντά σου σε 140 χαρακτήρες"
 
-#: actions/outbox.php:28 actions/outbox.php:58
-#, php-format
-msgid "Outbox for %s - page %d"
-msgstr ""
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "Βιογραφικό"
 
-#: actions/outbox.php:30 actions/outbox.php:61
-#, php-format
-msgid "Outbox for %s"
-msgstr ""
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "Τοποθεσία"
 
-#: actions/outbox.php:53 actions/outbox.php:116
-msgid "This is your outbox, which lists private messages you have sent."
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
-#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
-#, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
 msgstr ""
 
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
-msgid "You can update your personal profile info here "
+#: actions/profilesettings.php:140
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
-msgid "User without matching profile"
+#: actions/profilesettings.php:144
+msgid "Language"
 msgstr ""
 
-#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
+#: actions/profilesettings.php:145
+msgid "Preferred language"
 msgstr ""
 
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
+#: actions/profilesettings.php:154
+msgid "Timezone"
 msgstr ""
 
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a "
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
 msgstr ""
 
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-msgid "Your nickname on this server, "
+#: actions/profilesettings.php:160
+#, fuzzy
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
+"Αυτόματα γίνε συνδρομητής σε όσους γίνονται συνδρομητές σε μένα  (χρήση "
+"κυρίως από λογισμικό και όχι ανθρώπους)"
 
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-msgid "Instructions for recovering your password "
-msgstr ""
+#: actions/profilesettings.php:221 actions/register.php:223
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Το βιογραφικό είναι πολύ μεγάλο (μέγιστο 140 χαρακτ.)."
 
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
-msgid "New password successfully saved. "
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
 msgstr ""
 
-#: actions/register.php:95 actions/register.php:180
-msgid "Password must be 6 or more characters."
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
 msgstr ""
 
-#: actions/register.php:216
+#: actions/profilesettings.php:246 actions/tagother.php:178
 #, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
+msgid "Invalid tag: \"%s\""
 msgstr ""
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
-msgstr ""
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
+msgstr "Απέτυχε η ενημέρωση του χρήστη για την αυτόματη συνδρομή."
 
-#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
-#, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr ""
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+msgstr "Απέτυχε η αποθήκευση του προφίλ."
 
-#: actions/showfavorites.php:61 actions/showfavorites.php:145
-#, php-format
-msgid "Feed for favorites of %s"
-msgstr ""
+#: actions/profilesettings.php:336
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Αδύνατη η αποθήκευση του προφίλ."
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-msgid "Could not retrieve favorite notices."
+#: actions/profilesettings.php:344
+msgid "Settings saved."
 msgstr ""
 
-#: actions/showmessage.php:33 actions/showmessage.php:81
-msgid "No such message."
+#: actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
 msgstr ""
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
 msgstr ""
 
-#: actions/showmessage.php:61 actions/showmessage.php:108
+#: actions/public.php:129
 #, php-format
-msgid "Message to %1$s on %2$s"
+msgid "Public timeline, page %d"
 msgstr ""
 
-#: actions/showmessage.php:66 actions/showmessage.php:113
-#, php-format
-msgid "Message from %1$s on %2$s"
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
 msgstr ""
 
-#: actions/showstream.php:154
-msgid "Send a message"
+#: actions/public.php:151
+msgid "Public Stream Feed (RSS 1.0)"
 msgstr ""
 
-#: actions/smssettings.php:312 actions/smssettings.php:464
-#, php-format
-msgid "Mobile carrier for your phone. "
+#: actions/public.php:155
+msgid "Public Stream Feed (RSS 2.0)"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
-#, php-format
-msgid "Direct messages to %s"
-msgstr ""
+#: actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Δημόσια ροή %s"
 
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/public.php:179
 #, php-format
-msgid "All the direct messages sent to %s"
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-msgid "Direct Messages You've Sent"
+#: actions/public.php:182
+msgid "Be the first to post!"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/public.php:186
 #, php-format
-msgid "All the direct messages sent from %s"
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-msgid "No message text!"
+#: actions/public.php:233
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-msgid "Recipient user not found."
+#: actions/public.php:238
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
 msgstr ""
 
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-msgid "Can't send direct messages to users who aren't your friend."
+#: actions/publictagcloud.php:57
+msgid "Public tag cloud"
 msgstr ""
 
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "%s / Favorites from %s"
+msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/publictagcloud.php:69
 #, php-format
-msgid "%s updates favorited by %s / %s."
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
-#, php-format
-msgid "%s added your notice as a favorite"
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
 msgstr ""
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
+#: actions/publictagcloud.php:75
 #, 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 actions/twittersettings.php:60
-msgid "Twitter settings"
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
 msgstr ""
 
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-msgid "Twitter Account"
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
 msgstr ""
 
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-msgid "Current verified Twitter account."
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
 msgstr ""
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
 msgstr ""
 
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-msgid "No spaces, please."
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
 msgstr ""
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
 msgstr ""
 
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-msgid "Automatically send my notices to Twitter."
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
 msgstr ""
 
-#: actions/twittersettings.php:75 actions/twittersettings.php:146
-msgid "Send local \"@\" replies to Twitter."
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
 msgstr ""
 
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-msgid "Subscribe to my Twitter friends here."
-msgstr ""
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
+msgstr "Απέτυχε η ενημέρωση χρήστη μέσω επιβεβαιωμένης email διεύθυνσης."
 
-#: actions/twittersettings.php:122
+#: actions/recoverpassword.php:152
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
 msgstr ""
 
-#: actions/twittersettings.php:128 actions/twittersettings.php:334
-msgid "Could not verify your Twitter credentials!"
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
-#: actions/twittersettings.php:137
-#, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
 msgstr ""
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-msgid "Unable to save your Twitter settings!"
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
 msgstr ""
 
-#: actions/twittersettings.php:174 actions/twittersettings.php:376
-msgid "Twitter settings saved."
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-msgid "That is not your Twitter account."
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
 msgstr ""
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
-msgid "Couldn't remove Twitter user."
+#: actions/recoverpassword.php:208
+msgid "Reset password"
 msgstr ""
 
-#: actions/twittersettings.php:212 actions/twittersettings.php:407
-msgid "Twitter account removed."
+#: actions/recoverpassword.php:209
+msgid "Recover password"
 msgstr ""
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
-msgid "Couldn't save Twitter preferences."
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
 msgstr ""
 
-#: actions/twittersettings.php:245 actions/twittersettings.php:461
-msgid "Twitter preferences saved."
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
 msgstr ""
 
-#: actions/userauthorization.php:84 actions/userauthorization.php:86
-msgid "Please check these details to make sure "
-msgstr ""
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 ή περισσότεροι χαρακτήρες και μην το ξεχάσετε!"
 
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
-msgid "The subscription has been authorized, but no "
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
 msgstr ""
 
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-msgid "The subscription has been rejected, but no "
+#: actions/recoverpassword.php:243
+msgid "Reset"
 msgstr ""
 
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-msgid "Command results"
-msgstr ""
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "Εισάγετε ψευδώνυμο ή διεύθυνση email."
 
-#: classes/Channel.php:148 classes/Channel.php:204
-msgid "Command complete"
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
 msgstr ""
 
-#: classes/Channel.php:158 classes/Channel.php:215
-msgid "Command failed"
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
 msgstr ""
 
-#: classes/Command.php:39 classes/Command.php:44
-msgid "Sorry, this command is not yet implemented."
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
 msgstr ""
 
-#: classes/Command.php:96 classes/Command.php:113
-#, php-format
-msgid "Subscriptions: %1$s\n"
+#: actions/recoverpassword.php:325
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
 msgstr ""
+"Οδηγίες για την ανάκτηση του κωδικού σας έχουν σταλεί στην διεύθυνση email "
+"που έχετε καταχωρίσει στον λογαριασμό σας."
 
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
-msgid "User has no last notice"
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
 msgstr ""
 
-#: classes/Command.php:146 classes/Command.php:166
-msgid "Notice marked as fave."
-msgstr ""
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "Ο κωδικός πρέπει να είναι 6 χαρακτήρες ή περισσότεροι."
 
-#: classes/Command.php:166 classes/Command.php:189
-#, php-format
-msgid "%1$s (%2$s)"
-msgstr ""
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
+msgstr "Ο κωδικός και η επιβεβαίωση του δεν ταυτίζονται."
 
-#: classes/Command.php:169 classes/Command.php:192
-#, php-format
-msgid "Fullname: %s"
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
-#: classes/Command.php:172 classes/Command.php:195
-#, php-format
-msgid "Location: %s"
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: classes/Command.php:175 classes/Command.php:198
-#, php-format
-msgid "Homepage: %s"
+#: actions/register.php:92
+msgid "Sorry, invalid invitation code."
 msgstr ""
 
-#: classes/Command.php:178 classes/Command.php:201
-#, php-format
-msgid "About: %s"
+#: actions/register.php:112
+msgid "Registration successful"
 msgstr ""
 
-#: classes/Command.php:200 classes/Command.php:228
-#, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
 msgstr ""
 
-#: classes/Command.php:214 classes/Command.php:245
-#, php-format
-msgid "Direct message to %s sent"
+#: actions/register.php:135
+msgid "Registration not allowed."
 msgstr ""
 
-#: classes/Command.php:216 classes/Command.php:247
-msgid "Error sending direct message."
+#: actions/register.php:198
+msgid "You can't register if you don't agree to the license."
 msgstr ""
 
-#: classes/Command.php:263 classes/Command.php:300
-msgid "Specify the name of the user to subscribe to"
+#: actions/register.php:201
+msgid "Not a valid email address."
 msgstr ""
 
-#: classes/Command.php:270 classes/Command.php:307
-#, php-format
-msgid "Subscribed to %s"
-msgstr ""
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "Η διεύθυνση email υπάρχει ήδη."
 
-#: classes/Command.php:288 classes/Command.php:328
-msgid "Specify the name of the user to unsubscribe from"
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
 msgstr ""
 
-#: classes/Command.php:295 classes/Command.php:335
-#, php-format
-msgid "Unsubscribed from %s"
+#: actions/register.php:342
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
-msgid "Command not yet implemented."
-msgstr ""
+#: actions/register.php:424
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr "1-64 μικρά γράμματα ή αριθμοί, χωρίς σημεία στίξης ή κενά. Απαραίτητο."
 
-#: classes/Command.php:313 classes/Command.php:356
-msgid "Notification off."
-msgstr ""
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr "6 ή περισσότεροι χαρακτήρες. Απαραίτητο."
 
-#: classes/Command.php:315 classes/Command.php:358
-msgid "Can't turn off notification."
+#: actions/register.php:433
+msgid "Same as password above. Required."
 msgstr ""
 
-#: classes/Command.php:333 classes/Command.php:379
-msgid "Notification on."
-msgstr ""
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "Email"
 
-#: classes/Command.php:335 classes/Command.php:381
-msgid "Can't turn on notification."
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
-#: classes/Message.php:53 classes/Message.php:56
-msgid "Could not insert message."
+#: actions/register.php:493
+msgid "My text and files are available under "
 msgstr ""
 
-#: classes/Message.php:63 classes/Message.php:66
-msgid "Could not update message with new URI."
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
+#: actions/register.php:496
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
 msgstr ""
+"εκτός από τα εξής προσωπικά δεδομένα: κωδικός πρόσβασης, διεύθυνση email, "
+"διεύθυνση IM, τηλεφωνικό νούμερο."
 
-#: lib/mail.php:147 lib/mail.php:289
-#, php-format
+#: actions/register.php:537
+#, fuzzy, php-format
 msgid ""
-"You have a new posting address on %1$s.\n"
+"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"
+"* Πας στο [your profile](%s) και να στείλεις το πρώτο σου μήνυμα.\n"
+"* Προσθέσεις ένα [Jabber/GTalk address](%%%%action.imsettings%%%%) ώστε να "
+"δέχεσε μηνύματα στο instant messager σου.\n"
+"* [Search for people](%%%%action.peoplesearch%%%%) που μπορεί να ξέρεις ή "
+"που έχουν τα ίδια ενδιαφέροντα με σένα. \n"
+"* Ενημερώσεις το προφίλ σου [profile settings](%%%%action.profilesettings%%%"
+"%) για να μάθουν οι άλλοι περισσότερα για σένα. \n"
+"* Διαβάσεις τα [online docs](%%%%doc.help%%%%) για λειτουργίες που μπορεί να "
+"μην έχεις μάθει ακόμα. \n"
+"\n"
+"Ευχαριστούμε που εγγράφηκες και ευχόμαστε να περάσεις καλά με την υπηρεσία "
+"μας."
 
-#: lib/mail.php:249 lib/mail.php:508
-#, php-format
-msgid "New private message from %s"
+#: actions/register.php:561
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
 msgstr ""
+"(Σύντομα θα λάβετε μέσω ηλεκτρονικού ταχυδρομείου ένα μήνυμα με οδηγίες για "
+"την επιβεβαίωση της ηλεκτρονικής σας διεύθυνσης.)"
 
-#: lib/mail.php:253 lib/mail.php:512
+#: actions/remotesubscribe.php:98
 #, php-format
 msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+"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 ""
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
 msgstr ""
 
-#: lib/openid.php:195 lib/openid.php:203
-msgid "This form should automatically submit itself. "
-msgstr ""
+#: actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Γίνε συνδρομητής αυτού του χρήστη"
 
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-msgid "Favorites"
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
 msgstr ""
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-#, php-format
-msgid "%s's favorite notices"
-msgstr ""
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr "Το ψευδώνυμο του χρήστη που θέλετε να παρακολουθήσετε"
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-msgid "User"
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
 msgstr ""
 
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-msgid "Inbox"
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-msgid "Your incoming messages"
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
 msgstr ""
 
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-msgid "Outbox"
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
 msgstr ""
 
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-msgid "Your sent messages"
+#: actions/remotesubscribe.php:168
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
 msgstr ""
 
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-msgid "Twitter"
+#: actions/remotesubscribe.php:176
+msgid "That’s a local profile! Login to subscribe."
 msgstr ""
 
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
-msgstr ""
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "Απέτυχε η μετατροπή αιτούμενων tokens σε tokens πρόσβασης."
 
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-msgid "To"
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
+#, php-format
+msgid "Replies to %s"
 msgstr ""
 
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-msgid "Could not parse message."
+#: actions/replies.php:127
+#, php-format
+msgid "Replies to %s, page %d"
 msgstr ""
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/replies.php:144
 #, fuzzy, php-format
-msgid "%s and friends, page %d"
-msgstr "%s και οι φίλοι του/της"
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Ροή φίλων του/της %s"
 
-#: actions/avatarsettings.php:76
-msgid "You can upload your personal avatar."
-msgstr ""
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Ροή φίλων του/της %s"
 
-#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
-#, fuzzy
-msgid "Avatar settings"
-msgstr "Ρυθμίσεις OpenID"
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Ροή φίλων του/της %s"
 
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-msgid "Original"
+#: actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
 msgstr ""
 
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-msgid "Preview"
+#: actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
 msgstr ""
 
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
-msgid "Crop"
+#: actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-msgid "There was a problem with your session token. "
+#: actions/repliesrss.php:72
+#, php-format
+msgid "Replies to %1$s on %2$s!"
 msgstr ""
 
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-msgid "Pick a square area of the image to be your avatar"
-msgstr ""
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "%s και οι φίλοι του/της"
 
-#: actions/avatarsettings.php:327 actions/grouplogo.php:384
-msgid "Lost our file data."
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
 msgstr ""
 
-#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
-#, fuzzy
-msgid "Lost our file."
-msgstr "Αδύνατη η αποθήκευση του προφίλ."
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Ροή φίλων του/της %s"
 
-#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
-#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
-msgid "Unknown file type"
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Ροή φίλων του/της %s"
+
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Ροή φίλων του/της %s"
+
+#: actions/showfavorites.php:205
+msgid ""
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""
 
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
+#: actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
 msgstr ""
 
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
 msgstr ""
 
-#: actions/block.php:111
-msgid "Block user"
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
 msgstr ""
 
-#: actions/block.php:129
-msgid "Are you sure you want to block this user? "
+#: actions/showgroup.php:82 lib/groupnav.php:86
+#, php-format
+msgid "%s group"
 msgstr ""
 
-#: actions/block.php:162
-msgid "You have already blocked this user."
+#: actions/showgroup.php:84
+#, php-format
+msgid "%s group, page %d"
 msgstr ""
 
-#: actions/block.php:167
-msgid "Failed to save block information."
+#: actions/showgroup.php:218
+#, fuzzy
+msgid "Group profile"
+msgstr "Αδύνατη η αποθήκευση του προφίλ."
+
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
+msgid "URL"
 msgstr ""
 
-#: actions/confirmaddress.php:159
-#, php-format
-msgid "The address \"%s\" has been "
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
+msgid "Note"
 msgstr ""
 
-#: actions/deletenotice.php:73
-msgid "You are about to permanently delete a notice. "
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
 msgstr ""
 
-#: actions/disfavor.php:94
-msgid "Add to favorites"
+#: actions/showgroup.php:293
+msgid "Group actions"
 msgstr ""
 
-#: actions/editgroup.php:54
+#: actions/showgroup.php:328
 #, php-format
-msgid "Edit %s group"
+msgid "Notice feed for %s group (RSS 1.0)"
 msgstr ""
 
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-msgid "Inboxes must be enabled for groups to work"
+#: actions/showgroup.php:334
+#, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
 msgstr ""
 
-#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-msgid "You must be logged in to create a group."
+#: actions/showgroup.php:340
+#, php-format
+msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
-#: actions/editgroup.php:87 actions/grouplogo.php:87
-#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
-#, fuzzy
-msgid "No nickname"
-msgstr "Νέο ψευδώνυμο"
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "Αδύνατη η αποθήκευση του προφίλ."
 
-#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
-#: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
 #, fuzzy
-msgid "No such group"
-msgstr "Αδύνατη η αποθήκευση του προφίλ."
+msgid "Members"
+msgstr "Μέλος από"
 
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
-msgid "You must be an admin to edit the group"
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/tagcloudsection.php:71
+msgid "(None)"
 msgstr ""
 
-#: actions/editgroup.php:157
-msgid "Use this form to edit the group."
+#: actions/showgroup.php:392
+msgid "All members"
 msgstr ""
 
-#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
-#, fuzzy
-msgid "Nickname must have only lowercase letters "
-msgstr "Το ψευδώνυμο πρέπει να έχει μόνο πεζούς χαρακτήρες και χωρίς κενά."
-
-#: actions/editgroup.php:198 actions/newgroup.php:149
-#, fuzzy
-msgid "description is too long (max 140 chars)."
-msgstr "Το βιογραφικό είναι πολύ μεγάλο (μέγιστο 140 χαρακτ.)."
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr ""
 
-#: actions/editgroup.php:218
+#: actions/showgroup.php:432
 #, fuzzy
-msgid "Could not update group."
-msgstr "Αδύνατη η αποθήκευση του προφίλ."
+msgid "Created"
+msgstr "Δημιουργία"
 
-#: actions/editgroup.php:226
-msgid "Options saved."
+#: actions/showgroup.php:448
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/emailsettings.php:107 actions/imsettings.php:108
+#: actions/showgroup.php:454
 #, php-format
-msgid "Awaiting confirmation on this address. "
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
 msgstr ""
 
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-msgid "Make a new email address for posting to; "
-msgstr ""
+#: actions/showgroup.php:482
+#, fuzzy
+msgid "Admins"
+msgstr "Διαχειριστής"
 
-#: actions/emailsettings.php:157
-msgid "Send me email when someone "
+#: actions/showmessage.php:81
+msgid "No such message."
 msgstr ""
 
-#: actions/emailsettings.php:168
-msgid "Allow friends to nudge me and send me an email."
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: actions/emailsettings.php:321
-#, fuzzy
-msgid "That email address already belongs "
-msgstr "Η διεύθυνση email υπάρχει ήδη."
-
-#: actions/emailsettings.php:343
-msgid "A confirmation code was sent to the email address you added. "
+#: actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: actions/facebookhome.php:110
-msgid "Server error - couldn't get user!"
+#: actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/facebookhome.php:196
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Ρυθμίσεις OpenID"
+
+#: actions/showstream.php:73
 #, php-format
-msgid "If you would like the %s app to automatically update "
+msgid " tagged %s"
 msgstr ""
 
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#: actions/showstream.php:79
 #, php-format
-msgid "Allow %s to update my Facebook status"
+msgid "%s, page %d"
 msgstr ""
 
-#: actions/facebookhome.php:218
-msgid "Skip"
+#: actions/showstream.php:122
+#, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
 msgstr ""
 
-#: actions/facebookhome.php:235
-msgid "No notice content!"
+#: actions/showstream.php:129
+#, php-format
+msgid "Notice feed for %s (RSS 1.0)"
 msgstr ""
 
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-msgid "Pagination"
+#: actions/showstream.php:136
+#, php-format
+msgid "Notice feed for %s (RSS 2.0)"
 msgstr ""
 
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-msgid "After"
+#: actions/showstream.php:143
+#, php-format
+msgid "Notice feed for %s (Atom)"
 msgstr ""
 
-#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
-msgid "Before"
+#: actions/showstream.php:148
+#, php-format
+msgid "FOAF for %s"
 msgstr ""
 
-#: actions/facebookinvite.php:70
+#: actions/showstream.php:191
 #, php-format
-msgid "Thanks for inviting your friends to use %s"
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
 msgstr ""
 
-#: actions/facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
 msgstr ""
 
-#: actions/facebookinvite.php:96
+#: actions/showstream.php:198
 #, php-format
-msgid "You have been invited to %s"
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: actions/facebookinvite.php:105
-#, fuzzy, php-format
-msgid "Invite your friends to use %s"
-msgstr "Ροή φίλων του/της %s"
-
-#: actions/facebookinvite.php:113
+#: actions/showstream.php:234
 #, php-format
-msgid "Friends already using %s:"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/facebookinvite.php:130
+#: actions/showstream.php:239
 #, php-format
-msgid "Send invitations"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
 msgstr ""
 
-#: actions/facebookremove.php:56
-msgid "Couldn't remove Facebook user."
+#: actions/smssettings.php:58
+msgid "SMS Settings"
 msgstr ""
 
-#: actions/facebooksettings.php:65
-msgid "There was a problem saving your sync preferences!"
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: actions/facebooksettings.php:67
+#: actions/smssettings.php:91
 #, fuzzy
-msgid "Sync preferences saved."
-msgstr "Οι προτιμήσεις αποθηκεύτηκαν"
+msgid "SMS is not available."
+msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL."
+
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Τρέχων επιβεβαιωμένο, μέσω SMS, νούμερο κινητού τηλεφώνου."
 
-#: actions/facebooksettings.php:90
-msgid "Automatically update my Facebook status with my notices."
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
+msgstr "Αναμένωντας επιβεβαίωση σ' αυτό το νούμερο τηλεφώνου."
+
+#: actions/smssettings.php:130
+msgid "Confirmation code"
 msgstr ""
 
-#: actions/facebooksettings.php:97
-msgid "Send \"@\" replies to Facebook."
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
 msgstr ""
 
-#: actions/facebooksettings.php:106
-msgid "Prefix"
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
 msgstr ""
 
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
-#: actions/facebooksettings.php:124
-#, php-format
-msgid "If you would like %s to automatically update "
+#: actions/smssettings.php:174
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
 msgstr ""
 
-#: actions/facebooksettings.php:147
-#, fuzzy
-msgid "Sync preferences"
-msgstr "Προτιμήσεις"
+#: actions/smssettings.php:306
+msgid "No phone number."
+msgstr ""
 
-#: actions/favor.php:94 lib/disfavorform.php:140
-msgid "Disfavor favorite"
+#: actions/smssettings.php:311
+msgid "No carrier selected."
 msgstr ""
 
-#: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
-msgid "Popular notices"
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
 msgstr ""
 
-#: actions/favorited.php:67
-#, php-format
-msgid "Popular notices, page %d"
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
 msgstr ""
 
-#: actions/favorited.php:79
-msgid "The most popular notices on the site right now."
+#: actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
 msgstr ""
+"Έχει αποσταλεί ένας κωδικός επιβεβαίωσης στο τηλεφωνικό νούμερο που "
+"προσθέσατε. Ελέγξτε τα εισερχόμενα (και τον φάκελο ανεπιθύμητης "
+"αλληλογραφίας) για τον κωδικό και για το πως να τον χρησιμοποιήσετε."
 
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
-msgid "Featured users"
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
 msgstr ""
 
-#: actions/featured.php:71
-#, php-format
-msgid "Featured users, page %d"
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
 msgstr ""
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some of the great users on %s"
+#: actions/smssettings.php:465
+msgid "Mobile carrier"
 msgstr ""
 
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
+#: actions/smssettings.php:469
+msgid "Select a carrier"
 msgstr ""
 
-#: actions/groupbyid.php:79
-msgid "No ID"
+#: actions/smssettings.php:476
+#, 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/grouplogo.php:138 actions/grouplogo.php:191
-msgid "Group logo"
+#: actions/smssettings.php:498
+msgid "No code entered"
 msgstr ""
 
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
+#: actions/subedit.php:70
+msgid "You are not subscribed to that profile."
 msgstr ""
 
-#: actions/grouplogo.php:448
+#: actions/subedit.php:83
 #, fuzzy
-msgid "Logo updated."
-msgstr "Αποσύνδεση"
+msgid "Could not save subscription."
+msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ"
 
-#: actions/grouplogo.php:450
-msgid "Failed updating logo."
+#: actions/subscribe.php:55
+msgid "Not a local user."
 msgstr ""
 
-#: actions/groupmembers.php:93 lib/groupnav.php:91
-#, php-format
-msgid "%s group members"
+#: actions/subscribe.php:69
+msgid "Subscribed"
 msgstr ""
 
-#: actions/groupmembers.php:96
+#: actions/subscribers.php:50
 #, php-format
-msgid "%s group members, page %d"
+msgid "%s subscribers"
 msgstr ""
 
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %d"
 msgstr ""
 
-#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
-msgid "Groups"
+#: actions/subscribers.php:63
+msgid "These are the people who listen to your notices."
 msgstr ""
 
-#: actions/groups.php:64
+#: actions/subscribers.php:67
 #, php-format
-msgid "Groups, page %d"
+msgid "These are the people who listen to %s's notices."
 msgstr ""
 
-#: actions/groups.php:90
-#, php-format
-msgid "%%%%site.name%%%% groups let you find and talk with "
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
 msgstr ""
 
-#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-#, fuzzy
-msgid "Create a new group"
-msgstr "Δημιουργία νέου λογαριασμού"
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr ""
 
-#: actions/groupsearch.php:57
+#: actions/subscribers.php:114
 #, php-format
 msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
 msgstr ""
 
-#: actions/groupsearch.php:63
-msgid "Group search"
+#: actions/subscriptions.php:52
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ"
+
+#: actions/subscriptions.php:54
+#, php-format
+msgid "%s subscriptions, page %d"
 msgstr ""
 
-#: actions/imsettings.php:70
-msgid "You can send and receive notices through "
+#: actions/subscriptions.php:65
+msgid "These are the people whose notices you listen to."
 msgstr ""
 
-#: actions/imsettings.php:120
+#: actions/subscriptions.php:69
 #, php-format
-msgid "Jabber or GTalk address, "
+msgid "These are the people whose notices %s listens to."
 msgstr ""
 
-#: actions/imsettings.php:147
-msgid "Send me replies through Jabber/GTalk "
+#: actions/subscriptions.php:121
+#, php-format
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
 msgstr ""
 
-#: actions/imsettings.php:321
-#, fuzzy, php-format
-msgid "A confirmation code was sent "
-msgstr "Ο κωδικός επιβεβαίωσης δεν βρέθηκε."
-
-#: actions/joingroup.php:65
-msgid "You must be logged in to join a group."
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, php-format
+msgid "%s is not listening to anyone."
 msgstr ""
 
-#: actions/joingroup.php:95
-msgid "You are already a member of that group"
+#: actions/subscriptions.php:194
+msgid "Jabber"
 msgstr ""
 
-#: actions/joingroup.php:128
-#, php-format
-msgid "Could not join user %s to group %s"
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
 msgstr ""
 
-#: actions/joingroup.php:135
-#, php-format
-msgid "%s joined group %s"
+#: actions/tagother.php:33
+msgid "Not logged in"
 msgstr ""
 
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
+#: actions/tagother.php:39
+msgid "No id argument."
 msgstr ""
 
-#: actions/leavegroup.php:65
-msgid "You must be logged in to leave a group."
+#: actions/tagother.php:65
+#, php-format
+msgid "Tag %s"
 msgstr ""
 
-#: actions/leavegroup.php:88
+#: actions/tagother.php:77 lib/userprofile.php:75
 #, fuzzy
-msgid "No such group."
+msgid "User profile"
 msgstr "Αδύνατη η αποθήκευση του προφίλ."
 
-#: actions/leavegroup.php:95
-msgid "You are not a member of that group."
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
 msgstr ""
 
-#: actions/leavegroup.php:100
-msgid "You may not leave a group while you are its administrator."
+#: actions/tagother.php:141
+msgid "Tag user"
 msgstr ""
 
-#: actions/leavegroup.php:130
-msgid "Could not find membership record."
+#: actions/tagother.php:151
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
 msgstr ""
 
-#: actions/leavegroup.php:138
-#, php-format
-msgid "Could not remove user %s to group %s"
+#: actions/tagother.php:193
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/leavegroup.php:145
-#, php-format
-msgid "%s left group %s"
-msgstr ""
+#: actions/tagother.php:200
+#, fuzzy
+msgid "Could not save tags."
+msgstr "Αδύνατη η αποθήκευση του προφίλ."
 
-#: actions/login.php:225 lib/facebookaction.php:304
-msgid "Login to site"
+#: actions/tagother.php:236
+msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/microsummary.php:69
-msgid "No current status"
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
 msgstr ""
 
-#: actions/newgroup.php:53
-msgid "New group"
+#: actions/tag.php:86
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr ""
 
-#: actions/newgroup.php:115
-msgid "Use this form to create a new group."
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Ροή φίλων του/της %s"
+
+#: actions/tag.php:98
+#, php-format
+msgid "Notice feed for tag %s (Atom)"
 msgstr ""
 
-#: actions/newgroup.php:177
-#, fuzzy
-msgid "Could not create group."
-msgstr "Αδύνατη η αποθήκευση του προφίλ."
+#: actions/tagrss.php:35
+msgid "No such tag."
+msgstr ""
 
-#: actions/newgroup.php:191
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ"
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
+msgstr "Η μέθοδος του ΑΡΙ είναι υπό κατασκευή."
 
-#: actions/newmessage.php:119 actions/newnotice.php:132
-msgid "That's too long. "
+#: actions/unsubscribe.php:77
+msgid "No profile id in request."
 msgstr ""
 
-#: actions/newmessage.php:134
-msgid "Don't send a message to yourself; "
+#: actions/unsubscribe.php:84
+msgid "No profile with that id."
 msgstr ""
 
-#: actions/newnotice.php:166
-msgid "Notice posted"
+#: actions/unsubscribe.php:98
+msgid "Unsubscribed"
 msgstr ""
 
-#: actions/newnotice.php:200 classes/Channel.php:163
-msgid "Ajax Error"
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
-#: actions/nudge.php:85
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "Εξουσιοδοτημένη συνδρομή"
+
+#: actions/userauthorization.php:110
 msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
 msgstr ""
 
-#: actions/nudge.php:94
-msgid "Nudge sent"
+#: actions/userauthorization.php:188
+msgid "License"
 msgstr ""
 
-#: actions/nudge.php:97
-msgid "Nudge sent!"
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "Αποδοχή"
+
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Γίνε συνδρομητής αυτού του χρήστη"
+
+#: actions/userauthorization.php:211
+msgid "Reject"
 msgstr ""
 
-#: actions/openidlogin.php:97
+#: actions/userauthorization.php:212
 #, fuzzy
-msgid "OpenID login"
-msgstr "Ρυθμίσεις OpenID"
+msgid "Reject this subscription"
+msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ"
 
-#: actions/openidsettings.php:128
-msgid "Removing your only OpenID "
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
 msgstr ""
 
-#: actions/othersettings.php:60
-#, fuzzy
-msgid "Other Settings"
-msgstr "Ρυθμίσεις OpenID"
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+msgstr ""
 
-#: actions/othersettings.php:71
-msgid "Manage various other options."
+#: actions/userauthorization.php:249
+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/othersettings.php:93
-msgid "URL Auto-shortening"
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
 msgstr ""
 
-#: actions/othersettings.php:112
-msgid "Service"
+#: actions/userauthorization.php:261
+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/othersettings.php:113
-msgid "Automatic shortening service to use."
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
 msgstr ""
 
-#: actions/othersettings.php:144
-#, fuzzy
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "Η τοποθεσία είναι πολύ μεγάλη (μέγιστο 255 χαρακτ.)."
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
 
-#: actions/passwordsettings.php:69
-#, fuzzy
-msgid "Change your password."
-msgstr "Αλλαγή κωδικού"
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
 
-#: actions/passwordsettings.php:89
-#, fuzzy
-msgid "Password change"
-msgstr "Ο κωδικός αποθηκεύτηκε."
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
 
-#: actions/peopletag.php:35
+#: actions/userauthorization.php:338
 #, php-format
-msgid "Not a valid people tag: %s"
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr ""
 
-#: actions/peopletag.php:47
+#: actions/userauthorization.php:343
 #, php-format
-msgid "Users self-tagged with %s - page %d"
+msgid "Can’t read avatar URL ‘%s’."
 msgstr ""
 
-#: actions/peopletag.php:91
+#: actions/userauthorization.php:348
 #, php-format
-msgid "These are users who have tagged themselves \"%s\" "
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr ""
 
-#: actions/profilesettings.php:91
-msgid "Profile information"
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr ""
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+msgid "Profile design"
 msgstr ""
 
-#: actions/profilesettings.php:124
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
 msgstr ""
 
-#: actions/profilesettings.php:144
-msgid "Automatically subscribe to whoever "
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
 msgstr ""
 
-#: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/usergroups.php:64
 #, php-format
-msgid "Invalid tag: \"%s\""
+msgid "%s groups, page %d"
 msgstr ""
 
-#: actions/profilesettings.php:311
-#, fuzzy
-msgid "Couldn't save tags."
-msgstr "Αδύνατη η αποθήκευση του προφίλ."
+#: actions/usergroups.php:130
+msgid "Search for more groups"
+msgstr ""
 
-#: actions/public.php:107
+#: actions/usergroups.php:153
 #, php-format
-msgid "Public timeline, page %d"
+msgid "%s is not a member of any group."
 msgstr ""
 
-#: actions/public.php:173
-msgid "Could not retrieve public stream."
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
 
-#: actions/public.php:220
+#: classes/File.php:137
 #, php-format
 msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
 msgstr ""
 
-#: actions/publictagcloud.php:57
-msgid "Public tag cloud"
+#: classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
 msgstr ""
 
-#: actions/publictagcloud.php:63
+#: classes/File.php:154
 #, php-format
-msgid "These are most popular recent tags on %s "
+msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
-#: actions/publictagcloud.php:119
-msgid "Tag cloud"
+#: classes/Message.php:55
+msgid "Could not insert message."
 msgstr ""
 
-#: actions/register.php:139 actions/register.php:349
-msgid "Sorry, only invited people can register."
+#: classes/Message.php:65
+msgid "Could not update message with new URI."
 msgstr ""
 
-#: actions/register.php:149
-msgid "You can't register if you don't "
+#: classes/Notice.php:164
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "Σφάλμα στη βάση δεδομένων κατά την εισαγωγή hashtag: %s"
+
+#: classes/Notice.php:179
+msgid "Problem saving notice. Too long."
 msgstr ""
 
-#: actions/register.php:286
-msgid "With this form you can create "
+#: classes/Notice.php:183
+msgid "Problem saving notice. Unknown user."
 msgstr ""
 
-#: actions/register.php:368
-msgid "1-64 lowercase letters or numbers, "
+#: classes/Notice.php:188
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: actions/register.php:382 actions/register.php:386
-msgid "Used only for updates, announcements, "
+#: classes/Notice.php:194
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
 msgstr ""
 
-#: actions/register.php:398
-msgid "URL of your homepage, blog, "
+#: classes/Notice.php:202
+msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: actions/register.php:404
-msgid "Describe yourself and your "
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
 msgstr ""
 
-#: actions/register.php:410
-msgid "Where you are, like \"City, "
+#: classes/Notice.php:1120
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "Σφάλμα βάσης δεδομένων κατά την εισαγωγή απάντησης: %s"
+
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 
-#: actions/register.php:432
-msgid " except this private data: password, "
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
 msgstr ""
 
-#: actions/register.php:471
-#, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
+#: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
+msgstr "Αλλάξτε τις ρυθμίσεις του προφίλ σας"
+
+#: lib/accountsettingsaction.php:112
+msgid "Upload an avatar"
 msgstr ""
 
-#: actions/register.php:495
-msgid "(You should receive a message by email "
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr "Αλλάξτε τον κωδικό σας"
+
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
 msgstr ""
 
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
 msgstr ""
 
-#: actions/replies.php:118
-#, php-format
-msgid "Replies to %s, page %d"
+#: lib/accountsettingsaction.php:124
+#, fuzzy
+msgid "Design your profile"
+msgstr "Αδύνατη η αποθήκευση του προφίλ."
+
+#: lib/accountsettingsaction.php:128
+msgid "Other"
 msgstr ""
 
-#: actions/showfavorites.php:79
-#, php-format
-msgid "%s favorite notices, page %d"
+#: lib/accountsettingsaction.php:128
+msgid "Other options"
 msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: lib/action.php:144
 #, php-format
-msgid "%s group"
+msgid "%s - %s"
 msgstr ""
 
-#: actions/showgroup.php:79
-#, php-format
-msgid "%s group, page %d"
+#: lib/action.php:159
+msgid "Untitled page"
 msgstr ""
 
-#: actions/showgroup.php:206
-#, fuzzy
-msgid "Group profile"
-msgstr "Αδύνατη η αποθήκευση του προφίλ."
+#: lib/action.php:424
+msgid "Primary site navigation"
+msgstr ""
 
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
-msgid "URL"
+#: lib/action.php:430
+msgid "Home"
+msgstr "Αρχή"
+
+#: lib/action.php:430
+msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
-msgid "Note"
+#: lib/action.php:432
+#, fuzzy
+msgid "Account"
+msgstr "Περί"
+
+#: lib/action.php:432
+msgid "Change your email, avatar, password, profile"
 msgstr ""
 
-#: actions/showgroup.php:270
-msgid "Group actions"
+#: lib/action.php:435
+msgid "Connect"
+msgstr "Σύνδεση"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Αδυναμία ανακατεύθηνσης στο διακομιστή: %s"
+
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
 msgstr ""
 
-#: actions/showgroup.php:323
+#: lib/action.php:440 lib/subgroupnav.php:106
 #, php-format
-msgid "Notice feed for %s group"
+msgid "Invite friends and colleagues to join you on %s"
+msgstr "Προσκάλεσε φίλους και συναδέλφους σου να γίνουν μέλη στο %s"
+
+#: lib/action.php:445
+msgid "Logout"
+msgstr "Αποσύνδεση"
+
+#: lib/action.php:445
+msgid "Logout from the site"
 msgstr ""
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: lib/action.php:450
 #, fuzzy
-msgid "Members"
-msgstr "Μέλος από"
+msgid "Create an account"
+msgstr "Δημιουργία νέου λογαριασμού"
 
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
-msgid "(None)"
+#: lib/action.php:453
+msgid "Login to the site"
 msgstr ""
 
-#: actions/showgroup.php:370
-msgid "All members"
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
+msgstr "Βοήθεια"
+
+#: lib/action.php:456
+#, fuzzy
+msgid "Help me!"
+msgstr "Βοήθεια"
+
+#: lib/action.php:459
+msgid "Search"
 msgstr ""
 
-#: actions/showgroup.php:378
-#, php-format
-msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+#: lib/action.php:459
+msgid "Search for people or text"
 msgstr ""
 
-#: actions/showmessage.php:98
-msgid "Only the sender and recipient "
+#: lib/action.php:480
+msgid "Site notice"
 msgstr ""
 
-#: actions/showstream.php:73
-#, php-format
-msgid "%s, page %d"
+#: lib/action.php:546
+msgid "Local views"
 msgstr ""
 
-#: actions/showstream.php:143
-#, fuzzy
-msgid "'s profile"
-msgstr "Αδύνατη η αποθήκευση του προφίλ."
+#: lib/action.php:612
+msgid "Page notice"
+msgstr ""
 
-#: actions/showstream.php:236 actions/tagother.php:77
-#, fuzzy
-msgid "User profile"
-msgstr "Αδύνατη η αποθήκευση του προφίλ."
+#: lib/action.php:714
+msgid "Secondary site navigation"
+msgstr ""
 
-#: actions/showstream.php:240 actions/tagother.php:81
-msgid "Photo"
+#: lib/action.php:721
+msgid "About"
+msgstr "Περί"
+
+#: lib/action.php:723
+msgid "FAQ"
+msgstr "Συχνές ερωτήσεις"
+
+#: lib/action.php:727
+msgid "TOS"
 msgstr ""
 
-#: actions/showstream.php:317
-msgid "User actions"
+#: lib/action.php:730
+msgid "Privacy"
 msgstr ""
 
-#: actions/showstream.php:342
-msgid "Send a direct message to this user"
+#: lib/action.php:732
+msgid "Source"
 msgstr ""
 
-#: actions/showstream.php:343
-msgid "Message"
+#: lib/action.php:734
+msgid "Contact"
+msgstr "Επικοινωνία"
+
+#: lib/action.php:736
+msgid "Badge"
 msgstr ""
 
-#: actions/showstream.php:451
-msgid "All subscribers"
+#: lib/action.php:764
+msgid "StatusNet software license"
 msgstr ""
 
-#: actions/showstream.php:533
-msgid "All groups"
+#: lib/action.php:767
+#, fuzzy, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
+msgstr ""
+"To **%%site.name%%** είναι μία υπηρεσία microblogging (μικρο-ιστολογίου) που "
+"έφερε κοντά σας το  [%%site.broughtby%%](%%site.broughtbyurl%%). "
+
+#: lib/action.php:769
+#, fuzzy, php-format
+msgid "**%%site.name%%** is a microblogging service. "
 msgstr ""
+"Το **%%site.name%%** είναι μία υπηρεσία microblogging (μικρο-ιστολογίου). "
 
-#: actions/showstream.php:542
+#: lib/action.php:771
 #, php-format
 msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 
-#: actions/smssettings.php:128
-msgid "Phone number, no punctuation or spaces, "
+#: lib/action.php:785
+msgid "Site content license"
 msgstr ""
 
-#: actions/smssettings.php:162
-msgid "Send me notices through SMS; "
+#: lib/action.php:794
+msgid "All "
 msgstr ""
 
-#: actions/smssettings.php:335
-msgid "A confirmation code was sent to the phone number you added. "
+#: lib/action.php:799
+msgid "license."
 msgstr ""
 
-#: actions/smssettings.php:453
-msgid "Mobile carrier"
+#: lib/action.php:1052
+msgid "Pagination"
 msgstr ""
 
-#: actions/subedit.php:70
-msgid "You are not subscribed to that profile."
+#: lib/action.php:1061
+msgid "After"
 msgstr ""
 
-#: actions/subedit.php:83
-#, fuzzy
-msgid "Could not save subscription."
-msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ"
+#: lib/action.php:1069
+msgid "Before"
+msgstr ""
 
-#: actions/subscribe.php:55
-msgid "Not a local user."
+#: lib/action.php:1117
+msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/subscribe.php:69
-msgid "Subscribed"
+#: lib/attachmentlist.php:87
+msgid "Attachments"
 msgstr ""
 
-#: actions/subscribers.php:50
-#, php-format
-msgid "%s subscribers"
+#: lib/attachmentlist.php:265
+msgid "Author"
 msgstr ""
 
-#: actions/subscribers.php:52
-#, php-format
-msgid "%s subscribers, page %d"
+#: lib/attachmentlist.php:278
+msgid "Provider"
 msgstr ""
 
-#: actions/subscribers.php:63
-msgid "These are the people who listen to "
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
 msgstr ""
 
-#: actions/subscribers.php:67
-#, php-format
-msgid "These are the people who "
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
 msgstr ""
 
-#: actions/subscriptions.php:52
-#, fuzzy, php-format
-msgid "%s subscriptions"
-msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ"
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
+msgstr ""
 
-#: actions/subscriptions.php:54
-#, php-format
-msgid "%s subscriptions, page %d"
+#: lib/channel.php:210
+msgid "Command complete"
 msgstr ""
 
-#: actions/subscriptions.php:65
-msgid "These are the people whose notices "
+#: lib/channel.php:221
+msgid "Command failed"
 msgstr ""
 
-#: actions/subscriptions.php:69
-#, php-format
-msgid "These are the people whose "
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: actions/subscriptions.php:122
-msgid "Jabber"
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Απέτυχε η ενημέρωση χρήστη μέσω επιβεβαιωμένης email διεύθυνσης."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: actions/tag.php:43
+#: lib/command.php:99
 #, php-format
-msgid "Notices tagged with %s, page %d"
+msgid "Nudge sent to %s"
 msgstr ""
 
-#: actions/tag.php:66
+#: lib/command.php:126
 #, php-format
-msgid "Messages tagged \"%s\", most recent first"
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
 msgstr ""
 
-#: actions/tagother.php:33
-msgid "Not logged in"
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
 msgstr ""
 
-#: actions/tagother.php:39
-msgid "No id argument."
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
 msgstr ""
 
-#: actions/tagother.php:65
-#, php-format
-msgid "Tag %s"
+#: lib/command.php:190
+msgid "Notice marked as fave."
 msgstr ""
 
-#: actions/tagother.php:141
-msgid "Tag user"
+#: lib/command.php:315
+#, php-format
+msgid "%1$s (%2$s)"
 msgstr ""
 
-#: actions/tagother.php:149
-msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+#: lib/command.php:318
+#, php-format
+msgid "Fullname: %s"
 msgstr ""
 
-#: actions/tagother.php:164
-msgid "There was a problem with your session token."
+#: lib/command.php:321
+#, php-format
+msgid "Location: %s"
 msgstr ""
 
-#: actions/tagother.php:191
-msgid ""
-"You can only tag people you are subscribed to or who are subscribed to you."
+#: lib/command.php:324
+#, php-format
+msgid "Homepage: %s"
 msgstr ""
 
-#: actions/tagother.php:198
-#, fuzzy
-msgid "Could not save tags."
-msgstr "Αδύνατη η αποθήκευση του προφίλ."
+#: lib/command.php:327
+#, php-format
+msgid "About: %s"
+msgstr ""
 
-#: actions/tagother.php:233
-msgid "Use this form to add tags to your subscribers or subscriptions."
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: actions/tagrss.php:35
-msgid "No such tag."
+#: lib/command.php:377
+msgid "Error sending direct message."
 msgstr ""
 
-#: actions/tagrss.php:66
+#: lib/command.php:431
 #, php-format
-msgid "Microblog tagged with %s"
+msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: actions/twitapiblocks.php:47
-msgid "Block user failed."
+#: lib/command.php:439
+#, php-format
+msgid "Reply to %s sent"
 msgstr ""
 
-#: actions/twitapiblocks.php:69
-msgid "Unblock user failed."
+#: lib/command.php:441
+msgid "Error saving notice."
 msgstr ""
 
-#: actions/twitapiusers.php:48
-msgid "Not found."
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: actions/twittersettings.php:71
-msgid "Add your Twitter account to automatically send "
+#: lib/command.php:502
+#, php-format
+msgid "Subscribed to %s"
 msgstr ""
 
-#: actions/twittersettings.php:119
-msgid "Twitter user name"
-msgstr "Όνομα χρήστη στο Twitter"
-
-#: actions/twittersettings.php:126
-msgid "Twitter password"
-msgstr "Κωδικός στο Twitter"
-
-#: actions/twittersettings.php:228
-msgid "Twitter Friends"
-msgstr "Φίλοι στο Twitter"
-
-#: actions/twittersettings.php:327
-msgid "Username must have only numbers, "
-msgstr "Το όνομα χρήστη πρέπει να έχει μόνο νούμερα,"
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
 
-#: actions/twittersettings.php:341
+#: lib/command.php:530
 #, php-format
-msgid "Unable to retrieve account information "
+msgid "Unsubscribed from %s"
 msgstr ""
 
-#: actions/unblock.php:108
-msgid "Error removing the block."
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
 msgstr ""
 
-#: actions/unsubscribe.php:50
-msgid "No profile id in request."
+#: lib/command.php:551
+msgid "Notification off."
 msgstr ""
 
-#: actions/unsubscribe.php:57
-msgid "No profile with that id."
+#: lib/command.php:553
+msgid "Can't turn off notification."
 msgstr ""
 
-#: actions/unsubscribe.php:71
-msgid "Unsubscribed"
+#: lib/command.php:574
+msgid "Notification on."
 msgstr ""
 
-#: actions/usergroups.php:63
-#, php-format
-msgid "%s groups"
+#: lib/command.php:576
+msgid "Can't turn on notification."
 msgstr ""
 
-#: actions/usergroups.php:65
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Αδυναμία δημιουργίας φόρμας OpenID: %s "
+
+#: lib/command.php:602
 #, php-format
-msgid "%s groups, page %d"
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: classes/Notice.php:104
-msgid "Problem saving notice. Unknown user."
-msgstr ""
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
 
-#: classes/Notice.php:109
-msgid ""
-"Too many notices too fast; take a breather and post again in a few minutes."
-msgstr ""
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
 
-#: classes/Notice.php:116
-msgid "You are banned from posting notices on this site."
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
+
+#: lib/command.php:639
+msgid "These people are subscribed to you: "
 msgstr ""
 
-#: lib/accountsettingsaction.php:108
-msgid "Upload an avatar"
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Ομάδες με τα περισσότερα μέλη"
+
+#: lib/command.php:658
+msgid "You are a member of these groups: "
 msgstr ""
 
-#: lib/accountsettingsaction.php:119
-msgid "Other"
+#: lib/command.php:670
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+
+#: lib/common.php:192
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Ο κωδικός επιβεβαίωσης δεν βρέθηκε."
+
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/accountsettingsaction.php:120
-msgid "Other options"
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/action.php:130
-#, php-format
-msgid "%s - %s"
+#: lib/common.php:195
+msgid "Go to the installer."
 msgstr ""
 
-#: lib/action.php:145
-msgid "Untitled page"
+#: lib/connectsettingsaction.php:110
+msgid "IM"
+msgstr "ΙΜ"
+
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
 msgstr ""
 
-#: lib/action.php:316
-msgid "Primary site navigation"
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
 msgstr ""
 
-#: lib/action.php:322
-msgid "Personal profile and friends timeline"
+#: lib/dberroraction.php:60
+msgid "Database error"
 msgstr ""
 
-#: lib/action.php:325
-msgid "Search for people or text"
+#: lib/designsettings.php:101
+msgid "Change background image"
 msgstr ""
 
-#: lib/action.php:328
+#: lib/designsettings.php:105
 #, fuzzy
-msgid "Account"
-msgstr "Περί"
+msgid "Upload file"
+msgstr "Αδύνατη η αποθήκευση του προφίλ."
 
-#: lib/action.php:328
-msgid "Change your email, avatar, password, profile"
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 
-#: lib/action.php:330
-msgid "Connect to IM, SMS, Twitter"
+#: lib/designsettings.php:139
+msgid "On"
 msgstr ""
 
-#: lib/action.php:332
-msgid "Logout from the site"
+#: lib/designsettings.php:155
+msgid "Off"
 msgstr ""
 
-#: lib/action.php:335
-msgid "Login to the site"
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
 msgstr ""
 
-#: lib/action.php:338
+#: lib/designsettings.php:170
 #, fuzzy
-msgid "Create an account"
-msgstr "Δημιουργία νέου λογαριασμού"
+msgid "Change colours"
+msgstr "Αλλάξτε τον κωδικό σας"
 
-#: lib/action.php:341
-msgid "Login with OpenID"
+#: lib/designsettings.php:178
+msgid "Background"
 msgstr ""
 
-#: lib/action.php:344
+#: lib/designsettings.php:191
 #, fuzzy
-msgid "Help me!"
-msgstr "Βοήθεια"
+msgid "Content"
+msgstr "Σύνδεση"
 
-#: lib/action.php:362
-msgid "Site notice"
+#: lib/designsettings.php:204
+msgid "Sidebar"
 msgstr ""
 
-#: lib/action.php:417
-msgid "Local views"
+#: lib/designsettings.php:217
+msgid "Text"
 msgstr ""
 
-#: lib/action.php:472
-msgid "Page notice"
-msgstr ""
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Σύνδεση"
 
-#: lib/action.php:562
-msgid "Secondary site navigation"
+#: lib/designsettings.php:247
+msgid "Use defaults"
 msgstr ""
 
-#: lib/action.php:602 lib/action.php:623
-msgid "StatusNet software license"
+#: lib/designsettings.php:248
+msgid "Restore default designs"
 msgstr ""
 
-#: lib/action.php:630
-msgid "All "
+#: lib/designsettings.php:254
+msgid "Reset back to default"
 msgstr ""
 
-#: lib/action.php:635
-msgid "license."
+#: lib/designsettings.php:257
+msgid "Save design"
 msgstr ""
 
-#: lib/blockform.php:123 lib/blockform.php:153
-msgid "Block this user"
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
 msgstr ""
 
-#: lib/blockform.php:153
-msgid "Block"
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
 msgstr ""
 
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr ""
 
-#: lib/facebookaction.php:268
-#, php-format
-msgid "To use the %s Facebook Application you need to login "
+#: lib/favorform.php:114 lib/favorform.php:140
+msgid "Favor this notice"
 msgstr ""
 
-#: lib/facebookaction.php:271
-#, fuzzy
-msgid " a new account."
-msgstr "Δημιουργία νέου λογαριασμού"
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr ""
 
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-msgid "Published"
+#: lib/feedlist.php:64
+msgid "Export data"
 msgstr ""
 
-#: lib/favorform.php:114 lib/favorform.php:140
-msgid "Favor this notice"
+#: lib/feed.php:85
+msgid "RSS 1.0"
 msgstr ""
 
-#: lib/feedlist.php:64
-msgid "Export data"
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr ""
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr ""
+
+#: lib/feed.php:91
+msgid "FOAF"
 msgstr ""
 
 #: lib/galleryaction.php:121
@@ -4475,57 +3902,82 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
+msgstr ""
+
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr ""
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr ""
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr ""
 
-#: lib/groupeditform.php:151
-msgid "Description"
-msgstr "Περιγραφή"
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Περιγράψτε την ομάδα ή το θέμα μέχρι 140 χαρακτήρες"
 
-#: lib/groupeditform.php:153
-msgid "Describe the group or topic in 140 chars"
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
 msgstr "Περιγράψτε την ομάδα ή το θέμα μέχρι 140 χαρακτήρες"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:172
+msgid "Description"
+msgstr "Περιγραφή"
+
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr "Τοποθεσία της ομάδας (εάν υπάρχει), πχ: \"Πόλη, Περιοχή, Χώρα)"
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
 msgid "Group"
 msgstr "Ομάδα"
 
-#: lib/groupnav.php:100
-msgid "Admin"
-msgstr "Διαχειριστής"
-
 #: lib/groupnav.php:101
+msgid "Blocked"
+msgstr ""
+
+#: lib/groupnav.php:102
+#, php-format
+msgid "%s blocked users"
+msgstr ""
+
+#: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
 msgstr "Επεξεργασία ιδιοτήτων της ομάδας %s"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:113
 msgid "Logo"
 msgstr "Λογότυπο"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:114
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "Προσθήκη ή επεξεργασία λογότυπου για την ομάδα %s"
 
+#: lib/groupnav.php:120
+#, fuzzy, php-format
+msgid "Add or edit %s design"
+msgstr "Προσθήκη ή επεξεργασία λογότυπου για την ομάδα %s"
+
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Ομάδες με τα περισσότερα μέλη"
@@ -4540,9 +3992,43 @@ msgid "Tags in %s group's notices"
 msgstr ""
 
 #: lib/htmloutputter.php:104
+msgid "This page is not available in a media type you accept"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr ""
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr ""
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr ""
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr ""
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr ""
+
+#: lib/imagefile.php:118
 #, fuzzy
-msgid "This page is not available in a "
-msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL."
+msgid "Lost our file."
+msgstr "Αδύνατη η αποθήκευση του προφίλ."
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr ""
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr ""
 
 #: lib/joinform.php:114
 #, fuzzy
@@ -4553,44 +4039,82 @@ msgstr "Συμμετοχή"
 msgid "Leave"
 msgstr "Αποχώρηση"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr "Σύνδεση με όνομα χρήστη και κωδικό"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:86
 #, fuzzy
 msgid "Sign up for a new account"
 msgstr "Δημιουργία νέου λογαριασμού"
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
-msgstr "Σύνδεση ή δημιουργία λογαριασμού με OpenID"
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr ""
 
-#: lib/mail.php:175
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr "από"
+
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "Επιβεβαίωση διεύθυνσης email"
+
+#: lib/mail.php:174
 #, php-format
 msgid ""
 "Hey, %s.\n"
 "\n"
-msgstr ""
-"Γεια σου, %s.\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
 "\n"
+"\t%s\n"
+"\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
+msgstr ""
 
-#: lib/mail.php:236
+#: lib/mail.php:235
 #, php-format
-msgid "%1$s is now listening to "
+msgid "%1$s is now listening to your notices on %2$s."
 msgstr ""
 
-#: lib/mail.php:254
+#: lib/mail.php:240
+#, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
+
+#: lib/mail.php:253
 #, fuzzy, php-format
 msgid "Location: %s\n"
 msgstr "Τοποθεσία: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:255
 #, fuzzy, php-format
 msgid "Homepage: %s\n"
 msgstr "Αρχική σελίδα: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
@@ -4599,56 +4123,217 @@ msgstr ""
 "Βιογραφικό: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:285
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: lib/mail.php:288
+#, 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 ""
+
+#: lib/mail.php:412
+#, php-format
+msgid "%s status"
+msgstr "Κατάσταση του/της %s"
+
+#: lib/mail.php:438
+msgid "SMS confirmation"
+msgstr ""
+
+#: lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr ""
 
-#: lib/mail.php:465
+#: lib/mail.php:466
 #, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
+msgstr ""
+
+#: lib/mail.php:509
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:513
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%5$s\n"
+msgstr ""
+
+#: lib/mail.php:554
+#, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr ""
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, php-format
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+msgstr ""
+
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
 msgstr ""
 
-#: lib/mail.php:555
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "Απέτυχε η ενημέρωση του χρήστη."
+
+#: lib/mediafile.php:270
 #, php-format
-msgid "%1$s just added your notice from %2$s"
+msgid " Try using another %s format."
 msgstr ""
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
-msgid "From"
-msgstr "Από"
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
 
-#: lib/messageform.php:110
+#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr ""
 
-#: lib/noticeform.php:125
-msgid "Send a notice"
+#: lib/messageform.php:146
+msgid "To"
 msgstr ""
 
-#: lib/noticeform.php:152
+#: lib/messageform.php:162 lib/noticeform.php:173
 #, fuzzy
 msgid "Available characters"
 msgstr "6 ή περισσότεροι χαρακτήρες"
 
-#: lib/noticelist.php:426
-msgid "in reply to"
+#: lib/noticeform.php:145
+msgid "Send a notice"
 msgstr ""
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
-msgid "Reply to this notice"
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
 msgstr ""
 
-#: lib/noticelist.php:451
-msgid "Reply"
+#: lib/noticeform.php:180
+msgid "Attach"
 msgstr ""
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
-msgid "Delete this notice"
+#: lib/noticeform.php:184
+msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:474
-msgid "Delete"
+#: lib/noticelist.php:478
+msgid "in context"
+msgstr ""
+
+#: lib/noticelist.php:498
+msgid "Reply to this notice"
+msgstr ""
+
+#: lib/noticelist.php:499
+msgid "Reply"
 msgstr ""
 
 #: lib/nudgeform.php:116
@@ -4663,40 +4348,136 @@ msgstr ""
 msgid "Send a nudge to this user"
 msgstr ""
 
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr ""
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr ""
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr ""
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Διαγραφή μηνύματος"
+
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
+msgstr "Απέτυχε η εισαγωγή νέας συνδρομής."
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "Προσωπικά"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr ""
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr ""
+
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr ""
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr ""
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr ""
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr ""
+
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/profilelist.php:182
-#, fuzzy
-msgid "(none)"
-msgstr "(κανένα)"
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr ""
 
-#: lib/publicgroupnav.php:76
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "Όλες οι συνδρομές"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr ""
+
+#: lib/profileaction.php:157
+msgid "All subscribers"
+msgstr ""
+
+#: lib/profileaction.php:177
+msgid "User ID"
+msgstr ""
+
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "Μέλος από"
+
+#: lib/profileaction.php:235
+msgid "All groups"
+msgstr ""
+
+#: lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Δημόσια"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Ομάδες χρηστών"
 
-#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Πρόσφατες ετικέτες "
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Προτεινόμενα"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Δημοφιλή"
 
+#: lib/searchaction.php:120
+msgid "Search site"
+msgstr ""
+
+#: lib/searchaction.php:162
+msgid "Search help"
+msgstr ""
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr ""
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr ""
+
 #: lib/searchgroupnav.php:82
 msgid "Notice"
 msgstr "Μήνυμα"
 
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr ""
+
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Βρες ομάδες στο site"
@@ -4705,33 +4486,64 @@ msgstr "Βρες ομάδες στο site"
 msgid "Untitled section"
 msgstr "Ενότητα χωρίς τίτλο"
 
-#: lib/subgroupnav.php:81
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr ""
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:91
 #, php-format
 msgid "People subscribed to %s"
 msgstr ""
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:104
-#, php-format
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Προσκάλεσε φίλους και συναδέλφους σου να γίνουν μέλη στο %s"
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
 
-#: lib/subs.php:53
+#: lib/subscriptionlist.php:126
+#, fuzzy
+msgid "(none)"
+msgstr "(κανένα)"
+
+#: lib/subs.php:48
+msgid "Already subscribed!"
+msgstr ""
+
+#: lib/subs.php:52
 msgid "User has blocked you."
 msgstr ""
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Γίνε συνδρομητής αυτού του χρήστη"
+#: lib/subs.php:56
+msgid "Could not subscribe."
+msgstr "Απέτυχε η συνδρομή."
+
+#: lib/subs.php:75
+msgid "Could not subscribe other to you."
+msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
+
+#: lib/subs.php:124
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Απέτυχε η συνδρομή."
+
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
+msgstr "Απέτυχε η διαγραφή συνδρομής."
 
 #: lib/tagcloudsection.php:56
 msgid "None"
@@ -4741,18 +4553,105 @@ msgstr "Κανένα"
 msgid "Top posters"
 msgstr "Κορυφαίοι δημοσιευτές"
 
-#: lib/unblockform.php:120 lib/unblockform.php:150
-msgid "Unblock this user"
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+msgid "Unsubscribe from this user"
 msgstr ""
 
-#: lib/unblockform.php:150
-msgid "Unblock"
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
 msgstr ""
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
-msgid "Unsubscribe from this user"
+#: lib/userprofile.php:116
+msgid "Edit Avatar"
 msgstr ""
 
+#: lib/userprofile.php:236
+msgid "User actions"
+msgstr ""
+
+#: lib/userprofile.php:248
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "Δημιουργία νέου λογαριασμού"
+msgid "Edit profile settings"
+msgstr "Αλλάξτε τις ρυθμίσεις του προφίλ σας"
+
+#: lib/userprofile.php:249
+msgid "Edit"
+msgstr ""
+
+#: lib/userprofile.php:272
+msgid "Send a direct message to this user"
+msgstr ""
+
+#: lib/userprofile.php:273
+msgid "Message"
+msgstr ""
+
+#: lib/util.php:821
+msgid "a few seconds ago"
+msgstr ""
+
+#: lib/util.php:823
+msgid "about a minute ago"
+msgstr ""
+
+#: lib/util.php:825
+#, php-format
+msgid "about %d minutes ago"
+msgstr ""
+
+#: lib/util.php:827
+msgid "about an hour ago"
+msgstr ""
+
+#: lib/util.php:829
+#, php-format
+msgid "about %d hours ago"
+msgstr ""
+
+#: lib/util.php:831
+msgid "about a day ago"
+msgstr ""
+
+#: lib/util.php:833
+#, php-format
+msgid "about %d days ago"
+msgstr ""
+
+#: lib/util.php:835
+msgid "about a month ago"
+msgstr ""
+
+#: lib/util.php:837
+#, php-format
+msgid "about %d months ago"
+msgstr ""
+
+#: lib/util.php:839
+msgid "about a year ago"
+msgstr ""
+
+#: lib/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr ""
+
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr ""
+
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr ""
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.mo b/locale/en_GB/LC_MESSAGES/statusnet.mo
index 4eeac7304..33531f33c 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.mo
+++ b/locale/en_GB/LC_MESSAGES/statusnet.mo
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index a105d2b86..c65fc1c73 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -1,3 +1,7 @@
+# Translation of StatusNet to British English
+#
+# Author@translatewiki.net: CiaranG
+# --
 # #-#-#-#-#  statusnet.new.pot (PACKAGE VERSION)  #-#-#-#-#
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -6,4255 +10,2975 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-05-21 01:42+0000\n"
-"Last-Translator: Bruce Cowan <l10n@bcowan.fastmail.co.uk>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:18+0000\n"
+"Language-Team: British English\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
-
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
-#, php-format
-msgid " Search Stream for \"%s\""
-msgstr " Search Stream for \"%s\""
-
-# Adjusted for grammar.
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-#: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
-msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr ""
-" except this private data: password, e-mail address, IM address, phone "
-"number."
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr "from"
-
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr "%1$s / Updates replying to %2$s"
-
-#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s has invited you to join them on %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 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"
-
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s is now listening to your notices on %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 is now listening to your notices on %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s.\n"
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "%1$s updates that reply to updates from %2$s / %3$s."
-
-#: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr "%1$s's status on %2$s"
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
-#, php-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: en-gb\n"
+"X-Message-Group: out-statusnet\n"
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+msgid "No such page"
+msgstr "No such page"
+
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
+msgstr "No such user."
 
-#: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/all.php:84
 #, php-format
-msgid "%s Public Stream"
-msgstr "%s Public Stream"
+msgid "%s and friends, page %d"
+msgstr "%s and friends, page %d"
 
-#: ../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
-#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s and friends"
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/all.php:99
 #, php-format
-msgid "%s public timeline"
-msgstr "%s public timeline"
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Feed for friends of %s (RSS 1.0)"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: actions/all.php:107
 #, php-format
-msgid "%s status"
-msgstr "%s status"
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Feed for friends of %s (RSS 2.0)"
 
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/all.php:115
 #, php-format
-msgid "%s timeline"
-msgstr "%s timeline"
+msgid "Feed for friends of %s (Atom)"
+msgstr "Feed for friends of %s (Atom)"
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/all.php:127
 #, php-format
-msgid "%s updates from everyone!"
-msgstr "%s updates from everyone!"
-
-#: ../actions/register.php:213
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
-"(You should receive a message by e-mail momentarily, with instructions on "
-"how to confirm your e-mail address.)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: actions/all.php:132
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
 msgstr ""
-"**%%site.name%%** is a microblogging service brought to you by "
-"[%%site.broughtby%%](%%site.broughtbyurl%%)."
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: actions/all.php:134
 #, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** is a microblogging service."
-
-#: ../lib/util.php:274 lib/util.php:290
-msgid ". Contributors should be attributed by full name or nickname."
-msgstr ". Contributors should be attributed by full name or nickname."
-
-#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
-#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-
-#: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr "6 or more characters"
-
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
-msgid "6 or more characters, and don't forget it!"
-msgstr "6 or more characters, and don't forget it!"
-
-#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
-msgid "6 or more characters. Required."
-msgstr "6 or more characters. Required."
-
-#: ../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 ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
-
-#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
 msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
-"A confirmation code was sent to the e-mail address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
 
-#: ../actions/smssettings.php:216 actions/smssettings.php:224
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#, php-format
 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."
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
 msgstr ""
-"A confirmation code was sent to the phone number you added. Check your inbox "
-"(and spam box!) for the code and instructions on how to use it."
-
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../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 actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
-msgid "API method not found!"
-msgstr "API method not found!"
-
-#: ../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 actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
-msgid "API method under construction."
-msgstr "API method under construction."
-
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
-msgid "About"
-msgstr "About"
-
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
-msgid "Accept"
-msgstr "Accept"
-
-#: ../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 actions/emailsettings.php:120
-#: actions/imsettings.php:127 actions/openidsettings.php:111
-#: actions/smssettings.php:133 actions/twittersettings.php:163
-msgid "Add"
-msgstr "Add"
-
-#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
-msgstr "Add OpenID"
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-msgid "Add or remove OpenIDs"
-msgstr "Add or remove OpenIDs"
-
-#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39 actions/emailsettings.php:39
-#: actions/imsettings.php:40 actions/smssettings.php:39
-#: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
-msgstr "Address"
-
-#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-msgid "Addresses of friends to invite (one per line)"
-msgstr "Addresses of friends to invite (one per line)"
 
-#: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
-msgid "All subscriptions"
-msgstr "All subscriptions"
-
-#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
-#, php-format
-msgid "All updates for %s"
-msgstr "All updates for %s"
+#: actions/all.php:165
+msgid "You and friends"
+msgstr "You and friends"
 
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
 #, php-format
-msgid "All updates matching search term \"%s\""
-msgstr "All updates matching search term \"%s\""
-
-#: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
-#: ../actions/openidlogin.php:29 ../actions/register.php:30
-#: actions/finishopenidlogin.php:29 actions/login.php:31
-#: actions/openidlogin.php:29 actions/register.php:30
-#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
-msgid "Already logged in."
-msgstr "Already logged in."
-
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
-msgid "Already subscribed!."
-msgstr "Already subscribed!"
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
-msgid "Are you sure you want to delete this notice?"
-msgstr "Are you sure you want to delete this notice?"
-
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
-msgid "Authorize subscription"
-msgstr "Authorise subscription"
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr "Updates from %1$s and friends on %2$s!"
 
-#: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
-msgid "Automatically login in the future; not for shared computers!"
-msgstr "Automatically login in the future; not for shared computers!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+msgid "API method not found."
+msgstr "API method not found."
+
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
+msgstr "This method requires a POST."
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/apiaccountupdatedeliverydevice.php:105
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
 msgstr ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34 actions/avatarsettings.php:65
-#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
-msgid "Avatar"
-msgstr "Avatar"
 
-#: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
-msgid "Avatar updated."
-msgstr "Avatar updated."
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Couldn't update user."
 
-# Buddy?
-#: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
 #, php-format
-#, fuzzy
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
 msgstr ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
 
-#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
-msgid "Awaiting confirmation on this phone number."
-msgstr "Awaiting confirmation on this phone number."
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
+msgstr "Unable to save your design settings!"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+msgid "Could not update your design."
+msgstr "Could not update your design."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "User has no profile."
 
-#  erm, not sure what to do here, » is recognised as a quotation mark.
-#: ../lib/util.php:1318 lib/util.php:1452
-msgid "Before »"
-msgstr "Before »"
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Couldn't save profile."
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
-#: actions/profilesettings.php:82 actions/register.php:184
-#: actions/profilesettings.php:112 actions/register.php:402
-msgid "Bio"
-msgstr "Bio"
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
+msgstr "Block user failed."
 
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
-#: actions/register.php:89 actions/updateprofile.php:104
-#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
-msgid "Bio is too long (max 140 chars)."
-msgstr "Bio is too long (max 140 chars)."
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
+msgstr "Unblock user failed."
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
-msgid "Can't delete this notice."
-msgstr "Can't delete this notice."
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "No message text!"
 
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
 #, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr "Can't read avatar URL '%s'"
-
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404 actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-msgid "Can't save new password."
-msgstr "Can't save new password."
-
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62 actions/emailsettings.php:58
-#: actions/imsettings.php:59 actions/smssettings.php:62
-#: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Cannot create OpenID consumer object."
-
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
-msgstr "Cannot normalise Jabber ID"
-
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
-msgid "Cannot normalize that email address"
-msgstr "Cannot normalise that e-mail address"
-
-#: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
-msgstr "Change"
-
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
-msgstr "Change e-mail handling"
-
-#: ../actions/password.php:32 actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr "Change password"
+msgid "That's too long. Max message size is %d chars."
+msgstr "That's too long. Max message size is %d chars."
 
-#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
-msgid "Change your password"
-msgstr "Change your password"
-
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-msgid "Change your profile settings"
-msgstr "Change your profile settings"
-
-#: ../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
-#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
-#: actions/register.php:376 actions/smssettings.php:122
-msgid "Confirm"
-msgstr "Confirm"
-
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "Confirm Address"
-
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245 actions/emailsettings.php:256
-#: actions/imsettings.php:230 actions/smssettings.php:253
-#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
-msgid "Confirmation cancelled."
-msgstr "Confirmation cancelled."
-
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
-msgid "Confirmation code"
-msgstr "Confirmation code"
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "Recipient user not found."
 
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-msgid "Confirmation code not found."
-msgstr "Confirmation code not found."
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr "Can't send direct messages to users who aren't your friend."
 
-#: ../actions/register.php:202
+#: actions/apidirectmessage.php:89
 #, 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 ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to...\n"
-"\n"
-"* Go to [your profile](%s) and post your first message.\n"
-"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
-"notices through instant messages.\n"
-"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
-"share your interests. \n"
-"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
-"others more about you. \n"
-"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
-"missed. \n"
-"\n"
-"Thanks for signing up and we hope you enjoy using this service."
-
-#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
-msgid "Connect"
-msgstr "Connect"
-
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
-msgid "Connect existing account"
-msgstr "Connect existing account"
-
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
-msgid "Contact"
-msgstr "Contact"
+msgid "Direct messages from %s"
+msgstr "Direct messages from %s"
 
-#  Thought form was incorrect
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: actions/apidirectmessage.php:93
 #, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "Could not create OpenID from: %s"
+msgid "All the direct messages sent from %s"
+msgstr "All the direct messages sent from %s"
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/apidirectmessage.php:101
 #, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr "Could not follow user: %s is already on your list."
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
-msgid "Could not follow user: User not found."
-msgstr "Could not follow user: User not found."
+msgid "Direct messages to %s"
+msgstr "Direct messages to %s"
 
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: actions/apidirectmessage.php:105
 #, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Could not redirect to server: %s"
-
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
-msgid "Could not save avatar info"
-msgstr "Could not save avatar info"
-
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
-msgid "Could not save new profile info"
-msgstr "Could not save new profile info"
+msgid "All the direct messages sent to %s"
+msgstr "All the direct messages sent to %s"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
-msgid "Could not subscribe other to you."
-msgstr "Could not subscribe other to you."
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "API method not found!"
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
-msgid "Could not subscribe."
-msgstr "Could not subscribe."
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
+msgstr "No status found with that ID."
 
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
-msgstr "Couldn't update user with confirmed e-mail address."
+#: actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
+msgstr "This status is already a favourite!"
 
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-msgid "Couldn't convert request tokens to access tokens."
-msgstr "Couldn't convert request tokens to access tokens."
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+msgstr "Could not create favourite."
 
-#: ../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
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-msgid "Couldn't delete email confirmation."
-msgstr "Couldn't delete e-mail confirmation."
+#: actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
+msgstr "That status is not a favourite!"
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
-msgid "Couldn't delete subscription."
-msgstr "Couldn't delete subscription."
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr "Could not delete favourite."
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
-msgid "Couldn't find any statuses."
-msgstr "Couldn't find any statuses."
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
+msgstr "Could not follow user: User not found."
 
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-msgid "Couldn't get a request token."
-msgstr "Couldn't get a request token."
+#: actions/apifriendshipscreate.php:118
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr "Could not follow user: %s is already on your list."
 
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206 actions/emailsettings.php:223
-#: actions/imsettings.php:195 actions/smssettings.php:214
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
-msgid "Couldn't insert confirmation code."
-msgstr "Couldn't insert confirmation code."
+#: actions/apifriendshipsdestroy.php:109
+msgid "Could not unfollow user: User not found."
+msgstr "Could not unfollow user: User not found."
 
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
-msgstr "Couldn't insert new subscription."
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-msgid "Couldn't save profile."
-msgstr "Couldn't save profile."
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
+msgstr "Two user ids or screen_names must be supplied."
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
-msgstr "Couldn't update user for autosubscribe."
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Could not retrieve public stream."
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
-msgid "Couldn't update user record."
-msgstr "Couldn't update user record."
+#: actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Couldn't find any statuses."
 
-#: ../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
-#: actions/confirmaddress.php:114 actions/emailsettings.php:280
-#: actions/emailsettings.php:411 actions/imsettings.php:252
-#: actions/imsettings.php:395 actions/othersettings.php:162
-#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
-msgid "Couldn't update user."
-msgstr "Couldn't update user."
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
+msgid "Could not create group."
+msgstr "Could not create group."
 
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
-msgid "Create"
-msgstr "Create"
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
+msgid "Could not create aliases."
+msgstr "Could not create aliases"
 
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
-msgid "Create a new user with this nickname."
-msgstr "Create a new user with this nickname."
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+msgid "Could not set group membership."
+msgstr "Could not set group membership."
 
-#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
-msgid "Create new account"
-msgstr "Create new account"
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "Nickname must have only lowercase letters and numbers, and no spaces."
 
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
-msgid "Creating new account for OpenID that already has a user."
-msgstr "Creating new account for OpenID that already has a user."
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr "Nickname already in use. Try another one."
 
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "Current confirmed Jabber/GTalk address."
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "Not a valid nickname."
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "Current confirmed SMS-enabled phone number."
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "Homepage is not a valid URL."
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-msgid "Current confirmed email address."
-msgstr "Current confirmed e-mail address."
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "Full name is too long (max 255 chars)."
 
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
-msgstr "Currently"
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "description is too long (max 140 chars)."
 
-#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "DB error inserting hashtag: %s"
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "Location is too long (max 255 chars)."
 
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
 #, php-format
-msgid "DB error inserting reply: %s"
-msgstr "DB error inserting reply: %s"
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
-msgid "Delete notice"
-msgstr "Delete notice"
-
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "Describe yourself and your interests in 140 chars"
-
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87 actions/register.php:172
-#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
-#: actions/register.php:385 lib/accountsettingsaction.php:113
-msgid "Email"
-msgstr "E-mail"
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-msgid "Email Address"
-msgstr "E-mail Address"
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
-msgstr "E-mail Settings"
-
-#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-msgid "Email address already exists."
-msgstr "E-mail address already exists."
-
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
-msgid "Email address confirmation"
-msgstr "E-mail address confirmation"
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
-msgstr "E-mail address, like \"UserName@example.org\""
-
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-msgid "Email addresses"
-msgstr "E-mail addresses"
-
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
-msgid "Enter a nickname or email address."
-msgstr "Enter a nickname or e-mail address."
-
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
-msgstr "Enter the code you received on your phone."
-
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
-msgid "Error authorizing token"
-msgstr "Error authorising token."
-
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
-msgid "Error connecting user to OpenID."
-msgstr "Error connecting user to OpenID."
+msgid "Too many aliases! Maximum %d."
+msgstr ""
 
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
-msgstr "Error connecting user."
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Invalid tag: \"%s\""
 
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
-msgstr "Error inserting avatar."
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Nickname already in use. Try another one."
 
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
-msgstr "Error inserting new profile."
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
-msgstr "Error inserting remote profile."
+#: actions/apigroupjoin.php:110
+msgid "You are already a member of that group."
+msgstr "You are already a member of that group."
 
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
-msgid "Error saving address confirmation."
-msgstr "Error saving address confirmation."
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
 
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
-msgid "Error saving remote profile"
-msgstr "Error saving remote profile."
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Could not join user %s to group %s"
 
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-msgid "Error saving the profile."
-msgstr "Error saving the profile."
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "You are not a member of that group."
 
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-msgid "Error saving the user."
-msgstr "Error saving the user."
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Could not remove user %s to group %s"
 
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
-msgid "Error saving user; invalid."
-msgstr "Error saving user; invalid."
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "%s groups"
 
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
-#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
-#: actions/register.php:108 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-msgid "Error setting user."
-msgstr "Error setting user."
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Group actions"
 
-#  Added full stop
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr "Error updating profile."
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "%s groups"
 
-#  Added full stop
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
-msgstr "Error updating remote profile."
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Groups %s is a member of"
 
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr "Error with confirmation code."
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
+msgstr "This method requires a POST or DELETE."
 
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
-msgid "Existing nickname"
-msgstr "Existing nickname"
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
+msgstr "You may not delete another user's status."
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
-msgid "FAQ"
-msgstr "F.A.Q."
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "Avatar updated."
 
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
-msgid "Failed updating avatar."
-msgstr "Failed updating avatar."
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
+msgstr "No status with that ID found."
 
-#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
 #, php-format
-msgid "Feed for friends of %s"
-msgstr "Feed for friends of %s"
+msgid "That's too long. Max notice size is %d chars."
+msgstr "That's too long. Max notice size is %d chars."
 
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
-#, php-format
-msgid "Feed for replies to %s"
-msgstr "Feed for replies to %s"
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
+msgstr "Not found"
 
-#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
 #, php-format
-msgid "Feed for tag %s"
-msgstr "Feed for tag %s"
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
-msgstr "Find content of notices"
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
-msgstr "Find people on this site"
-
-#: ../actions/login.php:122
-msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
+msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
-
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
-#: actions/profilesettings.php:77 actions/register.php:178
-#: actions/profilesettings.php:103 actions/register.php:391
-#: actions/showgroup.php:235 actions/showstream.php:262
-#: actions/tagother.php:105 lib/groupeditform.php:142
-msgid "Full name"
-msgstr "Full name"
-
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
-#: actions/register.php:86 actions/updateprofile.php:94
-#: actions/editgroup.php:195 actions/newgroup.php:146
-#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
-msgid "Full name is too long (max 255 chars)."
-msgstr "Full name is too long (max 255 chars)."
 
-#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
-msgid "Help"
-msgstr "Help"
-
-#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
-msgid "Home"
-msgstr "Home"
-
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
-msgid "Homepage"
-msgstr "Homepage"
-
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
-msgid "Homepage is not a valid URL."
-msgstr "Homepage is not a valid URL."
-
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
-msgid "I want to post notices by email."
-msgstr "I want to post notices by e-mail."
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
-msgstr "I.M."
-
-#  possibly use I.M.
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
-msgstr "I.M. Address"
-
-#  requires full stops?
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
-msgstr "I.M. Settings"
-
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
-msgstr ""
-"If you already have an account, login with your username and password to "
-"connect it to your 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 ""
-"If you want to add an OpenID to your account, enter it in the box below and "
-"click \"Add\"."
-
-# double space here
-#: ../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 ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"e-mail address you have stored  in your account."
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Unsupported image file format."
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-#: actions/emailsettings.php:127 actions/smssettings.php:140
-msgid "Incoming email"
-msgstr "Incoming e-mail"
+#: actions/apitimelinefavorites.php:107
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr "%s / Favourites from %s"
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
-msgid "Incoming email address removed."
-msgstr "Incoming e-mail address removed."
+#: actions/apitimelinefavorites.php:119
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr "%s updates favourited by %s / %s."
 
-#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
-msgid "Incorrect old password"
-msgstr "Incorrect old password"
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
+#, php-format
+msgid "%s timeline"
+msgstr "%s timeline"
 
-#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
-msgid "Incorrect username or password."
-msgstr "Incorrect username or password."
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "Updates from %1$s on %2$s!"
 
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
-msgstr ""
-"Instructions for recovering your password have been sent to the e-mail "
-"address registered to your account."
+#: actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Updates replying to %2$s"
 
-#  Avatar?
-#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/apitimelinementions.php:126
 #, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "Invalid avatar URL '%s'"
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr "%1$s updates that reply to updates from %2$s / %3$s."
 
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
 #, php-format
-msgid "Invalid email address: %s"
-msgstr "Invalid e-mail address: %s"
+msgid "%s public timeline"
+msgstr "%s public timeline"
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
 #, php-format
-msgid "Invalid homepage '%s'"
-msgstr "Invalid homepage '%s'"
+msgid "%s updates from everyone!"
+msgstr "%s updates from everyone!"
 
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/apitimelinetag.php:101 actions/tag.php:66
 #, php-format
-msgid "Invalid license URL '%s'"
-msgstr "Invalid licence URL '%s'"
-
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
-msgstr "Invalid notice content"
+msgid "Notices tagged with %s"
+msgstr "Notices tagged with %s"
 
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
-msgstr "Invalid notice URI"
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Updates from %1$s on %2$s!"
 
-# URL case
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
-msgstr "Invalid notice URL"
+#: actions/apiusershow.php:96
+msgid "Not found."
+msgstr "Not found."
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "Invalid profile URL '%s'."
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "No such document."
 
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
-msgstr "Invalid profile URL (bad format)"
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+msgstr "No nickname."
 
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
-msgstr "Invalid profile URL returned by server."
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "No size."
 
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 #: actions/avatarbynickname.php:69
 msgid "Invalid size."
 msgstr "Invalid size."
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111 actions/finishopenidlogin.php:241
-#: actions/register.php:103 actions/register.php:121
-#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
-msgid "Invalid username or password."
-msgstr "Invalid username or password."
-
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-msgid "Invitation(s) sent"
-msgstr "Invitation(s) sent"
-
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-msgid "Invitation(s) sent to the following people:"
-msgstr "Invitation(s) sent to the following people:"
-
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
-msgid "Invite"
-msgstr "Invite"
-
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-msgid "Invite new users"
-msgstr "Invite new users"
-
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
-#, php-format
-msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
-msgstr ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public Licence](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
-
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
-msgstr "Jabber ID already belongs to another user."
-
-#: ../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 or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "Avatar"
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
-msgid "Language"
-msgstr "Language"
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "You can upload your personal avatar."
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
-msgid "Language is too long (max 50 chars)."
-msgstr "Language is too long (max 50 chars)."
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
+msgstr "User without matching profile"
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
-msgid "Location"
-msgstr "Location"
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+msgid "Avatar settings"
+msgstr "Avatar settings"
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
-#: actions/register.php:92 actions/updateprofile.php:109
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
-msgid "Location is too long (max 255 chars)."
-msgstr "Location is too long (max 255 chars)."
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr "Original"
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
-#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
-#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
-#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
-#, php-format
-msgid "Login"
-msgstr "Login"
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr "Preview"
 
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Login with an [OpenID](%%doc.openid%%) account."
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+msgid "Delete"
+msgstr "Delete"
 
-#: ../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 ""
-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%). "
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+msgstr "Upload"
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
-msgid "Logout"
-msgstr "Logout"
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
+msgstr "Crop"
 
-#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
-msgid "Longer name, preferably your \"real\" name"
-msgstr "Longer name, preferably your \"real\" name"
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr "There was a problem with your session token. Try again, please."
 
-#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
-msgid "Lost or forgotten password?"
-msgstr "Lost or forgotten password?"
+#: actions/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Unexpected form submission."
 
-#: ../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 "Make a new e-mail address for posting to - cancels the old one."
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
+msgstr "Pick a square area of the image to be your avatar"
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#: actions/emailsettings.php:71
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr "Manage how you get e-mail from %%site.name%%."
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
+msgstr "Lost our file data."
 
-#: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
-msgid "Member since"
-msgstr "Member since"
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+msgstr "Avatar updated."
 
-#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
-#, php-format
-msgid "Microblog by %s"
-msgstr "Microblog by %s"
+#: actions/avatarsettings.php:363
+msgid "Failed updating avatar."
+msgstr "Failed updating avatar."
 
-# Carrier?
-#: ../actions/smssettings.php:304
-#, php-format
+#: actions/avatarsettings.php:387
 #, fuzzy
-msgid ""
-"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
-"email but isn't listed here, send email to let us know at %s."
-msgstr ""
-"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
-"e-mail but isn't listed here, send e-mail to let us know at %s."
-
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-msgid "My text and files are available under "
-msgstr "My text and files are available under "
+msgid "Avatar deleted."
+msgstr "Avatar updated."
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#: actions/emailsettings.php:142 actions/smssettings.php:152
-msgid "New"
-msgstr "New"
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+msgid "No nickname"
+msgstr "No nickname"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
-#, php-format
-msgid "New email address for posting to %s"
-msgstr "New e-mail address for posting to %s"
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
+msgstr "No such group"
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
-msgid "New incoming email address added."
-msgstr "New incoming e-mail address added."
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "User profile"
 
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
-msgid "New nickname"
-msgstr "New nickname"
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s and friends, page %d"
 
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
-msgstr "New notice"
+#: actions/blockedfromgroup.php:108
+#, fuzzy
+msgid "A list of the users blocked from joining this group."
+msgstr "A list of the users in this group."
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-msgid "New password"
-msgstr "New password"
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Unblock user failed."
 
-#: ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
-msgstr "New password successfully saved. You are now logged in."
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
+msgstr "Unblock"
 
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151 actions/login.php:101
-#: actions/profilesettings.php:74 actions/register.php:165
-#: actions/login.php:228 actions/profilesettings.php:98
-#: actions/register.php:367 actions/showgroup.php:224
-#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
-msgid "Nickname"
-msgstr "Nickname"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+msgid "Unblock this user"
+msgstr "Unblock this user"
 
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69 actions/finishopenidlogin.php:181
-#: actions/profilesettings.php:225 actions/register.php:76
-#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
-msgid "Nickname already in use. Try another one."
-msgstr "Nickname already in use. Try another one."
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Not logged in."
 
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:67 ../actions/updateprofile.php:77
-#: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
-#: actions/register.php:74 actions/updateprofile.php:78
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "Nickname must have only lowercase letters and numbers, and no spaces."
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
+msgstr "No profile specified."
 
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
-msgid "Nickname not allowed."
-msgstr "Nickname not allowed."
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
+msgstr "No profile with that ID."
 
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
-msgstr "Nickname of the user you want to follow"
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Block user"
 
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
-msgid "Nickname or email"
-msgstr "Nickname or e-mail"
+#: actions/block.php:136
+msgid ""
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
+msgstr ""
 
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
+#: actions/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
 msgid "No"
 msgstr "No"
 
-#: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
-msgstr "No Jabber ID."
-
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
-msgid "No authorization request!"
-msgstr "No authorisation request!"
-
-# Carrier?
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: actions/block.php:149
 #, fuzzy
-msgid "No carrier selected."
-msgstr "No carrier selected."
-
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
-msgstr "No code entered"
-
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
-#: actions/confirmaddress.php:75
-msgid "No confirmation code."
-msgstr "No confirmation code."
-
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
-#: actions/newnotice.php:126 classes/Command.php:223
-msgid "No content!"
-msgstr "No content!"
+msgid "Do not block this user"
+msgstr "Unblock this user"
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
-msgid "No email address."
-msgstr "No e-mail address."
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
+msgstr "Yes"
 
-#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
-msgid "No id."
-msgstr "No id."
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+msgid "Block this user"
+msgstr "Block this user"
 
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
-msgid "No incoming email address."
-msgstr "No incoming e-mail address."
+#: actions/block.php:165
+msgid "You have already blocked this user."
+msgstr "You have already blocked this user."
 
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr "No nickname provided by remote server."
+#: actions/block.php:170
+msgid "Failed to save block information."
+msgstr "Failed to save block information."
 
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
-msgid "No nickname."
-msgstr "No nickname."
+#: actions/bookmarklet.php:50
+msgid "Post to "
+msgstr "Post to "
 
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229 actions/emailsettings.php:240
-#: actions/imsettings.php:214 actions/smssettings.php:237
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
-msgid "No pending confirmation to cancel."
-msgstr "No pending confirmation to cancel."
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+msgstr "No confirmation code."
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
-msgstr "No phone number."
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "Confirmation code not found."
 
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
-msgstr "No profile URL returned by server."
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "That confirmation code is not for you!"
 
-#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
-msgid "No registered email address for that user."
-msgstr "No registered e-mail address for that user."
+#: actions/confirmaddress.php:90
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr "Unrecognised address type %s"
 
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr "No request found!"
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr "That address has already been confirmed."
 
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
-msgid "No results"
-msgstr "No results"
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "Couldn't update user."
 
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
-msgstr "No size."
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr "Couldn't delete e-mail confirmation."
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
-msgid "No status found with that ID."
-msgstr "No status found with that ID."
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "Confirm Address"
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
-msgid "No status with that ID found."
-msgstr "No status with that ID found."
+#: actions/confirmaddress.php:159
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "The address \"%s\" has been confirmed for your account."
 
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
-msgstr "No such OpenID."
+#: actions/conversation.php:99
+msgid "Conversation"
+msgstr "Conversation"
 
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
-msgid "No such document."
-msgstr "No such document."
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
+msgstr "Notices"
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30 actions/shownotice.php:32
-#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "No such notice."
 
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr "No such recovery code."
-
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-msgid "No such subscription"
-msgstr "No such subscription"
-
-#: ../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 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
-msgid "No such user."
-msgstr "No such user."
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-msgid "No user with that email address or username."
-msgstr "No user with that e-mail address or username."
-
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
-msgstr "Nobody to show!"
-
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr "Not a recovery code."
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "Can't delete this notice."
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
-msgstr "Not a registered user."
+#: actions/deletenotice.php:103
+#, fuzzy
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+"You are about to permanently delete a notice.  Once this is done, it cannot "
+"be undone."
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
-msgid "Not a supported data format."
-msgstr "Not a supported data format."
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr "Delete notice"
 
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
-msgstr "Not a valid Jabber ID"
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr "Are you sure you want to delete this notice?"
 
-#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-msgid "Not a valid OpenID."
-msgstr "Not a valid OpenID."
+#: actions/deletenotice.php:145
+msgid "Do not delete this notice"
+msgstr "Do not delete this notice"
 
-# Missing full stop, needs to merge with: actions/register.php:63 actions/register.php:70 actions/register.php:152
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
-msgid "Not a valid email address"
-msgstr "Not a valid e-mail address."
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+msgid "Delete this notice"
+msgstr "Delete this notice"
 
-#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-msgid "Not a valid email address."
-msgstr "Not a valid e-mail address."
+#: actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
+msgstr "There was a problem with your session token. Try again, please."
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-#: actions/editgroup.php:186 actions/newgroup.php:137
-#: actions/profilesettings.php:195 actions/register.php:161
-msgid "Not a valid nickname."
-msgstr "Not a valid nickname."
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr "This notice is not a favourite!"
 
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
-msgstr "Not a valid profile URL (incorrect services)."
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "Add to favourites"
 
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr "Not a valid profile URL (no XRDS defined)."
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "No such document."
 
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr "Not a valid profile URL (no YADIS document)."
+#: actions/editgroup.php:56
+#, php-format
+msgid "Edit %s group"
+msgstr "Edit %s group"
 
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
-msgid "Not an image or corrupt file."
-msgstr "Not an image or corrupt file."
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
+msgstr "You must be logged in to create a group."
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
-msgid "Not authorized."
-msgstr "Not authorised."
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+msgid "You must be an admin to edit the group"
+msgstr "You must be an admin to edit the group"
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
-msgid "Not expecting this response!"
-msgstr "Not expecting this response!"
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
+msgstr "Use this form to edit the group."
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
-msgid "Not found"
-msgstr "Not found"
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "description is too long (max 140 chars)."
 
-#: ../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 actions/block.php:59 actions/disfavor.php:61
-#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
-#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
-#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
-#: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Not logged in."
+#: actions/editgroup.php:253
+msgid "Could not update group."
+msgstr "Could not update group."
 
-# removed full stop
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
-msgid "Not subscribed!."
-msgstr "Not subscribed!"
+#: actions/editgroup.php:269
+msgid "Options saved."
+msgstr "Options saved."
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
-msgstr "Notice Search"
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "E-mail Settings"
 
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
+#: actions/emailsettings.php:71
 #, php-format
-msgid "Notice feed for %s"
-msgstr "Notice feed for %s"
+msgid "Manage how you get email from %%site.name%%."
+msgstr "Manage how you get e-mail from %%site.name%%."
 
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
-msgstr "Notice has no profile"
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "Address"
 
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
-msgid "Notices"
-msgstr "Notices"
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr "Current confirmed e-mail address."
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
-#, php-format
-msgid "Notices tagged with %s"
-msgstr "Notices tagged with %s"
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "Remove"
 
-#: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
-msgstr "Old password"
+#: actions/emailsettings.php:113
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
-msgid "OpenID"
-msgstr "OpenID"
-
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
-msgid "OpenID Account Setup"
-msgstr "OpenID Account Setup"
-
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-msgid "OpenID Auto-Submit"
-msgstr "OpenID Auto-Submit"
-
-#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
-#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-msgid "OpenID Login"
-msgstr "OpenID Login"
-
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-#: actions/openidlogin.php:102 actions/openidsettings.php:101
-msgid "OpenID URL"
-msgstr "OpenID URL"
-
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
-msgid "OpenID authentication cancelled."
-msgstr "OpenID authentication cancelled."
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr "OpenID authentication failed: %s"
-
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "OpenID failure: %s"
-
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr "OpenID removed."
-
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
-msgstr "OpenID settings"
-
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-msgid "Optionally add a personal message to the invitation."
-msgstr "Optionally add a personal message to the invitation."
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
-msgid "Partial upload."
-msgstr "Partial upload."
+#: actions/emailsettings.php:121
+msgid "Email Address"
+msgstr "E-mail Address"
 
-#: ../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 actions/finishopenidlogin.php:118
-#: actions/login.php:231 actions/register.php:372
-#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-msgid "Password"
-msgstr "Password"
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr "E-mail address, like \"UserName@example.org\""
 
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
-msgid "Password and confirmation do not match."
-msgstr "Password and confirmation do not match."
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "Add"
 
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
-msgid "Password must be 6 chars or more."
-msgstr "Password must be 6 chars or more."
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+msgstr "Incoming e-mail"
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-msgid "Password recovery requested"
-msgstr "Password recovery requested"
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
+msgstr "Send e-mail to this address to post new notices."
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-msgid "Password saved."
-msgstr "Password saved."
+#: actions/emailsettings.php:145 actions/smssettings.php:162
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr "Make a new e-mail address for posting to - cancels the old one."
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-msgid "Passwords don't match."
-msgstr "Passwords don't match."
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
+msgstr "New"
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
-msgstr "People"
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
+msgstr "Preferences"
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
-msgstr "People Search"
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
+msgstr "Send me notices of new subscriptions through e-mail."
 
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
-msgstr "People Search"
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr "Send me e-mail when someone adds my notice as a favourite."
 
-#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
-msgid "Personal"
-msgstr "Personal"
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
+msgstr "Send me e-mail when someone sends me a private message."
 
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-msgid "Personal message"
-msgstr "Personal message"
+#: actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "Send me e-mail when someone sends me an \"@-reply\"."
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "Phone number, no punctuation or spaces, with area code"
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
+msgstr "Allow friends to nudge me and send me an e-mail."
 
-#: ../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 ""
-"Please check these details to make sure that you want to subscribe to this "
-"user's notices. If you didn't just ask to subscribe to someone's notices, "
-"click \"Cancel\"."
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
+msgstr "I want to post notices by e-mail."
 
-#: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Post a notice when my Jabber/GTalk status changes."
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
+msgstr "Publish a MicroID for my e-mail address."
 
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94 actions/emailsettings.php:86
-#: actions/imsettings.php:68 actions/smssettings.php:94
-#: actions/twittersettings.php:70 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
-msgid "Preferences"
-msgstr "Preferences"
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Save"
 
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163 actions/emailsettings.php:180
-#: actions/imsettings.php:152 actions/smssettings.php:171
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr "Preferences saved."
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
-msgid "Preferred language"
-msgstr "Preferred language"
-
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
-msgid "Privacy"
-msgstr "Privacy"
-
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-msgid "Problem saving notice."
-msgstr "Problem saving notice."
-
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
-msgid "Profile"
-msgstr "Profile"
-
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
-msgstr "Profile URL"
+#: actions/emailsettings.php:319
+msgid "No email address."
+msgstr "No e-mail address."
 
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
-msgstr "Profile settings"
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
+msgstr "Cannot normalise that e-mail address"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-msgid "Profile unknown"
-msgstr "Profile unknown"
+#: actions/emailsettings.php:330
+msgid "Not a valid email address"
+msgstr "Not a valid e-mail address."
 
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
-msgid "Public Stream Feed"
-msgstr "Public Stream Feed"
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
+msgstr "That is already your e-mail address."
 
-#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
-msgid "Public timeline"
-msgstr "Public timeline"
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another user."
+msgstr "That e-mail address already belongs to another user."
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Publish a MicroID for my Jabber/GTalk address."
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+msgstr "Couldn't insert confirmation code."
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
-msgid "Publish a MicroID for my email address."
-msgstr "Publish a MicroID for my e-mail address."
+#: actions/emailsettings.php:358
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr ""
+"A confirmation code was sent to the e-mail address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr "Recent Tags"
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
+msgstr "No pending confirmation to cancel."
 
-#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
-msgid "Recover"
-msgstr "Recover"
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "That is the wrong IM address."
 
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
-msgid "Recover password"
-msgstr "Recover password"
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "Confirmation cancelled."
 
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-msgid "Recovery code for unknown user."
-msgstr "Recovery code for unknown user."
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
+msgstr "That is not your e-mail address."
 
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
-#: actions/register.php:152 actions/register.php:207 lib/util.php:328
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-msgid "Register"
-msgstr "Register"
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "The address was removed."
 
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
-msgid "Registration not allowed."
-msgstr "Registration not allowed."
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
+msgstr "No incoming e-mail address."
 
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
-msgid "Registration successful"
-msgstr "Registration successful"
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
+msgstr "Couldn't update user record."
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
-msgid "Reject"
-msgstr "Reject"
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
+msgstr "Incoming e-mail address removed."
 
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
-msgid "Remember me"
-msgstr "Remember me"
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
+msgstr "New incoming e-mail address added."
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
-msgid "Remote profile with no matching profile"
-msgstr "Remote profile with no matching profile"
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+msgid "Popular notices"
+msgstr "Popular notices"
 
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
-msgstr "Remote subscribe"
+#: actions/favorited.php:67
+#, php-format
+msgid "Popular notices, page %d"
+msgstr "Popular notices, page %d"
 
-#: ../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 actions/emailsettings.php:101
-#: actions/emailsettings.php:134 actions/imsettings.php:102
-#: actions/openidsettings.php:166 actions/smssettings.php:103
-#: actions/smssettings.php:146 actions/twittersettings.php:115
-msgid "Remove"
-msgstr "Remove"
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
+msgstr "The most popular notices on the site right now."
 
-#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
-msgstr "Remove OpenID"
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+"Favourite notices appear on this page but no one has favourited one yet"
 
-#: ../actions/openidsettings.php:73
+#: actions/favorited.php:153
 msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
 msgstr ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+"Be the first to add a notice to your favourites by clicking the fave button "
+"next to any notice you like."
 
-#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
-msgid "Replies"
-msgstr "Replies"
-
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
-#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
-#: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: actions/favorited.php:156
 #, php-format
-msgid "Replies to %s"
-msgstr "Replies to %s"
-
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
-msgid "Reset"
-msgstr "Reset"
-
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
-msgid "Reset password"
-msgstr "Reset password"
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
+msgstr ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favourites!"
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-msgid "SMS"
-msgstr "SMS"
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
+msgstr "%s's favourite notices"
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
-msgid "SMS Phone number"
-msgstr "SMS Phone number"
+#: actions/favoritesrss.php:115
+#, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Updates favoured by %1$s on %2$s!"
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
-msgstr "SMS Settings"
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "This notice is already a favourite!"
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
-msgid "SMS confirmation"
-msgstr "SMS confirmation"
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Disfavor favourite"
 
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
-msgid "Same as password above"
-msgstr "Same as password above"
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr "Featured users"
 
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
-msgid "Same as password above. Required."
-msgstr "Same as password above. Required."
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr "Featured users, page %d"
 
-#: ../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 actions/emailsettings.php:182
-#: actions/facebooksettings.php:114 actions/imsettings.php:157
-#: actions/othersettings.php:117 actions/profilesettings.php:150
-#: actions/smssettings.php:169 actions/subscriptions.php:124
-#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
-msgid "Save"
-msgstr "Save"
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
+msgstr "A selection of some of the great users on %s"
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
-msgid "Search"
-msgstr "Search"
+#: actions/file.php:34
+msgid "No notice id"
+msgstr "No notice id"
 
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
-msgstr "Search Stream Feed"
+#: actions/file.php:38
+msgid "No notice"
+msgstr "No notice."
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
-#, php-format
-msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
+#: actions/file.php:42
+msgid "No attachments"
 msgstr ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
 
-#: ../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."
+#: actions/file.php:51
+msgid "No uploaded attachments"
 msgstr ""
-"Search for people on %%site.name%% by their name, location, or interests. "
-"Separate the terms by spaces; they must be 3 characters or more."
 
-# Carrier?
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
-#, fuzzy
-msgid "Select a carrier"
-msgstr "Select a carrier"
+#: actions/finishremotesubscribe.php:69
+msgid "Not expecting this response!"
+msgstr "Not expecting this response!"
 
-#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
-#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
-msgid "Send"
-msgstr "Send"
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "User being listened to doesn't exist."
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
-msgstr "Send e-mail to this address to post new notices."
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+msgstr "You can use the local subscription!"
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
-msgstr "Send me notices of new subscriptions through e-mail."
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
+msgstr "That user has blocked you from subscribing."
 
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
-msgid "Send me notices through Jabber/GTalk."
-msgstr "Send me notices through Jabber/GTalk."
+#: actions/finishremotesubscribe.php:106
+msgid "You are not authorized."
+msgstr "You are not authorised."
 
-# Carrier
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/finishremotesubscribe.php:109
 #, fuzzy
-msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
-msgstr ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
+msgid "Could not convert request token to access token."
+msgstr "Couldn't convert request tokens to access tokens."
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Unknown version of OMB protocol."
 
-#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
-msgid "Settings"
-msgstr "Settings"
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "Error updating remote profile."
 
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
-msgid "Settings saved."
-msgstr "Settings saved."
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+msgid "No such group."
+msgstr "No such group."
 
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr "Showing most popular tags from the last week"
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "No such notice."
 
-#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:114
-msgid "Someone else already has this OpenID."
-msgstr "Someone else already has this OpenID."
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Lost our file."
 
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
-msgstr "Something weird happened."
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "No profile specified."
 
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
-msgstr "Sorry, no incoming e-mail allowed."
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
 
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
-msgstr "Sorry, that is not your incoming e-mail address."
+#: actions/groupblock.php:95
+msgid "User is already blocked from group."
+msgstr "User is already blocked from group."
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
-msgid "Source"
-msgstr "Source"
+#: actions/groupblock.php:100
+msgid "User is not a member of group."
+msgstr "User is not a member of group."
 
-#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
-msgid "Statistics"
-msgstr "Statistics"
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "Block user"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-msgid "Stored OpenID not found."
-msgstr "Stored OpenID not found."
+#: actions/groupblock.php:162
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
-#: actions/showstream.php:197 actions/showstream.php:206
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
-msgid "Subscribe"
-msgstr "Subscribe"
+#: actions/groupblock.php:178
+msgid "Do not block this user from this group"
+msgstr "Do not block this user from this group"
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
-msgid "Subscribers"
-msgstr "Subscribers"
+#: actions/groupblock.php:179
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "A list of the users in this group."
 
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
-msgid "Subscription authorized"
-msgstr "Subscription authorised"
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
+msgstr ""
 
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
-msgid "Subscription rejected"
-msgstr "Subscription rejected"
+#: actions/groupbyid.php:74
+msgid "No ID"
+msgstr "No ID"
 
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27 actions/showstream.php:240
-#: actions/showstream.php:322 actions/subscriptions.php:27
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
-msgid "Subscriptions"
-msgstr "Subscriptions"
+#: actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "You must be logged in to create a group."
 
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
-msgid "System error uploading file."
-msgstr "System error uploading file."
+#: actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "Groups"
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
-#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
-msgid "Tags"
-msgstr "Tags"
+#: actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "Text"
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Couldn't update user."
 
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
-msgid "Text search"
-msgstr "Text search"
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "Unable to save your Twitter settings!"
 
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
-msgstr "That OpenID does not belong to you."
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Sync preferences saved."
 
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
-msgstr "That address has already been confirmed."
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
+msgstr "Group logo"
 
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
-msgstr "That confirmation code is not for you!"
+#: actions/grouplogo.php:150
+#, fuzzy, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr "You can upload a logo image for your group."
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr "That e-mail address already belongs to another user."
+#: actions/grouplogo.php:362
+#, fuzzy
+msgid "Pick a square area of the image to be the logo."
+msgstr "Pick a square area of the image to be your avatar"
 
-#: ../actions/avatar.php:80 actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
-msgstr "That file is too big."
+#: actions/grouplogo.php:396
+msgid "Logo updated."
+msgstr "Logo updated."
 
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
-msgid "That is already your Jabber ID."
-msgstr "That is already your Jabber ID."
+#: actions/grouplogo.php:398
+msgid "Failed updating logo."
+msgstr "Failed updating logo."
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
-msgid "That is already your email address."
-msgstr "That is already your e-mail address."
+#: actions/groupmembers.php:93 lib/groupnav.php:92
+#, php-format
+msgid "%s group members"
+msgstr "%s group members"
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
-msgid "That is already your phone number."
-msgstr "That is already your phone number."
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
+msgstr "%s group members, page %d"
 
-#: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
-msgid "That is not your Jabber ID."
-msgstr "That is not your Jabber ID."
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr "A list of the users in this group."
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
-msgid "That is not your email address."
-msgstr "That is not your e-mail address."
+#: actions/groupmembers.php:175 lib/groupnav.php:107
+msgid "Admin"
+msgstr "Admin"
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
-msgstr "That is not your phone number."
+#: actions/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
+msgstr "Block"
 
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-#: actions/emailsettings.php:367 actions/imsettings.php:349
-msgid "That is the wrong IM address."
-msgstr "That is the wrong IM address."
+#: actions/groupmembers.php:441
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "You must be an admin to edit the group"
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
-msgstr "That is the wrong confirmation number."
+#: actions/groupmembers.php:473
+#, fuzzy
+msgid "Make Admin"
+msgstr "Admin"
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-msgid "That phone number already belongs to another user."
-msgstr "That phone number already belongs to another user."
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
 
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49 actions/twitapistatuses.php:330
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-msgid "That's too long. Max notice size is 140 chars."
-msgstr "That's too long. Max notice size is 140 chars."
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Updates from %1$s on %2$s!"
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "That's too long. Max notice size is 255 chars."
+#: actions/groupsearch.php:52
+#, fuzzy, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+"Separate the terms by spaces; they must be 3 characters or more."
 
-#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
-#, php-format
-msgid "The address \"%s\" has been confirmed for your account."
-msgstr "The address \"%s\" has been confirmed for your account."
+#: actions/groupsearch.php:58
+msgid "Group search"
+msgstr "Group search"
 
-#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274 actions/emailsettings.php:282
-#: actions/imsettings.php:258 actions/smssettings.php:282
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
-msgid "The address was removed."
-msgstr "The address was removed."
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "No results"
 
-#: ../actions/userauthorization.php:312
+#: actions/groupsearch.php:82
+#, php-format
 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:"
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
 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
+#: actions/groupsearch.php:85
+#, php-format
 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."
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
 msgstr ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the site's instructions for details on how to fully reject the "
-"subscription."
 
-#: ../actions/subscribers.php:35 actions/subscribers.php:35
-#, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr "These are the people who listen to %s's notices."
-
-#: ../actions/subscribers.php:33 actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr "These are the people who listen to your notices."
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Groups"
 
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/groups.php:64
 #, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr "These are the people whose notices %s listens to."
-
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr "These are the people whose notices you listen to."
+msgid "Groups, page %d"
+msgstr "Groups, page %d"
 
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/groups.php:90
+#, php-format
 msgid ""
-"These people are already users and you were automatically subscribed to them:"
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
 msgstr ""
-"These people are already users and you were automatically subscribed to "
-"them:"
 
-#: ../actions/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
-msgstr "This confirmation code is too old. Please start again."
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Create a new group"
 
-#: ../lib/openid.php:195
-msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
 msgstr ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
-
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
-#, 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 ""
-"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."
-
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-msgid "This method requires a POST or DELETE."
-msgstr "This method requires a POST or 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 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
-msgid "This method requires a POST."
-msgstr "This method requires a POST."
-
-#: ../lib/util.php:164 lib/util.php:246
-msgid "This page is not available in a media type you accept"
-msgstr "This page is not available in a media type you accept"
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "User has blocked you."
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
-msgid "Timezone"
-msgstr "Timezone"
+#: actions/groupunblock.php:128 actions/unblock.php:108
+msgid "Error removing the block."
+msgstr "Error removing the block."
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
-msgid "Timezone not selected."
-msgstr "Timezone not selected."
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "I.M. Settings"
 
-# double space.
-#: ../actions/remotesubscribe.php:43
+#: actions/imsettings.php:70
 #, 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."
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 msgstr ""
-"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."
-
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
-msgid "Two user ids or screen_names must be supplied."
-msgstr "Two user ids or screen_names must be supplied."
-
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL of your homepage, blog, or profile on another site"
-
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-msgid "URL of your profile on another compatible microblogging service"
-msgstr "URL of your profile on another compatible microblogging service"
-
-#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
-#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
-#: actions/emailsettings.php:144 actions/imsettings.php:118
-#: actions/recoverpassword.php:39 actions/smssettings.php:143
-#: actions/twittersettings.php:108 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-msgid "Unexpected form submission."
-msgstr "Unexpected form submission."
-
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
-msgid "Unexpected password reset."
-msgstr "Unexpected password reset."
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-msgid "Unknown action"
-msgstr "Unknown action"
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "This page is not available in a "
 
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-msgid "Unknown version of OMB protocol."
-msgstr "Unknown version of OMB protocol."
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Current confirmed Jabber/GTalk address."
 
-#: ../lib/util.php:269 lib/util.php:285
+#: actions/imsettings.php:114
+#, fuzzy, php-format
 msgid ""
-"Unless otherwise specified, contents of this site are copyright by the "
-"contributors and available under the "
+"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 ""
-"Unless otherwise specified, contents of this site are copyright by the "
-"contributors and available under the "
-
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
-#, php-format
-msgid "Unrecognized address type %s"
-msgstr "Unrecognised address type %s"
-
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
-msgstr "Unsubscribe"
-
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-msgid "Unsupported OMB version"
-msgstr "Unsupported OMB version"
-
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
-msgid "Unsupported image file format."
-msgstr "Unsupported image file format."
-
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
-msgstr "Updates by SMS"
-
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
-msgstr "Updates by instant messenger (I.M.)"
+"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
+"message with further instructions. (Did you add %s to your buddy list?)"
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr "Updates from %1$s and friends on %2$s!"
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "I.M. Address"
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/imsettings.php:126
 #, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr "Updates from %1$s on %2$s!"
-
-#: ../actions/avatar.php:68 actions/profilesettings.php:161
-#: actions/avatarsettings.php:162 actions/grouplogo.php:232
-msgid "Upload"
-msgstr "Upload"
-
-#: ../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."
+"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 ""
-"Upload a new \"avatar\" (user image) here. You can't edit the picture after "
-"you upload it, so make sure it's more or less square. It must be under the "
-"site licence, also. Use a picture that belongs to you and that you want to "
-"share."
+"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."
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr "Upload a new profile image"
+#: actions/imsettings.php:143
+msgid "Send me notices through Jabber/GTalk."
+msgstr "Send me notices through Jabber/GTalk."
 
-#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr "Post a notice when my Jabber/GTalk status changes."
+
+#: actions/imsettings.php:153
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
-"Use this form to invite your friends and colleagues to use this service."
+"Send me replies through Jabber/GTalk from people I'm not subscribed to."
 
-#: ../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 "Used only for updates, announcements, and password recovery"
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Publish a MicroID for my Jabber/GTalk address."
 
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
-msgid "User being listened to doesn't exist."
-msgstr "User being listened to doesn't exist."
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "No Jabber ID."
 
-#: ../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
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-msgid "User has no profile."
-msgstr "User has no profile."
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr "Cannot normalise Jabber ID"
 
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
-msgstr "User nickname"
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "Not a valid Jabber ID"
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr "User not found."
+#: actions/imsettings.php:299
+msgid "That is already your Jabber ID."
+msgstr "That is already your Jabber ID."
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
-msgid "What timezone are you normally in?"
-msgstr "In which timezone are you?"
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr "Jabber ID already belongs to another user."
 
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: actions/imsettings.php:327
 #, php-format
-msgid "What's up, %s?"
-msgstr "What's up, %s?"
+msgid ""
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr ""
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-#: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Where you are, like \"City, State (or Region), Country\""
+#: actions/imsettings.php:387
+msgid "That is not your Jabber ID."
+msgstr "That is not your Jabber ID."
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/inbox.php:59
 #, php-format
-msgid "Wrong image type for '%s'"
-msgstr "Wrong image type for '%s'"
+msgid "Inbox for %s - page %d"
+msgstr "Inbox for %s - page %d"
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/inbox.php:62
 #, php-format
-msgid "Wrong size image at '%s'"
-msgstr "Wrong size image at '%s'"
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
-msgid "Yes"
-msgstr "Yes"
+msgid "Inbox for %s"
+msgstr "Inbox for %s"
 
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-msgid "You already have this OpenID!"
-msgstr "You already have this OpenID!"
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr "This is your inbox, which lists your incoming private messages."
 
-#: ../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."
+#: actions/invite.php:39
+msgid "Invites have been disabled."
 msgstr ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
 
-#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
-msgstr "You are already logged in!"
+#: actions/invite.php:41
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr "You must be logged in to invite other users to use %s"
 
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-msgid "You are already subscribed to these users:"
-msgstr "You are already subscribed to these users:"
+#: actions/invite.php:72
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "Invalid e-mail address: %s"
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
-msgid "You are not friends with the specified user."
-msgstr "You are not friends with the specified user."
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
+msgstr "Invitation(s) sent"
 
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr "You can change your password here. Choose a good one!"
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr "Invite new users"
 
-#: ../actions/register.php:135 actions/register.php:145
-msgid "You can create a new account to start posting notices."
-msgstr "You can create a new account to start posting notices."
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr "You are already subscribed to these users:"
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
+#: actions/invite.php:131 actions/invite.php:139
 #, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "You can receive SMS messages through e-mail from %%site.name%%."
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../actions/openidsettings.php:86
+#: actions/invite.php:136
 msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
+"These people are already users and you were automatically subscribed to them:"
 msgstr ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
+"These people are already users and you were automatically subscribed to them:"
 
-#: ../actions/imsettings.php:28 actions/imsettings.php:28
-#, php-format
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
+msgstr "Invitation(s) sent to the following people:"
+
+#: actions/invite.php:150
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 msgstr ""
-"You can send and receive notices through Jabber/GTalk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 
-#: ../actions/profilesettings.php:27
+#: actions/invite.php:162
 msgid ""
-"You can update your personal profile info here so people know more about you."
+"Use this form to invite your friends and colleagues to use this service."
 msgstr ""
-"You can update your personal profile info here so people know more about "
-"you."
+"Use this form to invite your friends and colleagues to use this service."
 
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
-msgstr "You can use the local subscription!"
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "E-mail addresses"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
-msgid "You can't register if you don't agree to the license."
-msgstr "You can't register if you don't agree to the licence."
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr "Addresses of friends to invite (one per line)"
 
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
-msgid "You did not send us that profile"
-msgstr "You did not send us that profile"
+#: actions/invite.php:192
+msgid "Personal message"
+msgstr "Personal message"
 
-#: ../lib/mail.php:147
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
+msgstr "Optionally add a personal message to the invitation."
+
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
+msgstr "Send"
+
+#: actions/invite.php:226
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s has invited you to join them on %2$s"
+
+#: actions/invite.php:228
 #, php-format
 msgid ""
-"You have a new posting address on %1$s.\n"
+"%1$s has invited you to join them on %2$s (%3$s).\n"
 "\n"
-"Send email to %2$s to post new messages.\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"
-"More email instructions at %3$s.\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"
-"Faithfully yours,\n"
-"%4$s"
-msgstr ""
-"You have a new posting address on %1$s.\n"
+"%1$s said:\n"
 "\n"
-"Send e-mail to %2$s to post new messages.\n"
+"%4$s\n"
 "\n"
-"More e-mail instructions at %3$s.\n"
+"You can see %1$s's profile page on %2$s here:\n"
 "\n"
-"Faithfully yours,\n"
-"%4$s"
-
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
-msgid "You may not delete another user's status."
-msgstr "You may not delete another user's status."
-
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr "You must be logged in to invite other users to use %s"
-
-#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+"%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 ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+"%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"
 
-# extra spaces.
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr "You've been identified. Enter a  new password below. "
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
+msgstr "You must be logged in to join a group."
 
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
-msgid "Your OpenID URL"
-msgstr "Your OpenID URL"
+#: actions/joingroup.php:90 lib/command.php:217
+msgid "You are already a member of that group"
+msgstr "You are already a member of that group"
 
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
-msgstr "Your nickname on this server, or your registered e-mail address."
+#: actions/joingroup.php:128 lib/command.php:234
+#, php-format
+msgid "Could not join user %s to group %s"
+msgstr "Could not join user %s to group %s"
 
-# extra spaces.
-#: ../actions/openidsettings.php:28
+#: actions/joingroup.php:135 lib/command.php:239
 #, 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%%) lets you log into many sites with the same user "
-"account. Manage your associated OpenIDs from here."
+msgid "%s joined group %s"
+msgstr "%s joined group %s"
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
-msgid "a few seconds ago"
-msgstr "a few seconds ago"
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
+msgstr "You must be logged in to leave a group."
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
-#, php-format
-msgid "about %d days ago"
-msgstr "about %d days ago"
+#: actions/leavegroup.php:90 lib/command.php:268
+msgid "You are not a member of that group."
+msgstr "You are not a member of that group."
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
-#, php-format
-msgid "about %d hours ago"
-msgstr "about %d hours ago"
+#: actions/leavegroup.php:119 lib/command.php:278
+msgid "Could not find membership record."
+msgstr "Could not find membership record."
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: actions/leavegroup.php:127 lib/command.php:284
 #, php-format
-msgid "about %d minutes ago"
-msgstr "about %d minutes ago"
+msgid "Could not remove user %s to group %s"
+msgstr "Could not remove user %s to group %s"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
-msgid "about %d months ago"
-msgstr "about %d months ago"
-
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
-msgid "about a day ago"
-msgstr "about a day ago"
-
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
-msgid "about a minute ago"
-msgstr "about a minute ago"
-
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
-msgid "about a month ago"
-msgstr "about a month ago"
+msgid "%s left group %s"
+msgstr "%s left group %s"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
-msgid "about a year ago"
-msgstr "about a year ago"
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "Already logged in."
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
-msgid "about an hour ago"
-msgstr "about an hour ago"
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Invalid notice content"
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
-msgstr "delete"
-
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117 actions/noticesearch.php:136
-#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
-msgid "in reply to..."
-msgstr "in reply to…"
-
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124 actions/noticesearch.php:143
-#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
-msgid "reply"
-msgstr "reply"
-
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-msgid "same as password above"
-msgstr "same as password above"
+#: actions/login.php:143
+msgid "Incorrect username or password."
+msgstr "Incorrect username or password."
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
-msgid "unsupported file type"
-msgstr "unsupported file type"
-
-#  erm, not sure what to do here, « is recognised as a quotation mark.
-#: ../lib/util.php:1309 lib/util.php:1443
-msgid "« After"
-msgstr "← After"
-
-#: 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
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-msgid "There was a problem with your session token. Try again, please."
-msgstr "There was a problem with your session token. Try again, please."
+#: actions/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
+msgstr "Error setting user."
 
-#: actions/disfavor.php:55 actions/disfavor.php:81
-msgid "This notice is not a favorite!"
-msgstr "This notice is not a favourite!"
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "Login"
 
-#: actions/disfavor.php:63 actions/disfavor.php:87
-msgid "Could not delete favorite."
-msgstr "Could not delete favourite."
+#: actions/login.php:243
+msgid "Login to site"
+msgstr "Login to site"
 
-#: actions/disfavor.php:72 lib/favorform.php:140
-msgid "Favor"
-msgstr "Favour"
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Nickname"
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
-msgstr "Send me e-mail when someone adds my notice as a favourite."
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Password"
 
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-msgid "Send me email when someone sends me a private message."
-msgstr "Send me e-mail when someone sends me a private message."
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "Remember me"
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
-msgid "This notice is already a favorite!"
-msgstr "This notice is already a favourite!"
+#: actions/login.php:253 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
+msgstr "Automatically login in the future; not for shared computers!"
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132 actions/favor.php:86
-#: actions/twitapifavorites.php:125 classes/Command.php:152
-msgid "Could not create favorite."
-msgstr "Could not create favourite."
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "Lost or forgotten password?"
 
-#: actions/favor.php:70
-msgid "Disfavor"
-msgstr "Disfavour"
+#: actions/login.php:282
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/login.php:286
 #, php-format
-msgid "%s favorite notices"
-msgstr "%s's favorite notices"
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
 
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
-#, php-format
-msgid "Feed of favorite notices of %s"
-msgstr "Feed of favourite notices of %s"
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
 
-#: actions/inbox.php:28 actions/inbox.php:59
+#: actions/makeadmin.php:95
 #, php-format
-msgid "Inbox for %s - page %d"
-msgstr "Inbox for %s - page %d"
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
 
-#: actions/inbox.php:30 actions/inbox.php:62
+#: actions/makeadmin.php:132
 #, php-format
-msgid "Inbox for %s"
-msgstr "Inbox for %s"
-
-#: actions/inbox.php:53 actions/inbox.php:115
-msgid "This is your inbox, which lists your incoming private messages."
-msgstr "This is your inbox, which lists your incoming private messages."
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
 
-#: actions/invite.php:178 actions/invite.php:213
+#: actions/makeadmin.php:145
 #, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+msgid "Can't make %s an admin for group %s"
 msgstr ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-
-# extra space?
-#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-msgid "Automatically login in the future; "
-msgstr "Automatically login in the future; "
 
-#: actions/login.php:122 actions/login.php:264
-msgid "For security reasons, please re-enter your "
-msgstr "For security reasons, please re-enter your "
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr "No current status"
 
-#: actions/login.php:126 actions/login.php:268
-msgid "Login with your username and password. "
-msgstr "Login with your username and password. "
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr "New group"
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
-msgid "That's too long. Max message size is 140 chars."
-msgstr "That's too long. Max message size is 140 chars."
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
+msgstr "Use this form to create a new group."
 
-#: actions/newmessage.php:65 actions/newmessage.php:128
-msgid "No recipient specified."
-msgstr "No recipient specified."
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr "New message"
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206 actions/newmessage.php:131
-#: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
 msgid "You can't send a message to this user."
 msgstr "You can't send a message to this user."
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+msgstr "No content!"
+
+#: actions/newmessage.php:158
+msgid "No recipient specified."
+msgstr "No recipient specified."
+
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 
-#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
-msgid "No such user"
-msgstr "No such user"
-
-#: actions/newmessage.php:117 actions/newmessage.php:67
-msgid "New message"
-msgstr "New message"
-
-#: actions/noticesearch.php:95 actions/noticesearch.php:146
-msgid "Notice without matching profile"
-msgstr "Notice without matching profile"
+#: actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "Message"
 
-#: actions/openidsettings.php:28 actions/openidsettings.php:70
+#: actions/newmessage.php:185 lib/command.php:375
 #, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgid "Direct message to %s sent"
+msgstr "Direct message to %s sent"
 
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
-msgstr "If you want to add an OpenID to your account, "
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
+msgstr "Ajax Error"
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr "Removing your only OpenID would make it impossible to log in! "
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "New notice"
 
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-msgid "You can remove an OpenID from your account "
-msgstr "You can remove an OpenID from your account "
+#: actions/newnotice.php:199
+msgid "Notice posted"
+msgstr "Notice posted"
 
-#: actions/outbox.php:28 actions/outbox.php:58
+#: actions/noticesearch.php:68
 #, php-format
-msgid "Outbox for %s - page %d"
-msgstr "Outbox for %s - page %d"
+msgid ""
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
+msgstr ""
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
 
-#: actions/outbox.php:30 actions/outbox.php:61
-#, php-format
-msgid "Outbox for %s"
-msgstr "Outbox for %s"
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "Text search"
 
-#: actions/outbox.php:53 actions/outbox.php:116
-msgid "This is your outbox, which lists private messages you have sent."
-msgstr "This is your outbox, which lists private messages you have sent."
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr " Search Stream for \"%s\""
 
-#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 msgstr ""
-"Search for people on %%site.name%% by their name, location, or interests. "
-
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
-msgid "You can update your personal profile info here "
-msgstr "You can update your personal profile info here "
-
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
-msgid "User without matching profile"
-msgstr "User without matching profile"
-
-#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
-msgstr "This confirmation code is too old. "
-
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
-msgstr "If you've forgotten or lost your"
 
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a "
-msgstr "You've been identified. Enter a "
-
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-msgid "Your nickname on this server, "
-msgstr "Your nickname on this server, "
-
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-msgid "Instructions for recovering your password "
-msgstr "Instructions for recovering your password "
-
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
-msgid "New password successfully saved. "
-msgstr "New password successfully saved. "
-
-#: actions/register.php:95 actions/register.php:180
-msgid "Password must be 6 or more characters."
-msgstr "Password must be 6 or more characters."
-
-#: actions/register.php:216
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to…"
-
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
-msgstr "(You should receive a message by e-mail momentarily, with "
 
-#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
-#, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr "To subscribe, you can [login](%%action.login%%),"
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Updates from %1$s on %2$s!"
 
-#: actions/showfavorites.php:61 actions/showfavorites.php:145
-#, php-format
-msgid "Feed for favorites of %s"
-msgstr "Feed for favourites of %s"
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "All updates matching search term \"%s\""
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-msgid "Could not retrieve favorite notices."
-msgstr "Could not retrieve favourite notices."
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+"This user doesn't allow nudges or hasn't confirmed or set his e-mail yet."
 
-#: actions/showmessage.php:33 actions/showmessage.php:81
-msgid "No such message."
-msgstr "No such message."
+#: actions/nudge.php:94
+msgid "Nudge sent"
+msgstr "Nudge sent"
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
-msgstr "Only the sender and recipient may read this message."
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr "Nudge sent!"
 
-#: actions/showmessage.php:61 actions/showmessage.php:108
-#, php-format
-msgid "Message to %1$s on %2$s"
-msgstr "Message to %1$s on %2$s"
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+msgstr "Notice has no profile"
 
-#: actions/showmessage.php:66 actions/showmessage.php:113
+#: actions/oembed.php:86 actions/shownotice.php:180
 #, php-format
-msgid "Message from %1$s on %2$s"
-msgstr "Message from %1$s on %2$s"
-
-#: actions/showstream.php:154
-msgid "Send a message"
-msgstr "Send a message"
+msgid "%1$s's status on %2$s"
+msgstr "%1$s's status on %2$s"
 
-# Carrier?
-#: actions/smssettings.php:312 actions/smssettings.php:464
-#, php-format
+#: actions/oembed.php:157
 #, fuzzy
-msgid "Mobile carrier for your phone. "
-msgstr "Mobile carrier for your phone. "
-
-#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
-#, php-format
-msgid "Direct messages to %s"
-msgstr "Direct messages to %s"
-
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
-#, php-format
-msgid "All the direct messages sent to %s"
-msgstr "All the direct messages sent to %s"
-
-#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-msgid "Direct Messages You've Sent"
-msgstr "Direct Messages You've Sent"
-
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
-#, php-format
-msgid "All the direct messages sent from %s"
-msgstr "All the direct messages sent from %s"
+msgid "content type "
+msgstr "Connect"
 
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-msgid "No message text!"
-msgstr "No message text!"
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
 
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-msgid "Recipient user not found."
-msgstr "Recipient user not found."
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
+msgstr "Not a supported data format."
 
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr "Can't send direct messages to users who aren't your friend."
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "People Search"
 
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
-#, php-format
-msgid "%s / Favorites from %s"
-msgstr "%s / Favourites from %s"
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "Notice Search"
 
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
-#, php-format
-msgid "%s updates favorited by %s / %s."
-msgstr "%s updates favourited by %s / %s."
+#: actions/othersettings.php:60
+msgid "Other Settings"
+msgstr "Other Settings"
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
-#, php-format
-msgid "%s added your notice as a favorite"
-msgstr "%s added your notice as a favourite"
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr "Manage various other options."
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
-#, php-format
-msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+#: actions/othersettings.php:108
+msgid " (free service)"
 msgstr ""
-"%1$s just added your notice from %2$s as one of their favourites.\n"
-"\n"
 
-#: actions/twittersettings.php:27
-msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
 msgstr ""
-"Add your Twitter account to automatically send your notices to Twitter, "
-
-#: actions/twittersettings.php:41 actions/twittersettings.php:60
-msgid "Twitter settings"
-msgstr "Twitter settings"
-
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-msgid "Twitter Account"
-msgstr "Twitter Account"
-
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-msgid "Current verified Twitter account."
-msgstr "Current verified Twitter account."
-
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr "Twitter Username"
-
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-msgid "No spaces, please."
-msgstr "No spaces, please."
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
-msgstr "Twitter Password"
-
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-msgid "Automatically send my notices to Twitter."
-msgstr "Automatically send my notices to Twitter."
-
-#: actions/twittersettings.php:75 actions/twittersettings.php:146
-msgid "Send local \"@\" replies to Twitter."
-msgstr "Send local \"@\" replies to Twitter."
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
+msgstr "Automatic shortening service to use."
 
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-msgid "Subscribe to my Twitter friends here."
-msgstr "Subscribe to my Twitter friends here."
+#: actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "Profile settings"
 
-#: actions/twittersettings.php:122
-msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
 msgstr ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
 
-#: actions/twittersettings.php:128 actions/twittersettings.php:334
-msgid "Could not verify your Twitter credentials!"
-msgstr "Could not verify your Twitter credentials!"
+#: actions/othersettings.php:153
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "URL shortening service is too long (max 50 chars)."
 
-#: actions/twittersettings.php:137
+#: actions/outbox.php:58
 #, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr "Unable to retrieve account information for \"%s\" from Twitter."
-
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-msgid "Unable to save your Twitter settings!"
-msgstr "Unable to save your Twitter settings!"
-
-#: actions/twittersettings.php:174 actions/twittersettings.php:376
-msgid "Twitter settings saved."
-msgstr "Twitter settings saved."
-
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-msgid "That is not your Twitter account."
-msgstr "That is not your Twitter account."
-
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
-msgid "Couldn't remove Twitter user."
-msgstr "Couldn't remove Twitter user."
-
-#: actions/twittersettings.php:212 actions/twittersettings.php:407
-msgid "Twitter account removed."
-msgstr "Twitter account removed."
-
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
-msgid "Couldn't save Twitter preferences."
-msgstr "Couldn't save Twitter preferences."
+msgid "Outbox for %s - page %d"
+msgstr "Outbox for %s - page %d"
 
-#: actions/twittersettings.php:245 actions/twittersettings.php:461
-msgid "Twitter preferences saved."
-msgstr "Twitter preferences saved."
+#: actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
+msgstr "Outbox for %s"
 
-#: actions/userauthorization.php:84 actions/userauthorization.php:86
-msgid "Please check these details to make sure "
-msgstr "Please check these details to make sure "
+#: actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr "This is your outbox, which lists private messages you have sent."
 
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
-msgid "The subscription has been authorized, but no "
-msgstr "The subscription has been authorised, but no "
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "Change password"
 
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-msgid "The subscription has been rejected, but no "
-msgstr "The subscription has been rejected, but no "
+#: actions/passwordsettings.php:69
+msgid "Change your password."
+msgstr "Change your password."
 
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-msgid "Command results"
-msgstr "Command results"
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+msgid "Password change"
+msgstr "Password change"
 
-#: classes/Channel.php:148 classes/Channel.php:204
-msgid "Command complete"
-msgstr "Command complete"
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "Old password"
 
-#: classes/Channel.php:158 classes/Channel.php:215
-msgid "Command failed"
-msgstr "Command failed"
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "New password"
 
-#: classes/Command.php:39 classes/Command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Sorry, this command is not yet implemented."
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6 or more characters"
 
-#: classes/Command.php:96 classes/Command.php:113
-#, php-format
-msgid "Subscriptions: %1$s\n"
-msgstr "Subscriptions: %1$s\n"
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "Confirm"
 
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
-msgid "User has no last notice"
-msgstr "User has no last notice"
+#: actions/passwordsettings.php:113
+msgid "same as password above"
+msgstr "same as password above"
 
-#: classes/Command.php:146 classes/Command.php:166
-msgid "Notice marked as fave."
-msgstr "Notice marked as fave."
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "Change"
 
-#: classes/Command.php:166 classes/Command.php:189
-#, php-format
-msgid "%1$s (%2$s)"
-msgstr "%1$s (%2$s)"
+#: actions/passwordsettings.php:154 actions/register.php:230
+msgid "Password must be 6 or more characters."
+msgstr "Password must be 6 or more characters."
 
-#: classes/Command.php:169 classes/Command.php:192
-#, php-format
-msgid "Fullname: %s"
-msgstr "Fullname: %s"
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "Passwords don't match."
 
-#: classes/Command.php:172 classes/Command.php:195
-#, php-format
-msgid "Location: %s"
-msgstr "Location: %s"
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "Incorrect old password"
 
-#: classes/Command.php:175 classes/Command.php:198
-#, php-format
-msgid "Homepage: %s"
-msgstr "Homepage: %s"
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "Error saving user; invalid."
 
-#: classes/Command.php:178 classes/Command.php:201
-#, php-format
-msgid "About: %s"
-msgstr "About: %s"
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "Can't save new password."
 
-#: classes/Command.php:200 classes/Command.php:228
-#, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
-msgstr "Message too long - maximum is 140 characters, you sent %d"
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "Password saved."
 
-#: classes/Command.php:214 classes/Command.php:245
+#: actions/peoplesearch.php:52
 #, php-format
-msgid "Direct message to %s sent"
-msgstr "Direct message to %s sent"
-
-#: classes/Command.php:216 classes/Command.php:247
-msgid "Error sending direct message."
-msgstr "Error sending direct message."
+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 ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+"Separate the terms by spaces; they must be 3 characters or more."
 
-#: classes/Command.php:263 classes/Command.php:300
-msgid "Specify the name of the user to subscribe to"
-msgstr "Specify the name of the user to subscribe to"
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "People Search"
 
-#: classes/Command.php:270 classes/Command.php:307
+#: actions/peopletag.php:70
 #, php-format
-msgid "Subscribed to %s"
-msgstr "Subscribed to %s"
-
-#: classes/Command.php:288 classes/Command.php:328
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Specify the name of the user to unsubscribe from"
+msgid "Not a valid people tag: %s"
+msgstr "Not a valid people tag: %s"
 
-#: classes/Command.php:295 classes/Command.php:335
+#: actions/peopletag.php:144
 #, php-format
-msgid "Unsubscribed from %s"
-msgstr "Unsubscribed from %s"
-
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
-msgid "Command not yet implemented."
-msgstr "Command not yet implemented."
-
-#: classes/Command.php:313 classes/Command.php:356
-msgid "Notification off."
-msgstr "Notification off."
-
-#: classes/Command.php:315 classes/Command.php:358
-msgid "Can't turn off notification."
-msgstr "Can't turn off notification."
-
-#: classes/Command.php:333 classes/Command.php:379
-msgid "Notification on."
-msgstr "Notification on."
-
-#: classes/Command.php:335 classes/Command.php:381
-msgid "Can't turn on notification."
-msgstr "Can't turn on notification."
-
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
-msgstr "Commands:\n"
-
-#: classes/Message.php:53 classes/Message.php:56
-msgid "Could not insert message."
-msgstr "Could not insert message."
-
-#: classes/Message.php:63 classes/Message.php:66
-msgid "Could not update message with new URI."
-msgstr "Could not update message with new URI."
+msgid "Users self-tagged with %s - page %d"
+msgstr "Users self-tagged with %s - page %d"
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
-msgstr "User without matching profile in system."
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "Invalid notice content"
 
-#: lib/mail.php:147 lib/mail.php:289
+#: actions/postnotice.php:90
 #, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
-"You have a new posting address on %1$s.\n"
-"\n"
 
-#: lib/mail.php:249 lib/mail.php:508
-#, php-format
-msgid "New private message from %s"
-msgstr "New private message from %s"
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "Profile settings"
 
-#: lib/mail.php:253 lib/mail.php:512
-#, php-format
+#: actions/profilesettings.php:71
 msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+"You can update your personal profile info here so people know more about you."
 msgstr ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
-
-#: lib/mailbox.php:43 lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "Only the user can read their own mailboxes."
-
-#: lib/openid.php:195 lib/openid.php:203
-msgid "This form should automatically submit itself. "
-msgstr "This form should automatically submit itself. "
-
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-msgid "Favorites"
-msgstr "Favourites"
-
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-#, php-format
-msgid "%s's favorite notices"
-msgstr "%s's favourite notices"
+"You can update your personal profile info here so people know more about you."
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-msgid "User"
-msgstr "User"
+#: actions/profilesettings.php:99
+msgid "Profile information"
+msgstr "Profile information"
 
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-msgid "Inbox"
-msgstr "Inbox"
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
 
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-msgid "Your incoming messages"
-msgstr "Your incoming messages"
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full name"
+msgstr "Full name"
 
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-msgid "Outbox"
-msgstr "Outbox"
+#: actions/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "Homepage"
 
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-msgid "Your sent messages"
-msgstr "Your sent messages"
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "URL of your homepage, blog, or profile on another site"
 
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-msgid "Twitter"
-msgstr "Twitter"
+#: actions/profilesettings.php:122 actions/register.php:460
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Describe yourself and your interests in 140 chars"
 
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
-msgstr "Twitter integration options"
+#: actions/profilesettings.php:125 actions/register.php:463
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Describe yourself and your "
 
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-msgid "To"
-msgstr "To"
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "Bio"
 
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-msgid "Could not parse message."
-msgstr "Could not parse message."
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "Location"
 
-#: actions/all.php:63 actions/facebookhome.php:162
-#, php-format
-msgid "%s and friends, page %d"
-msgstr "%s and friends, page %d"
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "Where you are, like \"City, State (or Region), Country\""
 
-#: actions/avatarsettings.php:76
-msgid "You can upload your personal avatar."
-msgstr "You can upload your personal avatar."
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
+msgstr "Tags"
 
-#  requires full stops?
-#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
-msgid "Avatar settings"
-msgstr "Avatar settings"
+#: actions/profilesettings.php:140
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-msgid "Original"
-msgstr "Original"
+#: actions/profilesettings.php:144
+msgid "Language"
+msgstr "Language"
 
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-msgid "Preview"
-msgstr "Preview"
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr "Preferred language"
 
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
-msgid "Crop"
-msgstr "Crop"
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr "Timezone"
 
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-msgid "There was a problem with your session token. "
-msgstr "There was a problem with your session token. "
-
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-msgid "Pick a square area of the image to be your avatar"
-msgstr "Pick a square area of the image to be your avatar"
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
+msgstr "In which timezone are you?"
 
-#: actions/avatarsettings.php:327 actions/grouplogo.php:384
-msgid "Lost our file data."
-msgstr "Lost our file data."
+#: actions/profilesettings.php:160
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 
-#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
-msgid "Lost our file."
-msgstr "Lost our file."
+#: actions/profilesettings.php:221 actions/register.php:223
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Bio is too long (max 140 chars)."
 
-#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
-#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
-msgid "Unknown file type"
-msgstr "Unknown file type"
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr "Timezone not selected."
 
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "No profile specified."
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr "Language is too long (max 50 chars)."
 
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "No profile with that ID."
+#: actions/profilesettings.php:246 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Invalid tag: \"%s\""
 
-#: actions/block.php:111
-msgid "Block user"
-msgstr "Block user"
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
+msgstr "Couldn't update user for autosubscribe."
 
-#: actions/block.php:129
-msgid "Are you sure you want to block this user? "
-msgstr "Are you sure you want to block this user? "
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+msgstr "Couldn't save profile."
 
-#: actions/block.php:162
-msgid "You have already blocked this user."
-msgstr "You have already blocked this user."
+#: actions/profilesettings.php:336
+msgid "Couldn't save tags."
+msgstr "Couldn't save tags."
 
-#: actions/block.php:167
-msgid "Failed to save block information."
-msgstr "Failed to save block information."
+#: actions/profilesettings.php:344
+msgid "Settings saved."
+msgstr "Settings saved."
 
-#: actions/confirmaddress.php:159
+#: actions/public.php:83
 #, php-format
-msgid "The address \"%s\" has been "
-msgstr "The address \"%s\" has been "
-
-#: actions/deletenotice.php:73
-msgid "You are about to permanently delete a notice. "
-msgstr "You are about to permanently delete a notice. "
+msgid "Beyond the page limit (%s)"
+msgstr ""
 
-#: actions/disfavor.php:94
-msgid "Add to favorites"
-msgstr "Add to favourites"
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
+msgstr "Could not retrieve public stream."
 
-#: actions/editgroup.php:54
+#: actions/public.php:129
 #, php-format
-msgid "Edit %s group"
-msgstr "Edit %s group"
-
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-msgid "Inboxes must be enabled for groups to work"
-msgstr "Inboxes must be enabled for groups to work"
-
-#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-msgid "You must be logged in to create a group."
-msgstr "You must be logged in to create a group."
-
-#: actions/editgroup.php:87 actions/grouplogo.php:87
-#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
-msgid "No nickname"
-msgstr "No nickname"
-
-#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
-#: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
-msgid "No such group"
-msgstr "No such group"
-
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
-msgid "You must be an admin to edit the group"
-msgstr "You must be an admin to edit the group"
-
-#: actions/editgroup.php:157
-msgid "Use this form to edit the group."
-msgstr "Use this form to edit the group."
+msgid "Public timeline, page %d"
+msgstr "Public timeline, page %d"
 
-#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
-msgid "Nickname must have only lowercase letters "
-msgstr "Nickname must have only lowercase letters "
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr "Public timeline"
 
-#: actions/editgroup.php:198 actions/newgroup.php:149
-msgid "description is too long (max 140 chars)."
-msgstr "description is too long (max 140 chars)."
+#: actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Public Stream Feed"
 
-#: actions/editgroup.php:218
-msgid "Could not update group."
-msgstr "Could not update group."
+#: actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Public Stream Feed"
 
-#: actions/editgroup.php:226
-msgid "Options saved."
-msgstr "Options saved."
+#: actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Public Stream Feed"
 
-#: actions/emailsettings.php:107 actions/imsettings.php:108
+#: actions/public.php:179
 #, php-format
-msgid "Awaiting confirmation on this address. "
-msgstr "Awaiting confirmation on this address. "
-
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-msgid "Make a new email address for posting to; "
-msgstr "Make a new e-mail address for posting to; "
-
-#: actions/emailsettings.php:157
-msgid "Send me email when someone "
-msgstr "Send me e-mail when someone "
-
-#: actions/emailsettings.php:168
-msgid "Allow friends to nudge me and send me an email."
-msgstr "Allow friends to nudge me and send me an e-mail."
-
-#: actions/emailsettings.php:321
-msgid "That email address already belongs "
-msgstr "That e-mail address already belongs "
-
-#: actions/emailsettings.php:343
-msgid "A confirmation code was sent to the email address you added. "
-msgstr "A confirmation code was sent to the e-mail address you added. "
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
 
-#: actions/facebookhome.php:110
-msgid "Server error - couldn't get user!"
-msgstr "Server error - couldn't get user!"
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
 
-#: actions/facebookhome.php:196
+#: actions/public.php:186
 #, php-format
-msgid "If you would like the %s app to automatically update "
-msgstr "If you would like the %s app to automatically update "
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
 
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#: actions/public.php:233
 #, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "Allow %s to update my Facebook status"
-
-#: actions/facebookhome.php:218
-msgid "Skip"
-msgstr "Skip"
-
-#: actions/facebookhome.php:235
-msgid "No notice content!"
-msgstr "No notice content!"
-
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-msgid "Pagination"
-msgstr "Pagination"
-
-#  erm, not sure what to do here, « is recognised as a quotation mark.
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-msgid "After"
-msgstr "After"
-
-#  erm, not sure what to do here, » is recognised as a quotation mark.
-#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
-msgid "Before"
-msgstr "Before"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
+msgstr ""
 
-#: actions/facebookinvite.php:70
-#, php-format
-msgid "Thanks for inviting your friends to use %s"
-msgstr "Thanks for inviting your friends to use %s"
+#: actions/public.php:238
+#, fuzzy, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
+msgstr ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
 
-#: actions/facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Invitations have been sent to the following users:"
+#: actions/publictagcloud.php:57
+msgid "Public tag cloud"
+msgstr "Public tag cloud"
 
-#: actions/facebookinvite.php:96
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "You have been invited to %s"
-msgstr "You have been invited to %s"
+msgid "These are most popular recent tags on %s "
+msgstr "These are most popular recent tags on %s "
 
-#: actions/facebookinvite.php:105
+#: actions/publictagcloud.php:69
 #, php-format
-msgid "Invite your friends to use %s"
-msgstr "Invite your friends to use %s"
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
+msgstr ""
 
-#: actions/facebookinvite.php:113
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Friends already using %s:"
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
+msgstr ""
 
-#: actions/facebookinvite.php:130
+#: actions/publictagcloud.php:75
 #, php-format
-msgid "Send invitations"
-msgstr "Send invitations"
-
-#: actions/facebookremove.php:56
-msgid "Couldn't remove Facebook user."
-msgstr "Couldn't remove Facebook user."
-
-#: actions/facebooksettings.php:65
-msgid "There was a problem saving your sync preferences!"
-msgstr "There was a problem saving your sync preferences!"
-
-#: actions/facebooksettings.php:67
-msgid "Sync preferences saved."
-msgstr "Sync preferences saved."
-
-#: actions/facebooksettings.php:90
-msgid "Automatically update my Facebook status with my notices."
-msgstr "Automatically update my Facebook status with my notices."
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
 
-#: actions/facebooksettings.php:97
-msgid "Send \"@\" replies to Facebook."
-msgstr "Send \"@\" replies to Facebook."
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
+msgstr "Tag cloud"
 
-#: actions/facebooksettings.php:106
-msgid "Prefix"
-msgstr "Prefix"
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "You are already logged in!"
 
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
-msgstr "A string to prefix notices with."
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "No such recovery code."
 
-#: actions/facebooksettings.php:124
-#, php-format
-msgid "If you would like %s to automatically update "
-msgstr "If you would like %s to automatically update "
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "Not a recovery code."
 
-#: actions/facebooksettings.php:147
-msgid "Sync preferences"
-msgstr "Sync preferences"
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr "Recovery code for unknown user."
 
-#: actions/favor.php:94 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "Disfavor favourite"
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "Error with confirmation code."
 
-#: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
-msgid "Popular notices"
-msgstr "Popular notices"
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
+msgstr "This confirmation code is too old. Please start again."
 
-#: actions/favorited.php:67
-#, php-format
-msgid "Popular notices, page %d"
-msgstr "Popular notices, page %d"
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
+msgstr "Couldn't update user with confirmed e-mail address."
 
-#: actions/favorited.php:79
-msgid "The most popular notices on the site right now."
-msgstr "The most popular notices on the site right now."
+#: actions/recoverpassword.php:152
+msgid ""
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
+msgstr ""
 
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
-msgid "Featured users"
-msgstr "Featured users"
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
+msgstr ""
 
-#: actions/featured.php:71
-#, php-format
-msgid "Featured users, page %d"
-msgstr "Featured users, page %d"
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
+msgstr ""
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some of the great users on %s"
-msgstr "A selection of some of the great users on %s"
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
+msgstr ""
 
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
-msgstr "That user has blocked you from subscribing."
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
+msgstr "Your nickname on this server, or your registered e-mail address."
 
-#: actions/groupbyid.php:79
-msgid "No ID"
-msgstr "No ID"
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
+msgstr "Recover"
 
-#: actions/grouplogo.php:138 actions/grouplogo.php:191
-msgid "Group logo"
-msgstr "Group logo"
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "Reset password"
 
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
-msgstr "You can upload a logo image for your group."
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr "Recover password"
 
-#: actions/grouplogo.php:448
-msgid "Logo updated."
-msgstr "Logo updated."
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
+msgstr "Password recovery requested"
 
-#: actions/grouplogo.php:450
-msgid "Failed updating logo."
-msgstr "Failed updating logo."
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
+msgstr "Unknown action"
 
-#: actions/groupmembers.php:93 lib/groupnav.php:91
-#, php-format
-msgid "%s group members"
-msgstr "%s group members"
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 or more characters, and don't forget it!"
 
-#: actions/groupmembers.php:96
-#, php-format
-msgid "%s group members, page %d"
-msgstr "%s group members, page %d"
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Same as password above"
 
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
-msgstr "A list of the users in this group."
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "Reset"
 
-#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
-msgid "Groups"
-msgstr "Groups"
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "Enter a nickname or e-mail address."
 
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "Groups, page %d"
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
+msgstr "No user with that e-mail address or username."
 
-#: actions/groups.php:90
-#, php-format
-msgid "%%%%site.name%%%% groups let you find and talk with "
-msgstr "%%%%site.name%%%% groups let you find and talk with "
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr "No registered e-mail address for that user."
 
-#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-msgid "Create a new group"
-msgstr "Create a new group"
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "Error saving address confirmation."
 
-#: actions/groupsearch.php:57
-#, php-format
+#: actions/recoverpassword.php:325
 msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
 msgstr ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-
-#: actions/groupsearch.php:63
-msgid "Group search"
-msgstr "Group search"
-
-#: actions/imsettings.php:70
-msgid "You can send and receive notices through "
-msgstr "You can send and receive notices through "
-
-#: actions/imsettings.php:120
-#, php-format
-msgid "Jabber or GTalk address, "
-msgstr "Jabber or GTalk address, "
-
-#: actions/imsettings.php:147
-msgid "Send me replies through Jabber/GTalk "
-msgstr "Send me replies through Jabber/GTalk "
+"Instructions for recovering your password have been sent to the e-mail "
+"address registered to your account."
 
-#: actions/imsettings.php:321
-#, php-format
-msgid "A confirmation code was sent "
-msgstr "A confirmation code was sent "
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
+msgstr "Unexpected password reset."
 
-#: actions/joingroup.php:65
-msgid "You must be logged in to join a group."
-msgstr "You must be logged in to join a group."
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "Password must be 6 chars or more."
 
-#: actions/joingroup.php:95
-msgid "You are already a member of that group"
-msgstr "You are already a member of that group"
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
+msgstr "Password and confirmation do not match."
 
-#: actions/joingroup.php:128
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Could not join user %s to group %s"
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
+msgstr "New password successfully saved. You are now logged in."
 
-#: actions/joingroup.php:135
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s joined group %s"
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
+msgstr "Sorry, only invited people can register."
 
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
-msgstr "Inboxes must be enabled for groups to work."
+#: actions/register.php:92
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "Error with confirmation code."
 
-#: actions/leavegroup.php:65
-msgid "You must be logged in to leave a group."
-msgstr "You must be logged in to leave a group."
+#: actions/register.php:112
+msgid "Registration successful"
+msgstr "Registration successful"
 
-#: actions/leavegroup.php:88
-msgid "No such group."
-msgstr "No such group."
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "Register"
 
-#: actions/leavegroup.php:95
-msgid "You are not a member of that group."
-msgstr "You are not a member of that group."
+#: actions/register.php:135
+msgid "Registration not allowed."
+msgstr "Registration not allowed."
 
-#: actions/leavegroup.php:100
-msgid "You may not leave a group while you are its administrator."
-msgstr "You may not leave a group while you are its administrator."
+#: actions/register.php:198
+msgid "You can't register if you don't agree to the license."
+msgstr "You can't register if you don't agree to the licence."
 
-#: actions/leavegroup.php:130
-msgid "Could not find membership record."
-msgstr "Could not find membership record."
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "Not a valid e-mail address."
 
-#  Thought form was incorrect
-#: actions/leavegroup.php:138
-#, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "Could not remove user %s to group %s"
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "E-mail address already exists."
 
-#: actions/leavegroup.php:145
-#, php-format
-msgid "%s left group %s"
-msgstr "%s left group %s"
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "Invalid username or password."
 
-#: actions/login.php:225 lib/facebookaction.php:304
-msgid "Login to site"
-msgstr "Login to site"
+#: actions/register.php:342
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
 
-#: actions/microsummary.php:69
-msgid "No current status"
-msgstr "No current status"
+#: actions/register.php:424
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 
-#: actions/newgroup.php:53
-msgid "New group"
-msgstr "New group"
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr "6 or more characters. Required."
 
-#: actions/newgroup.php:115
-msgid "Use this form to create a new group."
-msgstr "Use this form to create a new group."
+#: actions/register.php:433
+msgid "Same as password above. Required."
+msgstr "Same as password above. Required."
 
-#: actions/newgroup.php:177
-msgid "Could not create group."
-msgstr "Could not create group."
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "E-mail"
 
-#: actions/newgroup.php:191
-msgid "Could not set group membership."
-msgstr "Could not set group membership."
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
+msgstr "Used only for updates, announcements, and password recovery"
 
-#: actions/newmessage.php:119 actions/newnotice.php:132
-msgid "That's too long. "
-msgstr "That's too long. "
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
+msgstr "Longer name, preferably your \"real\" name"
 
-#: actions/newmessage.php:134
-msgid "Don't send a message to yourself; "
-msgstr "Don't send a message to yourself; "
+#: actions/register.php:493
+msgid "My text and files are available under "
+msgstr "My text and files are available under "
 
-#: actions/newnotice.php:166
-msgid "Notice posted"
-msgstr "Notice posted"
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
 
-#: actions/newnotice.php:200 classes/Channel.php:163
-msgid "Ajax Error"
-msgstr "Ajax Error"
+#: actions/register.php:496
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+" except this private data: password, e-mail address, IM address, phone "
+"number."
 
-#: actions/nudge.php:85
+#: actions/register.php:537
+#, php-format
 msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+"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 ""
-"This user doesn't allow nudges or hasn't confirmed or set his e-mail yet."
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to...\n"
+"\n"
+"* Go to [your profile](%s) and post your first message.\n"
+"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
+"notices through instant messages.\n"
+"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
+"share your interests. \n"
+"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
+"others more about you. \n"
+"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
+"missed. \n"
+"\n"
+"Thanks for signing up and we hope you enjoy using this service."
 
-#: actions/nudge.php:94
-msgid "Nudge sent"
-msgstr "Nudge sent"
+#: actions/register.php:561
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+"(You should receive a message by e-mail momentarily, with instructions on "
+"how to confirm your e-mail address.)"
 
-#: actions/nudge.php:97
-msgid "Nudge sent!"
-msgstr "Nudge sent!"
+#: actions/remotesubscribe.php:98
+#, php-format
+msgid ""
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
+msgstr ""
+"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."
 
-#: actions/openidlogin.php:97
-msgid "OpenID login"
-msgstr "OpenID login"
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr "Remote subscribe"
 
-#: actions/openidsettings.php:128
-msgid "Removing your only OpenID "
-msgstr "Removing your only OpenID "
+#: actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Subscribe to this user"
 
-#  requires full stops?
-#: actions/othersettings.php:60
-msgid "Other Settings"
-msgstr "Other Settings"
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "User nickname"
 
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Manage various other options."
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr "Nickname of the user you want to follow"
 
-#: actions/othersettings.php:93
-msgid "URL Auto-shortening"
-msgstr "URL Auto-shortening"
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "Profile URL"
 
-#: actions/othersettings.php:112
-msgid "Service"
-msgstr "Service"
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "URL of your profile on another compatible microblogging service"
 
-#: actions/othersettings.php:113
-msgid "Automatic shortening service to use."
-msgstr "Automatic shortening service to use."
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
+msgstr "Subscribe"
 
-#: actions/othersettings.php:144
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "URL shortening service is too long (max 50 chars)."
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr "Invalid profile URL (bad format)"
 
-#: actions/passwordsettings.php:69
-msgid "Change your password."
-msgstr "Change your password."
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "Not a valid profile URL (no YADIS document)."
 
-#: actions/passwordsettings.php:89
-msgid "Password change"
-msgstr "Password change"
+#: actions/remotesubscribe.php:176
+#, fuzzy
+msgid "That’s a local profile! Login to subscribe."
+msgstr "That's a local profile! Login to subscribe."
 
-#: actions/peopletag.php:35
-#, php-format
-msgid "Not a valid people tag: %s"
-msgstr "Not a valid people tag: %s"
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "Couldn't get a request token."
 
-#: actions/peopletag.php:47
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
 #, php-format
-msgid "Users self-tagged with %s - page %d"
-msgstr "Users self-tagged with %s - page %d"
+msgid "Replies to %s"
+msgstr "Replies to %s"
 
-#: actions/peopletag.php:91
+#: actions/replies.php:127
 #, php-format
-msgid "These are users who have tagged themselves \"%s\" "
-msgstr "These are users who have tagged themselves \"%s\" "
-
-#: actions/profilesettings.php:91
-msgid "Profile information"
-msgstr "Profile information"
+msgid "Replies to %s, page %d"
+msgstr "Replies to %s, page %d"
 
-#: actions/profilesettings.php:124
-msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
-msgstr ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Notice feed for %s"
 
-#: actions/profilesettings.php:144
-msgid "Automatically subscribe to whoever "
-msgstr "Automatically subscribe to whoever "
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Notice feed for %s"
 
-#: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/replies.php:158
 #, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Invalid tag: \"%s\""
-
-#: actions/profilesettings.php:311
-msgid "Couldn't save tags."
-msgstr "Couldn't save tags."
+msgid "Replies feed for %s (Atom)"
+msgstr "Notice feed for %s"
 
-#: actions/public.php:107
+#: actions/replies.php:198
 #, php-format
-msgid "Public timeline, page %d"
-msgstr "Public timeline, page %d"
-
-#: actions/public.php:173
-msgid "Could not retrieve public stream."
-msgstr "Could not retrieve public stream."
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
 
-#: actions/public.php:220
+#: actions/replies.php:203
 #, php-format
 msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
 msgstr ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki"
-"/Micro-blogging) service "
 
-#: actions/publictagcloud.php:57
-msgid "Public tag cloud"
-msgstr "Public tag cloud"
-
-#: actions/publictagcloud.php:63
+#: actions/replies.php:205
 #, php-format
-msgid "These are most popular recent tags on %s "
-msgstr "These are most popular recent tags on %s "
-
-#: actions/publictagcloud.php:119
-msgid "Tag cloud"
-msgstr "Tag cloud"
-
-#: actions/register.php:139 actions/register.php:349
-msgid "Sorry, only invited people can register."
-msgstr "Sorry, only invited people can register."
-
-#: actions/register.php:149
-msgid "You can't register if you don't "
-msgstr "You can't register if you don't "
-
-#: actions/register.php:286
-msgid "With this form you can create "
-msgstr "With this form you can create "
-
-#: actions/register.php:368
-msgid "1-64 lowercase letters or numbers, "
-msgstr "1-64 lowercase letters or numbers, "
-
-#: actions/register.php:382 actions/register.php:386
-msgid "Used only for updates, announcements, "
-msgstr "Used only for updates, announcements, "
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
 
-#: actions/register.php:398
-msgid "URL of your homepage, blog, "
-msgstr "URL of your homepage, blog, "
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Message to %1$s on %2$s"
 
-#: actions/register.php:404
-msgid "Describe yourself and your "
-msgstr "Describe yourself and your "
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "%s favourite notices, page %d"
 
-#: actions/register.php:410
-msgid "Where you are, like \"City, "
-msgstr "Where you are, like \"City, "
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
+msgstr "Could not retrieve favourite notices."
 
-#: actions/register.php:432
-msgid " except this private data: password, "
-msgstr " except this private data: password, "
+#: actions/showfavorites.php:170
+#, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Feed for friends of %s"
 
-#: actions/register.php:471
+#: actions/showfavorites.php:177
 #, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
-msgstr "Congratulations, %s! And welcome to %%%%site.name%%%%. "
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Feed for friends of %s"
 
-#: actions/register.php:495
-msgid "(You should receive a message by email "
-msgstr "(You should receive a message by e-mail "
+#: actions/showfavorites.php:184
+#, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Feed for friends of %s"
 
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
-msgstr "That's a local profile! Login to subscribe."
+#: actions/showfavorites.php:205
+msgid ""
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
+msgstr ""
 
-#: actions/replies.php:118
+#: actions/showfavorites.php:207
 #, php-format
-msgid "Replies to %s, page %d"
-msgstr "Replies to %s, page %d"
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
 
-#: actions/showfavorites.php:79
+#: actions/showfavorites.php:211
 #, php-format
-msgid "%s favorite notices, page %d"
-msgstr "%s favourite notices, page %d"
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:82 lib/groupnav.php:86
 #, php-format
 msgid "%s group"
 msgstr "%s group"
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr "%s group, page %d"
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:218
 msgid "Group profile"
 msgstr "Group profile"
 
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
 msgid "URL"
 msgstr "URL"
 
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
 msgid "Note"
 msgstr "Note"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:293
 msgid "Group actions"
 msgstr "Group actions"
 
-#: actions/showgroup.php:323
-#, php-format
-msgid "Notice feed for %s group"
+#: actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Notice feed for %s group"
+
+#: actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Notice feed for %s group"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Notice feed for %s group"
+
+#: actions/showgroup.php:345
+#, php-format
+msgid "FOAF for %s group"
+msgstr "Outbox for %s"
+
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
 msgid "Members"
 msgstr "Members"
 
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
 #: lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(None)"
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:392
 msgid "All members"
 msgstr "All members"
 
-#: actions/showgroup.php:378
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "Statistics"
+
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Create"
+
+#: actions/showgroup.php:448
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-"
-"blogging](http://en.wikipedia.org/wiki/Micro-blogging) service "
+
+#: actions/showgroup.php:454
+#, fuzzy, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
+msgstr ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
+
+#: actions/showgroup.php:482
+#, fuzzy
+msgid "Admins"
+msgstr "Admin"
+
+#: actions/showmessage.php:81
+msgid "No such message."
+msgstr "No such message."
 
 #: actions/showmessage.php:98
-msgid "Only the sender and recipient "
-msgstr "Only the sender and recipient "
+msgid "Only the sender and recipient may read this message."
+msgstr "Only the sender and recipient may read this message."
+
+#: actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr "Message to %1$s on %2$s"
+
+#: actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr "Message from %1$s on %2$s"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Notice posted"
 
 #: actions/showstream.php:73
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "Notices tagged with %s"
+
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, page %d"
 
-#: actions/showstream.php:143
-msgid "'s profile"
-msgstr "'s profile"
+#: actions/showstream.php:122
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Notice feed for %s group"
 
-#: actions/showstream.php:236 actions/tagother.php:77
-msgid "User profile"
-msgstr "User profile"
+#: actions/showstream.php:129
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Notice feed for %s"
 
-#: actions/showstream.php:240 actions/tagother.php:81
-msgid "Photo"
-msgstr "Photo"
+#: actions/showstream.php:136
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Notice feed for %s"
 
-#: actions/showstream.php:317
-msgid "User actions"
-msgstr "User actions"
+#: actions/showstream.php:143
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Notice feed for %s"
 
-#: actions/showstream.php:342
-msgid "Send a direct message to this user"
-msgstr "Send a direct message to this user"
+#: actions/showstream.php:148
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Outbox for %s"
 
-#: actions/showstream.php:343
-msgid "Message"
-msgstr "Message"
+#: actions/showstream.php:191
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
 
-#: actions/showstream.php:451
-msgid "All subscribers"
-msgstr "All subscribers"
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
 
-#: actions/showstream.php:533
-msgid "All groups"
-msgstr "All groups"
+#: actions/showstream.php:198
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
 
-#: actions/showstream.php:542
+#: actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+
+#: actions/showstream.php:239
+#, fuzzy, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
+msgstr ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
+
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "SMS Settings"
+
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr "You can receive SMS messages through e-mail from %%site.name%%."
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "This page is not available in a "
+
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Current confirmed SMS-enabled phone number."
+
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
+msgstr "Awaiting confirmation on this phone number."
+
+#: actions/smssettings.php:130
+msgid "Confirmation code"
+msgstr "Confirmation code"
+
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
+msgstr "Enter the code you received on your phone."
+
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
+msgstr "SMS Phone number"
+
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "Phone number, no punctuation or spaces, with area code"
+
+#: actions/smssettings.php:174
+#, fuzzy
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
 msgstr ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-"
-"blogging](http://en.wikipedia.org/wiki/Micro-blogging) service "
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+
+#: actions/smssettings.php:306
+msgid "No phone number."
+msgstr "No phone number."
+
+#: actions/smssettings.php:311
+#, fuzzy
+msgid "No carrier selected."
+msgstr "No carrier selected."
+
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
+msgstr "That is already your phone number."
 
-#: actions/smssettings.php:128
-msgid "Phone number, no punctuation or spaces, "
-msgstr "Phone number, no punctuation or spaces, "
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
+msgstr "That phone number already belongs to another user."
 
-#: actions/smssettings.php:162
-msgid "Send me notices through SMS; "
-msgstr "Send me notices through SMS; "
+#: actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"A confirmation code was sent to the phone number you added. Check your inbox "
+"(and spam box!) for the code and instructions on how to use it."
 
-#: actions/smssettings.php:335
-msgid "A confirmation code was sent to the phone number you added. "
-msgstr "A confirmation code was sent to the phone number you added. "
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
+msgstr "That is the wrong confirmation number."
 
-# Carrier?
-#: actions/smssettings.php:453
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
+msgstr "That is not your phone number."
+
+#: actions/smssettings.php:465
 #, fuzzy
 msgid "Mobile carrier"
 msgstr "Mobile carrier"
 
+#: actions/smssettings.php:469
+#, fuzzy
+msgid "Select a carrier"
+msgstr "Select a carrier"
+
+#: actions/smssettings.php:476
+#, fuzzy, 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 ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over e-"
+"mail but isn't listed here, send e-mail to let us know at %s."
+
+#: actions/smssettings.php:498
+msgid "No code entered"
+msgstr "No code entered"
+
 #: actions/subedit.php:70
 msgid "You are not subscribed to that profile."
 msgstr "You are not subscribed to that profile."
@@ -4282,13 +3006,31 @@ msgid "%s subscribers, page %d"
 msgstr "%s subscribers, page %d"
 
 #: actions/subscribers.php:63
-msgid "These are the people who listen to "
-msgstr "These are the people who listen to "
+msgid "These are the people who listen to your notices."
+msgstr "These are the people who listen to your notices."
 
 #: actions/subscribers.php:67
 #, php-format
-msgid "These are the people who "
-msgstr "These are the people who "
+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:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
+msgstr ""
+
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr ""
+
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
 
 #: actions/subscriptions.php:52
 #, php-format
@@ -4301,27 +3043,36 @@ msgid "%s subscriptions, page %d"
 msgstr "%s subscriptions, page %d"
 
 #: actions/subscriptions.php:65
-msgid "These are the people whose notices "
-msgstr "These are the people whose notices "
+msgid "These are the people whose notices you listen to."
+msgstr "These are the people whose notices you listen to."
 
 #: actions/subscriptions.php:69
 #, php-format
-msgid "These are the people whose "
-msgstr "These are the people whose "
+msgid "These are the people whose notices %s listens to."
+msgstr "These are the people whose notices %s listens to."
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:121
+#, php-format
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
+msgstr ""
+
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s is now listening to "
+
+#: actions/subscriptions.php:194
 msgid "Jabber"
 msgstr "Jabber"
 
-#: actions/tag.php:43
-#, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Notices tagged with %s, page %d"
-
-#: actions/tag.php:66
-#, php-format
-msgid "Messages tagged \"%s\", most recent first"
-msgstr "Messages tagged \"%s\", most recent first"
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
+msgstr "SMS"
 
 #: actions/tagother.php:33
 msgid "Not logged in"
@@ -4336,11 +3087,19 @@ msgstr "No id argument."
 msgid "Tag %s"
 msgstr "Tag %s"
 
+#: actions/tagother.php:77 lib/userprofile.php:75
+msgid "User profile"
+msgstr "User profile"
+
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
+msgstr "Photo"
+
 #: actions/tagother.php:141
 msgid "Tag user"
 msgstr "Tag user"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4348,236 +3107,884 @@ msgstr ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 
-#: actions/tagother.php:164
-msgid "There was a problem with your session token."
-msgstr "There was a problem with your session token."
-
-#: actions/tagother.php:191
+#: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 
-#: actions/tagother.php:198
+#: actions/tagother.php:200
 msgid "Could not save tags."
 msgstr "Could not save tags."
 
-#: actions/tagother.php:233
+#: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "Use this form to add tags to your subscribers or subscriptions."
 
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Notices tagged with %s, page %d"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Notice feed for %s"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Notice feed for %s"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Notice feed for %s"
+
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "No such tag."
 
-#: actions/tagrss.php:66
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
+msgstr "API method under construction."
+
+#: actions/unsubscribe.php:77
+msgid "No profile id in request."
+msgstr "No profile id in request."
+
+#: actions/unsubscribe.php:84
+msgid "No profile with that id."
+msgstr "No profile with that id."
+
+#: actions/unsubscribe.php:98
+msgid "Unsubscribed"
+msgstr "Unsubscribed"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
 #, php-format
-msgid "Microblog tagged with %s"
-msgstr "Microblog tagged with %s"
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
 
-#: actions/twitapiblocks.php:47
-msgid "Block user failed."
-msgstr "Block user failed."
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "Authorise subscription"
 
-#: actions/twitapiblocks.php:69
-msgid "Unblock user failed."
-msgstr "Unblock user failed."
+#: actions/userauthorization.php:110
+#, fuzzy
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
+msgstr ""
+"Please check these details to make sure that you want to subscribe to this "
+"user's notices. If you didn't just ask to subscribe to someone's notices, "
+"click \"Cancel\"."
 
-#: actions/twitapiusers.php:48
-msgid "Not found."
-msgstr "Not found."
+#: actions/userauthorization.php:188
+#, fuzzy
+msgid "License"
+msgstr "licence."
 
-#: actions/twittersettings.php:71
-msgid "Add your Twitter account to automatically send "
-msgstr "Add your Twitter account to automatically send "
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "Accept"
 
-#: actions/twittersettings.php:119
-msgid "Twitter user name"
-msgstr "Twitter user name"
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Subscribe to this user"
 
-#: actions/twittersettings.php:126
-msgid "Twitter password"
-msgstr "Twitter password"
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "Reject"
 
-#: actions/twittersettings.php:228
-msgid "Twitter Friends"
-msgstr "Twitter Friends"
+#: actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "%s subscriptions"
 
-#: actions/twittersettings.php:327
-msgid "Username must have only numbers, "
-msgstr "Username must have only numbers, "
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
+msgstr "No authorisation request!"
 
-#: actions/twittersettings.php:341
-#, php-format
-msgid "Unable to retrieve account information "
-msgstr "Unable to retrieve account information "
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+msgstr "Subscription authorised"
 
-#: actions/unblock.php:108
-msgid "Error removing the block."
-msgstr "Error removing the block."
+#: actions/userauthorization.php:249
+#, fuzzy
+msgid ""
+"The subscription has been authorized, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to authorize the "
+"subscription. Your subscription token is:"
+msgstr ""
+"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/unsubscribe.php:50
-msgid "No profile id in request."
-msgstr "No profile id in request."
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
+msgstr "Subscription rejected"
 
-#: actions/unsubscribe.php:57
-msgid "No profile with that id."
-msgstr "No profile with that id."
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site's instructions for details on how to fully reject the "
+"subscription."
 
-#: actions/unsubscribe.php:71
-msgid "Unsubscribed"
-msgstr "Unsubscribed"
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
 
-#: actions/usergroups.php:63
+#: actions/userauthorization.php:301
 #, php-format
-msgid "%s groups"
-msgstr "%s groups"
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Can't read avatar URL '%s'"
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Wrong image type for '%s'"
+
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr "No id."
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "Profile settings"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "%s groups, page %d"
 
-#: classes/Notice.php:104
+#: actions/usergroups.php:130
+#, fuzzy
+msgid "Search for more groups"
+msgstr "Search for people or text"
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "You are not a member of that group."
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Message.php:55
+msgid "Could not insert message."
+msgstr "Could not insert message."
+
+#: classes/Message.php:65
+msgid "Could not update message with new URI."
+msgstr "Could not update message with new URI."
+
+#: classes/Notice.php:164
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "DB error inserting hashtag: %s"
+
+#: classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Problem saving notice."
+
+#: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
 msgstr "Problem saving notice. Unknown user."
 
-#: classes/Notice.php:109
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 
-#: classes/Notice.php:116
+#: classes/Notice.php:194
+#, fuzzy
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr "You are banned from posting notices on this site."
 
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
+msgstr "Problem saving notice."
+
+#: classes/Notice.php:1120
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "DB error inserting reply: %s"
+
+#: classes/User.php:347
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Message to %1$s on %2$s"
+
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Profile"
+
 #: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
+msgstr "Change your profile settings"
+
+#: lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "Upload an avatar"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr "Change your password"
+
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
+msgstr "Change e-mail handling"
+
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:124
+#, fuzzy
+msgid "Design your profile"
+msgstr "User profile"
+
+#: lib/accountsettingsaction.php:128
 msgid "Other"
 msgstr "Other"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:128
 msgid "Other options"
 msgstr "Other options"
 
-#: lib/action.php:130
+#: lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: lib/action.php:145
+#: lib/action.php:159
 msgid "Untitled page"
 msgstr "Untitled page"
 
-#: lib/action.php:316
+#: lib/action.php:424
 msgid "Primary site navigation"
 msgstr "Primary site navigation"
 
-#: lib/action.php:322
+#: lib/action.php:430
+msgid "Home"
+msgstr "Home"
+
+#: lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr "Personal profile and friends timeline"
 
-#: lib/action.php:325
-msgid "Search for people or text"
-msgstr "Search for people or text"
-
-#: lib/action.php:328
+#: lib/action.php:432
 msgid "Account"
 msgstr "Account"
 
-#: lib/action.php:328
+#: lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr "Change your e-mail, avatar, password, profile"
 
-#: lib/action.php:330
-msgid "Connect to IM, SMS, Twitter"
-msgstr "Connect to IM, SMS, Twitter"
+#: lib/action.php:435
+msgid "Connect"
+msgstr "Connect"
 
-#: lib/action.php:332
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Could not redirect to server: %s"
+
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
+msgstr "Invite"
+
+#: lib/action.php:440 lib/subgroupnav.php:106
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr "Invite friends and colleagues to join you on %s"
+
+#: lib/action.php:445
+msgid "Logout"
+msgstr "Logout"
+
+#: lib/action.php:445
 msgid "Logout from the site"
 msgstr "Logout from the site"
 
-#: lib/action.php:335
-msgid "Login to the site"
-msgstr "Login to the site"
-
-#: lib/action.php:338
+#: lib/action.php:450
 msgid "Create an account"
 msgstr "Create an account"
 
-#: lib/action.php:341
-msgid "Login with OpenID"
-msgstr "Login with OpenID"
+#: lib/action.php:453
+msgid "Login to the site"
+msgstr "Login to the site"
+
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
+msgstr "Help"
 
-#: lib/action.php:344
+#: lib/action.php:456
 msgid "Help me!"
 msgstr "Help me!"
 
-#: lib/action.php:362
+#: lib/action.php:459
+msgid "Search"
+msgstr "Search"
+
+#: lib/action.php:459
+msgid "Search for people or text"
+msgstr "Search for people or text"
+
+#: lib/action.php:480
 msgid "Site notice"
 msgstr "Site notice"
 
-#: lib/action.php:417
+#: lib/action.php:546
 msgid "Local views"
 msgstr "Local views"
 
-#: lib/action.php:472
+#: lib/action.php:612
 msgid "Page notice"
 msgstr "Page notice"
 
-#: lib/action.php:562
+#: lib/action.php:714
 msgid "Secondary site navigation"
 msgstr "Secondary site navigation"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:721
+msgid "About"
+msgstr "About"
+
+#: lib/action.php:723
+msgid "FAQ"
+msgstr "F.A.Q."
+
+#: lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/action.php:730
+msgid "Privacy"
+msgstr "Privacy"
+
+#: lib/action.php:732
+msgid "Source"
+msgstr "Source"
+
+#: lib/action.php:734
+msgid "Contact"
+msgstr "Contact"
+
+#: lib/action.php:736
+#, fuzzy
+msgid "Badge"
+msgstr "Nudge"
+
+#: lib/action.php:764
 msgid "StatusNet software license"
 msgstr "StatusNet software licence"
 
-#: lib/action.php:630
+#: lib/action.php:767
+#, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
+msgstr ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%)."
+
+#: lib/action.php:769
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** is a microblogging service."
+
+#: lib/action.php:771
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public Licence](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "StatusNet software licence"
+
+#: lib/action.php:794
 msgid "All "
 msgstr "All "
 
-#: lib/action.php:635
+#: lib/action.php:799
 msgid "license."
 msgstr "licence."
 
-#: lib/blockform.php:123 lib/blockform.php:153
-msgid "Block this user"
-msgstr "Block this user"
+#: lib/action.php:1052
+msgid "Pagination"
+msgstr "Pagination"
 
-#: lib/blockform.php:153
-msgid "Block"
-msgstr "Block"
+#: lib/action.php:1061
+msgid "After"
+msgstr "After"
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
-msgid "Disfavor this notice"
-msgstr "Disfavour this notice"
+#: lib/action.php:1069
+msgid "Before"
+msgstr "Before"
+
+#: lib/action.php:1117
+msgid "There was a problem with your session token."
+msgstr "There was a problem with your session token."
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "Profile"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
+msgstr "Command results"
+
+#: lib/channel.php:210
+msgid "Command complete"
+msgstr "Command complete"
+
+#: lib/channel.php:221
+msgid "Command failed"
+msgstr "Command failed"
+
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr "Sorry, this command is not yet implemented."
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Couldn't update user with confirmed e-mail address."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "Nudge sent"
+
+#: lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
+msgstr "User has no last notice"
+
+#: lib/command.php:190
+msgid "Notice marked as fave."
+msgstr "Notice marked as fave."
+
+#: lib/command.php:315
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#: lib/command.php:318
+#, php-format
+msgid "Fullname: %s"
+msgstr "Fullname: %s"
+
+#: lib/command.php:321
+#, php-format
+msgid "Location: %s"
+msgstr "Location: %s"
+
+#: lib/command.php:324
+#, php-format
+msgid "Homepage: %s"
+msgstr "Homepage: %s"
+
+#: lib/command.php:327
+#, php-format
+msgid "About: %s"
+msgstr "About: %s"
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr "Message too long - maximum is 140 characters, you sent %d"
+
+#: lib/command.php:377
+msgid "Error sending direct message."
+msgstr "Error sending direct message."
+
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "Message too long - maximum is 140 characters, you sent %d"
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Reply to this notice"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Problem saving notice."
+
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
+msgstr "Specify the name of the user to subscribe to"
+
+#: lib/command.php:502
+#, php-format
+msgid "Subscribed to %s"
+msgstr "Subscribed to %s"
+
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
+msgstr "Specify the name of the user to unsubscribe from"
+
+#: lib/command.php:530
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr "Unsubscribed from %s"
+
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
+msgstr "Command not yet implemented."
+
+#: lib/command.php:551
+msgid "Notification off."
+msgstr "Notification off."
+
+#: lib/command.php:553
+msgid "Can't turn off notification."
+msgstr "Can't turn off notification."
+
+#: lib/command.php:574
+msgid "Notification on."
+msgstr "Notification on."
+
+#: lib/command.php:576
+msgid "Can't turn on notification."
+msgstr "Can't turn on notification."
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Could not create OpenID from: %s"
 
-#: lib/facebookaction.php:268
+#: lib/command.php:602
 #, php-format
-msgid "To use the %s Facebook Application you need to login "
-msgstr "To use the %s Facebook Application you need to login "
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "You are not subscribed to that profile."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "You are not subscribed to that profile."
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Could not subscribe other to you."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "People subscribed to %s"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "You are not a member of that group."
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "You are not a member of that group."
+
+#: lib/command.php:670
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+
+#: lib/common.php:192
+msgid "No configuration file found. "
+msgstr "No configuration file found"
+
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
+msgstr ""
 
-#: lib/facebookaction.php:271
-msgid " a new account."
-msgstr " a new account."
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:195
+#, fuzzy
+msgid "Go to the installer."
+msgstr "Login to the site"
+
+#: lib/connectsettingsaction.php:110
+msgid "IM"
+msgstr "I.M."
+
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Updates by instant messenger (I.M.)"
+
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
+msgstr "Updates by SMS"
+
+#: lib/dberroraction.php:60
+msgid "Database error"
+msgstr ""
 
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-msgid "Published"
-msgstr "Published"
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Upload"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+msgid "Change colours"
+msgstr "Change colours"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Connect"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Search"
+
+#: lib/designsettings.php:217
+msgid "Text"
+msgstr "Text"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Login"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
+msgstr "Bad default colour settings: "
+
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
+msgstr "Disfavour this notice"
 
 #: lib/favorform.php:114 lib/favorform.php:140
 msgid "Favor this notice"
 msgstr "Favour this notice"
 
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr "Favour"
+
 #: lib/feedlist.php:64
 msgid "Export data"
 msgstr "Export data"
 
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr ""
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr ""
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr ""
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Filter tags"
@@ -4586,57 +3993,83 @@ msgstr "Filter tags"
 msgid "All"
 msgstr "All"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
+msgstr "Select tag to filter"
+
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Tag"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "Choose a tag to narrow list"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "Go"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "URL of the homepage or blog of the group or topic"
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:168
+msgid "Describe the group or topic"
+msgstr "Describe the group or topic"
+
+#: lib/groupeditform.php:170
+#, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "Describe the group or topic in %d characters"
+
+#: lib/groupeditform.php:172
 msgid "Description"
 msgstr "Description"
 
-#: lib/groupeditform.php:153
-msgid "Describe the group or topic in 140 chars"
-msgstr "Describe the group or topic in 140 chars"
-
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr "Location for the group, if any, like \"City, State (or Region), Country\""
+msgstr ""
+"Location for the group, if any, like \"City, State (or Region), Country\""
+
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
 msgid "Group"
 msgstr "Group"
 
-#: lib/groupnav.php:100
-msgid "Admin"
-msgstr "Admin"
-
 #: lib/groupnav.php:101
+#, fuzzy
+msgid "Blocked"
+msgstr "Block"
+
+#: lib/groupnav.php:102
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Block user"
+
+#: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
 msgstr "Edit %s group properties"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:113
 msgid "Logo"
 msgstr "Logo"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:114
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "Add or edit %s logo"
 
+#: lib/groupnav.php:120
+#, fuzzy, php-format
+msgid "Add or edit %s design"
+msgstr "Add or edit %s logo"
+
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Groups with most members"
@@ -4651,8 +4084,42 @@ msgid "Tags in %s group's notices"
 msgstr "Tags in %s group's notices"
 
 #: lib/htmloutputter.php:104
-msgid "This page is not available in a "
-msgstr "This page is not available in a "
+msgid "This page is not available in a media type you accept"
+msgstr "This page is not available in a media type you accept"
+
+#: lib/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "That file is too big. The maximum file size is %s."
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr "Partial upload."
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr "System error uploading file."
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr "Not an image or corrupt file."
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr "Unsupported image file format."
+
+#: lib/imagefile.php:118
+msgid "Lost our file."
+msgstr "Lost our file."
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr "Unknown file type"
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr ""
 
 #: lib/joinform.php:114
 msgid "Join"
@@ -4662,43 +4129,87 @@ msgstr "Join"
 msgid "Leave"
 msgstr "Leave"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr "Login with a username and password"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr "Sign up for a new account"
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
-msgstr "Login or register with OpenID"
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "Only the user can read their own mailboxes."
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr "from"
+
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "E-mail address confirmation"
 
-#: lib/mail.php:175
+#: lib/mail.php:174
 #, php-format
 msgid ""
 "Hey, %s.\n"
 "\n"
-msgstr ""
-"Hey, %s.\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%s\n"
 "\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
+msgstr ""
 
-#: lib/mail.php:236
+#: lib/mail.php:235
 #, php-format
-msgid "%1$s is now listening to "
-msgstr "%1$s is now listening to "
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr "%1$s is now listening to your notices on %2$s."
+
+#: lib/mail.php:240
+#, fuzzy, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s.\n"
 
-#: lib/mail.php:254
+#: lib/mail.php:253
 #, php-format
 msgid "Location: %s\n"
 msgstr "Location: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:255
 #, php-format
 msgid "Homepage: %s\n"
 msgstr "Homepage: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
@@ -4707,57 +4218,225 @@ msgstr ""
 "Bio: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:285
+#, php-format
+msgid "New email address for posting to %s"
+msgstr "New e-mail address for posting to %s"
+
+#: lib/mail.php:288
+#, 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 ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send e-mail to %2$s to post new messages.\n"
+"\n"
+"More e-mail instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+
+#: lib/mail.php:412
+#, php-format
+msgid "%s status"
+msgstr "%s status"
+
+#: lib/mail.php:438
+msgid "SMS confirmation"
+msgstr "SMS confirmation"
+
+#: lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "You've been nudged by %s"
 
-#: lib/mail.php:465
+#: lib/mail.php:466
 #, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
-msgstr "%1$s (%2$s) is wondering what you are up to "
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
+msgstr ""
+
+#: lib/mail.php:509
+#, php-format
+msgid "New private message from %s"
+msgstr "New private message from %s"
+
+#: lib/mail.php:513
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%5$s\n"
+msgstr ""
+
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s added your notice as a favourite"
 
-#: lib/mail.php:555
+#: lib/mail.php:556
 #, php-format
-msgid "%1$s just added your notice from %2$s"
-msgstr "%1$s just added your notice from %2$s"
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
-msgid "From"
-msgstr "From"
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
 
-#: lib/messageform.php:110
+#: lib/mail.php:613
+#, php-format
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+msgstr ""
+
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+msgid "Could not determine file's mime-type!"
+msgstr "Could not retrieve public stream."
+
+#: lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Send a direct notice"
 
-#: lib/noticeform.php:125
-msgid "Send a notice"
-msgstr "Send a notice"
+#: lib/messageform.php:146
+msgid "To"
+msgstr "To"
 
-#: lib/noticeform.php:152
+#: lib/messageform.php:162 lib/noticeform.php:173
 msgid "Available characters"
 msgstr "Available characters"
 
-#: lib/noticelist.php:426
-msgid "in reply to"
-msgstr "in reply to"
+#: lib/noticeform.php:145
+msgid "Send a notice"
+msgstr "Send a notice"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
+msgstr "What's up, %s?"
+
+#: lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:478
+msgid "in context"
+msgstr "in context"
+
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr "Reply to this notice"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "Reply"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
-msgid "Delete this notice"
-msgstr "Delete this notice"
-
-#: lib/noticelist.php:474
-msgid "Delete"
-msgstr "Delete"
-
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Nudge this user"
@@ -4770,39 +4449,139 @@ msgstr "Nudge"
 msgid "Send a nudge to this user"
 msgstr "Send a nudge to this user"
 
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "Error inserting new profile."
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "Error inserting avatar."
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "Error inserting remote profile."
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Delete notice"
+
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
+msgstr "Couldn't insert new subscription."
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "Personal"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "Replies"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr "Favourites"
+
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr "User"
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr "Inbox"
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr "Your incoming messages"
+
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr "Outbox"
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr "Your sent messages"
+
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Tags in %s's notices"
 
-#: lib/profilelist.php:182
-msgid "(none)"
-msgstr "(none)"
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "Subscriptions"
+
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "All subscriptions"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "Subscribers"
 
-#: lib/publicgroupnav.php:76
+#: lib/profileaction.php:157
+msgid "All subscribers"
+msgstr "All subscribers"
+
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "User"
+
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "Member since"
+
+#: lib/profileaction.php:235
+msgid "All groups"
+msgstr "All groups"
+
+#: lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Public"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "User groups"
 
-#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Recent tags"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Featured"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Popular"
 
+#: lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Search"
+
+#: lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Search"
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "People"
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr "Find people on this site"
+
 #: lib/searchgroupnav.php:82
 msgid "Notice"
 msgstr "Notice"
 
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr "Find content of notices"
+
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Find groups on this site"
@@ -4811,33 +4590,63 @@ msgstr "Find groups on this site"
 msgid "Untitled section"
 msgstr "Untitled section"
 
-#: lib/subgroupnav.php:81
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr "People %s subscribes to"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:91
 #, php-format
 msgid "People subscribed to %s"
 msgstr "People subscribed to %s"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Groups %s is a member of"
 
-#: lib/subgroupnav.php:104
-#, php-format
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Invite friends and colleagues to join you on %s"
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(none)"
+
+#: lib/subs.php:48
+msgid "Already subscribed!"
+msgstr ""
 
-#: lib/subs.php:53
+#: lib/subs.php:52
 msgid "User has blocked you."
 msgstr "User has blocked you."
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Subscribe to this user"
+#: lib/subs.php:56
+msgid "Could not subscribe."
+msgstr "Could not subscribe."
+
+#: lib/subs.php:75
+msgid "Could not subscribe other to you."
+msgstr "Could not subscribe other to you."
+
+#: lib/subs.php:124
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Not subscribed!"
+
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
+msgstr "Couldn't delete subscription."
 
 #: lib/tagcloudsection.php:56
 msgid "None"
@@ -4847,34 +4656,104 @@ msgstr "None"
 msgid "Top posters"
 msgstr "Top posters"
 
-#: lib/unblockform.php:120 lib/unblockform.php:150
-msgid "Unblock this user"
-msgstr "Unblock this user"
-
-#: lib/unblockform.php:150
-msgid "Unblock"
-msgstr "Unblock"
-
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Unsubscribe from this user"
 
-#, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "Create new account"
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "Unsubscribe"
+
+#: lib/userprofile.php:116
+msgid "Edit Avatar"
+msgstr "Edit Avatar"
+
+#: lib/userprofile.php:236
+msgid "User actions"
+msgstr "User actions"
+
+#: lib/userprofile.php:248
+msgid "Edit profile settings"
+msgstr "Edit profile settings"
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "Couldn’t confirm e-mail."
+#: lib/userprofile.php:249
+msgid "Edit"
+msgstr ""
+
+#: lib/userprofile.php:272
+msgid "Send a direct message to this user"
+msgstr "Send a direct message to this user"
+
+#: lib/userprofile.php:273
+msgid "Message"
+msgstr "Message"
+
+#: lib/util.php:821
+msgid "a few seconds ago"
+msgstr "a few seconds ago"
+
+#: lib/util.php:823
+msgid "about a minute ago"
+msgstr "about a minute ago"
+
+#: lib/util.php:825
+#, php-format
+msgid "about %d minutes ago"
+msgstr "about %d minutes ago"
+
+#: lib/util.php:827
+msgid "about an hour ago"
+msgstr "about an hour ago"
+
+#: lib/util.php:829
+#, php-format
+msgid "about %d hours ago"
+msgstr "about %d hours ago"
+
+#: lib/util.php:831
+msgid "about a day ago"
+msgstr "about a day ago"
+
+#: lib/util.php:833
+#, php-format
+msgid "about %d days ago"
+msgstr "about %d days ago"
+
+#: lib/util.php:835
+msgid "about a month ago"
+msgstr "about a month ago"
 
-#~ msgid "Email address"
-#~ msgstr "E-mail address"
+#: lib/util.php:837
+#, php-format
+msgid "about %d months ago"
+msgstr "about %d months ago"
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Error inserting notice"
+#: lib/util.php:839
+msgid "about a year ago"
+msgstr "about a year ago"
+
+#: lib/webcolor.php:82
+#, php-format
+msgid "%s is not a valid color!"
+msgstr "%s is not a valid colour!"
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
 
-#~ 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 ""
-#~ "If you’ve forgotten or lost your password, you can get a new one sent to "
-#~ "the e-mail address you have stored in your account."
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr "Could not parse message."
+
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr "Not a registered user."
+
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr "Sorry, that is not your incoming e-mail address."
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr "Sorry, no incoming e-mail allowed."
diff --git a/locale/es/LC_MESSAGES/statusnet.mo b/locale/es/LC_MESSAGES/statusnet.mo
index 05eabcc75..7bc7cf1b6 100644
--- a/locale/es/LC_MESSAGES/statusnet.mo
+++ b/locale/es/LC_MESSAGES/statusnet.mo
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index c0e69e3a7..aa34e255c 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -1,3 +1,9 @@
+# Translation of StatusNet to Spanish
+#
+# Author@translatewiki.net: Brion
+# Author@translatewiki.net: Crazymadlover
+# Author@translatewiki.net: Translationista
+# --
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -5,2652 +11,1419 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-07-12 05:49+0000\n"
-"Last-Translator: Jorge <xchido@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:21+0000\n"
+"Language-Team: Spanish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
-
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
-#, php-format
-msgid " Search Stream for \"%s\""
-msgstr "Busca \"%s\" en la Corriente"
-
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-#: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
-msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr ""
-"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
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr "desde"
-
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr "%1$s / Actualizaciones en respuesta a %2$s"
-
-#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s te ha invitado a que te unas con el/ellos en %2$s"
-
-#: ../actions/invite.php:170
-#, php-format
-#, fuzzy
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%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 te ha invitado a unirte a ellos en %2$s (%3$s).\n"
-"\n"
-"%2$s es un servicio de microblogueo que te permite estar al tanto de la "
-"gente que conoces y que te interesa.\n"
-"\n"
-"Puedes compartir noticias sobre tí mismo, tus pensamientos, o tu vida en "
-"línea con gente que te conoce. También es bueno para conocer gente que "
-"comparta tus intereses.\n"
-"\n"
-"%1$s dijo:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Puedes ver el perfil de %1$s en %2$s aquí:\n"
-"\n"
-"%5$s\n"
-"\n"
-"Si quieres inscribirte y probar el servicio, haz click en enlace debajo para "
-"aceptar la invitación.\n"
-"\n"
-"%6$s\n"
-"\n"
-"Si no deseas inscribirte puedes ignorar este mensaje. Gracias por tu "
-"paciencia y tiempo.\n"
-"\n"
-"Sinceramente, %2$s\n"
-
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s ahora está escuchando tus avisos en %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 ""
-"\t%1$s ahora está escuchando tus avisos en  %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Atentamente,\n"
-"%4$s.\n"
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "actualizaciones de %1$s en respuesta a las de %2$s / %3$s"
-
-#: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
-#, 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 actions/invite.php:91
-#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
-#, php-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: es\n"
+"X-Message-Group: out-statusnet\n"
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+msgid "No such page"
+msgstr "No existe tal página"
+
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
+msgstr "No existe ese usuario."
 
-#: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/all.php:84
 #, php-format
-msgid "%s Public Stream"
-msgstr "Mensajes publicos de %s"
+msgid "%s and friends, page %d"
+msgstr "%s y amigos, página %d"
 
-#: ../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
-#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s y amigos"
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
-#, php-format
-msgid "%s public timeline"
-msgstr "línea temporal pública de %s"
+#: actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Feed de los amigos de %s"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
-#, php-format
-msgid "%s status"
-msgstr "estado de %s"
+#: actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Feed de los amigos de %s"
 
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
-#, php-format
-msgid "%s timeline"
-msgstr "línea temporal de %s"
+#: actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Feed de los amigos de %s"
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/all.php:127
 #, php-format
-msgid "%s updates from everyone!"
-msgstr "¡Actualizaciones de todos en %s!"
-
-#: ../actions/register.php:213
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
-"(Deberías recibir un mensaje por correo eléctronico en unos momentos, con "
-"instrucciones sobre cómo confirmar tu dirección de correo.)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: actions/all.php:132
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
 msgstr ""
-"**%%site.name%%** es un servicio de microblogueo de [%%site.broughtby%%**](%%"
-"site.broughtbyurl%%)."
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: actions/all.php:134
 #, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** es un servicio de microblogueo."
-
-#: ../lib/util.php:274 lib/util.php:290
-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/finishopenidlogin.php:79 actions/profilesettings.php:76
-#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-"1-64 letras en minúscula o números, sin signos de puntuación o espacios"
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 letras en minúscula o números, sin signos de puntuación o espacios. "
-"Requerido."
-
-#: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr "6 o más caracteres"
-
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
-msgid "6 or more characters, and don't forget it!"
-msgstr "6 o más caracteres, ¡no te olvides!"
-
-#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
-msgid "6 or more characters. Required."
-msgstr "6 o más caracters. Requerido."
-
-#: ../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 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 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."
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
-"Un código de confirmación fue enviado al correo electrónico que agregaste. "
-"Revisa tu bandeja de entrada (¡y la de spam!) para encontrar el código y las "
-"instrucciones sobre cómo usarlo."
 
-#: ../actions/smssettings.php:216 actions/smssettings.php:224
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#, php-format
 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."
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
 msgstr ""
-"Un código de confirmación fue enviado al número de teléfono que agregaste. "
-"Revisa tu bandeja de entrada (¡y la de spam!) para encontrar el código y las "
-"instrucciones sobre cómo 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 actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
-msgid "API method not found!"
-msgstr "¡No se encontró el método de la 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 actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
-msgid "API method under construction."
-msgstr "Método API en construcción."
-
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
-msgid "About"
-msgstr "Acerca de"
-
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
-msgid "Accept"
-msgstr "Aceptar"
-
-#: ../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 actions/emailsettings.php:120
-#: actions/imsettings.php:127 actions/openidsettings.php:111
-#: actions/smssettings.php:133 actions/twittersettings.php:163
-msgid "Add"
-msgstr "Añadir"
-
-#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
-msgstr "Añadir OpenID"
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-msgid "Add or remove OpenIDs"
-msgstr "Agregar o quitar OpenIDs"
-
-#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39 actions/emailsettings.php:39
-#: actions/imsettings.php:40 actions/smssettings.php:39
-#: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
-msgstr "Dirección"
 
-#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-msgid "Addresses of friends to invite (one per line)"
-msgstr "Direcciones de los amigos a invitar (una por línea)"
+#: actions/all.php:165
+msgid "You and friends"
+msgstr "Tú y amigos"
 
-#: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
-msgid "All subscriptions"
-msgstr "Todas las suscripciones"
-
-#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
-#, php-format
-msgid "All updates for %s"
-msgstr "Todas las actualizaciones para %s"
-
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
 #, php-format
-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:31
-#: actions/openidlogin.php:29 actions/register.php:30
-#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
-msgid "Already logged in."
-msgstr "Ya estás conectado."
-
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
-msgid "Already subscribed!."
-msgstr "¡Ya está suscrito!"
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
-msgid "Are you sure you want to delete this notice?"
-msgstr "¿Estás seguro de que quieres eliminar este aviso?"
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr "¡Actualizaciones de %1$s y amigos en %2$s!"
 
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
-msgid "Authorize subscription"
-msgstr "Autorizar la suscripción"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
+msgstr "¡No se encontró el método de la API!"
 
-#: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
-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/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
+msgstr "Este método requiere PUBLICAR"
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/apiaccountupdatedeliverydevice.php:105
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
 msgstr ""
-"Suscribirse automáticamente a quien quiera que se suscriba a mí (es mejor "
-"para no-humanos)"
-
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34 actions/avatarsettings.php:65
-#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
-msgid "Avatar"
-msgstr "Avatar"
 
-#: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
-msgid "Avatar updated."
-msgstr "Avatar actualizado"
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "No se pudo actualizar el usuario."
 
-#: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
 #, 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?)"
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
 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 actions/emailsettings.php:55
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-"Esperando confirmación de esta dirección. Revisa tu bandeja de entrada (¡y "
-"la de spam!) por un mensaje con las instrucciones."
-
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
-msgid "Awaiting confirmation on this phone number."
-msgstr "Esperando confirmación de este número de teléfono."
+"El servidor no ha podido manejar tanta información del tipo POST (% de "
+"bytes) a causa de su configuración actual."
 
-#: ../lib/util.php:1318 lib/util.php:1452
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
 #, fuzzy
-msgid "Before »"
-msgstr "Antes »"
-
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
-#: actions/profilesettings.php:82 actions/register.php:184
-#: actions/profilesettings.php:112 actions/register.php:402
-msgid "Bio"
-msgstr "Biografía"
-
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
-#: actions/register.php:89 actions/updateprofile.php:104
-#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
-msgid "Bio is too long (max 140 chars)."
-msgstr "La biografía es demasiado larga (máx. 140 caracteres)."
-
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
-msgid "Can't delete this notice."
-msgstr "No se puede eliminar este aviso."
-
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
-#, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr "No se puede leer el URL del avatar '%s'"
+msgid "Unable to save your design settings."
+msgstr "¡No se pudo guardar tu configuración de Twitter!"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404 actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-msgid "Can't save new password."
-msgstr "No se puede guardar la nueva contraseña."
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "No se pudo actualizar el usuario."
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62 actions/emailsettings.php:58
-#: actions/imsettings.php:59 actions/smssettings.php:62
-#: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
-msgstr "Cancelar"
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "El usuario no tiene un perfil."
 
-#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Imposible crear una instancia del objeto OpenID."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "No se pudo guardar el perfil."
 
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
-msgstr "No se puede normalizar este Jabber ID"
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
+msgstr "Falló bloquear usuario."
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
-msgid "Cannot normalize that email address"
-msgstr "No se puede normalizar esta dirección de correo electrónico."
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
+msgstr "Falló desbloquear usuario."
 
-#: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
-msgstr "Cambiar"
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "¡Sin texto de mensaje!"
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
-msgstr "Cambiar el manejo del correo."
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Demasiado largo. Máximo 140 caracteres.  "
 
-#: ../actions/password.php:32 actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr "Cambiar contraseña"
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "No se encuentra usuario receptor."
 
-#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
-msgid "Change your password"
-msgstr "Cambia tu contraseña"
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr "No se puede enviar mensajes directos a usuarios que no son tu amigo."
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-msgid "Change your profile settings"
-msgstr "Cambia tus opciones de perfil"
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "Mensajes directos a %s"
 
-#: ../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
-#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
-#: actions/register.php:376 actions/smssettings.php:122
-msgid "Confirm"
-msgstr "Confirmar"
+#: actions/apidirectmessage.php:93
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr "Todos los mensajes directos enviados desde %s"
 
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "Confirmar la dirección"
+#: actions/apidirectmessage.php:101
+#, php-format
+msgid "Direct messages to %s"
+msgstr "Mensajes directos a %s"
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245 actions/emailsettings.php:256
-#: actions/imsettings.php:230 actions/smssettings.php:253
-#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
-msgid "Confirmation cancelled."
-msgstr "Confirmación cancelada."
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr "Todos los mensajes directos enviados a %s"
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
-msgid "Confirmation code"
-msgstr "Código de confirmación"
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "¡No se encontró el método de la API!"
 
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-msgid "Confirmation code not found."
-msgstr "Código de confirmación no encontrado."
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
+msgstr "No se encontró estado para ese ID"
 
-#: ../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 ""
-"¡Felicitaciones, %s! Y bienvenido a %%%%site.name%%%%. Desde aquí, puedes...\n"
-"\n"
-"* Ir a [tu perfil](%s) y enviar tu primer mensaje.\n"
-"* Agregar una [cuenta Jabber/Gtalk](%%%%action.imsettings%%%%) para enviar "
-"avisos por mensajes instantáneos.\n"
-"* [Buscar personas](%%%%action.peoplesearch%%%%) que podrías conoces o que "
-"comparte tus intereses.\n"
-"* Actualizar tus [opciones de perfil](%%%%action.profilesettings%%%%) para "
-"contar más sobre tí.\n"
-"* Leer la [documentación en línea](%%%%doc.help%%%%) para encontrar "
-"características pasadas por alto.\n"
-"\n"
-"Gracias por suscribirte y esperamos que disfrutes el uso de este servicio."
+#: actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+msgstr "¡Este aviso ya está en favoritos!"
 
-#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
-msgid "Connect"
-msgstr "Conectarse"
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+msgstr "No se pudo crear favorito."
 
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
-msgid "Connect existing account"
-msgstr "Conectarse a una cuenta existente"
+#: actions/apifavoritedestroy.php:122
+#, fuzzy
+msgid "That status is not a favorite!"
+msgstr "¡Este aviso no es un favorito!"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
-msgid "Contact"
-msgstr "Ponerse en contacto"
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr "No se pudo borrar favorito."
 
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
-#, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "No se pudo crear el formulario OpenID: %s"
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
+msgstr "No puede seguir al usuario. Usuario no encontrado"
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "No puede seguir al usuario: %s ya esta en su lista."
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
-msgid "Could not follow user: User not found."
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
 msgstr "No puede seguir al usuario. Usuario no encontrado"
 
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr "No se pudo redirigir al servidor: %s"
-
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
-msgid "Could not save avatar info"
-msgstr "No se pudo guardar la información del avatar"
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
 
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
-msgid "Could not save new profile info"
-msgstr "No se pudo guardar la información del nuevo perfil"
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
+msgstr "Deben proveerse dos identificaciones de usuario o nombres en pantalla."
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#: actions/apifriendshipsshow.php:135
 #, fuzzy
-msgid "Could not subscribe other to you."
-msgstr "No se pudo suscribir otro a tí."
-
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
-msgid "Could not subscribe."
-msgstr "No se pudo suscribir."
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
-msgstr "No se pudo actualizar el usuario con la dirección de correo confirmada."
-
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-msgid "Couldn't convert request tokens to access tokens."
-msgstr "No se pudieron convertir las clavesde petición a claves de acceso."
-
-#: ../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
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-msgid "Couldn't delete email confirmation."
-msgstr "No se pudo eliminar la confirmación de correo electrónico."
-
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
-msgid "Couldn't delete subscription."
-msgstr "No se pudo eliminar la suscripción."
+msgid "Could not determine source user."
+msgstr "No se pudo acceder a corriente pública."
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
-msgid "Couldn't find any statuses."
+#: actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
 msgstr "No se pudo encontrar ningún estado."
 
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-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/emailsettings.php:223
-#: actions/imsettings.php:195 actions/smssettings.php:214
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
-msgid "Couldn't insert confirmation code."
-msgstr "No se pudo insertar el código de confirmación."
-
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-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:299 actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-msgid "Couldn't save profile."
-msgstr "No se pudo guardar el perfil."
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
-msgstr "No se pudo actualizar el usuario para autosuscribirse."
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
-msgid "Couldn't update user record."
-msgstr "No se pudo actualizar información de 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: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
-#: actions/confirmaddress.php:114 actions/emailsettings.php:280
-#: actions/emailsettings.php:411 actions/imsettings.php:252
-#: actions/imsettings.php:395 actions/othersettings.php:162
-#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
-msgid "Couldn't update user."
-msgstr "No se pudo actualizar el usuario."
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
+#, fuzzy
+msgid "Could not create group."
+msgstr "No se pudo crear grupo."
 
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
-msgid "Create"
-msgstr "Crear"
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "No se pudo crear favorito."
 
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
-msgid "Create a new user with this nickname."
-msgstr "Crear un nuevo usuario con este apodo."
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "No se pudo configurar miembros de grupo."
 
-#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
-msgid "Create new account"
-msgstr "Crear una nueva cuenta"
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+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 "
+"espacios. "
 
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
-msgid "Creating new account for OpenID that already has a user."
-msgstr "Crear nueva cuenta para un OpenID que ya tiene un usuario."
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr "El apodo ya existe. Prueba otro."
 
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "Dirección actual Jabber/Gtalk confirmada."
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "Apodo no válido"
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "Actual número telefónico para SMS confirmado."
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "La página de inicio no es un URL válido."
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-msgid "Current confirmed email address."
-msgstr "Actual dirección de correo electrónico confirmada"
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "Tu nombre es demasiado largo (max. 255 carac.)"
 
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
-msgstr "Actualmente"
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "Descripción es demasiado larga (máx. 140 caracteres)."
 
-# 'Hash' existe en español (http://es.wikipedia.org/wiki/Hash) pero lo cambio por 'clave' para ser más claros - @fauno
-#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "Error de la BD al insertar la etiqueta clave: %s"
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
 
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
 #, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Error de BD al insertar respuesta: %s"
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
-msgid "Delete notice"
-msgstr "Borrar aviso"
-
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "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:172
-#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
-#: actions/register.php:385 lib/accountsettingsaction.php:113
-msgid "Email"
-msgstr "Correo electrónico"
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-msgid "Email Address"
-msgstr "Correo Electrónico"
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
-msgstr "Opciones de Email"
-
-#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-msgid "Email address already exists."
-msgstr "La dirección de correo electrónico ya existe."
-
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
-msgid "Email address confirmation"
-msgstr "Confirmación de correo electrónico"
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
-msgstr "Correo electrónico, como \"NombredeUsuario@ejemplo.org\""
-
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-msgid "Email addresses"
-msgstr "Direcciones de correo electrónico"
-
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
-msgid "Enter a nickname or email address."
-msgstr "Ingresa un apodo o correo electronico"
-
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
-msgstr "Ingrese el código recibido en su teléfono"
-
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
-msgid "Error authorizing token"
-msgstr "Error al autorizar clave"
-
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
-msgid "Error connecting user to OpenID."
-msgstr "Error al conectar tu usuario a OpenID"
-
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
-msgstr "Error al conectar usuario"
-
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
-msgstr "Error al insertar el avatar"
-
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
-msgstr "Error al insertar el nuevo perfil"
-
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
-msgstr "Error al insertar perfil remoto"
-
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
-msgid "Error saving address confirmation."
-msgstr "Error al guardar confirmación de la dirección."
-
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
-msgid "Error saving remote profile"
-msgstr "Error al guardar perfil remoto"
-
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-msgid "Error saving the profile."
-msgstr "Error al guardar el perfil."
-
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-msgid "Error saving the user."
-msgstr "Error al guardar el usuario."
+msgid "Too many aliases! Maximum %d."
+msgstr ""
 
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
-msgid "Error saving user; invalid."
-msgstr "Error al guardar el usuario; inválido."
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Tag no válido: '%s' "
 
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
-#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
-#: actions/register.php:108 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-msgid "Error setting user."
-msgstr "Error al configurar el usuario."
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "El apodo ya existe. Prueba otro."
 
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr "Error al actualizar el perfil"
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
-msgstr "Error al actualizar el perfil remoto"
+#: actions/apigroupjoin.php:110
+msgid "You are already a member of that group."
+msgstr "Ya eres miembro de ese grupo"
 
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr "Error con el código de confirmación."
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
-msgid "Existing nickname"
-msgstr "Apodo existente"
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "No se puede unir usuario %s a grupo %s"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
-msgid "FAQ"
-msgstr "Preguntas Frecuentes"
+#: actions/apigroupleave.php:114
+msgid "You are not a member of this group."
+msgstr "No eres miembro de este grupo."
 
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
-msgid "Failed updating avatar."
-msgstr "Error al actualizar avatar."
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "No se pudo eliminar a usuario %s de grupo %s"
 
-#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
 #, php-format
-msgid "Feed for friends of %s"
-msgstr "Feed de los amigos de %s"
+msgid "%s groups"
+msgstr "Grupos %s"
 
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/apigrouplistall.php:94
 #, php-format
-msgid "Feed for replies to %s"
-msgstr "Feed de respuestas a %s"
+msgid "groups on %s"
+msgstr "Grupos en %s"
 
-#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/apigrouplist.php:95
 #, php-format
-msgid "Feed for tag %s"
-msgstr "Feed para tag %s"
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
-msgstr "Encontrar el contenido de avisos"
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
-msgstr "Encontrar gente en este sitio"
-
-#: ../actions/login.php:122
-msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
-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:77 actions/register.php:178
-#: actions/profilesettings.php:103 actions/register.php:391
-#: actions/showgroup.php:235 actions/showstream.php:262
-#: actions/tagother.php:105 lib/groupeditform.php:142
-msgid "Full name"
-msgstr "Nombre completo"
-
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
-#: actions/register.php:86 actions/updateprofile.php:94
-#: actions/editgroup.php:195 actions/newgroup.php:146
-#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
-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:338 lib/action.php:344 lib/action.php:566
-msgid "Help"
-msgstr "Ayuda"
-
-#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
-msgid "Home"
-msgstr "Inicio"
+msgid "%s's groups"
+msgstr "Grupos de %s"
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
-msgid "Homepage"
-msgstr "Página de inicio"
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "%s es miembro de los grupos"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
-msgid "Homepage is not a valid URL."
-msgstr "La página de inicio no es un URL válido."
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
+msgstr "Este método requiere un PUBLICAR O ELIMINAR"
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
-msgid "I want to post notices by email."
-msgstr "Deseo enviar estados por email"
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
+msgstr "No puedes borrar el estado de otro usuario."
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
-msgstr "IM"
+#: actions/apistatusesshow.php:138
+msgid "Status deleted."
+msgstr "Status borrado."
 
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
-msgstr "Dirección de mensajería instantánea"
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
+msgstr "No hay estado para ese ID"
 
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
-msgstr "Configuración de mensajería instantánea"
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "Demasiado largo. La longitud máxima es de 140 caracteres. "
 
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
-msgstr ""
-"Si ya tienes una cuenta, ingresa con tu nombre de usuario y contraseña para "
-"conectarla con tu OpenID."
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
+msgstr "No encontrado"
 
-#: ../actions/openidsettings.php:45
-msgid ""
-"If you want to add an OpenID to your account, enter it in the box below and "
-"click \"Add\"."
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
-"Si quieres agregar una cuenta OpenID, ponla en el campo de abajo y haz clic "
-"en \"Añadir\"."
 
-#: ../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 ""
-"Si has olvidado o perdido tu contraseña, puedes obtener una nueva enviada a "
-"la dirección de correo electrónico que almacenaste en tu cuenta."
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+msgid "Unsupported format."
+msgstr "Formato no soportado."
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-#: actions/emailsettings.php:127 actions/smssettings.php:140
-msgid "Incoming email"
-msgstr "Correo entrante"
+#: actions/apitimelinefavorites.php:107
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr "%s / Favoritos desde %s"
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
-msgid "Incoming email address removed."
-msgstr "Dirección de correo entrante removida."
+#: actions/apitimelinefavorites.php:119
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr "%s actualizaciones favoritas por %s / %s."
 
-#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
-msgid "Incorrect old password"
-msgstr "Contraseña antigua incorrecta."
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
+#, php-format
+msgid "%s timeline"
+msgstr "línea temporal de %s"
 
-#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
-msgid "Incorrect username or password."
-msgstr "Nombre de usuario o contraseña incorrectos."
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "¡Actualizaciones de %1$s en %2$s!"
 
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
-msgstr ""
-"Se enviaron instrucciones para recuperar tu contraseña a la dirección de "
-"correo registrada."
+#: actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Actualizaciones en respuesta a %2$s"
 
-#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/apitimelinementions.php:126
 #, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "El URL del avatar '%s' es inválido"
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr "actualizaciones de %1$s en respuesta a las de %2$s / %3$s"
 
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
 #, php-format
-msgid "Invalid email address: %s"
-msgstr "Dirección de correo electrónico inválida: %s"
+msgid "%s public timeline"
+msgstr "línea temporal pública de %s"
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
 #, php-format
-msgid "Invalid homepage '%s'"
-msgstr "La página de incicio '%s' no es válida"
+msgid "%s updates from everyone!"
+msgstr "¡Actualizaciones de todos en %s!"
 
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/apitimelinetag.php:101 actions/tag.php:66
 #, php-format
-msgid "Invalid license URL '%s'"
-msgstr "El URL de la licencia '%s' es inválido"
-
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
-msgstr "El contenido del aviso es inválido"
+msgid "Notices tagged with %s"
+msgstr "Avisos marcados con %s"
 
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
-msgstr "El URI del aviso es inválido"
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "¡Actualizaciones de %1$s en %2$s!"
 
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
-msgstr "El URL del aviso es inválido"
+#: actions/apiusershow.php:96
+#, fuzzy
+msgid "Not found."
+msgstr "No se encontró."
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "El URL del perfil '%s' es inválido"
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "No existe ese documento."
 
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
-msgstr "El URL del perfil es inválido (formato incorrecto)"
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+msgstr "Ningún apodo."
 
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
-msgstr "URL del perfil devuelto por el servidor inválido."
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "Ningún tamaño."
 
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 #: actions/avatarbynickname.php:69
 msgid "Invalid size."
 msgstr "Tamaño inválido."
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111 actions/finishopenidlogin.php:241
-#: actions/register.php:103 actions/register.php:121
-#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
-msgid "Invalid username or password."
-msgstr "Usuario o contraseña inválidos."
-
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-msgid "Invitation(s) sent"
-msgstr "Invitacion(es) enviada(s)"
-
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-msgid "Invitation(s) sent to the following people:"
-msgstr "Invitacion(es) enviada(s) a las siguientes personas:"
-
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
-msgid "Invite"
-msgstr "Invitar"
-
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-msgid "Invite new users"
-msgstr "Invitar nuevos usuarios:"
-
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
-#, php-format
-msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
-msgstr ""
-"Usa el software de microblogueo [StatusNet](http://status.net), versión %s, "
-"disponible bajo la [GNU Affero General Public License](http://www.fsf.org/"
-"licensing/licenses/agpl-3.0.html)."
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "Avatar"
 
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
-msgstr "El Jabber ID ya pertenece a otro usuario."
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "Puedes cargar tu avatar personal."
 
-#: ../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 ""
-"Dirección Jabber o GTalk, por ejemplo \"NombreUsuario@ejemplo.org\". "
-"Primero, asegúrate de agregar a %s a tu lista de amigos en tu cliente de "
-"mensajería instantánea o en GTalk."
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
+msgstr "Usuario sin perfil equivalente"
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
-msgid "Language"
-msgstr "Idioma"
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+msgid "Avatar settings"
+msgstr "Configuración de Avatar"
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
-msgid "Language is too long (max 50 chars)."
-msgstr "Idioma es muy largo ( max 50 car.)"
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr "Original"
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
-msgid "Location"
-msgstr "Ubicación"
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr "Vista previa"
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
-#: actions/register.php:92 actions/updateprofile.php:109
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
-msgid "Location is too long (max 255 chars)."
-msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+msgid "Delete"
+msgstr "Borrar"
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
-#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
-#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
-#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
-#, php-format
-msgid "Login"
-msgstr "Inicio de sesión"
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+msgstr "Cargar"
 
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Inicio de sesión con una cuenta [OpenID](%%doc.openid%%)."
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
+msgstr "Cortar"
 
-#: ../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%"
-"%). "
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
 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%%). "
+"Hubo un problema con tu clave de sesión.  Por favor, intenta nuevamente."
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
-msgid "Logout"
-msgstr "Salir"
+#: actions/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Envío de formulario inesperado."
 
-#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
-msgid "Longer name, preferably your \"real\" name"
-msgstr "Nombre más largo, preferiblemente tu nombre \"real\""
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
+msgstr "Elige un área cuadrada de la imagen para que sea tu avatar"
 
-#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
-msgid "Lost or forgotten password?"
-msgstr "¿Contraseña olvidada o perdida?"
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
+msgstr "Se perdió nuestros datos de archivo."
 
-#: ../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 "Hace una nueva dirección de correo para postear; cancela la anterior."
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+msgstr "Avatar actualizado"
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#: actions/emailsettings.php:71
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr "Gestiona la forma en que recibes correo desde %%site.name%%"
+#: actions/avatarsettings.php:363
+msgid "Failed updating avatar."
+msgstr "Error al actualizar avatar."
 
-#: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
-msgid "Member since"
-msgstr "Miembro desde"
+#: actions/avatarsettings.php:387
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Avatar actualizado"
 
-#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
-#, php-format
-msgid "Microblog by %s"
-msgstr "Microblog por %s"
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+msgid "No nickname"
+msgstr "Ningún apodo."
 
-#: ../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 ""
-"Operador móvil para tu teléfono. Si conoces un operador móvil que acepte SMS "
-"sobre correo electrónico pero no está listado aquí, envíanos un correo para "
-"informarnos al %s."
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
+msgstr "No existe ese grupo"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-msgid "My text and files are available under "
-msgstr "Mi texto y archivos están disponibles bajo"
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "Perfil de usuario"
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#: actions/emailsettings.php:142 actions/smssettings.php:152
-msgid "New"
-msgstr "Nuevo"
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s y amigos, página %d"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
-#, php-format
-msgid "New email address for posting to %s"
-msgstr "Nueva dirección de correo para postear a %s"
+#: actions/blockedfromgroup.php:108
+#, fuzzy
+msgid "A list of the users blocked from joining this group."
+msgstr "Lista de los usuarios en este grupo."
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
-msgid "New incoming email address added."
-msgstr "Nueva dirección de correo entrante agregada."
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Falló desbloquear usuario."
 
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
-msgid "New nickname"
-msgstr "Nuevo apodo"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
+msgstr "Desbloquear"
 
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
-msgstr "Nuevo aviso"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+#, fuzzy
+msgid "Unblock this user"
+msgstr "Desbloquear este usuario"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-msgid "New password"
-msgstr "Nueva contraseña"
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "No conectado."
 
-#: ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
-msgstr "Nueva contraseña guardada correctamente. Has iniciado una sesión."
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
+msgstr "No se especificó perfil."
 
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151 actions/login.php:101
-#: actions/profilesettings.php:74 actions/register.php:165
-#: actions/login.php:228 actions/profilesettings.php:98
-#: actions/register.php:367 actions/showgroup.php:224
-#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
-msgid "Nickname"
-msgstr "Apodo"
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
+msgstr "No existe perfil con ese ID"
 
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69 actions/finishopenidlogin.php:181
-#: actions/profilesettings.php:225 actions/register.php:76
-#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
-msgid "Nickname already in use. Try another one."
-msgstr "El apodo ya existe. Prueba otro."
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Bloquear usuario."
 
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:67 ../actions/updateprofile.php:77
-#: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
-#: actions/register.php:74 actions/updateprofile.php:78
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#: actions/block.php:136
+msgid ""
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
 msgstr ""
-"El apodo debe tener solamente letras minúsculas y números y no puede tener "
-"espacios. "
-
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
-msgid "Nickname not allowed."
-msgstr "Apodo prohibido."
-
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
-msgstr "Apodo del usuario que quieres seguir"
 
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
-msgid "Nickname or email"
-msgstr "Apodo o correo electrónico"
-
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
+#: actions/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
 msgid "No"
 msgstr "No"
 
-#: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
-msgstr "Ningún Jabber ID."
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Desbloquear este usuario"
 
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
-msgid "No authorization request!"
-msgstr "¡Ninguna petición de autorización!"
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
+msgstr "Sí"
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
-msgid "No carrier selected."
-msgstr "No se seleccionó un operador móvil."
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+msgid "Block this user"
+msgstr "Bloquear este usuario."
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
-msgstr "No ingresó código"
+#: actions/block.php:165
+msgid "You have already blocked this user."
+msgstr "Ya has bloqueado este usuario."
+
+#: actions/block.php:170
+msgid "Failed to save block information."
+msgstr "No se guardó información de bloqueo."
+
+#: actions/bookmarklet.php:50
+msgid "Post to "
+msgstr "Mensaje a "
 
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 #: actions/confirmaddress.php:75
 msgid "No confirmation code."
 msgstr "Ningún código de confirmación."
 
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
-#: actions/newnotice.php:126 classes/Command.php:223
-msgid "No content!"
-msgstr "¡Ningún contenido!"
-
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
-msgid "No email address."
-msgstr "Sin dirección de correo electrónico"
-
-#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
-msgid "No id."
-msgstr "Ningún identificador."
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
-msgid "No incoming email address."
-msgstr "No hay dirección de correo entrante."
-
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr "Ningún apodo devuelto por el servidor remoto."
-
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
-msgid "No nickname."
-msgstr "Ningún apodo."
-
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229 actions/emailsettings.php:240
-#: actions/imsettings.php:214 actions/smssettings.php:237
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
-msgid "No pending confirmation to cancel."
-msgstr "Ninguna confirmación pendiente para cancelar."
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
-msgstr "Sin número telefónico"
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "Código de confirmación no encontrado."
 
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
-msgstr "Ningun URL de perfil devuelto por el servidor."
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "¡Ese código de confirmación no es para ti!"
 
-#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
-msgid "No registered email address for that user."
-msgstr "Ninguna dirección de correo electrónico registrada por este usuario."
+#: actions/confirmaddress.php:90
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr "Tipo de dirección %s desconocida"
 
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr "¡Ninguna petición encontrada!"
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr "Esa dirección ya fue confirmada."
 
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
-msgid "No results"
-msgstr "Ningún resultado"
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "No se pudo actualizar el usuario."
 
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
-msgstr "Ningún tamaño."
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr "No se pudo eliminar la confirmación de correo electrónico."
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
-msgid "No status found with that ID."
-msgstr "No se encontró estado para ese ID"
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "Confirmar la dirección"
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
-msgid "No status with that ID found."
-msgstr "No hay estado para ese ID"
+#: actions/confirmaddress.php:159
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "La dirección \"%s\" fue confirmada para tu cuenta."
 
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
-msgstr "No existe esa cuenta OpenID."
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Código de confirmación"
 
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
-msgid "No such document."
-msgstr "No existe ese documento."
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
+msgstr "Avisos"
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30 actions/shownotice.php:32
-#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "No existe ese aviso."
 
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr "No existe ese código de recuperación."
-
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-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/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 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
-msgid "No such user."
-msgstr "No existe ese usuario."
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-msgid "No user with that email address or username."
-msgstr "No hay ningún usuario con esa dirección de correo o nombre de usuario."
-
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
-msgstr "¡Nadie para mostrar!"
-
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr "No es un código de recuperación."
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
-msgstr "No es un usuario registrado"
-
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
-msgid "Not a supported data format."
-msgstr "No es un formato de dato soportado"
-
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
-msgstr "Jabber ID no válido"
-
-#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-msgid "Not a valid OpenID."
-msgstr "La cuenta OpenID no es válida."
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
-msgid "Not a valid email address"
-msgstr "No es una dirección de correo electrónico válida"
-
-#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-msgid "Not a valid email address."
-msgstr "Correo electrónico no válido"
-
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-#: actions/editgroup.php:186 actions/newgroup.php:137
-#: actions/profilesettings.php:195 actions/register.php:161
-msgid "Not a valid nickname."
-msgstr "Apodo no válido"
-
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
-msgstr "URL de perfil no válido (servicios incorrectos)."
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "No se puede eliminar este aviso."
 
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr "URL de perfil no válido (XRDS no definido)."
+#: actions/deletenotice.php:103
+#, fuzzy
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+"Estás a punto de eliminar permanentemente un aviso. Si lo hace, no se podrá "
+"deshacer"
 
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr "URL de perfil no válido (ningún documento YADIS)."
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr "Borrar aviso"
 
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
-msgid "Not an image or corrupt file."
-msgstr "No es una imagen o es un fichero corrupto."
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr "¿Estás seguro de que quieres eliminar este aviso?"
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
-msgid "Not authorized."
-msgstr "No autorizado."
+#: actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "No se puede eliminar este aviso."
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
-msgid "Not expecting this response!"
-msgstr "¡Respuesta inesperada!"
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+msgid "Delete this notice"
+msgstr "Borrar este aviso"
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
-msgid "Not found"
-msgstr "No encontrado"
+#: actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
+msgstr ""
+"Hubo un problema con tu clave de sesión.  Por favor, intenta nuevamente."
 
-#: ../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 actions/block.php:59 actions/disfavor.php:61
-#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
-#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
-#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
-#: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "No conectado."
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr "¡Este aviso no es un favorito!"
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
-msgid "Not subscribed!."
-msgstr "¡No estás suscrito!"
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "Agregar a favoritos"
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
-msgstr "Búsqueda de avisos"
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "No existe ese documento."
 
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
+#: actions/editgroup.php:56
 #, php-format
-msgid "Notice feed for %s"
-msgstr "Feed de avisos de %s"
+msgid "Edit %s group"
+msgstr "Editar grupo %s"
 
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
-msgstr "Aviso sin perfil"
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
+msgstr "Debes estar conectado para crear un grupo"
 
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
-msgid "Notices"
-msgstr "Avisos"
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+msgid "You must be an admin to edit the group"
+msgstr "Debes ser un admin para editar el grupo"
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
-#, php-format
-msgid "Notices tagged with %s"
-msgstr "Avisos marcados con %s"
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
+msgstr "Usa este formulario para editar el grupo."
 
-#: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
-msgstr "Antigua contraseña"
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Descripción es demasiado larga (máx. 140 caracteres)."
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
-msgid "OpenID"
-msgstr "Cuenta OpenID"
-
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
-msgid "OpenID Account Setup"
-msgstr "Configuración de la Cuenta OpenID"
-
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-msgid "OpenID Auto-Submit"
-msgstr "Auto-envío de OpenID"
-
-#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
-#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-msgid "OpenID Login"
-msgstr "Ingreso desde una cuenta OpenID"
-
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-#: actions/openidlogin.php:102 actions/openidsettings.php:101
-msgid "OpenID URL"
-msgstr "URL de la cuenta OpenID"
-
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
-msgid "OpenID authentication cancelled."
-msgstr "Autenticación OpenID cancelada."
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr "Autenticación OpenID fallida: %s"
-
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "Error OpenID: %s"
-
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr "OpenID eliminado."
-
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
-msgstr "Configuración OpenID"
-
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-msgid "Optionally add a personal message to the invitation."
-msgstr "Opcionalmente añada un mensaje personalizado a su invitación."
+#: actions/editgroup.php:253
+msgid "Could not update group."
+msgstr "No se pudo actualizar el grupo."
 
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
-msgid "Partial upload."
-msgstr "Carga parcial."
+#: actions/editgroup.php:269
+msgid "Options saved."
+msgstr "Se guardó Opciones."
 
-#: ../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 actions/finishopenidlogin.php:118
-#: actions/login.php:231 actions/register.php:372
-#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-msgid "Password"
-msgstr "Contraseña"
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "Opciones de Email"
 
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
-msgid "Password and confirmation do not match."
-msgstr "La contraseña y la confirmación no coinciden."
+#: actions/emailsettings.php:71
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr "Gestiona la forma en que recibes correo desde %%site.name%%"
 
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
-msgid "Password must be 6 chars or more."
-msgstr "La contraseña debe tener 6 o más caracteres."
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "Dirección"
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-msgid "Password recovery requested"
-msgstr "Recuperación de contraseña solicitada"
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr "Actual dirección de correo electrónico confirmada"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-msgid "Password saved."
-msgstr "Se guardó Contraseña."
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "Eliminar"
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-msgid "Passwords don't match."
-msgstr "Las contraseñas no coinciden"
+#: actions/emailsettings.php:113
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
+"Esperando confirmación de esta dirección. Revisa tu bandeja de entrada (¡y "
+"la de spam!) por un mensaje con las instrucciones."
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
-msgstr "Gente"
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
-msgstr "Búsqueda de gente"
+#: actions/emailsettings.php:121
+msgid "Email Address"
+msgstr "Correo Electrónico"
 
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
-msgstr "Buscador de gente"
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr "Correo electrónico, como \"NombredeUsuario@ejemplo.org\""
 
-#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
-msgid "Personal"
-msgstr "Personal"
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "Añadir"
 
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-msgid "Personal message"
-msgstr "Mensaje Personal"
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+msgstr "Correo entrante"
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "Número telefónico, sin puntuación ni espacios, incluya código de área"
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
+msgstr "Envie emails a esta dirección para ingresar nuevos avisos"
 
-#: ../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 ""
-"Por favor revisa estos detalles para asegurar que deseas suscribirte a los "
-"avisos de este usuario. Si no pediste esta suscripción, haz clic en "
-"\"Cancelar\"."
+#: actions/emailsettings.php:145 actions/smssettings.php:162
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr "Hace una nueva dirección de correo para postear; cancela la anterior."
 
-#: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
-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:148 actions/smssettings.php:164
+msgid "New"
+msgstr "Nuevo"
 
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94 actions/emailsettings.php:86
-#: actions/imsettings.php:68 actions/smssettings.php:94
-#: actions/twittersettings.php:70 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163 actions/emailsettings.php:180
-#: actions/imsettings.php:152 actions/smssettings.php:171
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
-msgid "Preferences saved."
-msgstr "Preferencias guardadas."
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
-msgid "Preferred language"
-msgstr "Lenguaje de preferencia"
-
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
-msgid "Privacy"
-msgstr "Privacidad"
-
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-msgid "Problem saving notice."
-msgstr "Hubo un problema al guardar el aviso."
-
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
-msgid "Profile"
-msgstr "Perfil"
-
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
-msgstr "URL del perfil"
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
+msgstr "Enviarme avisos de suscripciones nuevas por correo."
 
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
-msgstr "Configuración del perfil"
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+"Enviarme un correo electrónico cuando alguien agrega mi aviso a favoritos."
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-msgid "Profile unknown"
-msgstr "Perfil desconocido"
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+"Enviarme un correo electrónico cuando alguien me envía un mensaje privado."
 
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
-msgid "Public Stream Feed"
-msgstr "Feed del flujo público"
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr ""
+"Enviarme un correo electrónico cuando alguien me envía un mensaje privado."
 
-#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
-msgid "Public timeline"
-msgstr "Línea temporal pública"
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
+msgstr "Permitir que amigos me contacten y envién un correo."
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Publicar un MicroID para mi cuenta Jabber/GTalk."
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
+msgstr "Deseo enviar estados por email"
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr "Publicar un MicroID para mi dirección de correo."
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr "Tags recientes"
-
-#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
-msgid "Recover"
-msgstr "Recuperar"
-
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
-msgid "Recover password"
-msgstr "Recuperar contraseña"
-
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-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:152 actions/register.php:207 lib/util.php:328
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-msgid "Register"
-msgstr "Registrarse"
-
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
-msgid "Registration not allowed."
-msgstr "Registro de usuario no permitido."
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Guardar"
 
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
-msgid "Registration successful"
-msgstr "Registro exitoso."
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+msgstr "Preferencias guardadas."
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
-msgid "Reject"
-msgstr "Rechazar"
+#: actions/emailsettings.php:319
+msgid "No email address."
+msgstr "Sin dirección de correo electrónico"
 
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
-msgid "Remember me"
-msgstr "Recordarme"
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
+msgstr "No se puede normalizar esta dirección de correo electrónico."
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
-msgid "Remote profile with no matching profile"
-msgstr "Perfil remoto sin perfil coincidente"
+#: actions/emailsettings.php:330
+msgid "Not a valid email address"
+msgstr "No es una dirección de correo electrónico válida"
 
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
-msgstr "Subscripción remota"
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
+msgstr "Esa ya es tu dirección de correo electrónico"
 
-#: ../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 actions/emailsettings.php:101
-#: actions/emailsettings.php:134 actions/imsettings.php:102
-#: actions/openidsettings.php:166 actions/smssettings.php:103
-#: actions/smssettings.php:146 actions/twittersettings.php:115
-msgid "Remove"
-msgstr "Eliminar"
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another user."
+msgstr "Esa dirección de correo pertenece a otro usuario."
 
-#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
-msgstr "Eliminar OpenID"
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+msgstr "No se pudo insertar el código de confirmación."
 
-#: ../actions/openidsettings.php:73
+#: actions/emailsettings.php:358
 msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+"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 ""
-"¡Si eliminas tu único OpenID no podrás volver a entrar! Si necesitas "
-"eliminarlo, agrega otro antes."
-
-#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
-msgid "Replies"
-msgstr "Respuestas"
+"Un código de confirmación fue enviado al correo electrónico que agregaste. "
+"Revisa tu bandeja de entrada (¡y la de spam!) para encontrar el código y las "
+"instrucciones sobre cómo usarlo."
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
-#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
-#: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
-#, php-format
-msgid "Replies to %s"
-msgstr "Respuestas a %s"
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
+msgstr "Ninguna confirmación pendiente para cancelar."
 
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
-msgid "Reset"
-msgstr "Restablecer"
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "Esa dirección de mensajería instantánea es incorrecta."
 
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
-msgid "Reset password"
-msgstr "Restablecer contraseña"
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "Confirmación cancelada."
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-msgid "SMS"
-msgstr "SMS"
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
+msgstr "Esa no es tu dirección de correo electrónico"
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
-msgid "SMS Phone number"
-msgstr "Número telefónico para sms"
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "La dirección fue eliminada."
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
-msgstr "Preferencias SMS"
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
+msgstr "No hay dirección de correo entrante."
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
-msgid "SMS confirmation"
-msgstr "SMS confirmación"
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
+msgstr "No se pudo actualizar información de usuario."
 
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
-msgid "Same as password above"
-msgstr "Igual a la contraseña de arriba"
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
+msgstr "Dirección de correo entrante removida."
 
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
-msgid "Same as password above. Required."
-msgstr "Igual a la contraseña de arriba. Requerida"
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
+msgstr "Nueva dirección de correo entrante agregada."
 
-#: ../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 actions/emailsettings.php:182
-#: actions/facebooksettings.php:114 actions/imsettings.php:157
-#: actions/othersettings.php:117 actions/profilesettings.php:150
-#: actions/smssettings.php:169 actions/subscriptions.php:124
-#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
-msgid "Save"
-msgstr "Guardar"
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+#, fuzzy
+msgid "Popular notices"
+msgstr "Avisos populares"
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
-msgid "Search"
-msgstr "Buscar"
+#: actions/favorited.php:67
+#, fuzzy, php-format
+msgid "Popular notices, page %d"
+msgstr "Avisos populares, página %d"
 
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
-msgstr "Feed del flujo de búsqueda"
+#: actions/favorited.php:79
+#, fuzzy
+msgid "The most popular notices on the site right now."
+msgstr "Ahora se muestran los avisos más populares en el sitio."
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
-#, php-format
-msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
-"Buscar avisos en %%site.name%% por contenido. Separa los términos de "
-"búsqueda con espacios; deben tener una longitud mínima de 3 caracteres."
 
-#: ../actions/peoplesearch.php:28
-#, php-format
+#: actions/favorited.php:153
 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."
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
 msgstr ""
-"Buscar personas en %%site.name%% por nombre, ubicación o intereses. Separa "
-"los términos con espacios; deben tener una longitud mínima de 3 caracteres."
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
-msgid "Select a carrier"
-msgstr "Seleccione un operador móvil"
-
-#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
-#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
-msgid "Send"
-msgstr "Enviar"
-
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
-msgstr "Envie emails a esta dirección para ingresar nuevos avisos"
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
-msgstr "Enviarme avisos de suscripciones nuevas por correo."
-
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
-msgid "Send me notices through Jabber/GTalk."
-msgstr "Enviarme avisos por Jabber/GTalk"
-
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/favorited.php:156
+#, php-format
 msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
 msgstr ""
-"Enviarme avisos por SMS; Yo acepto que puede incurrir en grandes cobros por "
-"mi operador móvil"
-
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr ""
-"Envirame respuestas por medio de Jabber/GTalk de gente a la cual no sigo."
-
-#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
-msgid "Settings"
-msgstr "Configuración"
-
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
-msgid "Settings saved."
-msgstr "Se guardó configuración."
 
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr "Mostrando los tags más populares de la última semana"
-
-#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:114
-msgid "Someone else already has this OpenID."
-msgstr "Alguien ya tiene este OpenID."
-
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
-msgstr "Algo raro pasó."
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
-msgstr "Lo sentimos, pero no se permite correos entrantes"
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
-msgstr "Lo sentimos, pero este no es su dirección de correo entrante."
-
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
-msgid "Source"
-msgstr "Fuente"
-
-#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
-msgid "Statistics"
-msgstr "Estadísticas"
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
+msgstr "Avisos favoritos de %s"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-msgid "Stored OpenID not found."
-msgstr "No se ha encontrado el OpenID almacenado."
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "¡Actualizaciones de %1$s en %2$s!"
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
-#: actions/showstream.php:197 actions/showstream.php:206
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
-msgid "Subscribe"
-msgstr "Suscribirse"
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "¡Este aviso ya está en favoritos!"
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
-msgid "Subscribers"
-msgstr "Suscriptores"
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Sacar favorito"
 
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
-msgid "Subscription authorized"
-msgstr "Suscripción autorizada"
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr "Usuarios que figuran"
 
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
-msgid "Subscription rejected"
-msgstr "Suscripción rechazada"
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr "Usuarios que figuran, página %d"
 
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27 actions/showstream.php:240
-#: actions/showstream.php:322 actions/subscriptions.php:27
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
-msgid "Subscriptions"
-msgstr "Suscripciones"
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
+msgstr "Una selección de algunos de los grandes usuarios en %s"
 
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
-msgid "System error uploading file."
-msgstr "Error del sistema al cargar el archivo."
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "Nuevo aviso"
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
-#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
-msgid "Tags"
-msgstr "Tags"
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Nuevo aviso"
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "Texto"
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
 
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
-msgid "Text search"
-msgstr "Búsqueda de texto"
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
 
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
-msgstr "Ese OpenID no es tuyo."
+#: actions/finishremotesubscribe.php:69
+msgid "Not expecting this response!"
+msgstr "¡Respuesta inesperada!"
 
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
-msgstr "Esa dirección ya fue confirmada."
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "El usuario al que quieres seguir no existe."
 
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
-msgstr "¡Ese código de confirmación no es para ti!"
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+msgstr "¡Puedes usar la suscripción local!"
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr "Esa dirección de correo pertenece a otro usuario."
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
+msgstr "Ese usuario te ha bloqueado la suscripción."
 
-#: ../actions/avatar.php:80 actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
-msgstr "Ese archivo es demasiado grande."
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "No autorizado."
 
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
-msgid "That is already your Jabber ID."
-msgstr "Ese ya es tu Jabber ID."
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "No se pudieron convertir las clavesde petición a claves de acceso."
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
-msgid "That is already your email address."
-msgstr "Esa ya es tu dirección de correo electrónico"
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Versión desconocida del protocolo OMB."
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
-msgid "That is already your phone number."
-msgstr "Ese ya es tu número telefónico"
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "Error al actualizar el perfil remoto"
 
-#: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
-msgid "That is not your Jabber ID."
-msgstr "Ese no es tu Jabber ID."
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+#, fuzzy
+msgid "No such group."
+msgstr "No existe ese grupo."
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
-msgid "That is not your email address."
-msgstr "Esa no es tu dirección de correo electrónico"
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "No existe ese aviso."
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
-msgstr "Ese no es tu número telefónico"
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Se perdió nuestro archivo"
 
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-#: actions/emailsettings.php:367 actions/imsettings.php:349
-msgid "That is the wrong IM address."
-msgstr "Esa dirección de mensajería instantánea es incorrecta."
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "No se especificó perfil."
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
-msgstr "Ese no es el número de confirmación"
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-msgid "That phone number already belongs to another user."
-msgstr "Ese número telefónico ya pertenece a otro usuario"
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "El usuario te ha bloqueado."
 
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49 actions/twitapistatuses.php:330
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-msgid "That's too long. Max notice size is 140 chars."
-msgstr "Demasiado largo. La longitud máxima es de 140 caracteres. "
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "No eres miembro de ese grupo"
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "Es demasiado largo. La longitud máxima es de 255 caracteres. "
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "Bloquear usuario."
 
-#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/groupblock.php:162
 #, 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/emailsettings.php:282
-#: actions/imsettings.php:258 actions/smssettings.php:282
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
-msgid "The address was removed."
-msgstr "La dirección fue eliminada."
-
-#: ../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 ""
-"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:"
-
-#: ../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."
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
 msgstr ""
-"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 actions/subscribers.php:35
-#, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr "Estas son las personas que escuchan los avisos de %s."
+#: actions/groupblock.php:178
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "Lista de los usuarios en este grupo."
 
-#: ../actions/subscribers.php:33 actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr "Estas son las personas que escuchan tus avisos."
+#: actions/groupblock.php:179
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "Lista de los usuarios en este grupo."
 
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
-#, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr "Estas son las personas que %s escucha sus avisos."
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
+msgstr ""
 
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr "Estas son las personas que escuchas sus avisos."
+#: actions/groupbyid.php:74
+msgid "No ID"
+msgstr "Sin ID"
 
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
-msgid ""
-"These people are already users and you were automatically subscribed to them:"
-msgstr ""
-"Estas personas ya son usuarios y fuiste suscripto automáticamente a ellos:"
+#: actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "Debes estar conectado para crear un grupo"
 
-#: ../actions/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
-msgstr ""
-"Este código de confirmación es demasiado viejo. Por favor empieza de nuevo."
+#: actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "Grupos"
 
-#: ../lib/openid.php:195
+#: actions/groupdesignsettings.php:152
 msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
 msgstr ""
-"Este formulario debería enviarse automáticamente. En caso contrario, haz "
-"clic en el botón de envío para ir a tu proveedor de OpenID."
 
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
-#, 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 ""
-"Esta es la primera vez que accedes a %s por lo que debemos conectar tu "
-"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
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-msgid "This method requires a POST or DELETE."
-msgstr "Este método requiere un PUBLICAR O ELIMINAR"
-
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
-msgid "This method requires a POST."
-msgstr "Este método requiere PUBLICAR"
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "No se pudo actualizar el usuario."
 
-#: ../lib/util.php:164 lib/util.php:246
-msgid "This page is not available in a media type you accept"
-msgstr "Esta página no está disponible en el tipo de medio que aceptas."
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "¡No se pudo guardar tu configuración de Twitter!"
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
-msgid "Timezone"
-msgstr "Zona horaria"
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Preferencias de sincronización guardadas."
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
-msgid "Timezone not selected."
-msgstr "Zona horaria no seleccionada"
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
+msgstr "Logo de grupo"
 
-#: ../actions/remotesubscribe.php:43
-#, php-format
+#: actions/grouplogo.php:150
+#, fuzzy, 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 ""
-"Para suscribirte, puedes [iniciar una sesión](%%action.login%%), o "
-"[registrar](%%action.register%%) una cuenta nueva. Si ya tienes una en un "
-"[servicio de microblogueo compatible](%%doc.openmublog%%), escribe el URL de "
-"tu perfil debajo."
-
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
-msgid "Two user ids or screen_names must be supplied."
-msgstr "Deben proveerse dos identificaciones de usuario o nombres en pantalla."
-
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "El URL de tu página de inicio, blog o perfil en otro sitio"
-
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-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/emailsettings.php:144 actions/imsettings.php:118
-#: actions/recoverpassword.php:39 actions/smssettings.php:143
-#: actions/twittersettings.php:108 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-msgid "Unexpected form submission."
-msgstr "Envío de formulario inesperado."
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr "Puedes cargar una imagen de logo para tu grupo."
 
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
-msgid "Unexpected password reset."
-msgstr "Restablecimiento de contraseña inesperado."
+#: actions/grouplogo.php:362
+#, fuzzy
+msgid "Pick a square area of the image to be the logo."
+msgstr "Elige un área cuadrada de la imagen para que sea tu avatar"
 
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-msgid "Unknown action"
-msgstr "Acción desconocida"
+#: actions/grouplogo.php:396
+#, fuzzy
+msgid "Logo updated."
+msgstr "SE actualizó logo."
 
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-msgid "Unknown version of OMB protocol."
-msgstr "Versión desconocida del protocolo OMB."
+#: actions/grouplogo.php:398
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "Error al actualizar logo."
 
-#: ../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 ""
-"A menos que se especifique lo contrario, el contenido de este sitio es "
-"propiedad de sus colaboradores y está disponible bajo la"
+#: actions/groupmembers.php:93 lib/groupnav.php:92
+#, php-format
+msgid "%s group members"
+msgstr "Miembros del grupo %s"
 
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
+#: actions/groupmembers.php:96
 #, php-format
-msgid "Unrecognized address type %s"
-msgstr "Tipo de dirección %s desconocida"
+msgid "%s group members, page %d"
+msgstr "Miembros del grupo %s, página %d"
 
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
-msgstr "Cancelar suscripción"
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr "Lista de los usuarios en este grupo."
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-msgid "Unsupported OMB version"
-msgstr "Versión OMB no soportada"
+#: actions/groupmembers.php:175 lib/groupnav.php:107
+msgid "Admin"
+msgstr "Admin"
 
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
-msgid "Unsupported image file format."
-msgstr "Formato de imagen no soportado."
+#: actions/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
+msgstr "Bloquear"
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
-msgstr "Actualizaciones por sms"
+#: actions/groupmembers.php:441
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "Debes ser un admin para editar el grupo"
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
-msgstr "Actualizaciones por mensajería instantánea"
+#: actions/groupmembers.php:473
+#, fuzzy
+msgid "Make Admin"
+msgstr "Admin"
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr "¡Actualizaciones de %1$s y amigos en %2$s!"
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
-#, php-format
-msgid "Updates from %1$s on %2$s!"
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
 msgstr "¡Actualizaciones de %1$s en %2$s!"
 
-#: ../actions/avatar.php:68 actions/profilesettings.php:161
-#: actions/avatarsettings.php:162 actions/grouplogo.php:232
-msgid "Upload"
-msgstr "Cargar"
-
-#: ../actions/avatar.php:27
+#: actions/groupsearch.php:52
+#, fuzzy, php-format
 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."
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
-"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."
+"Buscar personas en %%site.name%% por nombre, ubicación o intereses. Separa "
+"los términos con espacios; deben tener una longitud mínima de 3 caracteres."
+
+#: actions/groupsearch.php:58
+#, fuzzy
+msgid "Group search"
+msgstr "Buscador de grupos"
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr "Cargar una nueva imagen de perfil"
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "Ningún resultado"
 
-#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/groupsearch.php:82
+#, php-format
 msgid ""
-"Use this form to invite your friends and colleagues to use this service."
-msgstr ""
-"Usa este formulario para invitar a tus amigos y colegas a usar este "
-"servicio."
-
-#: ../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"
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
 msgstr ""
-"Se usa sólo para actualizaciones, anuncios y recuperación de contraseñas"
-
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
-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/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
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-msgid "User has no profile."
-msgstr "El usuario no tiene un perfil."
 
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
-msgstr "Apodo del usuario"
-
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr "Usuario no encontrado"
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
-msgid "What timezone are you normally in?"
-msgstr "En que zona horaria se encuentra normalmente?"
-
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: actions/groupsearch.php:85
 #, php-format
-msgid "What's up, %s?"
-msgstr "¿Qué tal, %s?"
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-#: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Dónde estás, por ejemplo \"Ciudad, Estado (o Región), País\""
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Grupos"
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/groups.php:64
 #, php-format
-msgid "Wrong image type for '%s'"
-msgstr "Tipo de imagen incorrecto para '%s'"
+msgid "Groups, page %d"
+msgstr "Grupos, página %d"
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/groups.php:90
 #, php-format
-msgid "Wrong size image at '%s'"
-msgstr "Tamaño de imagen incorrecto para '%s'"
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
-msgid "Yes"
-msgstr "Sí"
-
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-msgid "You already have this OpenID!"
-msgstr "¡Ya tienes este 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."
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
 msgstr ""
-"Estás a punto de eliminar permanentemente un aviso. Si lo hace, no se podrá "
-"deshacer"
-
-#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
-msgstr "¡Ya te has conectado!"
 
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-msgid "You are already subscribed to these users:"
-msgstr "Ya estás suscrito a estos usuarios:"
-
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
-msgid "You are not friends with the specified user."
-msgstr "No eres amigo del usuario especificado."
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Crear un nuevo grupo"
 
-#: ../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/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
 
-#: ../actions/register.php:135 actions/register.php:145
-msgid "You can create a new account to start posting notices."
-msgstr "Puedes crear una nueva cuenta y empezar a enviar avisos."
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "El usuario te ha bloqueado."
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "Puedes recibir mensajes SMS por correo electrónico desde %%site.name%%."
+#: actions/groupunblock.php:128 actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Error al sacar bloqueo."
 
-#: ../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"
-"\"."
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "Configuración de mensajería instantánea"
 
-#: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2659,1661 +1432,1614 @@ msgstr ""
 "Puedes enviar y recibir avisos vía [mensajes instantáneos](%%doc.im%%) de "
 "Jabber/GTalk. Configura tu dirección y opciones abajo."
 
-#: ../actions/profilesettings.php:27
-msgid ""
-"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."
-
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
-msgstr "¡Puedes usar la suscripción local!"
-
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
-msgid "You can't register if you don't agree to the license."
-msgstr "No puedes registrarte si no estás de acuerdo con la licencia."
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Esta página no está disponible en un "
 
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
-msgid "You did not send us that profile"
-msgstr "No nos enviaste ese perfil"
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Dirección actual Jabber/Gtalk confirmada."
 
-#: ../lib/mail.php:147
+#: actions/imsettings.php:114
 #, 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"
+"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 ""
-"You have a new posting address on %1$s.\n"
-"\n"
-"Enviar correo a %2$s para publicar nuevos mensajes. \n"
-"\n"
-"Más instrucciones de correo en %3$s.\n"
-"\n"
-"Attentamente, \n"
-"%4$s"
+"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/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
-msgid "You may not delete another user's status."
-msgstr "No puedes borrar el estado de otro usuario."
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "Dirección de mensajería instantánea"
 
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/imsettings.php:126
 #, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr "Debes estar conectado para invitar otros usuarios a usar %s"
-
-#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
 msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+"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 ""
-"Recibirás un mensaje cuando tus invitados acepten tu invitacion y se "
-"registren en el sitio. ¡Gracias por extender la comunidad! "
+"Dirección Jabber o GTalk, por ejemplo \"NombreUsuario@ejemplo.org\". "
+"Primero, asegúrate de agregar a %s a tu lista de amigos en tu cliente de "
+"mensajería instantánea o en GTalk."
 
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr "Te has identificado. Escribe una nueva contraseña a continuación."
+#: actions/imsettings.php:143
+msgid "Send me notices through Jabber/GTalk."
+msgstr "Enviarme avisos por Jabber/GTalk"
 
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
-msgid "Your OpenID URL"
-msgstr "El URL de tu OpenID"
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr "Enviar un aviso cuando el estado de mi Jabber/GTalk cambie."
 
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
+#: actions/imsettings.php:153
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
-"Tu nombre de usuario en este servidor, o la dirección de correo electrónico "
-"registrada."
+"Envirame respuestas por medio de Jabber/GTalk de gente a la cual no sigo."
+
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Publicar un MicroID para mi cuenta Jabber/GTalk."
 
-#: ../actions/openidsettings.php:28
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "Ningún Jabber ID."
+
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr "No se puede normalizar este Jabber ID"
+
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "Jabber ID no válido"
+
+#: actions/imsettings.php:299
+msgid "That is already your Jabber ID."
+msgstr "Ese ya es tu Jabber ID."
+
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr "El Jabber ID ya pertenece a otro usuario."
+
+#: actions/imsettings.php:327
 #, php-format
 msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
-"account.  Manage your associated OpenIDs from here."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
 msgstr ""
-"[OpenID](%%doc.openid%%) te permite ingresar a muchos sitios con la misma "
-"cuenta de usuario. Puedes administrar tus OpenID asociados desde aquí."
+"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."
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
-msgid "a few seconds ago"
-msgstr "hace unos segundos"
+#: actions/imsettings.php:387
+msgid "That is not your Jabber ID."
+msgstr "Ese no es tu Jabber ID."
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: actions/inbox.php:59
 #, php-format
-msgid "about %d days ago"
-msgstr "hace %d días"
+msgid "Inbox for %s - page %d"
+msgstr "Bandeja de entrada para %s - página %d"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: actions/inbox.php:62
 #, php-format
-msgid "about %d hours ago"
-msgstr "hace %d horas"
+msgid "Inbox for %s"
+msgstr "Bandeja de entrada para %s"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
-#, php-format
-msgid "about %d minutes ago"
-msgstr "hace %d minutos"
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+"Ésta es tu bandeja de entrada, incluye lista de mensajes privados entrantes."
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
-#, php-format
-msgid "about %d months ago"
-msgstr "hace %d meses"
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
-msgid "about a day ago"
-msgstr "hace un día"
+#: actions/invite.php:41
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr "Debes estar conectado para invitar otros usuarios a usar %s"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
-msgid "about a minute ago"
-msgstr "hace un minuto"
+#: actions/invite.php:72
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "Dirección de correo electrónico inválida: %s"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
-msgid "about a month ago"
-msgstr "hace un mes"
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
+msgstr "Invitacion(es) enviada(s)"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
-msgid "about a year ago"
-msgstr "hace un año"
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr "Invitar nuevos usuarios:"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
-msgid "about an hour ago"
-msgstr "hace una hora"
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr "Ya estás suscrito a estos usuarios:"
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
-msgstr "borrar"
-
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117 actions/noticesearch.php:136
-#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
-msgid "in reply to..."
-msgstr "en respuesta a..."
-
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124 actions/noticesearch.php:143
-#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
-msgid "reply"
-msgstr "responder"
-
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-msgid "same as password above"
-msgstr "repita la contraseña anterior"
+#: actions/invite.php:131 actions/invite.php:139
+#, php-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
-msgid "unsupported file type"
-msgstr "tipo de archivo soportado"
-
-#: ../lib/util.php:1309 lib/util.php:1443
-#, fuzzy
-msgid "« After"
-msgstr "« Después"
-
-#: 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
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-msgid "There was a problem with your session token. Try again, please."
+#: actions/invite.php:136
+msgid ""
+"These people are already users and you were automatically subscribed to them:"
 msgstr ""
-"Hubo un problema con tu clave de sesión.  Por favor, intenta nuevamente."
-
-#: actions/disfavor.php:55 actions/disfavor.php:81
-msgid "This notice is not a favorite!"
-msgstr "¡Este aviso no es un favorito!"
-
-#: actions/disfavor.php:63 actions/disfavor.php:87
-msgid "Could not delete favorite."
-msgstr "No se pudo borrar favorito."
+"Estas personas ya son usuarios y fuiste suscripto automáticamente a ellos:"
 
-#: actions/disfavor.php:72 lib/favorform.php:140
-msgid "Favor"
-msgstr "Aceptar"
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
+msgstr "Invitacion(es) enviada(s) a las siguientes personas:"
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
+#: actions/invite.php:150
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 msgstr ""
-"Enviarme un correo electrónico cuando alguien agrega mi aviso a favoritos."
+"Recibirás un mensaje cuando tus invitados acepten tu invitacion y se "
+"registren en el sitio. ¡Gracias por extender la comunidad! "
 
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-msgid "Send me email when someone sends me a private message."
+#: actions/invite.php:162
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
 msgstr ""
-"Enviarme un correo electrónico cuando alguien me envía un mensaje privado."
-
-#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
-msgid "This notice is already a favorite!"
-msgstr "¡Este aviso ya está en favoritos!"
+"Usa este formulario para invitar a tus amigos y colegas a usar este servicio."
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132 actions/favor.php:86
-#: actions/twitapifavorites.php:125 classes/Command.php:152
-msgid "Could not create favorite."
-msgstr "No se pudo crear favorito."
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "Direcciones de correo electrónico"
 
-#: actions/favor.php:70
-msgid "Disfavor"
-msgstr "Sacar"
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr "Direcciones de los amigos a invitar (una por línea)"
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
-#, php-format
-msgid "%s favorite notices"
-msgstr "%s avisos favoritos"
+#: actions/invite.php:192
+msgid "Personal message"
+msgstr "Mensaje Personal"
 
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
-#, php-format
-msgid "Feed of favorite notices of %s"
-msgstr "Feed de avisos favoritos de %s"
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
+msgstr "Opcionalmente añada un mensaje personalizado a su invitación."
 
-#: actions/inbox.php:28 actions/inbox.php:59
-#, php-format
-msgid "Inbox for %s - page %d"
-msgstr "Bandeja de entrada para %s - página %d"
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
+msgstr "Enviar"
 
-#: actions/inbox.php:30 actions/inbox.php:62
+#: actions/invite.php:226
 #, php-format
-msgid "Inbox for %s"
-msgstr "Bandeja de entrada para %s"
-
-#: actions/inbox.php:53 actions/inbox.php:115
-msgid "This is your inbox, which lists your incoming private messages."
-msgstr ""
-"Ésta es tu bandeja de entrada, incluye lista de mensajes privados entrantes."
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s te ha invitado a que te unas con el/ellos en %2$s"
 
-#: actions/invite.php:178 actions/invite.php:213
-#, php-format
+#: actions/invite.php:228
+#, fuzzy, 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 te invitó a unirte a ellos en %2$s (%3$s).\n"
+"%1$s te ha invitado a unirte a ellos en %2$s (%3$s).\n"
 "\n"
+"%2$s es un servicio de microblogueo que te permite estar al tanto de la "
+"gente que conoces y que te interesa.\n"
+"\n"
+"Puedes compartir noticias sobre tí mismo, tus pensamientos, o tu vida en "
+"línea con gente que te conoce. También es bueno para conocer gente que "
+"comparta tus intereses.\n"
+"\n"
+"%1$s dijo:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Puedes ver el perfil de %1$s en %2$s aquí:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Si quieres inscribirte y probar el servicio, haz click en enlace debajo para "
+"aceptar la invitación.\n"
+"\n"
+"%6$s\n"
+"\n"
+"Si no deseas inscribirte puedes ignorar este mensaje. Gracias por tu "
+"paciencia y tiempo.\n"
+"\n"
+"Sinceramente, %2$s\n"
 
-#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-msgid "Automatically login in the future; "
-msgstr "Conectarte automáticamente en el futuro;"
-
-#: actions/login.php:122 actions/login.php:264
-msgid "For security reasons, please re-enter your "
-msgstr "Por razones de seguridad, por favor volver a ingresar tu "
-
-#: actions/login.php:126 actions/login.php:268
-msgid "Login with your username and password. "
-msgstr "Entrar con nombre y contraseña de usuario."
-
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
-msgid "That's too long. Max message size is 140 chars."
-msgstr "Demasiado largo. Máximo 140 caracteres.  "
-
-#: actions/newmessage.php:65 actions/newmessage.php:128
-msgid "No recipient specified."
-msgstr "No se especificó receptor."
-
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206 actions/newmessage.php:131
-#: actions/newmessage.php:168 classes/Command.php:237
-msgid "You can't send a message to this user."
-msgstr "No puedes enviar mensaje a este usuario."
-
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "No te auto envíes un mensaje; dícetelo a ti mismo."
-
-#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
-msgid "No such user"
-msgstr "No existe el usuario."
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
+msgstr "Debes estar conectado para unirte a un grupo."
 
-#: actions/newmessage.php:117 actions/newmessage.php:67
-msgid "New message"
-msgstr "Nuevo Mensaje "
+#: actions/joingroup.php:90 lib/command.php:217
+#, fuzzy
+msgid "You are already a member of that group"
+msgstr "Ya eres miembro de ese grupo"
 
-#: actions/noticesearch.php:95 actions/noticesearch.php:146
-msgid "Notice without matching profile"
-msgstr "Aviso sin perfil equivalente"
+#: actions/joingroup.php:128 lib/command.php:234
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s"
+msgstr "No se puede unir usuario %s a grupo %s"
 
-#: actions/openidsettings.php:28 actions/openidsettings.php:70
+#: actions/joingroup.php:135 lib/command.php:239
 #, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr "[OpenID](%%doc.openid%%) te permite entrar a muchos sitios"
+msgid "%s joined group %s"
+msgstr "%s se unió a grupo %s"
 
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
-msgstr "Si quieres agregar un OpenID a tu cuenta,"
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
+msgstr "Debes estar conectado para dejar un grupo."
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr "¡Eliminar tu único OpenID significa que no podrás conectarte!"
+#: actions/leavegroup.php:90 lib/command.php:268
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "No eres miembro de ese grupo"
 
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-msgid "You can remove an OpenID from your account "
-msgstr "Puedes eliminar un OpenID de tu cuenta"
+#: actions/leavegroup.php:119 lib/command.php:278
+#, fuzzy
+msgid "Could not find membership record."
+msgstr "No se pudo encontrar registro de miembro"
 
-#: actions/outbox.php:28 actions/outbox.php:58
-#, php-format
-msgid "Outbox for %s - page %d"
-msgstr "Bandeja de salida para %s - página %d"
+#: actions/leavegroup.php:127 lib/command.php:284
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "No se pudo eliminar a usuario %s de grupo %s"
 
-#: actions/outbox.php:30 actions/outbox.php:61
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
-msgid "Outbox for %s"
-msgstr "Bandeja de salida para %s"
+msgid "%s left group %s"
+msgstr "%s dejó grupo %s"
 
-#: actions/outbox.php:53 actions/outbox.php:116
-msgid "This is your outbox, which lists private messages you have sent."
-msgstr ""
-"Ésta es tu bandeja de salida, incluye la lista de mensajes privados "
-"enviados."
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "Ya estás conectado."
 
-#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
-#, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
-msgstr "Buscar personas en %%site.name%% por nombre, lugar o intereses."
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "El contenido del aviso es inválido"
 
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
-msgid "You can update your personal profile info here "
-msgstr "Puedes actualizar aquí tu información de perfil personal"
+#: actions/login.php:143
+msgid "Incorrect username or password."
+msgstr "Nombre de usuario o contraseña incorrectos."
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
-msgid "User without matching profile"
-msgstr "Usuario sin perfil equivalente"
+#: actions/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
+msgstr "Error al configurar el usuario."
 
-#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
-msgstr "Éste código de confirmación es demasiado antiguo."
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "Inicio de sesión"
 
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
-msgstr "Si olvidaste o perdiste tu"
+#: actions/login.php:243
+msgid "Login to site"
+msgstr "Ingresar a sitio"
 
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a "
-msgstr "Has sido identificado. Ingresar a "
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Apodo"
 
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-msgid "Your nickname on this server, "
-msgstr "Tu apodo en este servidor,"
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Contraseña"
 
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-msgid "Instructions for recovering your password "
-msgstr "Instrucciones para recuperar tu contraseña"
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "Recordarme"
 
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
-msgid "New password successfully saved. "
-msgstr "Se guardo exitosamente la nueva contraseña."
+#: actions/login.php:253 actions/register.php:479
+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/register.php:95 actions/register.php:180
-msgid "Password must be 6 or more characters."
-msgstr "Cotrnaseña debe tener 6 o más caracteres."
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "¿Contraseña olvidada o perdida?"
 
-#: actions/register.php:216
-#, php-format
+#: actions/login.php:282
 msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
 msgstr ""
-"¡Felicitaciones, %s! Y bienvenido a %%%%site.name%%%%. Desde aquí, quizás "
-"quieras..."
+"Por razones de seguridad, por favor vuelve a escribir tu nombre de usuario y "
+"contraseña antes de cambiar tu configuración."
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
-msgstr "(Debieras recibir un mensaje por correo electrónico en un momento, con"
+#: actions/login.php:286
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+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%%). "
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
 
-#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
+#: actions/makeadmin.php:95
 #, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr "Para suscribirse, puedes [login](%%action.login%%),"
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
 
-#: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/makeadmin.php:132
 #, php-format
-msgid "Feed for favorites of %s"
-msgstr "Feed para favoritos de %s"
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-msgid "Could not retrieve favorite notices."
-msgstr "No se pudo recibir avisos favoritos."
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
 
-#: actions/showmessage.php:33 actions/showmessage.php:81
-msgid "No such message."
-msgstr "No existe el mensaje."
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr "No existe estado actual"
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
-msgstr "Sólo el remitente y el receptor pueden leer este mensaje."
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr "Grupo nuevo "
 
-#: actions/showmessage.php:61 actions/showmessage.php:108
-#, php-format
-msgid "Message to %1$s on %2$s"
-msgstr "Mensaje a %1$s en %2$s"
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
+msgstr "Usa este formulario para crear un grupo nuevo."
 
-#: actions/showmessage.php:66 actions/showmessage.php:113
-#, php-format
-msgid "Message from %1$s on %2$s"
-msgstr "Mensaje de %1$s en %2$s"
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr "Nuevo Mensaje "
 
-#: actions/showstream.php:154
-msgid "Send a message"
-msgstr "Enviar un mensaje"
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
+msgstr "No puedes enviar mensaje a este usuario."
 
-#: actions/smssettings.php:312 actions/smssettings.php:464
-#, php-format
-msgid "Mobile carrier for your phone. "
-msgstr "Operador móvil para tu teléfono."
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+msgstr "¡Ningún contenido!"
 
-#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
-#, php-format
-msgid "Direct messages to %s"
-msgstr "Mensajes directos a %s"
+#: actions/newmessage.php:158
+msgid "No recipient specified."
+msgstr "No se especificó receptor."
 
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
-#, php-format
-msgid "All the direct messages sent to %s"
-msgstr "Todos los mensajes directos enviados a %s"
+#: actions/newmessage.php:164 lib/command.php:370
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly instead."
+msgstr "No te auto envíes un mensaje; dícetelo a ti mismo."
 
-#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-msgid "Direct Messages You've Sent"
-msgstr "Mensajes directos que has enviado"
+#: actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "Mensaje"
 
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/newmessage.php:185 lib/command.php:375
 #, php-format
-msgid "All the direct messages sent from %s"
-msgstr "Todos los mensajes directos enviados desde %s"
+msgid "Direct message to %s sent"
+msgstr "Se envió mensaje directo a %s"
 
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-msgid "No message text!"
-msgstr "¡Sin texto de mensaje!"
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
+msgstr "Error de Ajax"
 
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-msgid "Recipient user not found."
-msgstr "No se encuentra usuario receptor."
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "Nuevo aviso"
 
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr "No se puede enviar mensajes directos a usuarios que no son tu amigo."
+#: actions/newnotice.php:199
+#, fuzzy
+msgid "Notice posted"
+msgstr "Aviso publicado"
 
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/noticesearch.php:68
 #, php-format
-msgid "%s / Favorites from %s"
-msgstr "%s / Favoritos desde %s"
+msgid ""
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
+msgstr ""
+"Buscar avisos en %%site.name%% por contenido. Separa los términos de "
+"búsqueda con espacios; deben tener una longitud mínima de 3 caracteres."
 
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
-#, php-format
-msgid "%s updates favorited by %s / %s."
-msgstr "%s actualizaciones favoritas por %s / %s."
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "Búsqueda de texto"
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
-#, php-format
-msgid "%s added your notice as a favorite"
-msgstr "%s agregó tu aviso a favoritos"
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "Busca \"%s\" en la Corriente"
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 msgstr ""
-"%1$s recién agregó tu aviso desde %2$s como uno de sus favoritos. \n"
-"\n"
 
-#: actions/twittersettings.php:27
+#: actions/noticesearch.php:124
+#, php-format
 msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
-"Agregar tu cuenta Twitter para enviar automáticamente tus avisos a Twitter, "
-
-#: actions/twittersettings.php:41 actions/twittersettings.php:60
-msgid "Twitter settings"
-msgstr "Configuración de Twitter"
-
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-msgid "Twitter Account"
-msgstr "Cuenta Twitter"
-
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-msgid "Current verified Twitter account."
-msgstr "Cuenta Twitter actual verificada."
-
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr "Nombre de usuario Twitter"
-
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-msgid "No spaces, please."
-msgstr "Sin espacios, por favor."
-
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
-msgstr "Contraseña Twitter"
 
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-msgid "Automatically send my notices to Twitter."
-msgstr "Enviar automáticamente mis avisos a Twitter."
-
-#: actions/twittersettings.php:75 actions/twittersettings.php:146
-msgid "Send local \"@\" replies to Twitter."
-msgstr "Enviar respuestas \"@\" locales a Twitter."
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "¡Actualizaciones de %1$s en %2$s!"
 
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-msgid "Subscribe to my Twitter friends here."
-msgstr "Suscribir a mis amigos Twitter aquí."
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Todas las actualizaciones que corresponden a la frase a buscar \"%s\""
 
-#: actions/twittersettings.php:122
+#: actions/nudge.php:85
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
-"Nombre de usuario sólo debe tener números, letras en mayúscula y minúscula, "
-"y subrayadas (_). Máx. 15 caracteres."
-
-#: actions/twittersettings.php:128 actions/twittersettings.php:334
-msgid "Could not verify your Twitter credentials!"
-msgstr "¡No se pudo verificar tus credenciales Twitter!"
-
-#: actions/twittersettings.php:137
-#, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr "No se pudo obtener tu información de cuenta para \"%s% desde Twitter."
-
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-msgid "Unable to save your Twitter settings!"
-msgstr "¡No se pudo guardar tu configuración de Twitter!"
-
-#: actions/twittersettings.php:174 actions/twittersettings.php:376
-msgid "Twitter settings saved."
-msgstr "Se guardó configuración de Twitter."
-
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-msgid "That is not your Twitter account."
-msgstr "No es tu cuenta Twitter."
-
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
-msgid "Couldn't remove Twitter user."
-msgstr "No se pudo eliminar usuario Twitter."
-
-#: actions/twittersettings.php:212 actions/twittersettings.php:407
-msgid "Twitter account removed."
-msgstr "Se eliminó cuenta Twitter."
+"Este usuario no permite zumbidos o todavía no confirma o configura su correo "
+"electrónico."
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
-msgid "Couldn't save Twitter preferences."
-msgstr "No se pudo guardar preferencias de Twitter."
+#: actions/nudge.php:94
+msgid "Nudge sent"
+msgstr "Se envió zumbido"
 
-#: actions/twittersettings.php:245 actions/twittersettings.php:461
-msgid "Twitter preferences saved."
-msgstr "Se guardó preferencias de Twitter."
+#: actions/nudge.php:97
+#, fuzzy
+msgid "Nudge sent!"
+msgstr "¡Zumbido enviado!"
 
-#: actions/userauthorization.php:84 actions/userauthorization.php:86
-msgid "Please check these details to make sure "
-msgstr "Por favor revisa esta información para verificar"
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+msgstr "Aviso sin perfil"
 
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
-msgid "The subscription has been authorized, but no "
-msgstr "Se autorizó la suscripción, pero no"
+#: actions/oembed.php:86 actions/shownotice.php:180
+#, php-format
+msgid "%1$s's status on %2$s"
+msgstr "estado de %1$s en %2$s"
 
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-msgid "The subscription has been rejected, but no "
-msgstr "Se rechazó la suscripción, pero no"
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Conectarse"
 
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-msgid "Command results"
-msgstr "Resultados de comando"
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
 
-#: classes/Channel.php:148 classes/Channel.php:204
-msgid "Command complete"
-msgstr "Comando completo"
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
+msgstr "No es un formato de dato soportado"
 
-#: classes/Channel.php:158 classes/Channel.php:215
-msgid "Command failed"
-msgstr "Comando falló"
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "Búsqueda de gente"
 
-#: classes/Command.php:39 classes/Command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Disculpa, todavía no se implementa este comando."
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "Búsqueda de avisos"
 
-#: classes/Command.php:96 classes/Command.php:113
-#, php-format
-msgid "Subscriptions: %1$s\n"
-msgstr "Suscripciones: %1$s\n"
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "Otras configuraciones"
 
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
-msgid "User has no last notice"
-msgstr "Usuario no tiene último aviso"
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr "Manejo de varias opciones adicionales."
 
-#: classes/Command.php:146 classes/Command.php:166
-msgid "Notice marked as fave."
-msgstr "Aviso marcado como favorito."
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
 
-#: classes/Command.php:166 classes/Command.php:189
-#, php-format
-msgid "%1$s (%2$s)"
-msgstr "%1$s (%2$s)"
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
+msgstr ""
 
-#: classes/Command.php:169 classes/Command.php:192
-#, php-format
-msgid "Fullname: %s"
-msgstr "Nombre completo: %s"
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
+msgstr "Servicio de acorte automático a usar."
 
-#: classes/Command.php:172 classes/Command.php:195
-#, php-format
-msgid "Location: %s"
-msgstr "Lugar: %s"
+#: actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "Configuración del perfil"
 
-#: classes/Command.php:175 classes/Command.php:198
-#, php-format
-msgid "Homepage: %s"
-msgstr "Página de inicio: %s"
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
 
-#: classes/Command.php:178 classes/Command.php:201
-#, php-format
-msgid "About: %s"
-msgstr "Sobre: %s"
+#: actions/othersettings.php:153
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Servicio de acorte de URL demasiado largo (máx. 50 caracteres)."
 
-#: classes/Command.php:200 classes/Command.php:228
+#: actions/outbox.php:58
 #, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
-msgstr "Mensaje muy largo - máximo 140 caracteres, enviaste %d"
+msgid "Outbox for %s - page %d"
+msgstr "Bandeja de salida para %s - página %d"
 
-#: classes/Command.php:214 classes/Command.php:245
+#: actions/outbox.php:61
 #, php-format
-msgid "Direct message to %s sent"
-msgstr "Se envió mensaje directo a %s"
+msgid "Outbox for %s"
+msgstr "Bandeja de salida para %s"
 
-#: classes/Command.php:216 classes/Command.php:247
-msgid "Error sending direct message."
-msgstr "Error al enviar mensaje directo."
+#: actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+"Ésta es tu bandeja de salida, incluye la lista de mensajes privados enviados."
 
-#: classes/Command.php:263 classes/Command.php:300
-msgid "Specify the name of the user to subscribe to"
-msgstr "Especificar el nombre del usuario a suscribir"
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "Cambiar contraseña"
 
-#: classes/Command.php:270 classes/Command.php:307
-#, php-format
-msgid "Subscribed to %s"
-msgstr "Suscrito a %s"
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "Cambia tu contraseña."
 
-#: classes/Command.php:288 classes/Command.php:328
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Especificar el nombre del usuario para desuscribirse de"
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#, fuzzy
+msgid "Password change"
+msgstr "Cambio de contraseña "
 
-#: classes/Command.php:295 classes/Command.php:335
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "Desuscrito de %s"
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "Antigua contraseña"
 
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
-msgid "Command not yet implemented."
-msgstr "Todavía no se implementa comando."
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "Nueva contraseña"
 
-#: classes/Command.php:313 classes/Command.php:356
-msgid "Notification off."
-msgstr "Notificación no activa."
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6 o más caracteres"
 
-#: classes/Command.php:315 classes/Command.php:358
-msgid "Can't turn off notification."
-msgstr "No se puede desactivar notificación."
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "Confirmar"
 
-#: classes/Command.php:333 classes/Command.php:379
-msgid "Notification on."
-msgstr "Notificación activada."
+#: actions/passwordsettings.php:113
+msgid "same as password above"
+msgstr "repita la contraseña anterior"
 
-#: classes/Command.php:335 classes/Command.php:381
-msgid "Can't turn on notification."
-msgstr "No se puede activar notificación."
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "Cambiar"
 
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
-msgstr "Comandos:\n"
+#: actions/passwordsettings.php:154 actions/register.php:230
+msgid "Password must be 6 or more characters."
+msgstr "Cotrnaseña debe tener 6 o más caracteres."
 
-#: classes/Message.php:53 classes/Message.php:56
-msgid "Could not insert message."
-msgstr "No se pudo insertar mensaje."
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "Las contraseñas no coinciden"
 
-#: classes/Message.php:63 classes/Message.php:66
-msgid "Could not update message with new URI."
-msgstr "No se pudo actualizar mensaje con nuevo URI."
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "Contraseña antigua incorrecta."
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
-msgstr "Usuario sin perfil equivalente en sistema."
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "Error al guardar el usuario; inválido."
 
-#: lib/mail.php:147 lib/mail.php:289
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-msgstr ""
-"Tienes nueva dirección para publicar en %1$s.\n"
-"\n"
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "No se puede guardar la nueva contraseña."
 
-#: lib/mail.php:249 lib/mail.php:508
-#, php-format
-msgid "New private message from %s"
-msgstr "Nuevo mensaje privado de %s"
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "Se guardó Contraseña."
 
-#: lib/mail.php:253 lib/mail.php:512
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+"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 ""
-"%1$s (%2$s) te envió un mensaje privado:\n"
-"\n"
-
-#: lib/mailbox.php:43 lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "Sólo el usuario puede leer sus bandejas de correo."
+"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."
 
-#: lib/openid.php:195 lib/openid.php:203
-msgid "This form should automatically submit itself. "
-msgstr "Este formulario debería enviarse automáticamente."
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "Buscador de gente"
 
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-msgid "Favorites"
-msgstr "Favoritos"
+#: actions/peopletag.php:70
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "No es un tag de personas válido: %s"
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/peopletag.php:144
 #, php-format
-msgid "%s's favorite notices"
-msgstr "Avisos favoritos de %s"
+msgid "Users self-tagged with %s - page %d"
+msgstr "Usuarios auto marcados con %s - página %d"
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-msgid "User"
-msgstr "Usuario"
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "El contenido del aviso es inválido"
 
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-msgid "Inbox"
-msgstr "Bandeja de Entrada"
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
 
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-msgid "Your incoming messages"
-msgstr "Mensajes entrantes"
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "Configuración del perfil"
 
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-msgid "Outbox"
-msgstr "Bandeja de Salida"
+#: actions/profilesettings.php:71
+msgid ""
+"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."
 
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-msgid "Your sent messages"
-msgstr "Mensajes enviados"
+#: actions/profilesettings.php:99
+#, fuzzy
+msgid "Profile information"
+msgstr "Información de perfil "
 
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-msgid "Twitter"
-msgstr "Twitter"
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+"1-64 letras en minúscula o números, sin signos de puntuación o espacios"
 
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
-msgstr "Opciones de integración de Twitter"
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full name"
+msgstr "Nombre completo"
 
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-msgid "To"
-msgstr "Para"
+#: actions/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "Página de inicio"
 
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-msgid "Could not parse message."
-msgstr "No se pudo analizar sintácticamente mensaje."
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "El URL de tu página de inicio, blog o perfil en otro sitio"
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/profilesettings.php:122 actions/register.php:460
 #, fuzzy, php-format
-msgid "%s and friends, page %d"
-msgstr "%s y amigos, página %d"
-
-#: actions/avatarsettings.php:76
-msgid "You can upload your personal avatar."
-msgstr "Puedes cargar tu avatar personal."
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Cuéntanos algo sobre ti y tus intereses en 140 caracteres"
 
-#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/profilesettings.php:125 actions/register.php:463
 #, fuzzy
-msgid "Avatar settings"
-msgstr "Configuración de Avatar"
-
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-msgid "Original"
-msgstr "Original"
-
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-msgid "Preview"
-msgstr "Vista previa"
-
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
-msgid "Crop"
-msgstr "Cortar"
+msgid "Describe yourself and your interests"
+msgstr "Descríbete y cuenta de tus "
 
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-msgid "There was a problem with your session token. "
-msgstr "Hubo problemas con tu clave de sessión."
-
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-msgid "Pick a square area of the image to be your avatar"
-msgstr "Elige un área cuadrada de la imagen para que sea tu avatar"
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "Biografía"
 
-#: actions/avatarsettings.php:327 actions/grouplogo.php:384
-msgid "Lost our file data."
-msgstr "Se perdió nuestros datos de archivo."
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "Ubicación"
 
-#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
-#, fuzzy
-msgid "Lost our file."
-msgstr "Se perdió nuestro archivo"
+#: actions/profilesettings.php:134 actions/register.php:472
+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/avatarsettings.php:349 actions/avatarsettings.php:383
-#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
-#, fuzzy
-msgid "Unknown file type"
-msgstr "tipo de archivo desconocido"
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
+msgstr "Tags"
 
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "No se especificó perfil."
+#: actions/profilesettings.php:140
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr "Tags para ti (letras, números, -, ., y _), coma - o espacio - separado"
 
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "No existe perfil con ese ID"
+#: actions/profilesettings.php:144
+msgid "Language"
+msgstr "Idioma"
 
-#: actions/block.php:111
-#, fuzzy
-msgid "Block user"
-msgstr "Bloquear usuario."
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr "Lenguaje de preferencia"
 
-#: actions/block.php:129
-msgid "Are you sure you want to block this user? "
-msgstr "¿Seguro de que quieres bloquear este usuario?"
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr "Zona horaria"
 
-#: actions/block.php:162
-#, fuzzy
-msgid "You have already blocked this user."
-msgstr "Ya bloqueaste este usuario."
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
+msgstr "En que zona horaria se encuentra normalmente?"
 
-#: actions/block.php:167
-msgid "Failed to save block information."
-msgstr "No se guardó información de bloqueo."
+#: actions/profilesettings.php:160
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+"Suscribirse automáticamente a quien quiera que se suscriba a mí (es mejor "
+"para no-humanos)"
 
-#: actions/confirmaddress.php:159
+#: actions/profilesettings.php:221 actions/register.php:223
 #, fuzzy, php-format
-msgid "The address \"%s\" has been "
-msgstr "La dirección \"%s\" fue "
+msgid "Bio is too long (max %d chars)."
+msgstr "La biografía es demasiado larga (máx. 140 caracteres)."
 
-#: actions/deletenotice.php:73
-#, fuzzy
-msgid "You are about to permanently delete a notice. "
-msgstr "¿Estás seguro de que quieres eliminar permanentemente este aviso?"
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr "Zona horaria no seleccionada"
 
-#: actions/disfavor.php:94
-msgid "Add to favorites"
-msgstr "Agregar a favoritos"
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr "Idioma es muy largo ( max 50 car.)"
 
-#: actions/editgroup.php:54
-#, php-format
-msgid "Edit %s group"
-msgstr "Editar grupo %s"
+#: actions/profilesettings.php:246 actions/tagother.php:178
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Tag no válido: '%s' "
 
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-msgid "Inboxes must be enabled for groups to work"
-msgstr "Se debe habilitar las bandejas de entrada para grupos"
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
+msgstr "No se pudo actualizar el usuario para autosuscribirse."
 
-#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-msgid "You must be logged in to create a group."
-msgstr "Debes estar conectado para crear un grupo"
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+msgstr "No se pudo guardar el perfil."
 
-#: actions/editgroup.php:87 actions/grouplogo.php:87
-#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
+#: actions/profilesettings.php:336
 #, fuzzy
-msgid "No nickname"
-msgstr "Ningún apodo."
+msgid "Couldn't save tags."
+msgstr "No se pudo guardar tags."
 
-#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
-#: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
-#, fuzzy
-msgid "No such group"
-msgstr "No existe ese grupo"
+#: actions/profilesettings.php:344
+msgid "Settings saved."
+msgstr "Se guardó configuración."
 
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
-msgid "You must be an admin to edit the group"
-msgstr "Debes ser un admin para editar el grupo"
+#: actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
 
-#: actions/editgroup.php:157
-msgid "Use this form to edit the group."
-msgstr "Usa este formulario para editar el grupo."
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
+msgstr "No se pudo acceder a corriente pública."
 
-#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
-#, fuzzy
-msgid "Nickname must have only lowercase letters "
-msgstr "El apodo sólo debe tener letras en minúscula"
+#: actions/public.php:129
+#, fuzzy, php-format
+msgid "Public timeline, page %d"
+msgstr "Línea de tiempo pública, página %d"
 
-#: actions/editgroup.php:198 actions/newgroup.php:149
-#, fuzzy
-msgid "description is too long (max 140 chars)."
-msgstr "Descripción es demasiado larga (máx. 140 caracteres)."
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr "Línea temporal pública"
 
-#: actions/editgroup.php:218
+#: actions/public.php:151
 #, fuzzy
-msgid "Could not update group."
-msgstr "No se pudo actualizar el grupo."
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Feed del flujo público"
 
-#: actions/editgroup.php:226
+#: actions/public.php:155
 #, fuzzy
-msgid "Options saved."
-msgstr "Se guardó configuración de Opciones."
-
-#: actions/emailsettings.php:107 actions/imsettings.php:108
-#, fuzzy, php-format
-msgid "Awaiting confirmation on this address. "
-msgstr "Esperando confirmación de esta dirección."
-
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-msgid "Make a new email address for posting to; "
-msgstr "Crear una nueva dirección de correo electrónico para publicar;"
-
-#: actions/emailsettings.php:157
-msgid "Send me email when someone "
-msgstr "Enviarme un correo cuando alguien"
-
-#: actions/emailsettings.php:168
-msgid "Allow friends to nudge me and send me an email."
-msgstr "Permitir que amigos me contacten y envién un correo."
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Feed del flujo público"
 
-#: actions/emailsettings.php:321
+#: actions/public.php:159
 #, fuzzy
-msgid "That email address already belongs "
-msgstr "La dirección de correo electrónico ya existe."
+msgid "Public Stream Feed (Atom)"
+msgstr "Feed del flujo público"
 
-#: actions/emailsettings.php:343
-#, fuzzy
-msgid "A confirmation code was sent to the email address you added. "
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
 msgstr ""
-"Un código de confirmación fue enviado a la dirección de correo electrónico "
-"que agreaste. "
 
-#: actions/facebookhome.php:110
-msgid "Server error - couldn't get user!"
-msgstr "¡Error de servidor - no se pudo acceder a usuario!"
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
 
-#: actions/facebookhome.php:196
+#: actions/public.php:186
 #, php-format
-msgid "If you would like the %s app to automatically update "
-msgstr "Si quieres que la aplicación %s se actualice automáticamente"
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
 
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#: actions/public.php:233
 #, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "Permitir que %s actualice mi estado de Facebook"
-
-#: actions/facebookhome.php:218
-msgid "Skip"
-msgstr "Saltar"
-
-#: actions/facebookhome.php:235
-#, fuzzy
-msgid "No notice content!"
-msgstr "¡Aviso sin contenido!"
-
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-msgid "Pagination"
-msgstr "Paginación"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
+msgstr ""
 
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-#, fuzzy
-msgid "After"
-msgstr "« Después"
+#: actions/public.php:238
+#, fuzzy, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
+msgstr ""
+"Es un %%site.name%%, un servicio [micro-blogging](http://en.wikipedia.org/"
+"wiki/Micro-blogging) "
 
-#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/publictagcloud.php:57
 #, fuzzy
-msgid "Before"
-msgstr "Antes"
+msgid "Public tag cloud"
+msgstr "Nube de tags pública"
 
-#: actions/facebookinvite.php:70
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "Thanks for inviting your friends to use %s"
-msgstr "Gracias por invitar a tus amigos a usar %s"
-
-#: actions/facebookinvite.php:72
-#, fuzzy
-msgid "Invitations have been sent to the following users:"
-msgstr "Se enviarón invitaciones a los siguientes usuarios: "
+msgid "These are most popular recent tags on %s "
+msgstr "Éstos son los tags recientes más populares en %s"
 
-#: actions/facebookinvite.php:96
+#: actions/publictagcloud.php:69
 #, php-format
-msgid "You have been invited to %s"
-msgstr "Te invitaron a %s"
-
-#: actions/facebookinvite.php:105
-#, fuzzy, php-format
-msgid "Invite your friends to use %s"
-msgstr "Invita a tus amigos a usar %s"
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
+msgstr ""
 
-#: actions/facebookinvite.php:113
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Amigos que ya usan %s:"
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
+msgstr ""
 
-#: actions/facebookinvite.php:130
+#: actions/publictagcloud.php:75
 #, php-format
-msgid "Send invitations"
-msgstr "Enviar invitaciones"
-
-#: actions/facebookremove.php:56
-#, fuzzy
-msgid "Couldn't remove Facebook user."
-msgstr "No se pudo eliminar al usuario de Facebook."
-
-#: actions/facebooksettings.php:65
-msgid "There was a problem saving your sync preferences!"
-msgstr "¡Hubo problemas al guardar tus preferencias de sincronización!"
-
-#: actions/facebooksettings.php:67
-#, fuzzy
-msgid "Sync preferences saved."
-msgstr "Preferencias de sincronización guardadas."
-
-#: actions/facebooksettings.php:90
-msgid "Automatically update my Facebook status with my notices."
-msgstr "Automáticamente actualizar mi estado de Facebook con mis avisos."
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
 
-#: actions/facebooksettings.php:97
-msgid "Send \"@\" replies to Facebook."
-msgstr "Enviar respuestas \"@\" a Facebook."
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
+msgstr "Nube de tags"
 
-#: actions/facebooksettings.php:106
-#, fuzzy
-msgid "Prefix"
-msgstr "Prefijo"
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "¡Ya te has conectado!"
 
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
-msgstr "Una serie para prefijar avisos. "
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "No existe ese código de recuperación."
 
-#: actions/facebooksettings.php:124
-#, php-format
-msgid "If you would like %s to automatically update "
-msgstr "Si quieres que %s se actualice automáticamente"
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "No es un código de recuperación."
 
-#: actions/facebooksettings.php:147
-#, fuzzy
-msgid "Sync preferences"
-msgstr "Preferencias de sincronización"
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr "Código de recuperación para usuario desconocido."
 
-#: actions/favor.php:94 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "Sacar favorito"
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "Error con el código de confirmación."
 
-#: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
-#, fuzzy
-msgid "Popular notices"
-msgstr "Avisos populares"
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
+msgstr ""
+"Este código de confirmación es demasiado viejo. Por favor empieza de nuevo."
 
-#: actions/favorited.php:67
-#, fuzzy, php-format
-msgid "Popular notices, page %d"
-msgstr "Avisos populares, página %d"
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
+msgstr ""
+"No se pudo actualizar el usuario con la dirección de correo confirmada."
 
-#: actions/favorited.php:79
-#, fuzzy
-msgid "The most popular notices on the site right now."
-msgstr "Ahora se muestran los avisos más populares en el sitio."
+#: actions/recoverpassword.php:152
+msgid ""
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
+msgstr ""
 
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
-msgid "Featured users"
-msgstr "Usuarios que figuran"
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
+msgstr ""
 
-#: actions/featured.php:71
-#, php-format
-msgid "Featured users, page %d"
-msgstr "Usuarios que figuran, página %d"
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
+msgstr ""
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some of the great users on %s"
-msgstr "Una selección de algunos de los grandes usuarios en %s"
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
+msgstr ""
 
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
-msgstr "Ese usuario te ha bloqueado la suscripción."
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
+msgstr ""
+"Tu nombre de usuario en este servidor, o la dirección de correo electrónico "
+"registrada."
 
-#: actions/groupbyid.php:79
-msgid "No ID"
-msgstr "Sin ID"
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
+msgstr "Recuperar"
 
-#: actions/grouplogo.php:138 actions/grouplogo.php:191
-msgid "Group logo"
-msgstr "Logo de grupo"
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "Restablecer contraseña"
 
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
-msgstr "Puedes cargar una imagen de logo para tu grupo."
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr "Recuperar contraseña"
 
-#: actions/grouplogo.php:448
-#, fuzzy
-msgid "Logo updated."
-msgstr "SE actualizó logo."
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
+msgstr "Recuperación de contraseña solicitada"
 
-#: actions/grouplogo.php:450
-#, fuzzy
-msgid "Failed updating logo."
-msgstr "Error al actualizar logo."
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
+msgstr "Acción desconocida"
 
-#: actions/groupmembers.php:93 lib/groupnav.php:91
-#, php-format
-msgid "%s group members"
-msgstr "Miembros del grupo %s"
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 o más caracteres, ¡no te olvides!"
 
-#: actions/groupmembers.php:96
-#, php-format
-msgid "%s group members, page %d"
-msgstr "Miembros del grupo %s, página %d"
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Igual a la contraseña de arriba"
 
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
-msgstr "Lista de los usuarios en este grupo."
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "Restablecer"
 
-#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
-msgid "Groups"
-msgstr "Grupos"
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "Ingresa un apodo o correo electronico"
 
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "Grupos, página %d"
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
+msgstr "No hay ningún usuario con esa dirección de correo o nombre de usuario."
 
-#: actions/groups.php:90
-#, php-format
-msgid "%%%%site.name%%%% groups let you find and talk with "
-msgstr "Los grupos %%%%site.name%%%% dejan que los encuentres y les hables "
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr "Ninguna dirección de correo electrónico registrada por este usuario."
 
-#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-#, fuzzy
-msgid "Create a new group"
-msgstr "Crear un grupo nuevo"
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "Error al guardar confirmación de la dirección."
 
-#: actions/groupsearch.php:57
-#, fuzzy, php-format
+#: actions/recoverpassword.php:325
 msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-msgstr "Buscar grupos en %%site.name%% por nombre, lugar o descripción."
-
-#: actions/groupsearch.php:63
-#, fuzzy
-msgid "Group search"
-msgstr "Buscador de grupos"
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr ""
+"Se enviaron instrucciones para recuperar tu contraseña a la dirección de "
+"correo registrada."
 
-#: actions/imsettings.php:70
-msgid "You can send and receive notices through "
-msgstr "Puedes enviar y recibir avisos a través de "
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
+msgstr "Restablecimiento de contraseña inesperado."
 
-#: actions/imsettings.php:120
-#, php-format
-msgid "Jabber or GTalk address, "
-msgstr "Dirección Jabber o GTalk,"
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "La contraseña debe tener 6 o más caracteres."
 
-#: actions/imsettings.php:147
-#, fuzzy
-msgid "Send me replies through Jabber/GTalk "
-msgstr "Enviarme avisos a través de Jabber/GTalk"
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
+msgstr "La contraseña y la confirmación no coinciden."
 
-#: actions/imsettings.php:321
-#, fuzzy, php-format
-msgid "A confirmation code was sent "
-msgstr "Se envió un código de confirmación."
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
+msgstr "Nueva contraseña guardada correctamente. Has iniciado una sesión."
 
-#: actions/joingroup.php:65
-msgid "You must be logged in to join a group."
-msgstr "Debes estar conectado para unirte a un grupo."
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
+msgstr "Disculpa, sólo personas invitadas pueden registrarse."
 
-#: actions/joingroup.php:95
+#: actions/register.php:92
 #, fuzzy
-msgid "You are already a member of that group"
-msgstr "Ya eres miembro de ese grupo"
-
-#: actions/joingroup.php:128
-#, fuzzy, php-format
-msgid "Could not join user %s to group %s"
-msgstr "No se puede unir usuario %s a grupo %s"
-
-#: actions/joingroup.php:135
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s se unió a grupo %s"
+msgid "Sorry, invalid invitation code."
+msgstr "Error con el código de confirmación."
 
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
-msgstr "Se debe habilitar bandejas de entrada para que funcionen grupos."
+#: actions/register.php:112
+msgid "Registration successful"
+msgstr "Registro exitoso."
 
-#: actions/leavegroup.php:65
-msgid "You must be logged in to leave a group."
-msgstr "Debes estar conectado para dejar un grupo."
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "Registrarse"
 
-#: actions/leavegroup.php:88
-#, fuzzy
-msgid "No such group."
-msgstr "No existe ese grupo."
+#: actions/register.php:135
+msgid "Registration not allowed."
+msgstr "Registro de usuario no permitido."
 
-#: actions/leavegroup.php:95
-#, fuzzy
-msgid "You are not a member of that group."
-msgstr "No eres miembro de ese grupo"
+#: actions/register.php:198
+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/leavegroup.php:100
-msgid "You may not leave a group while you are its administrator."
-msgstr "No puedes dejar un grupo mientras seas su administrador."
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "Correo electrónico no válido"
 
-#: actions/leavegroup.php:130
-#, fuzzy
-msgid "Could not find membership record."
-msgstr "No se pudo encontrar registro de miembro"
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "La dirección de correo electrónico ya existe."
 
-#: actions/leavegroup.php:138
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "No se pudo eliminar a usuario %s de grupo %s"
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "Usuario o contraseña inválidos."
 
-#: actions/leavegroup.php:145
-#, php-format
-msgid "%s left group %s"
-msgstr "%s dejó grupo %s"
+#: actions/register.php:342
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
 
-#: actions/login.php:225 lib/facebookaction.php:304
-msgid "Login to site"
-msgstr "Ingresar a sitio"
+#: actions/register.php:424
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+"1-64 letras en minúscula o números, sin signos de puntuación o espacios. "
+"Requerido."
 
-#: actions/microsummary.php:69
-msgid "No current status"
-msgstr "No existe estado actual"
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr "6 o más caracters. Requerido."
 
-#: actions/newgroup.php:53
-msgid "New group"
-msgstr "Grupo nuevo "
+#: actions/register.php:433
+msgid "Same as password above. Required."
+msgstr "Igual a la contraseña de arriba. Requerida"
 
-#: actions/newgroup.php:115
-msgid "Use this form to create a new group."
-msgstr "Usa este formulario para crear un grupo nuevo."
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "Correo electrónico"
 
-#: actions/newgroup.php:177
-#, fuzzy
-msgid "Could not create group."
-msgstr "No se pudo crear grupo."
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
+msgstr ""
+"Se usa sólo para actualizaciones, anuncios y recuperación de contraseñas"
 
-#: actions/newgroup.php:191
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "No se pudo configurar miembros de grupo."
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
+msgstr "Nombre más largo, preferiblemente tu nombre \"real\""
 
-#: actions/newmessage.php:119 actions/newnotice.php:132
-#, fuzzy
-msgid "That's too long. "
-msgstr "Ese demasiado largo."
+#: actions/register.php:493
+msgid "My text and files are available under "
+msgstr "Mi texto y archivos están disponibles bajo"
 
-#: actions/newmessage.php:134
-msgid "Don't send a message to yourself; "
-msgstr "No te auto envíes un mensaje;"
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
 
-#: actions/newnotice.php:166
+#: actions/register.php:496
 #, fuzzy
-msgid "Notice posted"
-msgstr "Aviso publicado"
+msgid ""
+" except this private data: password, email address, IM address, and 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/newnotice.php:200 classes/Channel.php:163
-msgid "Ajax Error"
-msgstr "Error de Ajax"
+#: actions/register.php:537
+#, 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 ""
+"¡Felicitaciones, %s! Y bienvenido a %%%%site.name%%%%. Desde aquí, "
+"puedes...\n"
+"\n"
+"* Ir a [tu perfil](%s) y enviar tu primer mensaje.\n"
+"* Agregar una [cuenta Jabber/Gtalk](%%%%action.imsettings%%%%) para enviar "
+"avisos por mensajes instantáneos.\n"
+"* [Buscar personas](%%%%action.peoplesearch%%%%) que podrías conoces o que "
+"comparte tus intereses.\n"
+"* Actualizar tus [opciones de perfil](%%%%action.profilesettings%%%%) para "
+"contar más sobre tí.\n"
+"* Leer la [documentación en línea](%%%%doc.help%%%%) para encontrar "
+"características pasadas por alto.\n"
+"\n"
+"Gracias por suscribirte y esperamos que disfrutes el uso de este servicio."
 
-#: actions/nudge.php:85
+#: actions/register.php:561
 msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
 msgstr ""
-"Este usuario no permite zumbidos o todavía no confirma o configura su correo "
-"electrónico."
+"(Deberías recibir un mensaje por correo eléctronico en unos momentos, con "
+"instrucciones sobre cómo confirmar tu dirección de correo.)"
 
-#: actions/nudge.php:94
-msgid "Nudge sent"
-msgstr "Se envió zumbido"
+#: actions/remotesubscribe.php:98
+#, php-format
+msgid ""
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
+msgstr ""
+"Para suscribirte, puedes [iniciar una sesión](%%action.login%%), o "
+"[registrar](%%action.register%%) una cuenta nueva. Si ya tienes una en un "
+"[servicio de microblogueo compatible](%%doc.openmublog%%), escribe el URL de "
+"tu perfil debajo."
 
-# ¿zumbido? creo que así lo traduce msn
-#: actions/nudge.php:97
-#, fuzzy
-msgid "Nudge sent!"
-msgstr "¡Zumbido enviado!"
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr "Subscripción remota"
 
-#: actions/openidlogin.php:97
+#: actions/remotesubscribe.php:124
 #, fuzzy
-msgid "OpenID login"
-msgstr "Ingreso de OpenID"
+msgid "Subscribe to a remote user"
+msgstr "Suscribirse a este usuario"
 
-#: actions/openidsettings.php:128
-#, fuzzy
-msgid "Removing your only OpenID "
-msgstr "Eliminar único OpenID"
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "Apodo del usuario"
 
-#: actions/othersettings.php:60
-#, fuzzy
-msgid "Other Settings"
-msgstr "Otras configuraciones"
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr "Apodo del usuario que quieres seguir"
 
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Manejo de varias opciones adicionales."
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "URL del perfil"
 
-#: actions/othersettings.php:93
-msgid "URL Auto-shortening"
-msgstr "Acorte automático de URL"
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "El URL de tu perfil en otro servicio de microblogueo compatible"
 
-#: actions/othersettings.php:112
-#, fuzzy
-msgid "Service"
-msgstr "Servicio"
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
+msgstr "Suscribirse"
 
-#: actions/othersettings.php:113
-msgid "Automatic shortening service to use."
-msgstr "Servicio de acorte automático a usar."
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr "El URL del perfil es inválido (formato incorrecto)"
 
-#: actions/othersettings.php:144
+#: actions/remotesubscribe.php:168
 #, fuzzy
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "Servicio de acorte de URL demasiado largo (máx. 50 caracteres)."
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "URL de perfil no válido (ningún documento YADIS)."
 
-#: actions/passwordsettings.php:69
+#: actions/remotesubscribe.php:176
 #, fuzzy
-msgid "Change your password."
-msgstr "Cambia tu contraseña."
+msgid "That’s a local profile! Login to subscribe."
+msgstr "¡Es un perfil local! Ingresa para suscribirte"
 
-#: actions/passwordsettings.php:89
+#: actions/remotesubscribe.php:183
 #, fuzzy
-msgid "Password change"
-msgstr "Cambio de contraseña "
-
-#: actions/peopletag.php:35
-#, fuzzy, php-format
-msgid "Not a valid people tag: %s"
-msgstr "No es un tag de personas válido: %s"
-
-#: actions/peopletag.php:47
-#, php-format
-msgid "Users self-tagged with %s - page %d"
-msgstr "Usuarios auto marcados con %s - página %d"
+msgid "Couldn’t get a request token."
+msgstr "No se pudo obtener la señal de petición."
 
-#: actions/peopletag.php:91
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
 #, php-format
-msgid "These are users who have tagged themselves \"%s\" "
-msgstr "Estos usuarios se han marcado \"%s\""
-
-#: actions/profilesettings.php:91
-#, fuzzy
-msgid "Profile information"
-msgstr "Información de perfil "
-
-#: actions/profilesettings.php:124
-msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
-msgstr "Tags para ti (letras, números, -, ., y _), coma - o espacio - separado"
-
-#: actions/profilesettings.php:144
-#, fuzzy
-msgid "Automatically subscribe to whoever "
-msgstr "Suscribirse automáticamente a quien quiera "
+msgid "Replies to %s"
+msgstr "Respuestas a %s"
 
-#: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/replies.php:127
 #, fuzzy, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Tag no válido: '%s' "
+msgid "Replies to %s, page %d"
+msgstr "Respuestas a %s, página %d"
 
-#: actions/profilesettings.php:311
-#, fuzzy
-msgid "Couldn't save tags."
-msgstr "No se pudo guardar tags."
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Feed de avisos de %s"
 
-#: actions/public.php:107
+#: actions/replies.php:151
 #, fuzzy, php-format
-msgid "Public timeline, page %d"
-msgstr "Línea de tiempo pública, página %d"
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Feed de avisos de %s"
 
-#: actions/public.php:173
-msgid "Could not retrieve public stream."
-msgstr "No se pudo acceder a corriente pública."
+#: actions/replies.php:158
+#, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Feed de avisos de %s"
 
-#: actions/public.php:220
+#: actions/replies.php:198
 #, php-format
 msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
 msgstr ""
-"Es un %%site.name%%, un servicio [micro-"
-"blogging](http://en.wikipedia.org/wiki/Micro-blogging) "
 
-#: actions/publictagcloud.php:57
-#, fuzzy
-msgid "Public tag cloud"
-msgstr "Nube de tags pública"
-
-#: actions/publictagcloud.php:63
+#: actions/replies.php:203
 #, php-format
-msgid "These are most popular recent tags on %s "
-msgstr "Éstos son los tags recientes más populares en %s"
-
-#: actions/publictagcloud.php:119
-msgid "Tag cloud"
-msgstr "Nube de tags"
-
-#: actions/register.php:139 actions/register.php:349
-msgid "Sorry, only invited people can register."
-msgstr "Disculpa, sólo personas invitadas pueden registrarse."
-
-#: actions/register.php:149
-#, fuzzy
-msgid "You can't register if you don't "
-msgstr "No puedes registrarte si no "
-
-#: actions/register.php:286
-msgid "With this form you can create "
-msgstr "Con este formulario puedes crear"
-
-#: actions/register.php:368
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, "
-msgstr "1-64 letras en minúscula o números"
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
 
-#: actions/register.php:382 actions/register.php:386
-#, fuzzy
-msgid "Used only for updates, announcements, "
-msgstr "Usado sólo para actualizaciones, anuncios,"
+#: actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
 
-#: actions/register.php:398
-#, fuzzy
-msgid "URL of your homepage, blog, "
-msgstr "El URL de tu página de inicio, blog "
+#: actions/repliesrss.php:72
+#, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Respuestas a %1$s en %2$s!"
 
-#: actions/register.php:404
-#, fuzzy
-msgid "Describe yourself and your "
-msgstr "Descríbete y cuenta de tus "
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "%s avisos favoritos, página %d"
 
-#: actions/register.php:410
-#, fuzzy
-msgid "Where you are, like \"City, "
-msgstr "Dónde estás, por ejemplo \"Ciudad, "
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
+msgstr "No se pudo recibir avisos favoritos."
 
-#: actions/register.php:432
-#, fuzzy
-msgid " except this private data: password, "
-msgstr "excepto los siguientes datos privados: contraseña, "
+#: actions/showfavorites.php:170
+#, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Feed de los amigos de %s"
 
-#: actions/register.php:471
+#: actions/showfavorites.php:177
 #, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
-msgstr "¡Felicitaciones, %s! Y bienvenido a %%%%site.name%%%%."
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Feed de los amigos de %s"
 
-#: actions/register.php:495
-msgid "(You should receive a message by email "
-msgstr "(Debieras recibir un mensaje por correo"
+#: actions/showfavorites.php:184
+#, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Feed de los amigos de %s"
 
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
-msgstr "¡Es un perfil local! Ingresa para suscribirte"
+#: actions/showfavorites.php:205
+msgid ""
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
+msgstr ""
 
-#: actions/replies.php:118
-#, fuzzy, php-format
-msgid "Replies to %s, page %d"
-msgstr "Respuestas a %s, página %d"
+#: actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
 
-#: actions/showfavorites.php:79
+#: actions/showfavorites.php:211
 #, php-format
-msgid "%s favorite notices, page %d"
-msgstr "%s avisos favoritos, página %d"
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:82 lib/groupnav.php:86
 #, php-format
 msgid "%s group"
 msgstr "Grupo %s"
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr "Grupo %s, página %d"
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:218
 #, fuzzy
 msgid "Group profile"
 msgstr "Perfil de grupo"
 
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
 msgid "URL"
 msgstr "URL"
 
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
 #, fuzzy
 msgid "Note"
 msgstr "Nota"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:293
 msgid "Group actions"
 msgstr "Acciones del grupo"
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Feed de avisos de grupo %s"
+
+#: actions/showgroup.php:334
 #, fuzzy, php-format
-msgid "Notice feed for %s group"
+msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Feed de avisos de grupo %s"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Feed de avisos de grupo %s"
+
+#: actions/showgroup.php:345
+#, php-format
+msgid "FOAF for %s group"
+msgstr "Bandeja de salida para %s"
+
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
 #, fuzzy
 msgid "Members"
 msgstr "Miembros"
 
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
 #: lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Ninguno)"
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:392
 msgid "All members"
 msgstr "Todos los miembros"
 
-#: actions/showgroup.php:378
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "Estadísticas"
+
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Crear"
+
+#: actions/showgroup.php:448
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+
+#: actions/showgroup.php:454
+#, fuzzy, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
 msgstr ""
 "**%s** es un grupo de usuarios en %%%%site.name%%%%, un servicio [micro-"
 "blogging](http://en.wikipedia.org/wiki/Micro-blogging) "
 
+#: actions/showgroup.php:482
+#, fuzzy
+msgid "Admins"
+msgstr "Admin"
+
+#: actions/showmessage.php:81
+msgid "No such message."
+msgstr "No existe el mensaje."
+
 #: actions/showmessage.php:98
-msgid "Only the sender and recipient "
-msgstr "Sólo el remitente y el receptor"
+msgid "Only the sender and recipient may read this message."
+msgstr "Sólo el remitente y el receptor pueden leer este mensaje."
+
+#: actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr "Mensaje a %1$s en %2$s"
+
+#: actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr "Mensaje de %1$s en %2$s"
+
+#: actions/shownotice.php:90
+msgid "Notice deleted."
+msgstr "Aviso borrado"
 
 #: actions/showstream.php:73
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "Avisos marcados con %s"
+
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, página %d"
 
-#: actions/showstream.php:143
-#, fuzzy
-msgid "'s profile"
-msgstr "Perfil de"
+#: actions/showstream.php:122
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Feed de avisos de grupo %s"
 
-#: actions/showstream.php:236 actions/tagother.php:77
-#, fuzzy
-msgid "User profile"
-msgstr "Perfil de usuario"
+#: actions/showstream.php:129
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Feed de avisos de %s"
 
-#: actions/showstream.php:240 actions/tagother.php:81
-msgid "Photo"
-msgstr "Foto"
+#: actions/showstream.php:136
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Feed de avisos de %s"
 
-#: actions/showstream.php:317
-#, fuzzy
-msgid "User actions"
-msgstr "Acciones de usuario"
+#: actions/showstream.php:143
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Feed de avisos de %s"
 
-#: actions/showstream.php:342
-msgid "Send a direct message to this user"
-msgstr "Enviar un mensaje directo a este usuario"
+#: actions/showstream.php:148
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Bandeja de salida para %s"
 
-#: actions/showstream.php:343
-msgid "Message"
-msgstr "Mensaje"
+#: actions/showstream.php:191
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
 
-#: actions/showstream.php:451
-#, fuzzy
-msgid "All subscribers"
-msgstr "Todos los suscriptores"
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
 
-#: actions/showstream.php:533
-msgid "All groups"
-msgstr "Todos los grupos"
+#: actions/showstream.php:198
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
 
-#: actions/showstream.php:542
+#: actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
-"**%s** tiene una cuenta en %%%%site.name%%%%, un servicio [micro-"
-"blogging](http://en.wikipedia.org/wiki/Micro-blogging) "
 
-#: actions/smssettings.php:128
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, "
-msgstr "Número telefónico, sin puntuación ni espacios, "
+#: actions/showstream.php:239
+#, fuzzy, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
+msgstr ""
+"**%s** tiene una cuenta en %%%%site.name%%%%, un servicio [micro-blogging]"
+"(http://en.wikipedia.org/wiki/Micro-blogging) "
 
-#: actions/smssettings.php:162
-#, fuzzy
-msgid "Send me notices through SMS; "
-msgstr "Enviarme avisos por SMS;"
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "Preferencias SMS"
+
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+"Puedes recibir mensajes SMS por correo electrónico desde %%site.name%%."
 
-#: actions/smssettings.php:335
+#: actions/smssettings.php:91
+msgid "SMS is not available."
+msgstr "SMS no está disponible."
+
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Actual número telefónico para SMS confirmado."
+
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
+msgstr "Esperando confirmación de este número de teléfono."
+
+#: actions/smssettings.php:130
+msgid "Confirmation code"
+msgstr "Código de confirmación"
+
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
+msgstr "Ingrese el código recibido en su teléfono"
+
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
+msgstr "Número telefónico para sms"
+
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "Número telefónico, sin puntuación ni espacios, incluya código de área"
+
+#: actions/smssettings.php:174
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+"Enviarme avisos por SMS; Yo acepto que puede incurrir en grandes cobros por "
+"mi operador móvil"
+
+#: actions/smssettings.php:306
+msgid "No phone number."
+msgstr "Sin número telefónico"
+
+#: actions/smssettings.php:311
+msgid "No carrier selected."
+msgstr "No se seleccionó un operador móvil."
+
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
+msgstr "Ese ya es tu número telefónico"
+
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
+msgstr "Ese número telefónico ya pertenece a otro usuario"
+
+#: actions/smssettings.php:347
 #, fuzzy
-msgid "A confirmation code was sent to the phone number you added. "
-msgstr "Se envió un código de confirmación al número de teléfono que agregaste."
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"Un código de confirmación fue enviado al número de teléfono que agregaste. "
+"Revisa tu bandeja de entrada (¡y la de spam!) para encontrar el código y las "
+"instrucciones sobre cómo usarlo."
+
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
+msgstr "Ese no es el número de confirmación"
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
+msgstr "Ese no es tu número telefónico"
+
+#: actions/smssettings.php:465
 #, fuzzy
 msgid "Mobile carrier"
 msgstr "Operador móvil"
 
+#: actions/smssettings.php:469
+msgid "Select a carrier"
+msgstr "Seleccione un operador móvil"
+
+#: actions/smssettings.php:476
+#, 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 ""
+"Operador móvil para tu teléfono. Si conoces un operador móvil que acepte SMS "
+"sobre correo electrónico pero no está listado aquí, envíanos un correo para "
+"informarnos al %s."
+
+#: actions/smssettings.php:498
+msgid "No code entered"
+msgstr "No ingresó código"
+
 #: actions/subedit.php:70
 #, fuzzy
 msgid "You are not subscribed to that profile."
@@ -4345,14 +3071,31 @@ msgid "%s subscribers, page %d"
 msgstr "Suscriptores, página %d"
 
 #: actions/subscribers.php:63
-#, fuzzy
-msgid "These are the people who listen to "
-msgstr "Estas son las personas que escuchan"
+msgid "These are the people who listen to your notices."
+msgstr "Estas son las personas que escuchan tus avisos."
 
 #: actions/subscribers.php:67
 #, php-format
-msgid "These are the people who "
-msgstr "Estas son las personas que "
+msgid "These are the people who listen to %s's notices."
+msgstr "Estas son las personas que escuchan los avisos de %s."
+
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
+msgstr ""
+
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr ""
+
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
 
 #: actions/subscriptions.php:52
 #, php-format
@@ -4365,29 +3108,37 @@ msgid "%s subscriptions, page %d"
 msgstr "%s suscripciones, página %d"
 
 #: actions/subscriptions.php:65
-#, fuzzy
-msgid "These are the people whose notices "
-msgstr "Estas son las personas cuyos avisos"
+msgid "These are the people whose notices you listen to."
+msgstr "Estas son las personas que escuchas sus avisos."
 
 #: actions/subscriptions.php:69
+#, php-format
+msgid "These are the people whose notices %s listens to."
+msgstr "Estas son las personas que %s escucha sus avisos."
+
+#: actions/subscriptions.php:121
+#, php-format
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
+msgstr ""
+
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
 #, fuzzy, php-format
-msgid "These are the people whose "
-msgstr "Estas son las personas cuyos"
+msgid "%s is not listening to anyone."
+msgstr "%1$s ahora está escuchando "
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:194
 #, fuzzy
 msgid "Jabber"
 msgstr "Jabber "
 
-#: actions/tag.php:43
-#, fuzzy, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Avisos marcados con %s, página %d"
-
-#: actions/tag.php:66
-#, php-format
-msgid "Messages tagged \"%s\", most recent first"
-msgstr "Mensajes marcados \"%s\", el más reciente primero"
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
+msgstr "SMS"
 
 #: actions/tagother.php:33
 #, fuzzy
@@ -4403,269 +3154,912 @@ msgstr "No existe argumento de ID."
 msgid "Tag %s"
 msgstr "%s tag"
 
+#: actions/tagother.php:77 lib/userprofile.php:75
+#, fuzzy
+msgid "User profile"
+msgstr "Perfil de usuario"
+
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
+msgstr "Foto"
+
 #: actions/tagother.php:141
 msgid "Tag user"
 msgstr "Usuario de tag"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 msgstr ""
 "Tags de este usuario (letras, números, -, ., y _), coma- o espacio- separado"
 
-#: actions/tagother.php:164
-msgid "There was a problem with your session token."
-msgstr "Hubo problemas con tu clave de sesión."
-
-#: actions/tagother.php:191
+#: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Sólo puedes marcar a las personas a quienes estás suscrito o que están "
 "suscritas a ti."
 
-#: actions/tagother.php:198
+#: actions/tagother.php:200
 #, fuzzy
 msgid "Could not save tags."
 msgstr "No se pudo guardar tags."
 
-#: actions/tagother.php:233
+#: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Usar este formulario para agregar tags a tus suscriptores o suscripciones."
 
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Avisos marcados con %s, página %d"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Feed de avisos de %s"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Feed de avisos de %s"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Feed de avisos de %s"
+
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "No existe ese tag."
 
-#: actions/tagrss.php:66
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
+msgstr "Método API en construcción."
+
+#: actions/unsubscribe.php:77
+#, fuzzy
+msgid "No profile id in request."
+msgstr "Ningún perfil de Id en solicitud."
+
+#: actions/unsubscribe.php:84
+msgid "No profile with that id."
+msgstr "Ningún perfil con ese ID."
+
+#: actions/unsubscribe.php:98
+msgid "Unsubscribed"
+msgstr "Desuscrito"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
 #, php-format
-msgid "Microblog tagged with %s"
-msgstr "Microblog marcado con %s"
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
 
-#: actions/twitapiblocks.php:47
-msgid "Block user failed."
-msgstr "Falló bloquear usuario."
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "Autorizar la suscripción"
 
-#: actions/twitapiblocks.php:69
-msgid "Unblock user failed."
-msgstr "Falló desbloquear usuario."
+#: actions/userauthorization.php:110
+#, fuzzy
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
+msgstr ""
+"Por favor revisa estos detalles para asegurar que deseas suscribirte a los "
+"avisos de este usuario. Si no pediste esta suscripción, haz clic en "
+"\"Cancelar\"."
 
-#: actions/twitapiusers.php:48
+#: actions/userauthorization.php:188
 #, fuzzy
-msgid "Not found."
-msgstr "No se encontró."
+msgid "License"
+msgstr "Licencia."
 
-#: actions/twittersettings.php:71
-msgid "Add your Twitter account to automatically send "
-msgstr "Agregar tu cuenta Twitter a enviar automáticamente"
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "Aceptar"
 
-#: actions/twittersettings.php:119
-msgid "Twitter user name"
-msgstr "Nombre de usuario de Twitter"
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+#, fuzzy
+msgid "Subscribe to this user"
+msgstr "Suscribirse a este usuario"
 
-#: actions/twittersettings.php:126
-msgid "Twitter password"
-msgstr "Contraseña de Twitter"
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "Rechazar"
 
-#: actions/twittersettings.php:228
-msgid "Twitter Friends"
-msgstr "Amigos en Twitter"
+#: actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "Suscripciones %s"
 
-#: actions/twittersettings.php:327
-msgid "Username must have only numbers, "
-msgstr "Nombre de usuario sólo debe tener números, "
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
+msgstr "¡Ninguna petición de autorización!"
 
-#: actions/twittersettings.php:341
-#, fuzzy, php-format
-msgid "Unable to retrieve account information "
-msgstr "No se pudo acceder a información de cuenta"
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+msgstr "Suscripción autorizada"
 
-#: actions/unblock.php:108
+#: actions/userauthorization.php:249
 #, fuzzy
-msgid "Error removing the block."
-msgstr "Error al sacar bloqueo."
+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:"
 
-#: actions/unsubscribe.php:50
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
+msgstr "Suscripción rechazada"
+
+#: actions/userauthorization.php:261
 #, fuzzy
-msgid "No profile id in request."
-msgstr "Ningún perfil de Id en solicitud."
+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 "
+"completamente."
 
-#: actions/unsubscribe.php:57
-msgid "No profile with that id."
-msgstr "Ningún perfil con ese ID."
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
 
-#: actions/unsubscribe.php:71
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "Desuscrito"
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
 
-#: actions/usergroups.php:63
+#: actions/userauthorization.php:307
 #, php-format
-msgid "%s groups"
-msgstr "Grupos %s"
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
 
-#: actions/usergroups.php:65
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "No se puede leer el URL del avatar '%s'"
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Tipo de imagen incorrecto para '%s'"
+
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr "Ningún identificador."
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "Configuración del perfil"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "Grupos %s, página %d"
 
-#: classes/Notice.php:104
+#: actions/usergroups.php:130
+#, fuzzy
+msgid "Search for more groups"
+msgstr "Buscar personas o texto"
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "No eres miembro de ese grupo"
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Message.php:55
+msgid "Could not insert message."
+msgstr "No se pudo insertar mensaje."
+
+#: classes/Message.php:65
+msgid "Could not update message with new URI."
+msgstr "No se pudo actualizar mensaje con nuevo URI."
+
+#: classes/Notice.php:164
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "Error de la BD al insertar la etiqueta clave: %s"
+
+#: classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Hubo un problema al guardar el aviso."
+
+#: classes/Notice.php:183
 #, fuzzy
 msgid "Problem saving notice. Unknown user."
 msgstr "Hubo problemas al guardar el aviso.  Usuario desconocido."
 
-#: classes/Notice.php:109
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Demasiados avisos demasiado rápido; para y publicar nuevamente en unos "
 "minutos."
 
-#: classes/Notice.php:116
+#: classes/Notice.php:194
+#, fuzzy
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+"Demasiados avisos demasiado rápido; para y publicar nuevamente en unos "
+"minutos."
+
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr "Tienes prohibido publicar avisos en este sitio."
 
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
+msgstr "Hubo un problema al guardar el aviso."
+
+#: classes/Notice.php:1120
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "Error de BD al insertar respuesta: %s"
+
+#: classes/User.php:347
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Mensaje a %1$s en %2$s"
+
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Perfil"
+
 #: lib/accountsettingsaction.php:108
-#, fuzzy
+msgid "Change your profile settings"
+msgstr "Cambia tus opciones de perfil"
+
+#: lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "Cargar un avatar."
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr "Cambia tu contraseña"
+
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
+msgstr "Cambiar el manejo del correo."
+
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:124
+msgid "Design your profile"
+msgstr "Diseñar tu perfil"
+
+#: lib/accountsettingsaction.php:128
 msgid "Other"
 msgstr "Otro"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:128
 msgid "Other options"
 msgstr "Otras opciones"
 
-#: lib/action.php:130
-#, fuzzy, php-format
+#: lib/action.php:144
+#, php-format
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: lib/action.php:145
+#: lib/action.php:159
 msgid "Untitled page"
 msgstr "Página sin título"
 
-#: lib/action.php:316
+#: lib/action.php:424
 msgid "Primary site navigation"
 msgstr "Navegación de sitio primario"
 
-#: lib/action.php:322
+#: lib/action.php:430
+msgid "Home"
+msgstr "Inicio"
+
+#: lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr "Perfil personal y línea de tiempo de amigos"
 
-#: lib/action.php:325
-msgid "Search for people or text"
-msgstr "Buscar personas o texto"
-
-#: lib/action.php:328
+#: lib/action.php:432
 #, fuzzy
 msgid "Account"
 msgstr "Cuenta"
 
-#: lib/action.php:328
+#: lib/action.php:432
 #, fuzzy
 msgid "Change your email, avatar, password, profile"
 msgstr "Cambia tu correo electrónico, avatar, contraseña, perfil"
 
-#: lib/action.php:330
-msgid "Connect to IM, SMS, Twitter"
-msgstr "Conectarse a IM, SMS, Twitter"
+#: lib/action.php:435
+msgid "Connect"
+msgstr "Conectarse"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "No se pudo redirigir al servidor: %s"
+
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
+msgstr "Invitar"
+
+#: lib/action.php:440 lib/subgroupnav.php:106
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr "Invita a amigos y colegas a unirse a %s"
+
+#: lib/action.php:445
+msgid "Logout"
+msgstr "Salir"
 
-#: lib/action.php:332
+#: lib/action.php:445
 msgid "Logout from the site"
 msgstr "Salir de sitio"
 
-#: lib/action.php:335
-msgid "Login to the site"
-msgstr "Ingresar a sitio"
-
-#: lib/action.php:338
+#: lib/action.php:450
 #, fuzzy
 msgid "Create an account"
 msgstr "Crear una cuenta"
 
-#: lib/action.php:341
-#, fuzzy
-msgid "Login with OpenID"
-msgstr "Ingresar con OpenID."
+#: lib/action.php:453
+msgid "Login to the site"
+msgstr "Ingresar a sitio"
 
-#: lib/action.php:344
-#, fuzzy
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
+msgstr "Ayuda"
+
+#: lib/action.php:456
 msgid "Help me!"
-msgstr "¡Ayúdame!"
+msgstr "Ayúdame!"
 
-#: lib/action.php:362
-#, fuzzy
+#: lib/action.php:459
+msgid "Search"
+msgstr "Buscar"
+
+#: lib/action.php:459
+msgid "Search for people or text"
+msgstr "Buscar personas o texto"
+
+#: lib/action.php:480
 msgid "Site notice"
 msgstr "Aviso de sitio"
 
-#: lib/action.php:417
+#: lib/action.php:546
 msgid "Local views"
 msgstr "Vistas locales"
 
-#: lib/action.php:472
+#: lib/action.php:612
 #, fuzzy
 msgid "Page notice"
 msgstr "Aviso de página"
 
-#: lib/action.php:562
-#, fuzzy
+#: lib/action.php:714
 msgid "Secondary site navigation"
 msgstr "Navegación de sitio secundario"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:721
+msgid "About"
+msgstr "Acerca de"
+
+#: lib/action.php:723
+msgid "FAQ"
+msgstr "Preguntas Frecuentes"
+
+#: lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/action.php:730
+msgid "Privacy"
+msgstr "Privacidad"
+
+#: lib/action.php:732
+msgid "Source"
+msgstr "Fuente"
+
+#: lib/action.php:734
+msgid "Contact"
+msgstr "Ponerse en contacto"
+
+#: lib/action.php:736
+#, fuzzy
+msgid "Badge"
+msgstr "Zumbido "
+
+#: lib/action.php:764
 msgid "StatusNet software license"
 msgstr "Licencia de software de StatusNet"
 
-#: lib/action.php:630
+#: lib/action.php:767
+#, php-format
+msgid ""
+"**%%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%%)."
+
+#: lib/action.php:769
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** es un servicio de microblogueo."
+
+#: lib/action.php:771
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+"Usa el software de microblogueo [StatusNet](http://status.net), versión %s, "
+"disponible bajo la [GNU Affero General Public License](http://www.fsf.org/"
+"licensing/licenses/agpl-3.0.html)."
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "Licencia de software de StatusNet"
+
+#: lib/action.php:794
 msgid "All "
 msgstr "Todo"
 
-#: lib/action.php:635
+#: lib/action.php:799
 msgid "license."
 msgstr "Licencia."
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/action.php:1052
+msgid "Pagination"
+msgstr "Paginación"
+
+#: lib/action.php:1061
+msgid "After"
+msgstr "Después"
+
+#: lib/action.php:1069
+msgid "Before"
+msgstr "Antes"
+
+#: lib/action.php:1117
+msgid "There was a problem with your session token."
+msgstr "Hubo problemas con tu clave de sesión."
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+msgid "Provider"
+msgstr "Proveedor"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
+msgstr "Resultados de comando"
+
+#: lib/channel.php:210
+msgid "Command complete"
+msgstr "Comando completo"
+
+#: lib/channel.php:221
+msgid "Command failed"
+msgstr "Comando falló"
+
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr "Disculpa, todavía no se implementa este comando."
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr ""
+"No se pudo actualizar el usuario con la dirección de correo confirmada."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, php-format
+msgid "Nudge sent to %s"
+msgstr "zumbido enviado a %s"
+
+#: lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
+msgstr "Usuario no tiene último aviso"
+
+#: lib/command.php:190
+msgid "Notice marked as fave."
+msgstr "Aviso marcado como favorito."
+
+#: lib/command.php:315
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#: lib/command.php:318
+#, php-format
+msgid "Fullname: %s"
+msgstr "Nombre completo: %s"
+
+#: lib/command.php:321
+#, php-format
+msgid "Location: %s"
+msgstr "Lugar: %s"
+
+#: lib/command.php:324
+#, php-format
+msgid "Homepage: %s"
+msgstr "Página de inicio: %s"
+
+#: lib/command.php:327
+#, php-format
+msgid "About: %s"
+msgstr "Sobre: %s"
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr "Mensaje muy largo - máximo 140 caracteres, enviaste %d"
+
+#: lib/command.php:377
+msgid "Error sending direct message."
+msgstr "Error al enviar mensaje directo."
+
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "Mensaje muy largo - máximo 140 caracteres, enviaste %d"
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Responder este aviso."
+
+#: lib/command.php:441
 #, fuzzy
-msgid "Block this user"
-msgstr "Bloquear este usuario."
+msgid "Error saving notice."
+msgstr "Hubo un problema al guardar el aviso."
 
-#: lib/blockform.php:153
-msgid "Block"
-msgstr "Bloquear"
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
+msgstr "Especificar el nombre del usuario a suscribir"
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
-msgid "Disfavor this notice"
-msgstr "Sacar este aviso"
+#: lib/command.php:502
+#, php-format
+msgid "Subscribed to %s"
+msgstr "Suscrito a %s"
 
-#: lib/facebookaction.php:268
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
+msgstr "Especificar el nombre del usuario para desuscribirse de"
+
+#: lib/command.php:530
 #, php-format
-msgid "To use the %s Facebook Application you need to login "
-msgstr "Para usar la Aplicación de Facebook %s debes ingresar"
+msgid "Unsubscribed from %s"
+msgstr "Desuscrito de %s"
+
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
+msgstr "Todavía no se implementa comando."
+
+#: lib/command.php:551
+msgid "Notification off."
+msgstr "Notificación no activa."
+
+#: lib/command.php:553
+msgid "Can't turn off notification."
+msgstr "No se puede desactivar notificación."
+
+#: lib/command.php:574
+msgid "Notification on."
+msgstr "Notificación activada."
+
+#: lib/command.php:576
+msgid "Can't turn on notification."
+msgstr "No se puede activar notificación."
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "No se pudo crear el formulario OpenID: %s"
 
-#: lib/facebookaction.php:271
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "No estás suscrito a ese perfil."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "No estás suscrito a ese perfil."
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "No se pudo suscribir otro a ti."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Personas suscritas a %s"
+
+#: lib/command.php:656
 #, fuzzy
-msgid " a new account."
-msgstr "una cuenta nueva. "
+msgid "You are not a member of any groups."
+msgstr "No eres miembro de ese grupo"
 
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/command.php:658
 #, fuzzy
-msgid "Published"
-msgstr "Publicado"
+msgid "You are a member of these groups: "
+msgstr "No eres miembro de este grupo."
+
+#: lib/command.php:670
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+
+#: lib/common.php:192
+msgid "No configuration file found. "
+msgstr "Ningún archivo de configuración encontrado. "
+
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:195
+msgid "Go to the installer."
+msgstr "Ir al instalador."
+
+#: lib/connectsettingsaction.php:110
+msgid "IM"
+msgstr "IM"
+
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Actualizaciones por mensajería instantánea"
+
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
+msgstr "Actualizaciones por sms"
+
+#: lib/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+msgid "Upload file"
+msgstr "Cargar archivo"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+msgid "Change colours"
+msgstr "Cambiar colores"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+msgid "Content"
+msgstr "Contenido"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Buscar"
+
+#: lib/designsettings.php:217
+msgid "Text"
+msgstr "Texto"
+
+#: lib/designsettings.php:230
+msgid "Links"
+msgstr "Vínculos"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
+msgstr "Sacar este aviso"
 
 #: lib/favorform.php:114 lib/favorform.php:140
 #, fuzzy
 msgid "Favor this notice"
 msgstr "Aceptar este aviso"
 
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr "Aceptar"
+
 #: lib/feedlist.php:64
 msgid "Export data"
 msgstr "Exportar datos"
 
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr ""
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr ""
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr ""
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Filtrar tags"
@@ -4674,63 +4068,84 @@ msgstr "Filtrar tags"
 msgid "All"
 msgstr "Todo"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
+msgstr "Seleccione una etiqueta a filtrar"
+
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Tag"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "Elegir tag para reducir lista"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "Ir"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:163
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "El URL de página de inicio o blog del grupo or tema"
 
-#: lib/groupeditform.php:151
-#, fuzzy
+#: lib/groupeditform.php:168
+msgid "Describe the group or topic"
+msgstr "Describir al grupo o tema"
+
+#: lib/groupeditform.php:170
+#, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "Describir al grupo o tema en %d caracteres"
+
+#: lib/groupeditform.php:172
 msgid "Description"
 msgstr "Descripción"
 
-#: lib/groupeditform.php:153
-#, fuzzy
-msgid "Describe the group or topic in 140 chars"
-msgstr "Describir al grupo o tema en 140 caracteres"
-
-#: lib/groupeditform.php:158
-#, fuzzy
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr ""
-"Lugar del grupo, si existe, por ejemplo \"Ciudad, Estado (o Región), País\""
+"Ubicación del grupo, si existe, por ejemplo \"Ciudad, Estado (o Región), País"
+"\""
+
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
 msgid "Group"
 msgstr "Grupo"
 
-#: lib/groupnav.php:100
-msgid "Admin"
-msgstr "Admin"
-
 #: lib/groupnav.php:101
+msgid "Blocked"
+msgstr "Bloqueado"
+
+#: lib/groupnav.php:102
+#, php-format
+msgid "%s blocked users"
+msgstr "usuarios bloqueados"
+
+#: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
 msgstr "Editar propiedades del grupo %s"
 
-#: lib/groupnav.php:106
-#, fuzzy
+#: lib/groupnav.php:113
 msgid "Logo"
 msgstr "Logo"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:114
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "Agregar o editar el logo de %s"
 
+#: lib/groupnav.php:120
+#, php-format
+msgid "Add or edit %s design"
+msgstr "Agregar o editar el diseño de %s"
+
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Grupos con más miembros"
@@ -4745,9 +4160,42 @@ msgid "Tags in %s group's notices"
 msgstr "Tags en avisos del grupo %s"
 
 #: lib/htmloutputter.php:104
-#, fuzzy
-msgid "This page is not available in a "
-msgstr "Esta página no está disponible en un "
+msgid "This page is not available in a media type you accept"
+msgstr "Esta página no está disponible en el tipo de medio que aceptas."
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Puedes cargar una imagen de logo para tu grupo."
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr "Carga parcial."
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr "Error del sistema al cargar el archivo."
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr "No es una imagen o es un fichero corrupto."
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr "Formato de imagen no soportado."
+
+#: lib/imagefile.php:118
+msgid "Lost our file."
+msgstr "Se perdió nuestro archivo."
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr "Tipo de archivo desconocido"
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr ""
 
 #: lib/joinform.php:114
 #, fuzzy
@@ -4759,45 +4207,88 @@ msgstr "Unirse"
 msgid "Leave"
 msgstr "Dejar"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:80
 #, fuzzy
 msgid "Login with a username and password"
 msgstr "Ingresar con un nombre de usuario y contraseña."
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:86
 #, fuzzy
 msgid "Sign up for a new account"
 msgstr "Registrar una cuenta nueva "
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
-msgstr "Ingresar o registrar con OpenID"
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "Sólo el usuario puede leer sus bandejas de correo."
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
 
-#: lib/mail.php:175
+#: lib/mailbox.php:227 lib/noticelist.php:424
+msgid "from"
+msgstr "desde"
+
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "Confirmación de correo electrónico"
+
+#: lib/mail.php:174
 #, php-format
 msgid ""
 "Hey, %s.\n"
 "\n"
-msgstr ""
-"Hola, %s.\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%s\n"
 "\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
+msgstr ""
 
-#: lib/mail.php:236
-#, fuzzy, php-format
-msgid "%1$s is now listening to "
-msgstr "%1$s ahora está escuchando "
+#: lib/mail.php:235
+#, 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:254
+#: lib/mail.php:240
 #, fuzzy, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
+"\t%1$s ahora está escuchando tus avisos en  %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Atentamente,\n"
+"%4$s.\n"
+
+#: lib/mail.php:253
+#, php-format
 msgid "Location: %s\n"
-msgstr "Lugar: %s\n"
+msgstr "Ubicación: %s\n"
 
-#: lib/mail.php:256
-#, fuzzy, php-format
+#: lib/mail.php:255
+#, php-format
 msgid "Homepage: %s\n"
 msgstr "Página de inicio: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
@@ -4806,110 +4297,371 @@ msgstr ""
 "Bio: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:285
+#, php-format
+msgid "New email address for posting to %s"
+msgstr "Nueva dirección de correo para postear a %s"
+
+#: lib/mail.php:288
+#, 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 ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Enviar correo a %2$s para publicar nuevos mensajes. \n"
+"\n"
+"Más instrucciones de correo en %3$s.\n"
+"\n"
+"Attentamente, \n"
+"%4$s"
+
+#: lib/mail.php:412
+#, php-format
+msgid "%s status"
+msgstr "estado de %s"
+
+#: lib/mail.php:438
+msgid "SMS confirmation"
+msgstr "SMS confirmación"
+
+#: lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "%s te mandó un zumbido "
 
-#: lib/mail.php:465
+#: lib/mail.php:466
 #, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
-msgstr "%1$s (%2$s) quiere saber qué estás haciendo"
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
+msgstr ""
 
-#: lib/mail.php:555
-#, fuzzy, php-format
-msgid "%1$s just added your notice from %2$s"
-msgstr "%1$s recién agregó tu aviso de %2$s"
+#: lib/mail.php:509
+#, php-format
+msgid "New private message from %s"
+msgstr "Nuevo mensaje privado de %s"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
-#, fuzzy
-msgid "From"
-msgstr "Desde"
+#: lib/mail.php:513
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%5$s\n"
+msgstr ""
 
-#: lib/messageform.php:110
+#: lib/mail.php:554
+#, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s (@%s) agregó tu aviso como un  favorito"
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, php-format
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+msgstr ""
+
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+msgid "Could not determine file's mime-type!"
+msgstr "No se pudo acceder a corriente pública."
+
+#: lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Enviar un aviso directo"
 
-# ¿zumbido? creo que así lo traduce msn
-#: lib/noticeform.php:125
-#, fuzzy
-msgid "Send a notice"
-msgstr "Enviar un aviso"
+#: lib/messageform.php:146
+msgid "To"
+msgstr "Para"
 
-#: lib/noticeform.php:152
+#: lib/messageform.php:162 lib/noticeform.php:173
 #, fuzzy
 msgid "Available characters"
 msgstr "Caracteres disponibles"
 
-#: lib/noticelist.php:426
-msgid "in reply to"
-msgstr "en respuesta a..."
+#: lib/noticeform.php:145
+#, fuzzy
+msgid "Send a notice"
+msgstr "Enviar un aviso"
+
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
+msgstr "¿Qué tal, %s?"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:478
+msgid "in context"
+msgstr "en contexto"
+
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr "Responder este aviso."
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "Responder"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
-msgid "Delete this notice"
-msgstr "Borrar este aviso"
-
-#: lib/noticelist.php:474
-msgid "Delete"
-msgstr "Borrar"
-
-# ¿zumbido? creo que así lo traduce msn
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Enviar zumbido a este usuario"
 
-# ¿zumbido? creo que así lo traduce msn
 #: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "Zumbido "
 
-# ¿zumbido? creo que así lo traduce msn
 #: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr "Enviar zumbido a este usuario"
 
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "Error al insertar el nuevo perfil"
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "Error al insertar el avatar"
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "Error al insertar perfil remoto"
+
+#: lib/oauthstore.php:345
+msgid "Duplicate notice"
+msgstr "Duplicar aviso"
+
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
+msgstr "No se pudo insertar una nueva suscripción."
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "Personal"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "Respuestas"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr "Favoritos"
+
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr "Usuario"
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr "Bandeja de Entrada"
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr "Mensajes entrantes"
+
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr "Bandeja de Salida"
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr "Mensajes enviados"
+
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Tags en avisos de %s"
 
-#: lib/profilelist.php:182
-msgid "(none)"
-msgstr "(ninguno)"
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "Suscripciones"
 
-#: lib/publicgroupnav.php:76
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "Todas las suscripciones"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "Suscriptores"
+
+#: lib/profileaction.php:157
+#, fuzzy
+msgid "All subscribers"
+msgstr "Todos los suscriptores"
+
+#: lib/profileaction.php:177
+msgid "User ID"
+msgstr "ID de usuario"
+
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "Miembro desde"
+
+#: lib/profileaction.php:235
+msgid "All groups"
+msgstr "Todos los grupos"
+
+#: lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Público"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Grupos de usuario"
 
-#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Tags recientes"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Destacado"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Popular"
 
+#: lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Buscar"
+
+#: lib/searchaction.php:162
+msgid "Search help"
+msgstr "Buscar ayuda"
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "Gente"
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr "Encontrar gente en este sitio"
+
 #: lib/searchgroupnav.php:82
 #, fuzzy
 msgid "Notice"
 msgstr "Aviso"
 
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr "Encontrar el contenido de avisos"
+
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Encontrar grupos en este sitio"
@@ -4918,34 +4670,63 @@ msgstr "Encontrar grupos en este sitio"
 msgid "Untitled section"
 msgstr "Sección sin título"
 
-#: lib/subgroupnav.php:81
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: lib/subgroupnav.php:83
 #, fuzzy, php-format
 msgid "People %s subscribes to"
 msgstr "Personas a las que %s está suscrito"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:91
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Personas suscritas a %s"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "%s es miembro de los grupos"
 
-#: lib/subgroupnav.php:104
-#, php-format
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Invita a amigos y colegas a unirse a %s"
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(ninguno)"
+
+#: lib/subs.php:48
+msgid "Already subscribed!"
+msgstr ""
 
-#: lib/subs.php:53
+#: lib/subs.php:52
 msgid "User has blocked you."
 msgstr "El usuario te ha bloqueado."
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: lib/subs.php:56
+msgid "Could not subscribe."
+msgstr "No se pudo suscribir."
+
+#: lib/subs.php:75
+msgid "Could not subscribe other to you."
+msgstr "No se pudo suscribir otro a ti."
+
+#: lib/subs.php:124
 #, fuzzy
-msgid "Subscribe to this user"
-msgstr "Suscribirse a este usuario"
+msgid "Not subscribed!"
+msgstr "¡No estás suscrito!"
+
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
+msgstr "No se pudo eliminar la suscripción."
 
 #: lib/tagcloudsection.php:56
 msgid "None"
@@ -4955,35 +4736,107 @@ msgstr "Ninguno"
 msgid "Top posters"
 msgstr "Principales posteadores"
 
-#: lib/unblockform.php:120 lib/unblockform.php:150
-#, fuzzy
-msgid "Unblock this user"
-msgstr "Desbloquear este usuario"
-
-#: lib/unblockform.php:150
-msgid "Unblock"
-msgstr "Desbloquear"
-
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Desuscribirse de este usuario"
 
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "Cancelar suscripción"
+
+#: lib/userprofile.php:116
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "Crear una nueva cuenta"
+msgid "Edit Avatar"
+msgstr "Avatar"
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "No se pudo confirmar el correo electrónico."
+#: lib/userprofile.php:236
+#, fuzzy
+msgid "User actions"
+msgstr "Acciones de usuario"
 
-#~ msgid "Email address"
-#~ msgstr "Dirección de correo electrónico"
+#: lib/userprofile.php:248
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Configuración del perfil"
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Error al insertar aviso"
+#: lib/userprofile.php:249
+msgid "Edit"
+msgstr ""
 
-#~ 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 olvidaste o perdiste tu contraseña, puedes recibir una nueva en la "
-#~ "dirección de correo electrónico que usaste para registrar tu cuenta."
+#: lib/userprofile.php:272
+msgid "Send a direct message to this user"
+msgstr "Enviar un mensaje directo a este usuario"
+
+#: lib/userprofile.php:273
+msgid "Message"
+msgstr "Mensaje"
+
+#: lib/util.php:821
+msgid "a few seconds ago"
+msgstr "hace unos segundos"
+
+#: lib/util.php:823
+msgid "about a minute ago"
+msgstr "hace un minuto"
+
+#: lib/util.php:825
+#, php-format
+msgid "about %d minutes ago"
+msgstr "hace %d minutos"
+
+#: lib/util.php:827
+msgid "about an hour ago"
+msgstr "hace una hora"
+
+#: lib/util.php:829
+#, php-format
+msgid "about %d hours ago"
+msgstr "hace %d horas"
+
+#: lib/util.php:831
+msgid "about a day ago"
+msgstr "hace un día"
+
+#: lib/util.php:833
+#, php-format
+msgid "about %d days ago"
+msgstr "hace %d días"
+
+#: lib/util.php:835
+msgid "about a month ago"
+msgstr "hace un mes"
+
+#: lib/util.php:837
+#, php-format
+msgid "about %d months ago"
+msgstr "hace %d meses"
+
+#: lib/util.php:839
+msgid "about a year ago"
+msgstr "hace un año"
+
+#: lib/webcolor.php:82
+#, php-format
+msgid "%s is not a valid color!"
+msgstr ""
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr "No se pudo analizar sintácticamente mensaje."
+
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr "No es un usuario registrado"
+
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr "Lo sentimos, pero este no es su dirección de correo entrante."
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr "Lo sentimos, pero no se permite correos entrantes"
diff --git a/locale/fi/LC_MESSAGES/statusnet.mo b/locale/fi/LC_MESSAGES/statusnet.mo
index 7e64ddb00..14026dc1e 100644
--- a/locale/fi/LC_MESSAGES/statusnet.mo
+++ b/locale/fi/LC_MESSAGES/statusnet.mo
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 5a53dd2df..c75267286 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -1,3 +1,8 @@
+# Translation of StatusNet to Finnish
+#
+# Author@translatewiki.net: Crt
+# Author@translatewiki.net: Jaakko
+# --
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -5,4313 +10,2983 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-02-28 01:41+0000\n"
-"Last-Translator: Antti Salminen <antti.salminen@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:24+0000\n"
+"Language-Team: Finnish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
-
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
-#, php-format
-msgid " Search Stream for \"%s\""
-msgstr " Hakusyöte haulle \"%s\""
-
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-#: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
-msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr ""
-" poislukien yksityinen tieto: salasana, sähköpostiosoite, IM osoite, "
-"puhelinnumero."
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr " lähteestä "
-
-# Onko päivitys hyvä sana?
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr "%1$s / Vastaukset päivitykseen %2$s"
-
-#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s on kutsunut sinut liittymään palveluun %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 on kutsunut sinut %2$s (%3$s) mikroblogipalveluun.\n"
-"\n"
-"%2$s mikroblogipalvelu auttaa sinua pysymään ajantasalla tuttujen ja "
-"kiinnostavien ihmisten kanssa.\n"
-"\n"
-"Voit myös jakaa uutisia itsestäsi ja ajatuksiasi verkossa ihmisten, jotka "
-"tuntevat sinut, kanssa. Se on myös kätevä tapa tutustua uusiin ihmisiin "
-"jotka ovat kiinnostuneet samanlaisista asioista, kuin sinä.\n"
-"\n"
-"%1$s sanoi:\n"
-"\n"
-"%4$s\n"
-"Voit nähdä henkilön %1$s profiilisivun %2$s-palvelussa täältä:\n"
-"\n"
-"%5$s\n"
-"\n"
-"Jos haluat kokeilla palvelua, klikkaa alla olevaa linkkiä hyväksyäksesi "
-"kutsun.\n"
-"\n"
-"%6$s\n"
-"\n"
-"Jos et halua osallistua, voit jättää tämän viestin huomioimatta. Kiitoksia "
-"kärsivällisyydestä ja ajastasi.\n"
-"\n"
-"Terveisin, %2$s\n"
-
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s seuraa nyt päivityksiäsi palvelussa %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 seuraa nyt päivityksiäsi palvelussa %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Terveisin,\n"
-"%4$s.\n"
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-"%1$s -päivitykset, jotka on vastauksia käyttäjän %2$s / %3$s päivityksiin."
-
-#: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr "Käyttäjän %1$s päivitys %2$s"
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
-#, php-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: fi\n"
+"X-Message-Group: out-statusnet\n"
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+msgid "No such page"
+msgstr "Sivua ei ole."
+
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
+msgstr "Käyttäjää ei ole."
 
-#: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/all.php:84
 #, php-format
-msgid "%s Public Stream"
-msgstr "%s julkinen syöte"
+msgid "%s and friends, page %d"
+msgstr "%s ja kaverit, sivu %d"
 
-#: ../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
-#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s ja kaverit"
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/all.php:99
 #, php-format
-msgid "%s public timeline"
-msgstr "%s julkinen aikajana"
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Käyttäjän %s kavereiden syöte (RSS 1.0)"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: actions/all.php:107
 #, php-format
-msgid "%s status"
-msgstr "%s päivitys"
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Käyttäjän %s kavereiden syöte (RSS 2.0)"
 
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/all.php:115
 #, php-format
-msgid "%s timeline"
-msgstr "%s aikajana"
+msgid "Feed for friends of %s (Atom)"
+msgstr "Käyttäjän %s kavereiden syöte (Atom)"
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/all.php:127
 #, php-format
-msgid "%s updates from everyone!"
-msgstr "%s päivitykset kaikilta!"
-
-#: ../actions/register.php:213
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
-"(Saat pian sähköpostiisi viestin, jonka ohjeita seuraamalla voit vahvistaa "
-"sähköpostiosoitteesi.)"
+"Tämä on käyttäjän %s ja kavereiden aikajana, mutta kukaan ei ole lähettyänyt "
+"vielä mitään."
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: actions/all.php:132
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
 msgstr ""
-"**%%site.name%%** on mikroblogipalvelu, jonka tarjoaa "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"Kokeile useamman käyttäjän tilaamista, [liity ryhmään] (%%action.groups%%) "
+"tai lähetä päivitys itse."
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: actions/all.php:134
 #, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** on mikroblogipalvelu. "
-
-#: ../lib/util.php:274 lib/util.php:290
-msgid ". Contributors should be attributed by full name or nickname."
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
-". Tunnustus osallistujille tulee antaa joko koko nimelle tai "
-"käyttäjätunnukselle."
 
-# näissä ei tueta tällä hetkellä myöskään ääkkösiä
-#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
-#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
 msgstr ""
-"1-64 pientä kirjainta tai numeroa, ei ääkkösiä eikä välimerkkejä tai "
-"välilyöntejä"
 
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 pientä kirjainta tai numeroa, ei ääkkösiä eikä välimerkkejä tai "
-"välilyöntejä. Pakollinen."
+#: actions/all.php:165
+msgid "You and friends"
+msgstr "Sinä ja kaverit"
 
-#: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr "6 tai useampia merkkejä"
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!"
 
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
-msgid "6 or more characters, and don't forget it!"
-msgstr "6 tai useampia merkkejä äläkä unohda mitä kirjoitit!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
+msgstr "API-metodia ei löytynyt!"
 
-#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
-msgid "6 or more characters. Required."
-msgstr "6 tai useampia merkkejä. Pakollinen."
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
+msgstr "Tämä metodi edellyttää POST sanoman."
 
-#: ../actions/imsettings.php:197 actions/imsettings.php:205
-#, php-format
+#: actions/apiaccountupdatedeliverydevice.php:105
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
 msgstr ""
-"Vahvistuskoodi lähetettiin antamaasi pikaviestinosoitteeseen. Sinun täytyy "
-"antaa osoitteelle %s oikeus lähettää viestejä sinulle."
 
-#: ../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 ""
-"Vahvistuskoodi on lähetetty sähköpostiosoitteeseesi. Katso "
-"sähköpostilaatikostasi (ja roskapostilaatikostasi!) vahvistuskoodisi ja "
-"miten sitä käytetään. "
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Ei voitu päivittää käyttäjää."
 
-#: ../actions/smssettings.php:216 actions/smssettings.php:224
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
+#, php-format
 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."
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
 msgstr ""
-"Vahvistuskoodi on lähetetty puhelinnumeroosi. Katso tekstiviesteistäsi "
-"vahvistuskoodisi ja miten sitä käytetää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 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 actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
-msgid "API method not found!"
-msgstr "API-metodia ei löytynyt!"
-
-#: ../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 actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
-msgid "API method under construction."
-msgstr "API-metodi on työn alla!"
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
-msgid "About"
-msgstr "Tietoa"
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "Twitter-asetuksia ei voitu tallentaa!"
 
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
-msgid "Accept"
-msgstr "Hyväksy"
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Ei voitu päivittää käyttäjää."
 
-#: ../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 actions/emailsettings.php:120
-#: actions/imsettings.php:127 actions/openidsettings.php:111
-#: actions/smssettings.php:133 actions/twittersettings.php:163
-msgid "Add"
-msgstr "Lisää"
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Käyttäjällä ei ole profiilia."
 
-#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
-msgstr "Lisää OpenID"
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-msgid "Add or remove OpenIDs"
-msgstr "Lisää tai poista OpenID:t"
-
-#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39 actions/emailsettings.php:39
-#: actions/imsettings.php:40 actions/smssettings.php:39
-#: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
-msgstr "Osoite"
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Ei voitu tallentaa profiilia."
 
-#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-msgid "Addresses of friends to invite (one per line)"
-msgstr "Kutsuttavien kavereiden osoitteet (yksi per rivi)"
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
+msgstr "Käyttäjän esto epäonnistui."
 
-#: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
-msgid "All subscriptions"
-msgstr "Kaikki tilaukset"
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
+msgstr "Käyttäjän eston poisto epäonnistui."
 
-#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
-#, php-format
-msgid "All updates for %s"
-msgstr "Kaikki päivitykset käyttäjältä %s"
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "Viestissä ei ole tekstiä!"
 
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
 #, php-format
-msgid "All updates matching search term \"%s\""
-msgstr "Kaikki päivitykset hakuehdolla \"%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
-#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
-msgid "Already logged in."
-msgstr "Olet jo kirjautunut sisään."
-
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
-msgid "Already subscribed!."
-msgstr "Tilaat jo!"
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
-msgid "Are you sure you want to delete this notice?"
-msgstr "Oletko varma että haluat poistaa tämän päivityksen?"
-
-# "anna lupa" ehkä parempi
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
-msgid "Authorize subscription"
-msgstr "Valtuuta tilaus"
+msgid "That's too long. Max message size is %d chars."
+msgstr "Liian pitkä päivitys. Maksimikoko päivitykselle on %d merkkiä."
 
-#: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
-msgid "Automatically login in the future; not for shared computers!"
-msgstr ""
-"Kirjaudu sisään automaattisesti tulevaisuudessa; ei tietokoneille joilla "
-"useampi käyttäjä!"
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "Vastaanottajaa ei löytynyt."
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
-"Tilaa automaattisesti kaikki, jotka tilaavat päivitykseni (ei sovi hyvin "
-"ihmiskäyttäjille)"
-
-# Avatar ei ole laajalti käytössä minun tietääkseni missään suomenkielisessä sivustossa tai ohjelmistossa, "kuva" tai silloin kuin täsmennystä tarvitaan "profiilikuva" tai "käyttäjäkuva" on selkeämpi.
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34 actions/avatarsettings.php:65
-#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
-msgid "Avatar"
-msgstr "Kuva"
-
-#: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
-msgid "Avatar updated."
-msgstr "Kuva päivitetty."
+"Et voi lähettää suoraa viestiä käyttäjälle, jonka kanssa et ole vielä kaveri."
 
-#: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/apidirectmessage.php:89
 #, 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 ""
-"Odotetaan vahvistusta tälle osoitteelle. Katso Jabber/GTalk "
-"käyttäjätililtäsi viesti, jossa on lisäohjeet. (Lisäsitkö %s:n "
-"ystävälistaasi?)"
+msgid "Direct messages from %s"
+msgstr "Suorat viestit käyttäjälle %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 ""
-"Odotetaan vahvistusta tälle sähköpostiosoitteelle. Katso "
-"sähköpostilaatikostasi (ja roskapostikansiosta!) viesti, jossa on "
-"lisäohjeita. "
+#: actions/apidirectmessage.php:93
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr "Kaikki suorat viestit käytäjältä %s"
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
-msgid "Awaiting confirmation on this phone number."
-msgstr "Odotetaan vahvistusta tälle puhelinnumerolle."
+#: actions/apidirectmessage.php:101
+#, php-format
+msgid "Direct messages to %s"
+msgstr "Suorat viestit käyttäjälle %s"
 
-#: ../lib/util.php:1318 lib/util.php:1452
-msgid "Before »"
-msgstr "Aiemmin »"
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr "Kaikki suorat viestit käyttäjälle %s"
 
-# Biolle ei oikein suoranaista käännöstä taida suomeksi olla (pl. elämäkerta, joka ei nyt ihan ole 140-merkkistä infokenttää vastaava), tietoja on varmaan kohtuullinen käännös.
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
-#: actions/profilesettings.php:82 actions/register.php:184
-#: actions/profilesettings.php:112 actions/register.php:402
-msgid "Bio"
-msgstr "Tietoja"
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "API-metodia ei löytynyt!"
 
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
-#: actions/register.php:89 actions/updateprofile.php:104
-#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
-msgid "Bio is too long (max 140 chars)."
-msgstr "\"Tietoja\" on liian pitkä (max 140 merkkiä)."
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
+msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä."
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
-msgid "Can't delete this notice."
-msgstr "Tätä päivitystä ei voi poistaa."
+#: actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
+msgstr "Tämä päivitys on jo suosikki!"
 
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
-#, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr "Kuvan URL-osoitetta '%s' ei voi avata."
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+msgstr "Ei voitu lisätä suosikiksi."
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404 actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-msgid "Can't save new password."
-msgstr "Uutta salasanaa ei voida tallentaa."
+#: actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
+msgstr "Tämä päivitys ei ole suosikki!"
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62 actions/emailsettings.php:58
-#: actions/imsettings.php:59 actions/smssettings.php:62
-#: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
-msgstr "Peruuta"
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr "Ei voitu poistaa suosikkia."
 
-#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Ei voitu luoda OpenID Consumer-oliota."
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
+msgstr "Ei voitu tilata käyttäjää: Käyttäjää ei löytynyt."
 
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
-msgstr "Ei voida normalisoida Jabber ID -tunnusta"
+#: actions/apifriendshipscreate.php:118
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr "Ei voitu tilata käyttäjää: %s on jo listallasi"
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
-msgid "Cannot normalize that email address"
-msgstr "Ei voida normalisoida sähköpostiosoitetta"
+#: actions/apifriendshipsdestroy.php:109
+msgid "Could not unfollow user: User not found."
+msgstr "Ei voitu lopettaa tilausta: Käyttäjää ei löytynyt."
 
-#: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
-msgstr "Vaihda"
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr "Et voi lopettaa itsesi tilausta!"
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
-msgstr "Muuta sähköpostin käsittelyasetuksia."
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
+msgstr "Kaksi käyttäjätunnusta tai nimeä täytyy antaa."
 
-#: ../actions/password.php:32 actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr "Vaihda salasana"
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Julkista päivitysvirtaa ei saatu."
 
-#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
-msgid "Change your password"
-msgstr "Vaihda salasanasi"
+#: actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Ei löytynyt yhtään päivitystä."
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-msgid "Change your profile settings"
-msgstr "Vaihda profiiliasetuksesi"
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
+msgid "Could not create group."
+msgstr "Ryhmän luonti ei onnistunut."
 
-#: ../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
-#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
-#: actions/register.php:376 actions/smssettings.php:122
-msgid "Confirm"
-msgstr "Vahvista"
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
+msgid "Could not create aliases."
+msgstr "Ei voitu lisätä aliasta."
 
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "Vahvista osoite"
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+msgid "Could not set group membership."
+msgstr "Ryhmän jäsenyystietoja ei voitu asettaa."
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245 actions/emailsettings.php:256
-#: actions/imsettings.php:230 actions/smssettings.php:253
-#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
-msgid "Confirmation cancelled."
-msgstr "Vahvistus peruttu."
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"Käyttäjätunnuksessa voi olla ainoastaan pieniä kirjaimia ja numeroita ilman "
+"välilyöntiä."
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
-msgid "Confirmation code"
-msgstr "Vahvistuskoodi"
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr "Tunnus on jo käytössä. Yritä toista tunnusta."
 
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-msgid "Confirmation code not found."
-msgstr "Vahvistuskoodia ei löytynyt."
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "Tuo ei ole kelvollinen tunnus."
 
-#: ../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 ""
-"Onnittelut, %s! Tervetuloa palveluun %%%%site.name%%%%. Täältä voit "
-"jatkaa...\n"
-"\n"
-"* [Profiiliisi](%s) ja lähettää ensimmäisen päivityksesi.\n"
-"* Lisäämään [Jabber/GTalk osoitteen](%%%%action.imsettings%%%%), jotta saat "
-"lähetettyä päivitykset pikaviestimen kautta.\n"
-"* [Hakemaan ihmisiä](%%%%action.peoplesearch%%%%), jotka tunnet tai joilla "
-"on samanlaisia kiinnostuksen kohteita. \n"
-"* Päivittämään [profiiliasi](%%%%action.profilesettings%%%%), jotta muut "
-"tietävät enemmän sinusta.\n"
-"* Lukemaan [ohjeista](%%%%doc.help%%%%) muista ominaisuuksista, joista et "
-"vielä tiedä. \n"
-"\n"
-"Kiitokset rekisteröitymisestäsi ja toivomme että pidät palvelustamme."
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "Kotisivun verkko-osoite ei ole toimiva."
 
-#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
-msgid "Connect"
-msgstr "Yhdistä"
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
 
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
-msgid "Connect existing account"
-msgstr "Yhdistä olemassa oleva käyttäjätunnus"
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "kuvaus on liian pitkä (max 140 merkkiä)."
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
-msgid "Contact"
-msgstr "Ota yhteyttä"
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)."
 
-# on lomake
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
 #, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "Ei voitu luoda OpenID lomaketta: %s"
+msgid "Too many aliases! Maximum %d."
+msgstr "Liikaa aliaksia. Maksimimäärä on %d."
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
 #, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr "Ei voitu tilata käyttäjää: %s on jo listallasi"
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
-msgid "Could not follow user: User not found."
-msgstr "Ei voitu tilata käyttäjää: Käyttäjää ei löytynyt."
+msgid "Invalid alias: \"%s\""
+msgstr "Virheellinen alias: \"%s\""
 
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
 #, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Ei voitu uudelleenohjata palvelimelle: %s"
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Alias \"%s\" on jo käytössä. Yritä toista aliasta."
 
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
-msgid "Could not save avatar info"
-msgstr "Ei voitu tallentaa profiilikuvan tietoja"
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr "Alias ei voi olla sama kuin ryhmätunnus."
 
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
-msgid "Could not save new profile info"
-msgstr "Ei voitu tallentaa uutta profiilitietoa"
+#: actions/apigroupjoin.php:110
+msgid "You are already a member of that group."
+msgstr "Sinä kuulut jo tähän ryhmään."
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
-msgid "Could not subscribe other to you."
-msgstr "Toista ei voitu asettaa tilaamaan sinua."
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr "Sinut on estetty osallistumasta tähän ryhmään ylläpitäjän toimesta."
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
-msgid "Could not subscribe."
-msgstr "Ei voitu tilata."
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
-msgstr "Ei voitu päivittää käyttäjälle vahvistettua sähköpostiosoitetta."
-
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-msgid "Couldn't convert request tokens to access tokens."
-msgstr "Ei voitu muuttaa request tokeneita access tokeneiksi."
-
-#: ../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
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-msgid "Couldn't delete email confirmation."
-msgstr "Ei voitu poistaa sähköpostivahvistusta."
-
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
-msgid "Couldn't delete subscription."
-msgstr "Ei voitu poistaa tilausta."
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
-msgid "Couldn't find any statuses."
-msgstr "Ei löytynyt yhtään päivitystä."
-
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-msgid "Couldn't get a request token."
-msgstr "Ei saatu request tokenia."
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Käyttäjää %s ei voinut liittää ryhmään %s"
 
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206 actions/emailsettings.php:223
-#: actions/imsettings.php:195 actions/smssettings.php:214
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
-msgid "Couldn't insert confirmation code."
-msgstr "Ei voitu asettaa vahvistuskoodia."
+#: actions/apigroupleave.php:114
+msgid "You are not a member of this group."
+msgstr "Sinä et kuulu tähän ryhmään."
 
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
-msgstr "Ei voitu lisätä uutta tilausta."
+#: actions/apigroupleave.php:124
+#, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Ei voitu poistaa käyttäjää %s ryhmästä %s"
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-msgid "Couldn't save profile."
-msgstr "Ei voitu tallentaa profiilia."
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "Käyttäjän %s ryhmät"
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
-msgstr "Ei voitu asettaa käyttäjälle automaattista tilausta."
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Ryhmän toiminnot"
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
-msgid "Couldn't update user record."
-msgstr "Ei voitu päivittää käyttäjätietoja."
+#: actions/apigrouplist.php:95
+#, php-format
+msgid "%s's groups"
+msgstr "Käyttäjän %s ryhmät"
 
-#: ../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
-#: actions/confirmaddress.php:114 actions/emailsettings.php:280
-#: actions/emailsettings.php:411 actions/imsettings.php:252
-#: actions/imsettings.php:395 actions/othersettings.php:162
-#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
-msgid "Couldn't update user."
-msgstr "Ei voitu päivittää käyttäjää."
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Ryhmät, joiden jäsen %s on"
 
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
-msgid "Create"
-msgstr "Luo"
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
+msgstr "Tämä metodi edellyttää joko POST tai DELETE sanoman."
 
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
-msgid "Create a new user with this nickname."
-msgstr "Luo uusi käyttäjä tällä käyttäjätunnuksella."
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
+msgstr "Et voi poistaa toisen käyttäjän päivitystä."
 
-#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
-msgid "Create new account"
-msgstr "Luo uusi käyttäjätili"
+#: actions/apistatusesshow.php:138
+msgid "Status deleted."
+msgstr "Päivitys poistettu."
 
-# Koodista selviää, että tämä on virhetilanne jossa on yritetty luoda tuollaista.
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
-msgid "Creating new account for OpenID that already has a user."
-msgstr ""
-"Yritettiin luoda uusi käyttäjätili OpenID tunnukselle, jolla on jo "
-"käyttäjätili."
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
+msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä."
 
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "Tämän hetken vahvistettu Jabber/GTalk -osoite."
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "Päivitys on liian pitkä. Maksimipituus on %d merkkiä."
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "Tämän hetken vahvistettu SMS puhelinnumero."
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
+msgstr "Ei löytynyt"
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-msgid "Current confirmed email address."
-msgstr "Tämän hetken vahvistettu sähköpostiosoite."
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr "Maksimikoko päivitykselle on %d merkkiä, mukaan lukien URL-osoite."
 
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
-msgstr "Tällä hetkellä"
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+msgid "Unsupported format."
+msgstr "Formaattia ei ole tuettu."
 
-#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: actions/apitimelinefavorites.php:107
 #, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "Tietokantavirhe tallennettaessa risutagiä: %s"
+msgid "%s / Favorites from %s"
+msgstr "%s / Käyttäjän %s suosikit"
 
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: actions/apitimelinefavorites.php:119
 #, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Tietokantavirhe tallennettaessa vastausta: %s"
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
-msgid "Delete notice"
-msgstr "Poista päivitys"
+msgid "%s updates favorited by %s / %s."
+msgstr " Palvelun %s päivitykset, jotka %s / %s on merkinnyt suosikikseen."
 
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "Kuvaile itseäsi ja kiinnostuksiasi 140 merkillä"
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
+#, php-format
+msgid "%s timeline"
+msgstr "%s aikajana"
 
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87 actions/register.php:172
-#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
-#: actions/register.php:385 lib/accountsettingsaction.php:113
-msgid "Email"
-msgstr "Sähköposti"
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-msgid "Email Address"
-msgstr "Sähköpostiosoite"
+#: actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Vastaukset päivitykseen %2$s"
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
-msgstr "Sähköpostiasetukset"
+#: actions/apitimelinementions.php:126
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+"%1$s -päivitykset, jotka on vastauksia käyttäjän %2$s / %3$s päivityksiin."
 
-#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-msgid "Email address already exists."
-msgstr "Sähköpostiosoite on jo käytössä."
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#, php-format
+msgid "%s public timeline"
+msgstr "%s julkinen aikajana"
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
-msgid "Email address confirmation"
-msgstr "Sähköpostiosoitteen vahvistus"
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#, php-format
+msgid "%s updates from everyone!"
+msgstr "%s päivitykset kaikilta!"
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
-msgstr "Sähköpostiosoite, esimerkiksi \"käyttäjätunnus@example.org\""
+#: actions/apitimelinetag.php:101 actions/tag.php:66
+#, php-format
+msgid "Notices tagged with %s"
+msgstr "Päivitykset joilla on tagi %s"
 
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-msgid "Email addresses"
-msgstr "Sähköpostiosoitteet"
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
 
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
-msgid "Enter a nickname or email address."
-msgstr "Syötä käyttäjätunnus tai sähköpostiosoite"
+#: actions/apiusershow.php:96
+msgid "Not found."
+msgstr "Ei löytynyt."
 
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
-msgstr "Syötä koodi jonka sait puhelimeesi."
+#: actions/attachment.php:73
+msgid "No such attachment."
+msgstr "Liitettä ei ole."
 
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
-msgid "Error authorizing token"
-msgstr "Virhe tapahtui tokenin hyväksynnässä."
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+msgstr "Tunnusta ei ole."
 
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
-msgid "Error connecting user to OpenID."
-msgstr "Virhe tapahtui käyttäjän ja OpenID-tunnuksen yhdistämisessä."
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "Kokoa ei ole."
 
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
-msgstr "Virhe tapahtui käyttäjän yhdistämisessä."
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "Koko ei kelpaa."
 
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
-msgstr "Virhe tapahtui profiilikuvan lisäämisessä"
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "Kuva"
 
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
-msgstr "Virhe tapahtui uuden profiilin lisäämisessä"
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "Voit ladata oman profiilikuvasi. Maksimikoko on %s."
 
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
-msgstr "Virhe tapahtui uuden etäprofiilin lisäämisessä"
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
+msgstr "Käyttäjälle ei löydy profiilia"
 
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
-msgid "Error saving address confirmation."
-msgstr "Virhe tapahtui osoitevahvistuksen tallentamisessa"
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+msgid "Avatar settings"
+msgstr "Profiilikuva-asetukset"
 
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
-msgid "Error saving remote profile"
-msgstr "Virhe tapahtui etäprofiilin tallentamisessa"
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr "Alkuperäinen"
 
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-msgid "Error saving the profile."
-msgstr "Virhe tapahtui profiilin tallentamisessa."
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr "Esikatselu"
 
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-msgid "Error saving the user."
-msgstr "Virhe tapahtui käyttäjän tallentamisessa."
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+msgid "Delete"
+msgstr "Poista"
 
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
-msgid "Error saving user; invalid."
-msgstr "Virhe tapahtui käyttäjän tallentamisessa; epäkelpo."
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+msgstr "Lataa"
 
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
-#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
-#: actions/register.php:108 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-msgid "Error setting user."
-msgstr "Virhe tapahtui käyttäjän asettamisessa."
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
+msgstr "Rajaa"
 
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr "Virhe tapahtui profiilin päivittämisessä"
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Istuntosi avaimen kanssa oli ongelmia. Olisitko ystävällinen ja kokeilisit "
+"uudelleen."
 
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
-msgstr "Virhe tapahtui etäprofiilin päivittämisessä"
+#: actions/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Odottamaton lomakkeen lähetys."
 
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr "Virhe vahvistuskoodin kanssa."
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
+msgstr "Valitse neliön muotoinen alue kuvasta profiilikuvaksi"
 
-# openid-tunnuksen liittämisessä omaan olemassaolevaan tunnukseen.
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
-msgid "Existing nickname"
-msgstr "Käytetty tunnus"
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
+msgstr "Tiedoston data hävisi."
 
-# Ei tämäkään kauheasti kerro, mutta ehkä silti englanninkielisiin sivustoihin tutustumattomalle edes lievästi selkeämpi.
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
-msgid "FAQ"
-msgstr "UKK"
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+msgstr "Kuva päivitetty."
 
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Profiilikuvan päivittäminen epäonnistui."
 
-# Tämä on otsikko käyttäjän Personal-sivun feedille jossa näkyy käyttäjän ja tämän tilausten päivitykset.
-#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
-#, php-format
-msgid "Feed for friends of %s"
-msgstr "Syöte käyttäjän %s kavereille"
+#: actions/avatarsettings.php:387
+msgid "Avatar deleted."
+msgstr "Kuva poistettu."
 
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
-#, php-format
-msgid "Feed for replies to %s"
-msgstr "Syöte käyttäjän %s saamista vastauksista"
-
-# tägille vai tagille?
-#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
-#, php-format
-msgid "Feed for tag %s"
-msgstr "Syöte tägille %s"
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
-msgstr "Hae päivityksien sisällöstä"
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
-msgstr "Hae ihmisiä tältä sivustolta"
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+msgid "No nickname"
+msgstr "Tunnusta ei ole."
 
-#: ../actions/login.php:122
-msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
-msgstr ""
-"Syötä turvallisuussyistä käyttäjätunnuksesi ja salasanasi uudelleen ennen "
-"asetuksiesi muuttamista."
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
+msgstr "Tuota ryhmää ei ole."
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
-#: actions/profilesettings.php:77 actions/register.php:178
-#: actions/profilesettings.php:103 actions/register.php:391
-#: actions/showgroup.php:235 actions/showstream.php:262
-#: actions/tagother.php:105 lib/groupeditform.php:142
-msgid "Full name"
-msgstr "Koko nimi"
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "Käyttäjän profiili"
 
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
-#: actions/register.php:86 actions/updateprofile.php:94
-#: actions/editgroup.php:195 actions/newgroup.php:146
-#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
-msgid "Full name is too long (max 255 chars)."
-msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s ja kaverit, sivu %d"
 
-#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
-msgid "Help"
-msgstr "Ohjeet"
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr "Lista käyttäjistä jotka ovat estetty liittymästä tähän ryhmään."
 
-# Tämä teksti tulee linkkiin, joka vie käyttäjän omalle sivulle.
-#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
-msgid "Home"
-msgstr "Koti"
+#: actions/blockedfromgroup.php:281
+msgid "Unblock user from group"
+msgstr "Poista käyttäjän esto ryhmästä"
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
-msgid "Homepage"
-msgstr "Kotisivu"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
+msgstr "Poista esto"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
-msgid "Homepage is not a valid URL."
-msgstr "Kotisivun verkko-osoite ei ole toimiva."
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+msgid "Unblock this user"
+msgstr "Poista esto tältä käyttäjältä"
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
-msgid "I want to post notices by email."
-msgstr "Haluan lähettää päivityksiä sähköpostilla."
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Et ole kirjautunut sisään."
 
-# IM ei ole suomessa käytössä ollenkaan, pikaviestimistä puhutaan ainakin jossain... surullista kyllä ainoa suosittu termi olisi varmaan joku "mese", mutta se ei taida sentään olla yleistynyt tarkoittamaan muuta kuin MS:n tuotetta.
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
-msgstr "Pikaviestin"
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
+msgstr "Profiilia ei ole määritelty."
 
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
-msgstr "Pikaviestiosoite"
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
+msgstr "Ei profiilia tuolle ID:lle."
 
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
-msgstr "Pikaviestiasetukset"
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Estä käyttäjä"
 
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/block.php:136
 msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
 msgstr ""
-"Jos sinulla on jo käyttäjätunnus, kirjaudu sisään käyttäjätunnuksella ja "
-"salasanalla yhdistääksesi OpenID-tunnuksesi siihen."
 
-#: ../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 ""
-"Jos haluat lisätä OpenID-tunnuksen käyttäjätunnukseesi, syötä se alla "
-"olevaan laatikkoon ja paina \"Lisää\"."
+#: actions/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
+msgid "No"
+msgstr "Ei"
 
-#: ../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 ""
-"Jos olet unohtanut tai hukannut salasanasi, voit saada uuden sähköpostiisi, "
-"jonka olet tallettanut  käyttäjätunnuksellesi."
+#: actions/block.php:149
+msgid "Do not block this user"
+msgstr "Älä estä tätä käyttäjää"
 
-# Saapuva on ehkä vakiintuneempi sana kun sitä näkee kaikissa sp-ohjelmissa
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-#: actions/emailsettings.php:127 actions/smssettings.php:140
-msgid "Incoming email"
-msgstr "Saapuva sähköposti"
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
+msgstr "Kyllä"
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
-msgid "Incoming email address removed."
-msgstr "Saapuvan sähköpostin osoite poistettu."
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+msgid "Block this user"
+msgstr "Estä tämä käyttäjä"
 
-#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
-msgid "Incorrect old password"
-msgstr "Väärä vanha salasana"
+#: actions/block.php:165
+msgid "You have already blocked this user."
+msgstr "Sinä olet jo estänyt tämän käyttäjän."
 
-#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
-msgid "Incorrect username or password."
-msgstr "Väärä käyttäjätunnus tai salasana"
+#: actions/block.php:170
+msgid "Failed to save block information."
+msgstr "Käyttäjän estotiedon tallennus epäonnistui."
 
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
-msgstr ""
-"Ohjeet salasanan palauttamiseksi on lähetetty sähköpostiisiosoitteeseen, "
-"joka on rekisteröity käyttäjätunnuksellesi."
+#: actions/bookmarklet.php:50
+#, fuzzy
+msgid "Post to "
+msgstr "Kuva"
 
-#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "Kuvan URL-verkkosoite '%s' ei kelpaa"
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+msgstr "Varmistuskoodia ei ole annettu."
 
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
-#, php-format
-msgid "Invalid email address: %s"
-msgstr "Sähköpostiosoite %s ei kelpaa"
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "Vahvistuskoodia ei löytynyt."
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
-#, php-format
-msgid "Invalid homepage '%s'"
-msgstr "Kotisivun osoite '%s' ei kelpaa"
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "Tämä vahvistuskoodi ei ole sinun!"
 
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/confirmaddress.php:90
 #, php-format
-msgid "Invalid license URL '%s'"
-msgstr "Lisenssin verkko-osoite '%s' ei kelpaa"
+msgid "Unrecognized address type %s"
+msgstr "Tuntematon osoitetyyppi %s "
 
-# status päivitys, päivitys, tätä ei ole vielä päätetty
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
-msgstr "Päivityksen sisältö ei kelpaa"
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr "Tämä osoite on jo vahvistettu."
 
-# URL ja URI ilmeisesti OMB:ssä eri asiat.
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
-msgstr "Päivityksen URI ei kelpaa"
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "Ei voitu päivittää käyttäjää."
 
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
-msgstr "Päivityksen URL ei kelpaa"
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr "Ei voitu poistaa sähköpostivahvistusta."
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "Profiilin URL-osoite '%s' ei kelpaa."
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "Vahvista osoite"
 
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
-msgstr "Profiilin URL-osoite '%s' ei kelpaa (virheellinen muoto)."
+#: actions/confirmaddress.php:159
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "Osoite \"%s\" on vahvistettu sinun käyttäjätunnuksellesi."
 
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
-msgstr "Palvelin palautti kelvottoman URL-osoitteen."
+#: actions/conversation.php:99
+msgid "Conversation"
+msgstr "Keskustelu"
 
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
-#: actions/avatarbynickname.php:69
-msgid "Invalid size."
-msgstr "Koko ei kelpaa."
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
+msgstr "Päivitykset"
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111 actions/finishopenidlogin.php:241
-#: actions/register.php:103 actions/register.php:121
-#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
-msgid "Invalid username or password."
-msgstr "Käyttäjätunnus tai salasana ei kelpaa."
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
+msgstr "Päivitystä ei ole."
 
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-msgid "Invitation(s) sent"
-msgstr "Kutsu(t) lähetettiin"
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "Tätä päivitystä ei voi poistaa."
 
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-msgid "Invitation(s) sent to the following people:"
-msgstr "Kutsu(t) lähetettiin seuraaville henkilöille:"
+#: actions/deletenotice.php:103
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+"Olet poistamassa tämän päivityksen pysyvästi.  Kun tämä on tehty, poistoa ei "
+"voi enää perua."
 
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
-msgid "Invite"
-msgstr "Kutsu"
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr "Poista päivitys"
 
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-msgid "Invite new users"
-msgstr "Kutsu uusia käyttäjiä"
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr "Oletko varma että haluat poistaa tämän päivityksen?"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
-#, php-format
-msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
-msgstr ""
-"Sivusto käyttää [StatusNet](http://status.net/) mikroblogausohjelmistoa, "
-"versio %s, saatavilla lisenssillä [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+#: actions/deletenotice.php:145
+msgid "Do not delete this notice"
+msgstr "Älä poista tätä päivitystä"
 
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
-msgstr "Jabber ID kuuluu jo toiselle käyttäjälle."
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+msgid "Delete this notice"
+msgstr "Poista tämä päivitys"
 
-#: ../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."
+#: actions/deletenotice.php:157
+msgid "There was a problem with your session token.  Try again, please."
 msgstr ""
-"Jabber ja GTalk -osoite, esimerkiksi \"käyttäjätunnus@esimerkki.org\". "
-"Varmista että olet lisännyt %s kaverilistaasi pikaviestiohjelmassasi tai "
-"GTalkissa."
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
-msgid "Language"
-msgstr "Kieli"
+"Istuntosi avaimen kanssa oli ongelmia. Olisitko ystävällinen ja kokeilisit "
+"uudelleen."
 
-# heh
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
-msgid "Language is too long (max 50 chars)."
-msgstr "Kieli on liian pitkä (max 50 merkkiä)."
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr "Tämä päivitys ei ole suosikki!"
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
-msgid "Location"
-msgstr "Kotipaikka"
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "Lisää suosikkeihin"
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
-#: actions/register.php:92 actions/updateprofile.php:109
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
-msgid "Location is too long (max 255 chars)."
-msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)."
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "Dokumenttia ei ole."
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
-#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
-#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
-#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: actions/editgroup.php:56
 #, php-format
-msgid "Login"
-msgstr "Kirjaudu sisään"
+msgid "Edit %s group"
+msgstr "Muokkaa ryhmää %s"
 
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Kirjaudu sisään [OpenID](%%doc.openid%%)-tunnuksella"
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
+msgstr "Sinun pitää olla kirjautunut sisään jotta voit luoda ryhmän."
 
-#: ../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 ""
-"Kirjaud sisään käyttäjätunnuksella ja salasanalla. Ei vielä "
-"käyttäjätunnusta? [Rekisteröi](%%action.register%%) käyttäjätunnus tai "
-"kokeile [OpenID](%%action.openidlogin%%)-tunnuksella sisään kirjautumista. "
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+msgid "You must be an admin to edit the group"
+msgstr "Sinun pitää olla ylläpitäjä, jotta voit muokata ryhmää"
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
-msgid "Logout"
-msgstr "Kirjaudu ulos"
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
+msgstr "Käytä tätä lomaketta muokataksesi ryhmää."
 
-#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
-msgid "Longer name, preferably your \"real\" name"
-msgstr "Pitempi nimi, mieluiten oikea nimesi"
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, php-format
+msgid "description is too long (max %d chars)."
+msgstr "kuvaus on liian pitkä (max %d merkkiä)."
 
-#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
-msgid "Lost or forgotten password?"
-msgstr "Oletko hukannut tai unohtanut salasanasi?"
+#: actions/editgroup.php:253
+msgid "Could not update group."
+msgstr "Ei voitu päivittää ryhmää."
 
-#: ../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 ""
-"Tee uusi sähköpostiosoite johon lähettää päivityksiä; tämä poistaa vanhan "
-"osoitteen"
+#: actions/editgroup.php:269
+msgid "Options saved."
+msgstr "Asetukset tallennettu."
+
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "Sähköpostiasetukset"
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
 #: actions/emailsettings.php:71
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Määritä miten saat sähköpostin palvelusta %%site.name%%."
 
-#: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
-msgid "Member since"
-msgstr "Käyttäjänä alkaen"
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "Osoite"
 
-#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
-#, php-format
-msgid "Microblog by %s"
-msgstr "Käyttäjän %s mikroblogi"
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr "Tämän hetken vahvistettu sähköpostiosoite."
 
-#: ../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 ""
-"Matkapuhelinoperaattorisi. Jos tiedät operaattorin, joka ottaa vastaan SMS "
-"viestilähetyksiä sähköpostilla, mutta ei ole listattu tänne, lähetä "
-"sähköpostia meille osoitteeseen %s."
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "Poista"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-msgid "My text and files are available under "
+#: actions/emailsettings.php:113
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
 msgstr ""
-"Minun tekstini ja tiedostoni ovat käytettävissä seuraavan lisenssin "
-"mukaisesti "
+"Odotetaan vahvistusta tälle sähköpostiosoitteelle. Katso "
+"sähköpostilaatikostasi (ja roskapostikansiosta!) viesti, jossa on "
+"lisäohjeita. "
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#: actions/emailsettings.php:142 actions/smssettings.php:152
-msgid "New"
-msgstr "Uusi"
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "Peruuta"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
-#, php-format
-msgid "New email address for posting to %s"
-msgstr "Uusi sähköpostiosoite päivityksien lähettämiseen palveluun %s"
+#: actions/emailsettings.php:121
+msgid "Email Address"
+msgstr "Sähköpostiosoite"
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
-msgid "New incoming email address added."
-msgstr "Uusi saapuvan sähköpostin osoite lisätty."
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr "Sähköpostiosoite, esimerkiksi \"käyttäjätunnus@example.org\""
 
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
-msgid "New nickname"
-msgstr "Uusi käyttäjätunnus"
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "Lisää"
 
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
-msgstr "Uusi päivitys"
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+msgstr "Saapuva sähköposti"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-msgid "New password"
-msgstr "Uusi salasana"
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
+msgstr "Lähetä sähköpostia tähän osoitteeseen tehdäksesi päivityksiä."
 
-#: ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
+#: actions/emailsettings.php:145 actions/smssettings.php:162
+msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
-"Uusi salasana tallennettiin onnistuneesti. Olet nyt kirjautunut sisään."
-
-# samaa stringiä käytetään sekä ryhmän nimessä, että käyttäjätunnuksessa ->"tunnus"
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151 actions/login.php:101
-#: actions/profilesettings.php:74 actions/register.php:165
-#: actions/login.php:228 actions/profilesettings.php:98
-#: actions/register.php:367 actions/showgroup.php:224
-#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
-msgid "Nickname"
-msgstr "Tunnus"
-
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69 actions/finishopenidlogin.php:181
-#: actions/profilesettings.php:225 actions/register.php:76
-#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
-msgid "Nickname already in use. Try another one."
-msgstr "Tunnus on jo käytössä. Yritä toista tunnusta."
+"Tee uusi sähköpostiosoite johon lähettää päivityksiä; tämä poistaa vanhan "
+"osoitteen"
 
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:67 ../actions/updateprofile.php:77
-#: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
-#: actions/register.php:74 actions/updateprofile.php:78
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Käyttäjätunnuksessa voi olla ainoastaan pieniä kirjaimia ja numeroita ilman "
-"välilyöntiä."
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
+msgstr "Uusi"
 
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
-msgid "Nickname not allowed."
-msgstr "Käyttäjätunnus ei ole sallittu."
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
+msgstr "Asetukset"
 
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
-msgstr "Käyttäjän, jota haluat seurata, käyttäjätunnus"
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
+msgstr "Lähetä sähköpostilla tieto uusista tilaajista."
 
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
-msgid "Nickname or email"
-msgstr "Käyttäjätunnus tai sähköposti"
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr "Lähetä sähköpostia, jos joku lisää päivitykseni suosikiksi."
 
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
-msgid "No"
-msgstr "Ei"
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
+msgstr "Lähetä sähköpostia, jos joku lähettää minulle yksityisviestin."
 
-#: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
-msgstr "Ei Jabber ID -osoitetta"
+#: actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "Lähetä sähköpostia, jos joku lähettää minulle \"@-vastauksen\"."
 
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
-msgid "No authorization request!"
-msgstr "Ei valtuutuspyyntöä!"
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
+msgstr "Salli kavereiden tönäistä minua ja lähetä sähköpostilla ilmoitus."
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
-msgid "No carrier selected."
-msgstr "Operaattoria ei ole valittu."
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
+msgstr "Haluan lähettää päivityksiä sähköpostilla."
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
-msgstr "Koodia ei ole syötetty."
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
+msgstr "Julkaise MicroID sähköpostiosoitteelleni."
 
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
-#: actions/confirmaddress.php:75
-msgid "No confirmation code."
-msgstr "Varmistuskoodia ei ole annettu."
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Tallenna"
 
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
-#: actions/newnotice.php:126 classes/Command.php:223
-msgid "No content!"
-msgstr "Ei sisältöä!"
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+msgstr "Asetukset tallennettu."
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr "Sähköpostiosoitetta ei ole."
 
-#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
-msgid "No id."
-msgstr "Id puuttuu."
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
-msgid "No incoming email address."
-msgstr "Saapuvan sähköpostin osoitetta ei ole."
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
+msgstr "Ei voida normalisoida sähköpostiosoitetta"
 
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr "Käyttäjätunnusta ei saatu etäpalvelimelta."
+#: actions/emailsettings.php:330
+msgid "Not a valid email address"
+msgstr "Tuo ei ole kelvollinen sähköpostiosoite"
 
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
-msgid "No nickname."
-msgstr "Tunnusta ei ole."
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
+msgstr "Tämä on jo sähköpostiosoitteesi."
 
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229 actions/emailsettings.php:240
-#: actions/imsettings.php:214 actions/smssettings.php:237
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
-msgid "No pending confirmation to cancel."
-msgstr "Avoimia vahvistuksia ei ole peruutettavana."
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another user."
+msgstr "Tämä sähköpostiosoite kuuluu jo toisella käyttäjällä."
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
-msgstr "Puhelinnumeroa ei ole."
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+msgstr "Ei voitu asettaa vahvistuskoodia."
 
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
-msgstr "Profiilin verkko-osoitetta ei saatu palvelimelta."
+#: actions/emailsettings.php:358
+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 ""
+"Vahvistuskoodi on lähetetty sähköpostiosoitteeseesi. Katso "
+"sähköpostilaatikostasi (ja roskapostilaatikostasi!) vahvistuskoodisi ja "
+"miten sitä käytetään. "
 
-#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
-msgid "No registered email address for that user."
-msgstr "Rekisteröityä sähköpostiosoitetta ei ole tälle käyttäjälle."
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
+msgstr "Avoimia vahvistuksia ei ole peruutettavana."
 
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr "Kyselyä ei löytynyt!"
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "Tämä on väärä pikaviestiosoite."
 
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
-msgid "No results"
-msgstr "Ei hakutuloksia"
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "Vahvistus peruttu."
 
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
-msgstr "Kokoa ei ole."
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
+msgstr "Tämä ei ole sähköpostiosoitteesi."
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
-msgid "No status found with that ID."
-msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä."
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "Osoite on poistettu."
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
-msgid "No status with that ID found."
-msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä."
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
+msgstr "Saapuvan sähköpostin osoitetta ei ole."
 
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
-msgstr "Annettua OpenID-tunnusta ei ole."
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
+msgstr "Ei voitu päivittää käyttäjätietoja."
 
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
-msgid "No such document."
-msgstr "Dokumenttia ei ole."
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
+msgstr "Saapuvan sähköpostin osoite poistettu."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30 actions/shownotice.php:32
-#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
-msgid "No such notice."
-msgstr "Päivitystä ei ole."
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
+msgstr "Uusi saapuvan sähköpostin osoite lisätty."
 
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr "Palautuskoodia ei ole."
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+msgid "Popular notices"
+msgstr "Suosituimmat päivitykset"
 
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-msgid "No such subscription"
-msgstr "Tilausta ei ole."
-
-#: ../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 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
-msgid "No such user."
-msgstr "Käyttäjää ei ole."
+#: actions/favorited.php:67
+#, php-format
+msgid "Popular notices, page %d"
+msgstr "Suosituimmat päivitykset, sivu %d"
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-msgid "No user with that email address or username."
-msgstr "Käyttäjää tuolla sähköpostilla tai käyttäjätunnuksella ei ole."
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
+msgstr "Suosituimmat päivitykset sivustolla juuri nyt."
 
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
-msgstr "Ketään ei voida näyttää."
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
 
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr "Tuo ei ole palautuskoodi."
+#: actions/favorited.php:153
+msgid ""
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
+msgstr ""
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
-msgstr "Tuo ei ole rekisteröitynyt käyttäjä."
+#: actions/favorited.php:156
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
+msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
-msgid "Not a supported data format."
-msgstr "Tuo ei ole tuettu tietomuoto."
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
+msgstr "Käyttäjän %s suosikkipäivitykset"
 
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
-msgstr "Tuo ei ole kelvollinen Jabber ID."
+#: actions/favoritesrss.php:115
+#, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Käyttäjän %1$s suosikit palvelussa %2$s!"
 
-#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-msgid "Not a valid OpenID."
-msgstr "Tuo ei ole kelvollinen OpenID."
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Tämä päivitys on jo suosikki!"
 
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
-msgid "Not a valid email address"
-msgstr "Tuo ei ole kelvollinen sähköpostiosoite"
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Poista suosikeista"
 
-#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-msgid "Not a valid email address."
-msgstr "Tuo ei ole kelvollinen sähköpostiosoite."
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr "Esittelyssä olevat käyttäjät"
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-#: actions/editgroup.php:186 actions/newgroup.php:137
-#: actions/profilesettings.php:195 actions/register.php:161
-msgid "Not a valid nickname."
-msgstr "Tuo ei ole kelvollinen tunnus."
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr "Esittelyssä olevat käyttäjät, sivu %d"
 
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
-msgstr "Tuo ei ole kelvollinen profiilin verkko-osoite (virheellinen palvelu)."
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
+msgstr "Valikoima joitakin loistavia palvelun %s käyttäjiä"
 
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr ""
-"Tuo ei ole kelvollinen profiilin verkko-osoite (XRDS ei ollut määritelty)."
+#: actions/file.php:34
+msgid "No notice id"
+msgstr "Ei päivitystä id-tunnusta"
 
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr ""
-"Tuo ei ole kelvollinen profiilin verkko-osoite (YADIS dokumenttia ei "
-"löytynyt)."
+#: actions/file.php:38
+msgid "No notice"
+msgstr "Ei päivitystä"
 
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
-msgid "Not an image or corrupt file."
-msgstr "Tuo ei ole kelvollinen kuva tai tiedosto on rikkoutunut."
+#: actions/file.php:42
+msgid "No attachments"
+msgstr "Ei liitteitä"
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
-msgid "Not authorized."
-msgstr "Ei valtuutusta."
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr "Ei ladattuja liitteitä"
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Odottamaton vastaus saatu!"
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
-msgid "Not found"
-msgstr "Ei löytynyt"
-
-#: ../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 actions/block.php:59 actions/disfavor.php:61
-#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
-#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
-#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
-#: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Et ole kirjautunut sisään."
-
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
-msgid "Not subscribed!."
-msgstr "Ei ole tilattu!."
-
-# Vaihtoehtoja noticelle löytyy: päivitys, nootti, status, viesti, päivitys, tilapäivitys, mikropostaus, tilaviesti, status
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
-msgstr "Etsi Päivityksistä"
-
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
-#, php-format
-msgid "Notice feed for %s"
-msgstr "Päivityksien syöte käyttäjälle %s"
-
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
-msgstr "Päivitykselle ei ole profiilia"
-
-# Notice suomennos vielä hakusessa
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
-msgid "Notices"
-msgstr "Päivitykset"
-
-# tagi, tägätty, tagätty, tagatty, tagitetty,
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
-#, php-format
-msgid "Notices tagged with %s"
-msgstr "Päivitykset joilla on tagi %s"
-
-#: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
-msgstr "Vanha salasana"
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "Käyttäjää jota seurataan ei ole olemassa."
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
-msgid "OpenID"
-msgstr "OpenID"
-
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
-msgid "OpenID Account Setup"
-msgstr "OpenID-tunnuksen asetukset"
-
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-msgid "OpenID Auto-Submit"
-msgstr "OpenID automaattilähetys"
-
-#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
-#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-msgid "OpenID Login"
-msgstr "OpenID-sisäänkirjautuminen"
-
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-#: actions/openidlogin.php:102 actions/openidsettings.php:101
-msgid "OpenID URL"
-msgstr "OpenID-osoite"
-
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
-msgid "OpenID authentication cancelled."
-msgstr "OpenID tunnistautuminen peruttiin."
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr "OpenID tunnistautuminen epäonnistui: %s"
-
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "OpenID virhe: %s"
-
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr "OpenID poistettu."
-
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
-msgstr "OpenID asetukset"
-
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-msgid "Optionally add a personal message to the invitation."
-msgstr "Voit myös lisätä oman viestisi kutsuun"
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+msgstr "Voit käyttää paikallista tilausta!"
 
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
-msgid "Partial upload."
-msgstr "Osittain ladattu palvelimelle."
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
+msgstr "Käyttäjä on estänyt sinua tilaamasta päivityksiä."
 
-#: ../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 actions/finishopenidlogin.php:118
-#: actions/login.php:231 actions/register.php:372
-#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-msgid "Password"
-msgstr "Salasana"
+#: actions/finishremotesubscribe.php:106
+msgid "You are not authorized."
+msgstr "Sinulla ei ole valtuutusta tähän."
 
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
-msgid "Password and confirmation do not match."
-msgstr "Salasana ja salasanan vahvistus eivät täsmää."
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "Ei voitu muuttaa request tokeneita access tokeneiksi."
 
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
-msgid "Password must be 6 chars or more."
-msgstr "Salasanassa pitää olla 6 tai useampia merkkejä."
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Tuntematon OMB-protokollan versio."
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-msgid "Password recovery requested"
-msgstr "Salasanan palautuspyyntö lähetetty."
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "Virhe tapahtui etäprofiilin päivittämisessä"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-msgid "Password saved."
-msgstr "Salasana tallennettu."
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+msgid "No such group."
+msgstr "Tuota ryhmää ei ole."
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-msgid "Passwords don't match."
-msgstr "Salasanat eivät täsmää."
+#: actions/getfile.php:75
+msgid "No such file."
+msgstr "Tiedostoa ei ole."
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
-msgstr "Henkilö"
+#: actions/getfile.php:79
+msgid "Cannot read file."
+msgstr "Tiedostoa ei voi lukea."
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
-msgstr "Etsi ihmisiä"
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
+msgstr "Ryhmää ei ole määritelty."
 
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
-msgstr "Etsi ihmisiä"
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr "Vain ylläpitäjä voi estää ryhmän jäseniä."
 
-# Tämä on otsikko käyttäjän sivun välilehdelle, jossa näkyy omat ja tilausten viestit. Omat on ehkä paremmin kuvaava, kuin henkilökohtainen. Saa kyllä muutakin ehdottaa.
-#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
-msgid "Personal"
-msgstr "Omat"
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "Käyttäjä on asettanut eston sinulle."
 
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-msgid "Personal message"
-msgstr "Henkilökohtainen viesti"
+#: actions/groupblock.php:100
+msgid "User is not a member of group."
+msgstr "Käyttäjä ei kuulu tähän ryhmään."
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "Puhelinnumero, ei välimerkkejä tai välilyöntejä, suuntanumerollinen"
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+msgid "Block user from group"
+msgstr "Estä käyttäjä ryhmästä"
 
-#: ../actions/userauthorization.php:78
+#: actions/groupblock.php:162
+#, php-format
 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\"."
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
 msgstr ""
-"Tarkista nämä tiedot varmistaaksesi, että haluat tilata tämän käyttäjän "
-"päivitykset. Jos et valinnut haluavasi tilata jonkin käyttäjän päivityksiä, "
-"paina \"Peruuta\"."
 
-#: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Lähetä päivitys kun Jabber/GTalk -tilatietoni vaihtuu."
+#: actions/groupblock.php:178
+msgid "Do not block this user from this group"
+msgstr "Älä estä tätä käyttäjää tästä ryhmästä"
 
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94 actions/emailsettings.php:86
-#: actions/imsettings.php:68 actions/smssettings.php:94
-#: actions/twittersettings.php:70 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
-msgid "Preferences"
-msgstr "Asetukset"
+#: actions/groupblock.php:179
+msgid "Block this user from this group"
+msgstr "Estä tätä käyttäjää osallistumassa tähän ryhmään"
 
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163 actions/emailsettings.php:180
-#: actions/imsettings.php:152 actions/smssettings.php:171
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
-msgid "Preferences saved."
-msgstr "Asetukset tallennettu."
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
+msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
-msgid "Preferred language"
-msgstr "Ensisijainen kieli"
+#: actions/groupbyid.php:74
+msgid "No ID"
+msgstr "ID-tunnusta ei ole"
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
-msgid "Privacy"
-msgstr "Yksityisyys"
+#: actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
+msgstr ""
+"Sinun pitää olla kirjautunut sisään, jotta voit muuttaa ryhmän tietoja."
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-msgid "Problem saving notice."
-msgstr "Ongelma päivityksen tallentamisessa."
+#: actions/groupdesignsettings.php:141
+msgid "Group design"
+msgstr "Ryhmän ulkoasu"
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
-msgid "Profile"
-msgstr "Profiili"
+#: actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
 
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
-msgstr "Profiilin URL"
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+msgid "Couldn't update your design."
+msgstr "Ei voitu päivittää sinun sivusi ulkoasua."
 
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
-msgstr "Profiiliasetukset"
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+msgid "Unable to save your design settings!"
+msgstr "Ei voitu tallentaa sinun ulkoasuasetuksia!"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-msgid "Profile unknown"
-msgstr "Tuntematon profiili."
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+msgid "Design preferences saved."
+msgstr "Ulkoasuasetukset tallennettu."
 
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
-msgid "Public Stream Feed"
-msgstr "Julkinen syöte"
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
+msgstr "Ryhmän logo"
 
-# Suorakäännös voisi sopia. Tähän voisi jotain suomenkielistä termiä hakea tai ottaa tuollainen vähän erikoisempi suora käännös.
-#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
-msgid "Public timeline"
-msgstr "Julkinen aikajana"
+#: actions/grouplogo.php:150
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr "Voit ladata ryhmälle logokuvan. Maksimikoko on %s."
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Julkaise MicroID Jabber/GTalk-osoitteelleni."
+#: actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
+msgstr "Valitse neliön muotoinen alue kuvasta logokuvaksi"
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
-msgid "Publish a MicroID for my email address."
-msgstr "Julkaise MicroID sähköpostiosoitteelleni."
+#: actions/grouplogo.php:396
+msgid "Logo updated."
+msgstr "Logo päivitetty."
 
-# Tagi, tägi,...
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr "Tuoreet tagit"
+#: actions/grouplogo.php:398
+msgid "Failed updating logo."
+msgstr "Logon päivittäminen epäonnistui."
 
-# Palautuslomakkeen toimintonappi
-#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
-msgid "Recover"
-msgstr "Palauta"
+#: actions/groupmembers.php:93 lib/groupnav.php:92
+#, php-format
+msgid "%s group members"
+msgstr "Ryhmän %s jäsenet"
 
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
-msgid "Recover password"
-msgstr "Salasanan palautus"
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
+msgstr "Ryhmän %s jäsenet, sivu %d"
 
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-msgid "Recovery code for unknown user."
-msgstr "Tuntemattoman käyttäjän palautuskoodi"
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr "Lista ryhmän käyttäjistä."
 
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
-#: actions/register.php:152 actions/register.php:207 lib/util.php:328
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-msgid "Register"
-msgstr "Rekisteröidy"
+#: actions/groupmembers.php:175 lib/groupnav.php:107
+msgid "Admin"
+msgstr "Ylläpito"
 
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
-msgid "Registration not allowed."
-msgstr "Rekisteröityminen ei ole sallittu."
+#: actions/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
+msgstr "Estä"
 
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
-msgid "Registration successful"
-msgstr "Rekisteröityminen onnistui"
+#: actions/groupmembers.php:441
+msgid "Make user an admin of the group"
+msgstr "Tee tästä käyttäjästä ylläpitäjä"
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
-msgid "Reject"
-msgstr "Hylkää"
+#: actions/groupmembers.php:473
+msgid "Make Admin"
+msgstr "Tee ylläpitäjäksi"
 
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
-msgid "Remember me"
-msgstr "Muista minut"
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr "Tee tästä käyttäjästä ylläpitäjä"
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
-msgid "Remote profile with no matching profile"
-msgstr "Etäprofiilille ei löytynyt vastaavaa profiilia"
+#: actions/grouprss.php:133
+#, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Ryhmän  %1$s käyttäjien päivitykset palvelussa %2$s!"
 
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
-msgstr "Etätilaus"
+#: actions/groupsearch.php:52
+#, fuzzy, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"Hae ihmisiä palvelun %%site.name%% käyttäjien nimistä, paikoista ja "
+"kiinnostuksen kohteista. Erota hakutermit välilyönnillä; hakutermien pitää "
+"olla 3 tai useamman merkin pituisia."
 
-#: ../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 actions/emailsettings.php:101
-#: actions/emailsettings.php:134 actions/imsettings.php:102
-#: actions/openidsettings.php:166 actions/smssettings.php:103
-#: actions/smssettings.php:146 actions/twittersettings.php:115
-msgid "Remove"
-msgstr "Poista"
+#: actions/groupsearch.php:58
+msgid "Group search"
+msgstr "Ryhmähaku"
 
-#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
-msgstr "Poista OpenID"
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+msgid "No results."
+msgstr "Ei tuloksia"
 
-#: ../actions/openidsettings.php:73
+#: actions/groupsearch.php:82
+#, php-format
 msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
 msgstr ""
-"Viimeisen OpenID-tunnuksen poistamisen jälkeen et voi enää kirjautua sisään "
-"palveluun. Jos haluat poistaa sen, lisää ensin uusi OpenID-tunnus."
 
-#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
-msgid "Replies"
-msgstr "Vastaukset"
-
-# Kai tuo on tiettyyn päivitykseen liittyvät vastaukset.
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
-#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
-#: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: actions/groupsearch.php:85
 #, php-format
-msgid "Replies to %s"
-msgstr "Vastaukset käyttäjälle %s"
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
 
-# Palauta, aseta uudelleen, uudelleenasetus, nollaus, tyhjää
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
-msgid "Reset"
-msgstr "Vaihda"
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Ryhmät"
 
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
-msgid "Reset password"
-msgstr "Vaihda salasana"
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Ryhmät, sivu %d"
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-msgid "SMS"
-msgstr "SMS"
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
-msgid "SMS Phone number"
-msgstr "SMS puhelinnumero"
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Luo uusi ryhmä"
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
-msgstr "SMS-asetukset"
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr "Vain ylläpitäjä voi poistaa eston ryhmän jäseniltä."
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
-msgid "SMS confirmation"
-msgstr "SMS vahvistus"
+#: actions/groupunblock.php:95
+msgid "User is not blocked from group."
+msgstr "Käyttäjää ei ole estetty ryhmästä."
 
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
-msgid "Same as password above"
-msgstr "Sama kuin ylläoleva salasana"
+#: actions/groupunblock.php:128 actions/unblock.php:108
+msgid "Error removing the block."
+msgstr "Tapahtui virhe, kun estoa poistettiin."
 
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
-msgid "Same as password above. Required."
-msgstr "Sama kuin ylläoleva salasana. Pakollinen."
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "Pikaviestiasetukset"
 
-#: ../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 actions/emailsettings.php:182
-#: actions/facebooksettings.php:114 actions/imsettings.php:157
-#: actions/othersettings.php:117 actions/profilesettings.php:150
-#: actions/smssettings.php:169 actions/subscriptions.php:124
-#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
-msgid "Save"
-msgstr "Tallenna"
+#: actions/imsettings.php:70
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+"Voit lähettää ja vastaanottaa päivityksiä Jabber/GTalk-[pikaviestintä](%%doc."
+"im%%) käyttäen. Alla voit määrittää osoitteesi ja asetuksesi. "
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
-msgid "Search"
-msgstr "Haku"
+#: actions/imsettings.php:89
+msgid "IM is not available."
+msgstr "Pikaviestin ei ole käytettävissä."
 
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
-msgstr "Hakusyöte"
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Tämän hetken vahvistettu Jabber/GTalk -osoite."
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/imsettings.php:114
 #, php-format
 msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
+"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 ""
-"Hae päivityksiä palvelun %%site.name%% sisällöistä. Erota hakutermit "
-"välilyönnillä; hakutermien pitää olla 3 tai useamman merkin pituisia."
+"Odotetaan vahvistusta tälle osoitteelle. Katso Jabber/GTalk "
+"käyttäjätililtäsi viesti, jossa on lisäohjeet. (Lisäsitkö %s:n "
+"ystävälistaasi?)"
 
-#: ../actions/peoplesearch.php:28
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "Pikaviestiosoite"
+
+#: actions/imsettings.php:126
 #, 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."
+"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 ""
-"Hae ihmisiä palvelun %%site.name%% käyttäjien nimistä, paikoista ja "
-"kiinnostuksen kohteista. Erota hakutermit välilyönnillä; hakutermien pitää "
-"olla 3 tai useamman merkin pituisia."
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
-msgid "Select a carrier"
-msgstr "Valitse operaattori"
-
-#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
-#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
-msgid "Send"
-msgstr "Lähetä"
-
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
-msgstr "Lähetä sähköpostia tähän osoitteeseen tehdäksesi päivityksiä."
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
-msgstr "Lähetä sähköpostilla tieto uusista tilaajista."
+"Jabber ja GTalk -osoite, esimerkiksi \"käyttäjätunnus@esimerkki.org\". "
+"Varmista että olet lisännyt %s kaverilistaasi pikaviestiohjelmassasi tai "
+"GTalkissa."
 
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Lähetä minulle päivityksiä Jabberilla/GTalkilla."
 
-#: ../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 ""
-"Lähetä päivityksiä SMS:llä; Ymmärrän, että voin saada kohtuuttomia laskuja "
-"tästä matkapuhelinoperaattoriltani."
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr "Lähetä päivitys kun Jabber/GTalk -tilatietoni vaihtuu."
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Lähetä Jabberilla/GTalkilla sellaistenkin ihmisten vastaukset, joita en ole "
 "tilannut. "
 
-#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
-msgid "Settings"
-msgstr "Asetukset"
-
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
-msgid "Settings saved."
-msgstr "Asetukset tallennettu."
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr "Viime viikon suosituimmat tagit"
-
-#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:114
-msgid "Someone else already has this OpenID."
-msgstr "Joku muu käyttää jo tätä OpenID-tunnusta."
-
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
-msgstr "Jotain erikoista tapahtui."
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
-msgstr "Valitettavasti päivitysten teko sähköpostilla ei ole sallittua."
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
-msgstr "Valitettavasti tuo ei ole oikea osoite sähköpostipäivityksille."
-
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
-msgid "Source"
-msgstr "Lähdekoodi"
-
-#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
-msgid "Statistics"
-msgstr "Tilastot"
-
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-msgid "Stored OpenID not found."
-msgstr "Tallennettua OpenID-tunnusta ei löytynyt."
-
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
-#: actions/showstream.php:197 actions/showstream.php:206
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
-msgid "Subscribe"
-msgstr "Tilaa"
-
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
-msgid "Subscribers"
-msgstr "Tilaajat"
-
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
-msgid "Subscription authorized"
-msgstr "Tilaus sallittu"
-
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
-msgid "Subscription rejected"
-msgstr "Tilaus hylätty"
-
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27 actions/showstream.php:240
-#: actions/showstream.php:322 actions/subscriptions.php:27
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
-msgid "Subscriptions"
-msgstr "Tilaukset"
-
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
-msgid "System error uploading file."
-msgstr "Tiedoston lähetyksessä tapahtui järjestelmävirhe."
-
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
-#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
-msgid "Tags"
-msgstr "Tagit"
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "Teksti"
-
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
-msgid "Text search"
-msgstr "Tekstihaku"
-
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
-msgstr "Tämä OpenID-tunnus ei kuulu sinulle."
-
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
-msgstr "Tämä osoite on jo vahvistettu."
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Julkaise MicroID Jabber/GTalk-osoitteelleni."
 
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
-msgstr "Tämä vahvistuskoodi ei ole sinun!"
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "Ei Jabber ID -osoitetta"
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr "Tämä sähköpostiosoite kuuluu jo toisella käyttäjällä."
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr "Ei voida normalisoida Jabber ID -tunnusta"
 
-#: ../actions/avatar.php:80 actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
-msgstr "Tämä tiedosto on liian iso."
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "Tuo ei ole kelvollinen Jabber ID."
 
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "Tämä on jo Jabber ID -tunnuksesi."
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
-msgid "That is already your email address."
-msgstr "Tämä on jo sähköpostiosoitteesi."
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr "Jabber ID kuuluu jo toiselle käyttäjälle."
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
-msgid "That is already your phone number."
-msgstr "Tämä on jo puhelinnumerosi."
+#: actions/imsettings.php:327
+#, php-format
+msgid ""
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr ""
+"Vahvistuskoodi lähetettiin antamaasi pikaviestinosoitteeseen. Sinun täytyy "
+"antaa osoitteelle %s oikeus lähettää viestejä sinulle."
 
-#: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "Tämä ei ole Jabber ID-tunnuksesi."
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
-msgid "That is not your email address."
-msgstr "Tämä ei ole sähköpostiosoitteesi."
-
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
-msgstr "Tämä ei ole puhelinnumerosi."
-
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-#: actions/emailsettings.php:367 actions/imsettings.php:349
-msgid "That is the wrong IM address."
-msgstr "Tämä on väärä pikaviestiosoite."
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
-msgstr "Tämä on väärä vahvistukoodi."
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-msgid "That phone number already belongs to another user."
-msgstr "Tämä puhelinnumero kuuluu jo toiselle käyttäjälle."
-
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49 actions/twitapistatuses.php:330
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-msgid "That's too long. Max notice size is 140 chars."
-msgstr "Päivitys on liian pitkä. Maksimipituus on 140 merkkiä."
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "Päivitys on liian pitkä. Maksimipituus on 255 merkkiä."
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr "Saapuneet viestit käyttäjälle %s - sivu %d"
 
-#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/inbox.php:62
 #, php-format
-msgid "The address \"%s\" has been confirmed for your account."
-msgstr "Osoite \"%s\" on vahvistettu sinun käyttäjätunnuksellesi."
+msgid "Inbox for %s"
+msgstr "Saapuneet viestit käyttäjälle %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
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
-msgid "The address was removed."
-msgstr "Osoite on poistettu."
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr "Tämä on postilaatikkosi, jossa on sinulle saapuneet yksityisviestit."
 
-# Ilmeisesti jotain etäprofiilin tilausvirheitä nämä on. Laitoin callbackin tuohon ettei huku tietoa virheestä...
-#: ../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 ""
-"Päivityksen tilaus on hyväksytty, mutta callback-osoitetta palveluun ei ole "
-"saatu. Tarkista sivuston ohjeet miten päivityksen tilaus hyväksytään. "
-"Tilauskoodisi on:"
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr "Kutsut ovat pois käytöstä."
 
-# Etäprofiilin tilausjuttua.
-#: ../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."
+#: actions/invite.php:41
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
 msgstr ""
-"Päivityksen tilaus on hylätty, mutta callback-osoitetta palveluun ei ole "
-"saatu. Tarkista sivuston ohjeet miten päivityksen tilaus hylätään kokonaan."
+"Sinun täytyy olla kirjautuneena sisään kutsuaksesi uusia käyttäjiä palveluun "
+"%s"
 
-#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/invite.php:72
 #, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr "Nämä ihmiset seuraavat käyttäjän %s päivityksiä."
+msgid "Invalid email address: %s"
+msgstr "Sähköpostiosoite %s ei kelpaa"
 
-#: ../actions/subscribers.php:33 actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr "Nämä ihmiset seuraavat sinun päivityksiäsi."
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
+msgstr "Kutsu(t) lähetettiin"
 
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
-#, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr "Käyttäjä %s seuraa näiden ihmisten päivityksiä."
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr "Kutsu uusia käyttäjiä"
 
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr "Näiden ihmisten päivityksiä sinä seuraat."
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr "Olet jos tilannut seuraavien käyttäjien päivitykset:"
+
+#: actions/invite.php:131 actions/invite.php:139
+#, php-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
 "Nämä ihmiset ovat jo käyttäjiä ja sinä olet automaattisesti tilannut heidän "
 "päivityksensä:"
 
-#: ../actions/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
-msgstr "Vahvistuskoodi on liian vanha. Aloita uudelleen."
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
+msgstr "Kutsu(t) lähetettiin seuraaville henkilöille:"
 
-#: ../lib/openid.php:195
+#: actions/invite.php:150
 msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 msgstr ""
-"Lomakkeen pitäisi lähettää automaattisesti tiedot. Jos kuitenkaan näin ei "
-"tapahdu, paina lähetä painiketta mennäksesi OpenID-palveluntajoajalle."
-
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
-#, 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 ""
-"Tämä on ensimmäinen kerta kun olet sisäänkirjautunut %s -palveluun, joten "
-"OpenID-tunnuksesi pitää yhdistää johonkin tämän palvelun käyttäjätunnukseen. "
-"Tätä varten voit luoda uuden käyttäjätunnuksen tai yhdistää OpenID-"
-"tunnuksen olemassa olevaan käyttäjätunnukseen, jos sinulla sellainen jo on."
-
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-msgid "This method requires a POST or DELETE."
-msgstr "Tämä metodi edellyttää joko POST tai DELETE sanoman."
-
-# sanoma?
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
-msgid "This method requires a POST."
-msgstr "Tämä metodi edellyttää POST sanoman."
-
-#: ../lib/util.php:164 lib/util.php:246
-msgid "This page is not available in a media type you accept"
-msgstr "Tämä sivu ei ole saatavilla sinulle sopivassa mediatyypissä."
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
-msgid "Timezone"
-msgstr "Aikavyöhyke"
-
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
-msgid "Timezone not selected."
-msgstr "Aikavyöhykettä ei ole valittu."
+"Lähetämme sinulle ilmoituksen, kun joku kutsumistasi henkilöistä hyväksyy "
+"kutsun ja rekisteröityy palveluun. Kiitoksia yhteisön kasvattamisesta!"
 
-#: ../actions/remotesubscribe.php:43
-#, php-format
+#: actions/invite.php:162
 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."
+"Use this form to invite your friends and colleagues to use this service."
 msgstr ""
-"Tilataksesi päivitykset, voit [kirjautua sisään](%%action.login%%), tai "
-"[rekisteröidä](%%action.register%%) uuden  käyttäjätunnuksen. Jos sinulla on "
-"jo käyttäjätunnus  jossain [yhteensopivassa "
-"mikroblogauspalvelussa](%%doc.openmublog%%),  syötä profiilisi URL-osoite "
-"alla olevaan kenttään."
-
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
-msgid "Two user ids or screen_names must be supplied."
-msgstr "Kaksi käyttäjätunnusta tai nimeä täytyy antaa."
+"Käytä tätä lomaketta, jos haluat kutsua kavereita ja työkavereita käyttämään "
+"tätä palvelua."
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "Kotisivusi, blogisi tai toisella sivustolla olevan profiilisi osoite."
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "Sähköpostiosoitteet"
 
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-msgid "URL of your profile on another compatible microblogging service"
-msgstr "Profiilisi URL-osoite toisessa yhteensopivassa mikroblogauspalvelussa"
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr "Kutsuttavien kavereiden osoitteet (yksi per rivi)"
 
-#: ../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 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-msgid "Unexpected form submission."
-msgstr "Odottamaton lomakkeen lähetys."
+#: actions/invite.php:192
+msgid "Personal message"
+msgstr "Henkilökohtainen viesti"
 
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
-msgid "Unexpected password reset."
-msgstr "Odottamaton salasanan uudelleenasetus."
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
+msgstr "Voit myös lisätä oman viestisi kutsuun"
 
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-msgid "Unknown action"
-msgstr "Tuntematon toiminto"
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
+msgstr "Lähetä"
 
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-msgid "Unknown version of OMB protocol."
-msgstr "Tuntematon OMB-protokollan versio."
+#: actions/invite.php:226
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s on kutsunut sinut liittymään palveluun %2$s"
 
-#: ../lib/util.php:269 lib/util.php:285
+#: actions/invite.php:228
+#, php-format
 msgid ""
-"Unless otherwise specified, contents of this site are copyright by the "
-"contributors and available under the "
+"%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 ""
-"Ellei toisin ilmoitettu, tämän palvelun sisältöjen tekijänoikeudet kuuluvat "
-"niiden kirjoittajille ja ovat saatavilla seuraavalla lisenssillä "
-
-# formaatti/tyyppi
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
-#, php-format
-msgid "Unrecognized address type %s"
-msgstr "Tuntematon osoitetyyppi %s "
-
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
-msgstr "Peruuta tilaus"
-
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-msgid "Unsupported OMB version"
-msgstr "OMB versiota ei ole tuettu"
-
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
-msgid "Unsupported image file format."
-msgstr "Kuvatiedoston formaattia ei ole tuettu."
+"%1$s on kutsunut sinut %2$s (%3$s) mikroblogipalveluun.\n"
+"\n"
+"%2$s mikroblogipalvelu auttaa sinua pysymään ajantasalla tuttujen ja "
+"kiinnostavien ihmisten kanssa.\n"
+"\n"
+"Voit myös jakaa uutisia itsestäsi ja ajatuksiasi verkossa ihmisten, jotka "
+"tuntevat sinut, kanssa. Se on myös kätevä tapa tutustua uusiin ihmisiin "
+"jotka ovat kiinnostuneet samanlaisista asioista, kuin sinä.\n"
+"\n"
+"%1$s sanoi:\n"
+"\n"
+"%4$s\n"
+"Voit nähdä henkilön %1$s profiilisivun %2$s-palvelussa täältä:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Jos haluat kokeilla palvelua, klikkaa alla olevaa linkkiä hyväksyäksesi "
+"kutsun.\n"
+"\n"
+"%6$s\n"
+"\n"
+"Jos et halua osallistua, voit jättää tämän viestin huomioimatta. Kiitoksia "
+"kärsivällisyydestä ja ajastasi.\n"
+"\n"
+"Terveisin, %2$s\n"
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
-msgstr "Päivitykset SMS:llä"
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
+msgstr "Sinun pitää olla kirjautunut sisään, jos haluat liittyä ryhmään."
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
-msgstr "Päivitykset pikaviestintä käyttäen (IM)"
+#: actions/joingroup.php:90 lib/command.php:217
+msgid "You are already a member of that group"
+msgstr "Sinä kuulut jo tähän ryhmään "
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/joingroup.php:128 lib/command.php:234
 #, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!"
+msgid "Could not join user %s to group %s"
+msgstr "Käyttäjää %s ei voinut liittää ryhmään %s"
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/joingroup.php:135 lib/command.php:239
 #, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
-
-# tai lähetä
-#: ../actions/avatar.php:68 actions/profilesettings.php:161
-#: actions/avatarsettings.php:162 actions/grouplogo.php:232
-msgid "Upload"
-msgstr "Lataa"
-
-#: ../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 ""
-"Lataa uusi käyttäjäkuva tästä. Et voi muokata kuvaa lataamisen jälkeen, "
-"joten varmista sen olevan suurinpiirtein neliön muotoinen. Kuvan pitää olla "
-"palvelun tekijänoikeuslisenssin mukainen. Sen täytyy myös olla sivuston "
-"lisenssin alla saatavilla. Käytä sellaista kuvaa, joka kuulu sinulle ja "
-"jonka haluat näkyvän muille."
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr "Lataa uusi profiilikuva"
-
-#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
-msgstr ""
-"Käytä tätä lomaketta, jos haluat kutsua kavereita ja työkavereita käyttämään "
-"tätä palvelua."
-
-#: ../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 ""
-"Käytetään ainoastaan päivityksien lähettämiseen, ilmoitusasioihin ja "
-"salasanan uudelleen käyttöönottoon."
-
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
-msgid "User being listened to doesn't exist."
-msgstr "Käyttäjää jota seurataan ei ole olemassa."
-
-#: ../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
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-msgid "User has no profile."
-msgstr "Käyttäjällä ei ole profiilia."
+msgid "%s joined group %s"
+msgstr "%s liittyi ryhmään %s"
 
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
-msgstr "Käyttäjätunnus"
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
+msgstr "Sinun pitää olla kirjautunut sisään, jotta voit erota ryhmästä."
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr "Käyttäjää ei löytynyt."
+#: actions/leavegroup.php:90 lib/command.php:268
+msgid "You are not a member of that group."
+msgstr "Sinä et kuulu tähän ryhmään."
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
-msgid "What timezone are you normally in?"
-msgstr "Missä aikavyöhykkeessä olet normaalisti?"
+#: actions/leavegroup.php:119 lib/command.php:278
+msgid "Could not find membership record."
+msgstr "Ei löydetty käyttäjän jäsenyystietoja."
 
-# Suora FB kopio.
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: actions/leavegroup.php:127 lib/command.php:284
 #, php-format
-msgid "What's up, %s?"
-msgstr "Mitä teet juuri nyt, %s?"
-
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-#: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Olinpaikka kuten \"Kaupunki, Maakunta (tai Lääni), Maa\""
+msgid "Could not remove user %s to group %s"
+msgstr "Ei voitu poistaa käyttäjää %s ryhmästä %s"
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
-msgid "Wrong image type for '%s'"
-msgstr "Kuvan '%s' tyyppi on väärä"
+msgid "%s left group %s"
+msgstr "%s erosi ryhmästä %s"
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
-#, php-format
-msgid "Wrong size image at '%s'"
-msgstr "Kuvan  '%s' koko on väärä"
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "Olet jo kirjautunut sisään."
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
-msgid "Yes"
-msgstr "Kyllä"
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Päivityksen sisältö ei kelpaa"
 
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-msgid "You already have this OpenID!"
-msgstr "Sinulla on jo tämä OpenID-tunnus!"
+#: actions/login.php:143
+msgid "Incorrect username or password."
+msgstr "Väärä käyttäjätunnus tai salasana"
 
-#: ../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 ""
-"Olet poistamassa tämän päivityksen pysyvästi.  Kun tämä on tehty, poistoa ei "
-"voi enää perua."
+#: actions/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
+msgstr "Virhe tapahtui käyttäjän asettamisessa."
 
-#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
-msgstr "Olet jo kirjautunut sisään!"
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "Kirjaudu sisään"
 
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-msgid "You are already subscribed to these users:"
-msgstr "Olet jos tilannut seuraavien käyttäjien päivitykset:"
+#: actions/login.php:243
+msgid "Login to site"
+msgstr "Kirjaudu sisään"
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
-msgid "You are not friends with the specified user."
-msgstr "Et ole määritellyn käyttäjän kaveri."
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Tunnus"
 
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr "Voit vaihtaa salasanan tästä. Muista valita riittävän hyvä!"
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Salasana"
 
-#: ../actions/register.php:135 actions/register.php:145
-msgid "You can create a new account to start posting notices."
-msgstr "Voit luoda uuden käyttäjätunnuksen ja aloittaa päivityksien tekemisen."
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "Muista minut"
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
+#: actions/login.php:253 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
-"Voit saada SMS viestit sähköpostin välityksellä %%site.name%% -palvelusta."
+"Kirjaudu sisään automaattisesti tulevaisuudessa; ei tietokoneille joilla "
+"useampi käyttäjä!"
 
-#: ../actions/openidsettings.php:86
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr "Voit poistaa OpenID-tunnuksen painamalla \"Poista\"-nappia."
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "Oletko hukannut tai unohtanut salasanasi?"
 
-#: ../actions/imsettings.php:28 actions/imsettings.php:28
-#, php-format
+#: actions/login.php:282
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
 msgstr ""
-"Voit lähettää ja vastaanottaa päivityksiä "
-"Jabber/GTalk-[pikaviestintä](%%doc.im%%) käyttäen. Alla voit määrittää "
-"osoitteesi ja asetuksesi. "
+"Syötä turvallisuussyistä käyttäjätunnuksesi ja salasanasi uudelleen ennen "
+"asetuksiesi muuttamista."
 
-#: ../actions/profilesettings.php:27
+#: actions/login.php:286
+#, fuzzy, php-format
 msgid ""
-"You can update your personal profile info here so people know more about you."
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
 msgstr ""
-"Voit päivittää täällä henkilötietojasi, jotta muut saavat tietää sinusta "
-"enemmän."
-
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
-msgstr "Voit käyttää paikallista tilausta!"
-
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
-msgid "You can't register if you don't agree to the license."
-msgstr "Et voi rekisteröityä, jos et hyväksy lisenssiehtoja."
+"Kirjaud sisään käyttäjätunnuksella ja salasanalla. Ei vielä "
+"käyttäjätunnusta? [Rekisteröi](%%action.register%%) käyttäjätunnus tai "
+"kokeile [OpenID](%%action.openidlogin%%)-tunnuksella sisään kirjautumista. "
 
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
-msgid "You did not send us that profile"
-msgstr "Et lähettänyt profiilia"
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr "Vain ylläpitäjä voi tehdä toisesta käyttäjästä ylläpitäjän."
 
-#: ../lib/mail.php:147
+#: actions/makeadmin.php:95
 #, 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 ""
-"Sinulla on uusi päivityksien lähetysosoite palvelussa %1$s.\n"
-"\n"
-"Lähetä sähköposti osoitteeseen %2$s tehdäksesi uuden päivityksen.\n"
-"\n"
-"Lisää sähköpostin käyttöohjeita voit lukea osoitteesta %3$s.\n"
-"\n"
-"Terveisin,\n"
-"%4$s"
+msgid "%s is already an admin for group \"%s\"."
+msgstr "%s on jo ryhmän \"%s\" ylläpitäjä."
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
-msgid "You may not delete another user's status."
-msgstr "Et voi poistaa toisen käyttäjän päivitystä."
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr "Ei saatu käyttäjän %s jäsenyystietoja ryhmästä %s"
 
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/makeadmin.php:145
 #, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr ""
-"Sinun täytyy olla kirjautuneena sisään kutsuaksesi uusia käyttäjiä palveluun "
-"%s"
+msgid "Can't make %s an admin for group %s"
+msgstr "Ei voitu tehdä käyttäjästä %s ylläpitäjää ryhmään %s"
 
-#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
-"Lähetämme sinulle ilmoituksen, kun joku kutsumistasi henkilöistä hyväksyy "
-"kutsun ja rekisteröityy palveluun. Kiitoksia yhteisön kasvattamisesta!"
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr "Ei nykyistä tilatietoa"
 
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr "Sinut on tunnistettu. Syötä  uusi salasana alle. "
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr "Uusi ryhmä"
 
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
-msgid "Your OpenID URL"
-msgstr "OpenID URL-osoitteesi"
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
+msgstr "Käytä tätä lomaketta luodaksesi ryhmän."
 
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
-msgstr ""
-"Käyttäjätunnuksesi tässä palvelussa tai rekisteröity sähköpostiosoitteesi."
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr "Uusi viesti"
 
-#: ../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%%) mahdollistaa kirjautumisen sisään useaan palveluun "
-"yhdellä tunnuksella. Voit hallinnoida OpenID-tunnuksiasi täällä."
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
+msgstr "Et voi lähettää viestiä tälle käyttäjälle."
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
-msgid "a few seconds ago"
-msgstr "muutama sekunti sitten"
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+msgstr "Ei sisältöä!"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
-#, php-format
-msgid "about %d days ago"
-msgstr "noin %d päivää sitten"
+#: actions/newmessage.php:158
+msgid "No recipient specified."
+msgstr "Vastaanottajaa ei ole määritelty."
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
-#, php-format
-msgid "about %d hours ago"
-msgstr "noin %d tuntia sitten"
+#: actions/newmessage.php:164 lib/command.php:370
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly instead."
+msgstr "Älä lähetä viestiä itsellesi, vaan kuiskaa se vain hiljaa itsellesi."
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
-#, php-format
-msgid "about %d minutes ago"
-msgstr "noin %d minuuttia sitten"
+#: actions/newmessage.php:181
+msgid "Message sent"
+msgstr "Viesti lähetetty"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: actions/newmessage.php:185 lib/command.php:375
 #, php-format
-msgid "about %d months ago"
-msgstr "noin %d kuukautta sitten"
-
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
-msgid "about a day ago"
-msgstr "noin päivä sitten"
-
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
-msgid "about a minute ago"
-msgstr "noin minuutti sitten"
-
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
-msgid "about a month ago"
-msgstr "noin kuukausi sitten"
+msgid "Direct message to %s sent"
+msgstr "Suora viesti käyttäjälle %s lähetetty"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
-msgid "about a year ago"
-msgstr "noin vuosi sitten"
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
+msgstr "Ajax-virhe"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
-msgid "about an hour ago"
-msgstr "noin tunti sitten"
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "Uusi päivitys"
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
-msgstr "poista"
-
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117 actions/noticesearch.php:136
-#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
-msgid "in reply to..."
-msgstr "vastaus viestiin..."
-
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124 actions/noticesearch.php:143
-#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
-msgid "reply"
-msgstr "vastaus"
-
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-msgid "same as password above"
-msgstr "sama salasana kuin yllä"
+#: actions/newnotice.php:199
+msgid "Notice posted"
+msgstr "Päivitys lähetetty"
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
-msgid "unsupported file type"
-msgstr "tiedoston tyyppi ei ole tuettu"
-
-#: ../lib/util.php:1309 lib/util.php:1443
-msgid "« After"
-msgstr "« Myöhemmin"
-
-#: 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
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-msgid "There was a problem with your session token. Try again, please."
+#: actions/noticesearch.php:68
+#, php-format
+msgid ""
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
 msgstr ""
-"Istuntosi avaimen kanssa oli ongelmia. Olisitko ystävällinen ja kokeilisit "
-"uudelleen."
-
-#: actions/disfavor.php:55 actions/disfavor.php:81
-msgid "This notice is not a favorite!"
-msgstr "Tämä päivitys ei ole suosikki!"
-
-#: actions/disfavor.php:63 actions/disfavor.php:87
-msgid "Could not delete favorite."
-msgstr "Ei voitu poistaa suosikkia."
-
-#: actions/disfavor.php:72 lib/favorform.php:140
-msgid "Favor"
-msgstr "Lisää suosikiksi"
-
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
-msgstr "Lähetä sähköpostia, jos joku lisää päivitykseni suosikiksi."
-
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-msgid "Send me email when someone sends me a private message."
-msgstr "Lähetä sähköpostia, jos joku lähettää minulle yksityisviestin."
-
-#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
-msgid "This notice is already a favorite!"
-msgstr "Tämä päivitys on jo suosikki!"
-
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132 actions/favor.php:86
-#: actions/twitapifavorites.php:125 classes/Command.php:152
-msgid "Could not create favorite."
-msgstr "Ei voitu lisätä suosikiksi."
+"Hae päivityksiä palvelun %%site.name%% sisällöistä. Erota hakutermit "
+"välilyönnillä; hakutermien pitää olla 3 tai useamman merkin pituisia."
 
-#: actions/favor.php:70
-msgid "Disfavor"
-msgstr "Poista suosikeista"
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "Tekstihaku"
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
-#, php-format
-msgid "%s favorite notices"
-msgstr "Käyttäjän %s suosikkipäivitykset"
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr " Hakusyöte haulle \"%s\""
 
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/noticesearch.php:121
 #, php-format
-msgid "Feed of favorite notices of %s"
-msgstr "Käyttäjän %s suosikkipäivityksien syöte"
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+"Ole ensimmäinen joka [lähettää päivityksen tästä aiheesta] (%%%%action."
+"newnotice%%%%?status_textarea=%s)!"
 
-#: actions/inbox.php:28 actions/inbox.php:59
+#: actions/noticesearch.php:124
 #, php-format
-msgid "Inbox for %s - page %d"
-msgstr "Saapuneet viestit käyttäjälle %s - sivu %d"
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
+msgstr ""
 
-#: actions/inbox.php:30 actions/inbox.php:62
-#, php-format
-msgid "Inbox for %s"
-msgstr "Saapuneet viestit käyttäjälle %s"
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
 
-#: actions/inbox.php:53 actions/inbox.php:115
-msgid "This is your inbox, which lists your incoming private messages."
-msgstr "Tämä on postilaatikkosi, jossa on sinulle saapuneet yksityisviestit."
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Kaikki päivitykset hakuehdolla \"%s\""
 
-#: actions/invite.php:178 actions/invite.php:213
-#, php-format
+#: actions/nudge.php:85
 msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
-"%1$s on kutsunut sinut liittymään palveluun %2$s (%3$s).\n"
-"\n"
+"Käyttäjä ei ole sallinut tönäisyjä tai ei ole vahvistanut "
+"sähköpostiosoitettaan."
+
+#: actions/nudge.php:94
+msgid "Nudge sent"
+msgstr "Tönäisy lähetetty"
 
-#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-msgid "Automatically login in the future; "
-msgstr "Kirjaudu sisään automaattisesti tulevaisuudessa; "
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr "Tönäisy lähetetty!"
 
-#: actions/login.php:122 actions/login.php:264
-msgid "For security reasons, please re-enter your "
-msgstr "Ole hyvä ja turvallisuussyistä syötä uudelleen "
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+msgstr "Päivitykselle ei ole profiilia"
 
-#: actions/login.php:126 actions/login.php:268
-msgid "Login with your username and password. "
-msgstr "Kirjaudu sisään käyttäjätunnuksella ja salasanalla. "
+#: actions/oembed.php:86 actions/shownotice.php:180
+#, php-format
+msgid "%1$s's status on %2$s"
+msgstr "Käyttäjän %1$s päivitys %2$s"
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
-msgid "That's too long. Max message size is 140 chars."
-msgstr "Liian pitkä päivitys. Maksimikoko päivitykselle on 140 merkkiä."
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Yhdistä"
 
-#: actions/newmessage.php:65 actions/newmessage.php:128
-msgid "No recipient specified."
-msgstr "Vastaanottajaa ei ole määritelty."
+#: actions/oembed.php:160
+msgid "Only "
+msgstr "Vain "
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206 actions/newmessage.php:131
-#: actions/newmessage.php:168 classes/Command.php:237
-msgid "You can't send a message to this user."
-msgstr "Et voi lähettää viestiä tälle käyttäjälle."
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
+msgstr "Tuo ei ole tuettu tietomuoto."
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "Älä lähetä viestiä itsellesi, vaan kuiskaa se vain hiljaa itsellesi."
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "Etsi ihmisiä"
 
-#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
-msgid "No such user"
-msgstr "Tuota käyttäjää ei ole."
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "Etsi Päivityksistä"
 
-#: actions/newmessage.php:117 actions/newmessage.php:67
-msgid "New message"
-msgstr "Uusi viesti"
+#: actions/othersettings.php:60
+msgid "Other Settings"
+msgstr "Muita Asetuksia"
 
-#: actions/noticesearch.php:95 actions/noticesearch.php:146
-msgid "Notice without matching profile"
-msgstr "Päivitys ilman vastaavaa profiilia"
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr "Hallinnoi muita asetuksia."
 
-#: actions/openidsettings.php:28 actions/openidsettings.php:70
-#, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+#: actions/othersettings.php:108
+msgid " (free service)"
 msgstr ""
-"[OpenID](%%doc.openid%%) mahdollistaa sisäänkirjautumisen useaan palveluun "
 
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
-msgstr "Jos haluat lisätä OpenID-tunnuksen käyttäjätiliisi, "
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
+msgstr "Lyhennä URL-osoitteita"
 
-# pitäisi olla ehkä et voi OpenID:llä kirjautua sisään.
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr ""
-"Et voisi enää kirjautua palveluun, jos poistaisit ainoan OpenID-tunnuksesi! "
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
+msgstr "Käytettävä automaattinen lyhennyspalvelu."
+
+#: actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "Profiiliasetukset"
 
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-msgid "You can remove an OpenID from your account "
-msgstr "Voit poistaa OpenID-tunnuksen käyttäjätililtäsi "
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr "Näytä tai piillota profiilin ulkoasu."
 
-#: actions/outbox.php:28 actions/outbox.php:58
+#: actions/othersettings.php:153
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "URL-lyhennyspalvelun nimi on liian pitkä (max 50 merkkiä)."
+
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %s - page %d"
 msgstr "Käyttäjän %s lähetetyt viestit - sivu %d"
 
-#: actions/outbox.php:30 actions/outbox.php:61
+#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Käyttäjän %s lähetetyt viestit"
 
-#: actions/outbox.php:53 actions/outbox.php:116
+#: actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Tämä on postilaatikkosi, jossa on lähettämäsi yksityisviestit."
 
-# olikos se näin aiemminkin
-#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
-#, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
-msgstr ""
-"Etsi ihmisiä palvelussa %%site.name%% heidän nimensä, paikkansa tai "
-"kiinnostustensa perusteella. "
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "Vaihda salasana"
 
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
-msgid "You can update your personal profile info here "
-msgstr "Voit päivittää täällä henkilökohtaista profiiliasi "
+#: actions/passwordsettings.php:69
+msgid "Change your password."
+msgstr "Vaihda salasanasi."
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
-msgid "User without matching profile"
-msgstr "Käyttäjälle ei löydy profiilia"
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+msgid "Password change"
+msgstr "Salasanan vaihto"
 
-#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
-msgstr "Tämä vahvistuskoodi on liian vanha. "
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "Vanha salasana"
 
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
-msgstr "Jos olet unohtanut tai hukannut"
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "Uusi salasana"
 
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a "
-msgstr "Sinut on tunnistettu. Syötä "
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6 tai useampia merkkejä"
 
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-msgid "Your nickname on this server, "
-msgstr "Käyttäjätunnuksesi tässä palvelussa, "
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "Vahvista"
 
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-msgid "Instructions for recovering your password "
-msgstr "Ohjeet salasanan palauttamiseksi "
+#: actions/passwordsettings.php:113
+msgid "same as password above"
+msgstr "sama salasana kuin yllä"
 
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
-msgid "New password successfully saved. "
-msgstr "Uuden salasanan tallennus onnistui. "
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "Vaihda"
 
-#: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:154 actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr "Salasanassa pitää olla 6 tai useampia merkkejä."
 
-#: actions/register.php:216
-#, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
-msgstr ""
-"Onneksi olkoon, %s! tervetuloa %%%%site.name%%%% palveluun. Tästä haluat "
-"ehkä jatkaa..."
-
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
-msgstr "Saat pian sähköpostilla viestin, jossa on "
-
-#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
-#, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr "Tilataksesi päivitykset, voit [kirjautua sisään](%%action.login%%),"
-
-#: actions/showfavorites.php:61 actions/showfavorites.php:145
-#, php-format
-msgid "Feed for favorites of %s"
-msgstr "Käyttäjän %s suosikkien syöte"
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "Salasanat eivät täsmää."
 
-# suosikkipäivitystä?
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-msgid "Could not retrieve favorite notices."
-msgstr "Ei saatu haettua suosikkipäivityksiä."
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "Väärä vanha salasana"
 
-#: actions/showmessage.php:33 actions/showmessage.php:81
-msgid "No such message."
-msgstr "Tuota viestiä ei ole."
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "Virhe tapahtui käyttäjän tallentamisessa; epäkelpo."
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
-msgstr "Vain lähettäjä ja vastaanottaja voivat lukea tämän viestin."
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "Uutta salasanaa ei voida tallentaa."
 
-#: actions/showmessage.php:61 actions/showmessage.php:108
-#, php-format
-msgid "Message to %1$s on %2$s"
-msgstr "Viesti käyttäjälle %1$s, %2$s"
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "Salasana tallennettu."
 
-# Ei välttämättä kovin hyvä tuo päiväysosa.
-#: actions/showmessage.php:66 actions/showmessage.php:113
+#: actions/peoplesearch.php:52
 #, php-format
-msgid "Message from %1$s on %2$s"
-msgstr "Viesti käyttäjältä %1$s, %2$s"
-
-#: actions/showstream.php:154
-msgid "Send a message"
-msgstr "Lähetä viesti"
+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 ""
+"Hae ihmisiä palvelun %%site.name%% käyttäjien nimistä, paikoista ja "
+"kiinnostuksen kohteista. Erota hakutermit välilyönnillä; hakutermien pitää "
+"olla 3 tai useamman merkin pituisia."
 
-#: actions/smssettings.php:312 actions/smssettings.php:464
-#, php-format
-msgid "Mobile carrier for your phone. "
-msgstr "Matkapuhelinoperaattorisi"
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "Etsi ihmisiä"
 
-#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/peopletag.php:70
 #, php-format
-msgid "Direct messages to %s"
-msgstr "Suorat viestit käyttäjälle %s"
+msgid "Not a valid people tag: %s"
+msgstr "Ei sallittu henkilötagi: %s"
 
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/peopletag.php:144
 #, php-format
-msgid "All the direct messages sent to %s"
-msgstr "Kaikki suorat viestit käyttäjälle %s"
+msgid "Users self-tagged with %s - page %d"
+msgstr "Käyttäjät joilla henkilötagi %s - sivu %d"
 
-#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-msgid "Direct Messages You've Sent"
-msgstr "Suorat viestit, jotka sinä olet lähettänyt"
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "Päivityksen sisältö ei kelpaa"
 
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/postnotice.php:90
 #, php-format
-msgid "All the direct messages sent from %s"
-msgstr "Kaikki suorat viestit käytäjältä %s"
-
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-msgid "No message text!"
-msgstr "Viestissä ei ole tekstiä!"
-
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-msgid "Recipient user not found."
-msgstr "Vastaanottajaa ei löytynyt."
-
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
-"Et voi lähettää suoraa viestiä käyttäjälle, jonka kanssa et ole vielä "
-"kaveri."
-
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
-#, php-format
-msgid "%s / Favorites from %s"
-msgstr "%s / Käyttäjän %s suosikit"
 
-# ensimmäinen on sivuston/palvelun nimi sorsasta päätellen.
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
-#, php-format
-msgid "%s updates favorited by %s / %s."
-msgstr " Palvelun %s päivitykset, jotka %s / %s on merkinnyt suosikikseen."
-
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
-#, php-format
-msgid "%s added your notice as a favorite"
-msgstr "%s lisäsi päivityksesi suosikkeihinsa"
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "Profiiliasetukset"
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
-#, php-format
+#: actions/profilesettings.php:71
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+"You can update your personal profile info here so people know more about you."
 msgstr ""
-"%1$s lisäsi päivityksesi ajalta %2$s suosikkeihinsa.\n"
-"\n"
+"Voit päivittää täällä henkilötietojasi, jotta muut saavat tietää sinusta "
+"enemmän."
 
-#: actions/twittersettings.php:27
-msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+#: actions/profilesettings.php:99
+msgid "Profile information"
+msgstr "Profiilitieto"
+
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
-"Lisää Twitter käyttäjätunnuksesi lähettääksesi päivitykset automaattisesti "
-"myös Twitteriin, "
+"1-64 pientä kirjainta tai numeroa, ei ääkkösiä eikä välimerkkejä tai "
+"välilyöntejä"
 
-#: actions/twittersettings.php:41 actions/twittersettings.php:60
-msgid "Twitter settings"
-msgstr "Twitter-asetukset"
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full name"
+msgstr "Koko nimi"
 
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-msgid "Twitter Account"
-msgstr "Twitter käyttäjätili"
+#: actions/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "Kotisivu"
 
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-msgid "Current verified Twitter account."
-msgstr "Tämänhetkinen vahvistettu Twitter käyttäjätilisi."
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "Kotisivusi, blogisi tai toisella sivustolla olevan profiilisi osoite."
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr "Twitter-käyttäjätunnus"
+#: actions/profilesettings.php:122 actions/register.php:460
+#, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Kuvaile itseäsi ja kiinnostuksen kohteitasi %d merkillä"
 
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-msgid "No spaces, please."
-msgstr "Ei välilyöntejä, kiitos."
+#: actions/profilesettings.php:125 actions/register.php:463
+msgid "Describe yourself and your interests"
+msgstr "Kuvaile itseäsi ja kiinnostuksen kohteitasi"
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
-msgstr "Twitter-salasana"
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "Tietoja"
 
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-msgid "Automatically send my notices to Twitter."
-msgstr "Lähetä päivitykseni automaattisesti Twitteriin."
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "Kotipaikka"
 
-#: actions/twittersettings.php:75 actions/twittersettings.php:146
-msgid "Send local \"@\" replies to Twitter."
-msgstr "Lähetä paikalliset \"@\"-vastaukset Twitteriin."
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "Olinpaikka kuten \"Kaupunki, Maakunta (tai Lääni), Maa\""
 
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-msgid "Subscribe to my Twitter friends here."
-msgstr "Tilaa kavereitteni Twitter päivitykset täällä."
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
+msgstr "Tagit"
 
-#: actions/twittersettings.php:122
+#: actions/profilesettings.php:140
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
-"Käyttäjätunnuksessa voi olla vain numeroita, isoja ja pieniä kirjaimia ja "
-"alaviiva (_). 15 merkkiä maksimissaan."
-
-#: actions/twittersettings.php:128 actions/twittersettings.php:334
-msgid "Could not verify your Twitter credentials!"
-msgstr "Twitter-tunnustasi ei voitu vahvistaa!"
-
-#: actions/twittersettings.php:137
-#, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr "Ei pystytty hakemaan käyttäjän \"%s\" tietoja Twitteristä."
-
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-msgid "Unable to save your Twitter settings!"
-msgstr "Twitter-asetuksia ei voitu tallentaa!"
-
-#: actions/twittersettings.php:174 actions/twittersettings.php:376
-msgid "Twitter settings saved."
-msgstr "Twitter-asetukset tallennettu."
-
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-msgid "That is not your Twitter account."
-msgstr "Tämä ei ole sinun Twitter käyttäjätilisi."
-
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
-msgid "Couldn't remove Twitter user."
-msgstr "Twitter käyttäjää ei onnistuttu poistamaan."
-
-#: actions/twittersettings.php:212 actions/twittersettings.php:407
-msgid "Twitter account removed."
-msgstr "Twitter käyttäjätili poistettu."
-
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
-msgid "Couldn't save Twitter preferences."
-msgstr "Twitter-asetuksia ei voitu tallentaa."
+"Kuvaa itseäsi henkilötageilla (sanoja joissa voi olla muita kirjaimia kuin "
+"ääkköset, numeroita, -, ., ja _), pilkulla tai välilyönnillä erotettuna"
 
-#: actions/twittersettings.php:245 actions/twittersettings.php:461
-msgid "Twitter preferences saved."
-msgstr "Twitter-asetukset tallennettu."
+#: actions/profilesettings.php:144
+msgid "Language"
+msgstr "Kieli"
 
-#: actions/userauthorization.php:84 actions/userauthorization.php:86
-msgid "Please check these details to make sure "
-msgstr "Tarkista näistä tiedoista haluatko "
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr "Ensisijainen kieli"
 
-# koodissa jatkuu "but no callback url was passed"...
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
-msgid "The subscription has been authorized, but no "
-msgstr "Tilausta ei ole hyväksytty, mutta"
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr "Aikavyöhyke"
 
-# koodissa jatkuu "but no callback url was passed"
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-msgid "The subscription has been rejected, but no "
-msgstr "Tilaus on hylätty, mutta "
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
+msgstr "Missä aikavyöhykkeessä olet normaalisti?"
 
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-msgid "Command results"
-msgstr "Komennon tulos"
+#: actions/profilesettings.php:160
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+"Tilaa automaattisesti kaikki, jotka tilaavat päivitykseni (ei sovi hyvin "
+"ihmiskäyttäjille)"
 
-#: classes/Channel.php:148 classes/Channel.php:204
-msgid "Command complete"
-msgstr "Komento suoritettu"
+#: actions/profilesettings.php:221 actions/register.php:223
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "\"Tietoja\" on liian pitkä (max 140 merkkiä)."
 
-#: classes/Channel.php:158 classes/Channel.php:215
-msgid "Command failed"
-msgstr "Komento epäonnistui"
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr "Aikavyöhykettä ei ole valittu."
 
-#: classes/Command.php:39 classes/Command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Valitettavasti tätä komentoa  ei ole vielä toteutettu."
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr "Kieli on liian pitkä (max 50 merkkiä)."
 
-#: classes/Command.php:96 classes/Command.php:113
+#: actions/profilesettings.php:246 actions/tagother.php:178
 #, php-format
-msgid "Subscriptions: %1$s\n"
-msgstr "Tilaukset: %1$s\n"
-
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
-msgid "User has no last notice"
-msgstr "Käyttäjällä ei ole viimeistä päivitystä"
-
-#: classes/Command.php:146 classes/Command.php:166
-msgid "Notice marked as fave."
-msgstr "Päivitys on merkitty suosikiksi."
+msgid "Invalid tag: \"%s\""
+msgstr "Virheellinen tagi: \"%s\""
 
-#: classes/Command.php:166 classes/Command.php:189
-#, php-format
-msgid "%1$s (%2$s)"
-msgstr "%1$s (%2$s)"
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
+msgstr "Ei voitu asettaa käyttäjälle automaattista tilausta."
 
-#: classes/Command.php:169 classes/Command.php:192
-#, php-format
-msgid "Fullname: %s"
-msgstr "Koko nimi: %s"
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+msgstr "Ei voitu tallentaa profiilia."
 
-#: classes/Command.php:172 classes/Command.php:195
-#, php-format
-msgid "Location: %s"
-msgstr "Kotipaikka: %s"
+#: actions/profilesettings.php:336
+msgid "Couldn't save tags."
+msgstr "Tageja ei voitu tallentaa."
 
-#: classes/Command.php:175 classes/Command.php:198
-#, php-format
-msgid "Homepage: %s"
-msgstr "Kotisivu: %s"
+#: actions/profilesettings.php:344
+msgid "Settings saved."
+msgstr "Asetukset tallennettu."
 
-#: classes/Command.php:178 classes/Command.php:201
+#: actions/public.php:83
 #, php-format
-msgid "About: %s"
-msgstr "Tietoa: %s"
+msgid "Beyond the page limit (%s)"
+msgstr ""
 
-#: classes/Command.php:200 classes/Command.php:228
-#, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
-msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
+msgstr "Julkista päivitysvirtaa ei saatu."
 
-#: classes/Command.php:214 classes/Command.php:245
+#: actions/public.php:129
 #, php-format
-msgid "Direct message to %s sent"
-msgstr "Suora viesti käyttäjälle %s lähetetty"
+msgid "Public timeline, page %d"
+msgstr "Julkinen aikajana, sivu %d"
 
-#: classes/Command.php:216 classes/Command.php:247
-msgid "Error sending direct message."
-msgstr "Tapahtui virhe suoran viestin lähetyksessä."
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr "Julkinen aikajana"
 
-#: classes/Command.php:263 classes/Command.php:300
-msgid "Specify the name of the user to subscribe to"
-msgstr "Anna käyttäjätunnus, jonka päivitykset haluat tilata"
+#: actions/public.php:151
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Julkinen syöte (RSS 1.0)"
 
-#: classes/Command.php:270 classes/Command.php:307
-#, php-format
-msgid "Subscribed to %s"
-msgstr "Käyttäjän %s päivitykset tilattu"
+#: actions/public.php:155
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Julkisen Aikajanan Syöte (RSS 2.0)"
 
-#: classes/Command.php:288 classes/Command.php:328
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Anna käyttäjätunnus, jonka päivityksien tilauksen haluat lopettaa"
+#: actions/public.php:159
+msgid "Public Stream Feed (Atom)"
+msgstr "Julkinen syöte (Atom)"
 
-#: classes/Command.php:295 classes/Command.php:335
+#: actions/public.php:179
 #, php-format
-msgid "Unsubscribed from %s"
-msgstr "Käyttäjän %s päivitysten tilaus lopetettu"
-
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
-msgid "Command not yet implemented."
-msgstr "Komentoa ei ole vielä toteutettu."
-
-#: classes/Command.php:313 classes/Command.php:356
-msgid "Notification off."
-msgstr "Ilmoitukset pois päältä."
-
-#: classes/Command.php:315 classes/Command.php:358
-msgid "Can't turn off notification."
-msgstr "Ilmoituksia ei voi pistää pois päältä."
-
-#: classes/Command.php:333 classes/Command.php:379
-msgid "Notification on."
-msgstr "Ilmoitukset päällä."
-
-#: classes/Command.php:335 classes/Command.php:381
-msgid "Can't turn on notification."
-msgstr "Ilmoituksia ei voi pistää päälle."
-
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
-msgstr "Komennot:\n"
-
-#: classes/Message.php:53 classes/Message.php:56
-msgid "Could not insert message."
-msgstr "Viestin tallennus ei onnistunut."
-
-#: classes/Message.php:63 classes/Message.php:66
-msgid "Could not update message with new URI."
-msgstr "Viestin päivittäminen uudella URI-osoitteella ei onnistunut."
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
-msgstr "Käyttäjälle ei löydy vastaavaa profiilia palvelussa."
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr "Ole ensimmäinen joka lähettää päivityksen!"
 
-#: lib/mail.php:147 lib/mail.php:289
+#: actions/public.php:186
 #, php-format
 msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+"Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
-"Sinulla on uusi lähetysosoite palvelussa %1$s.\n"
-"\n"
-
-#: lib/mail.php:249 lib/mail.php:508
-#, php-format
-msgid "New private message from %s"
-msgstr "Uusi yksityisviesti käyttäjältä %s"
 
-#: lib/mail.php:253 lib/mail.php:512
+#: actions/public.php:233
 #, php-format
 msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
-"%1$s (%2$s) lähetti sinulle yksityisviestin:\n"
-"\n"
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "Vain käyttäjä voi lukea omaa postilaatikkoaan."
-
-#: lib/openid.php:195 lib/openid.php:203
-msgid "This form should automatically submit itself. "
-msgstr "Tämän lomakkeen pitäisi automaattisesti lähettää tiedot. "
+#: actions/public.php:238
+#, fuzzy, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
+msgstr ""
+"Tämä on %%site.name%%, [mikroblogaus](http://en.wikipedia.org/wiki/Micro-"
+"blogging)palvelu "
 
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-msgid "Favorites"
-msgstr "Suosikit"
+#: actions/publictagcloud.php:57
+msgid "Public tag cloud"
+msgstr "Julkinen tagipilvi"
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "%s's favorite notices"
-msgstr "Käyttäjän %s suosikkipäivitykset"
-
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-msgid "User"
-msgstr "Käyttäjä"
-
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-msgid "Inbox"
-msgstr "Saapuneet"
-
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-msgid "Your incoming messages"
-msgstr "Sinulle saapuneet viestit"
-
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-msgid "Outbox"
-msgstr "Lähetetyt"
-
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-msgid "Your sent messages"
-msgstr "Lähettämäsi viestit"
-
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-msgid "Twitter"
-msgstr "Twitter"
-
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
-msgstr "Twitter yhdistämisen asetukset"
-
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-msgid "To"
-msgstr "Vastaanottaja"
-
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-msgid "Could not parse message."
-msgstr "Ei voitu lukea viestiä."
+msgid "These are most popular recent tags on %s "
+msgstr "Nämä ovat suosituimmat viimeaikaiset tagit %s -palvelussa"
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/publictagcloud.php:69
 #, php-format
-msgid "%s and friends, page %d"
-msgstr "%s ja kaverit, sivu %d"
-
-#: actions/avatarsettings.php:76
-msgid "You can upload your personal avatar."
-msgstr "Voit ladata oman profiilikuvasi."
-
-#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
-msgid "Avatar settings"
-msgstr "Profiilikuva-asetukset"
-
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-msgid "Original"
-msgstr "Alkuperäinen"
-
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-msgid "Preview"
-msgstr "Esikatselu"
-
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
-msgid "Crop"
-msgstr "Rajaa"
-
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-msgid "There was a problem with your session token. "
-msgstr "Istuntoavaimesi kanssa oli ongelma."
-
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-msgid "Pick a square area of the image to be your avatar"
-msgstr "Valitse neliön muotoinen alue kuvasta profiilikuvaksi"
-
-#: actions/avatarsettings.php:327 actions/grouplogo.php:384
-msgid "Lost our file data."
-msgstr "Tiedoston data hävisi."
-
-#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
-msgid "Lost our file."
-msgstr "Tiedosto hävisi."
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
+msgstr ""
+"Kukaan ei ole vielä lähettänyt päivitystä tagilla [hashtag] (%%doc.tags%%) "
+"vielä."
 
-#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
-#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
-msgid "Unknown file type"
-msgstr "Tunnistamaton tiedoston tyyppi"
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
+msgstr "Ole ensimmäinen joka lähettää päivityksen!"
 
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "Profiilia ei ole määritelty."
-
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "Ei profiilia tuolle ID:lle."
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
 
-#: actions/block.php:111
-msgid "Block user"
-msgstr "Estä käyttäjä"
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
+msgstr "Tagipilvi"
 
-#: actions/block.php:129
-msgid "Are you sure you want to block this user? "
-msgstr "Oletko varma että haluat estää tämän käyttäjän?"
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "Olet jo kirjautunut sisään!"
 
-#: actions/block.php:162
-msgid "You have already blocked this user."
-msgstr "Sinä olet jo estänyt tämän käyttäjän."
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "Palautuskoodia ei ole."
 
-#: actions/block.php:167
-msgid "Failed to save block information."
-msgstr "Käyttäjän estotiedon tallennus epäonnistui."
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "Tuo ei ole palautuskoodi."
 
-#: actions/confirmaddress.php:159
-#, php-format
-msgid "The address \"%s\" has been "
-msgstr "Osoite \"%s\" on "
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr "Tuntemattoman käyttäjän palautuskoodi"
 
-#: actions/deletenotice.php:73
-msgid "You are about to permanently delete a notice. "
-msgstr "Olet poistamassa pysyvästi tämän päivityksen. "
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "Virhe vahvistuskoodin kanssa."
 
-#: actions/disfavor.php:94
-msgid "Add to favorites"
-msgstr "Lisää suosikkeihin"
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
+msgstr "Vahvistuskoodi on liian vanha. Aloita uudelleen."
 
-#: actions/editgroup.php:54
-#, php-format
-msgid "Edit %s group"
-msgstr "Muokkaa ryhmää %s"
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
+msgstr "Ei voitu päivittää käyttäjälle vahvistettua sähköpostiosoitetta."
 
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-msgid "Inboxes must be enabled for groups to work"
-msgstr "Toimiakseen postilaatikkojen pitää olla käytössä ryhmille"
+#: actions/recoverpassword.php:152
+msgid ""
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
+msgstr ""
 
-#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-msgid "You must be logged in to create a group."
-msgstr "Sinun pitää olla kirjautunut sisään jotta voit luoda ryhmän."
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
+msgstr "Sinut on tunnistettu. Syötä uusi salasana alapuolelle. "
 
-#: actions/editgroup.php:87 actions/grouplogo.php:87
-#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
-msgid "No nickname"
-msgstr "Tunnusta ei ole."
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
+msgstr "Salasanan palautus"
 
-#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
-#: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
-msgid "No such group"
-msgstr "Tuota ryhmää ei ole."
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
+msgstr "Käyttäjätunnus tai sähköpostiosoite"
 
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
-msgid "You must be an admin to edit the group"
-msgstr "Sinun pitää olla ylläpitäjä, jotta voit muokata ryhmää"
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
+msgstr ""
+"Käyttäjätunnuksesi tässä palvelussa tai rekisteröity sähköpostiosoitteesi."
 
-#: actions/editgroup.php:157
-msgid "Use this form to edit the group."
-msgstr "Käytä tätä lomaketta muokataksesi ryhmää."
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
+msgstr "Palauta"
 
-#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
-msgid "Nickname must have only lowercase letters "
-msgstr "Tunnuksessa voi olla ainoastaan pieniä kirjaimia "
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "Vaihda salasana"
 
-#: actions/editgroup.php:198 actions/newgroup.php:149
-msgid "description is too long (max 140 chars)."
-msgstr "kuvaus on liian pitkä (max 140 merkkiä)."
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr "Salasanan palautus"
 
-#: actions/editgroup.php:218
-msgid "Could not update group."
-msgstr "Ei voitu päivittää ryhmää."
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
+msgstr "Salasanan palautuspyyntö lähetetty."
 
-#: actions/editgroup.php:226
-msgid "Options saved."
-msgstr "Asetukset tallennettu."
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
+msgstr "Tuntematon toiminto"
 
-#: actions/emailsettings.php:107 actions/imsettings.php:108
-#, php-format
-msgid "Awaiting confirmation on this address. "
-msgstr "Odotetaan vahvistusta tälle osoitteelle."
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 tai useampia merkkejä äläkä unohda mitä kirjoitit!"
 
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-msgid "Make a new email address for posting to; "
-msgstr "Tee uusi sähköpostiosoite päivityksien lähettämiseen; "
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Sama kuin ylläoleva salasana"
 
-#: actions/emailsettings.php:157
-msgid "Send me email when someone "
-msgstr "Lähetä sähköpostia kun joku "
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "Vaihda"
 
-#: actions/emailsettings.php:168
-msgid "Allow friends to nudge me and send me an email."
-msgstr "Salli kavereiden tönäistä minua ja lähetä sähköpostilla ilmoitus."
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "Syötä käyttäjätunnus tai sähköpostiosoite"
 
-#: actions/emailsettings.php:321
-msgid "That email address already belongs "
-msgstr "Sähköpostiosoite on jo käytössä "
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
+msgstr "Käyttäjää tuolla sähköpostilla tai käyttäjätunnuksella ei ole."
 
-#: actions/emailsettings.php:343
-msgid "A confirmation code was sent to the email address you added. "
-msgstr "Vahvistuskoodi lähetettiin lisäämääsi sähköpostiosoitteeseen. "
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr "Rekisteröityä sähköpostiosoitetta ei ole tälle käyttäjälle."
 
-#: actions/facebookhome.php:110
-msgid "Server error - couldn't get user!"
-msgstr "Palvelinvirhe - käyttäjän tietoja ei saatu!"
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "Virhe tapahtui osoitevahvistuksen tallentamisessa"
 
-#: actions/facebookhome.php:196
-#, php-format
-msgid "If you would like the %s app to automatically update "
-msgstr "Jos haluat %s-sovelluksen automaattisesti päivittävän "
+#: actions/recoverpassword.php:325
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr ""
+"Ohjeet salasanan palauttamiseksi on lähetetty sähköpostiisiosoitteeseen, "
+"joka on rekisteröity käyttäjätunnuksellesi."
 
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "Salli palvelun %s päivittää Facebook-tilani"
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
+msgstr "Odottamaton salasanan uudelleenasetus."
 
-#: actions/facebookhome.php:218
-msgid "Skip"
-msgstr "Ohita"
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "Salasanassa pitää olla 6 tai useampia merkkejä."
 
-#: actions/facebookhome.php:235
-msgid "No notice content!"
-msgstr "Päivityksellä ei ole sisältöä!"
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
+msgstr "Salasana ja salasanan vahvistus eivät täsmää."
 
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-msgid "Pagination"
-msgstr "Sivutus"
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
+msgstr ""
+"Uusi salasana tallennettiin onnistuneesti. Olet nyt kirjautunut sisään."
 
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-msgid "After"
-msgstr "Myöhemmin"
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
+msgstr "Valitettavasti vain kutsutut ihmiset voivat rekisteröityä."
 
-#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
-msgid "Before"
-msgstr "Aiemmin"
+#: actions/register.php:92
+msgid "Sorry, invalid invitation code."
+msgstr "Virheellinen kutsukoodin."
 
-#: actions/facebookinvite.php:70
-#, php-format
-msgid "Thanks for inviting your friends to use %s"
-msgstr "Kiitos, kun kutsuit kavereitasi käyttämään palvelua %s"
+#: actions/register.php:112
+msgid "Registration successful"
+msgstr "Rekisteröityminen onnistui"
 
-#: actions/facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Kutsu lähetettiin seuraaville henkilöille:"
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "Rekisteröidy"
 
-#: actions/facebookinvite.php:96
-#, php-format
-msgid "You have been invited to %s"
-msgstr "Sinut on kutsuttu palveluun %s"
+#: actions/register.php:135
+msgid "Registration not allowed."
+msgstr "Rekisteröityminen ei ole sallittu."
 
-#: actions/facebookinvite.php:105
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Kutsu kavereitasi käyttämään %s palvelua"
+#: actions/register.php:198
+msgid "You can't register if you don't agree to the license."
+msgstr "Et voi rekisteröityä, jos et hyväksy lisenssiehtoja."
 
-#: actions/facebookinvite.php:113
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Kaverisi jotka käyttävät jo %s palvelua:"
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "Tuo ei ole kelvollinen sähköpostiosoite."
 
-#: actions/facebookinvite.php:130
-#, php-format
-msgid "Send invitations"
-msgstr "Lähetä kutsut"
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "Sähköpostiosoite on jo käytössä."
 
-#: actions/facebookremove.php:56
-msgid "Couldn't remove Facebook user."
-msgstr "Facebook käyttäjää ei voitu poistaa."
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "Käyttäjätunnus tai salasana ei kelpaa."
 
-# Pitää tarkistaa mitä nuo sync on!
-#: actions/facebooksettings.php:65
-msgid "There was a problem saving your sync preferences!"
-msgstr "Synkronointiasetusten tallennus epäonnistui!"
+#: actions/register.php:342
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
 
-#: actions/facebooksettings.php:67
-msgid "Sync preferences saved."
-msgstr "Synkronointiasetukset tallennettiin."
+#: actions/register.php:424
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+"1-64 pientä kirjainta tai numeroa, ei ääkkösiä eikä välimerkkejä tai "
+"välilyöntejä. Pakollinen."
 
-#: actions/facebooksettings.php:90
-msgid "Automatically update my Facebook status with my notices."
-msgstr "Päivitä Facebook-tilani automaattisesti."
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr "6 tai useampia merkkejä. Pakollinen."
 
-#: actions/facebooksettings.php:97
-msgid "Send \"@\" replies to Facebook."
-msgstr "Lähetä \"@\" vastaukset Facebookiin."
+#: actions/register.php:433
+msgid "Same as password above. Required."
+msgstr "Sama kuin ylläoleva salasana. Pakollinen."
 
-#: actions/facebooksettings.php:106
-msgid "Prefix"
-msgstr "Etuliite"
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "Sähköposti"
 
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
-msgstr "Etuliite päivityksille."
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
+msgstr ""
+"Käytetään ainoastaan päivityksien lähettämiseen, ilmoitusasioihin ja "
+"salasanan uudelleen käyttöönottoon."
 
-#: actions/facebooksettings.php:124
-#, php-format
-msgid "If you would like %s to automatically update "
-msgstr "Jos haluat että %s päivittää automaattisesti "
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
+msgstr "Pitempi nimi, mieluiten oikea nimesi"
 
-#: actions/facebooksettings.php:147
-msgid "Sync preferences"
-msgstr "Synkronointiasetukset"
+#: actions/register.php:493
+msgid "My text and files are available under "
+msgstr ""
+"Minun tekstini ja tiedostoni ovat käytettävissä seuraavan lisenssin "
+"mukaisesti "
 
-#: actions/favor.php:94 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "Poista suosikeista"
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
 
-#: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
-msgid "Popular notices"
-msgstr "Suosituimmat päivitykset"
+#: actions/register.php:496
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+"poislukien yksityinen tieto: salasana, sähköpostiosoite, IM osoite, "
+"puhelinnumero."
 
-#: actions/favorited.php:67
+#: actions/register.php:537
 #, php-format
-msgid "Popular notices, page %d"
-msgstr "Suosituimmat päivitykset, sivu %d"
-
-#: actions/favorited.php:79
-msgid "The most popular notices on the site right now."
-msgstr "Suosituimmat päivitykset sivustolla juuri nyt."
-
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
-msgid "Featured users"
-msgstr "Esittelyssä olevat käyttäjät"
+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 ""
+"Onnittelut, %s! Tervetuloa palveluun %%%%site.name%%%%. Täältä voit "
+"jatkaa...\n"
+"\n"
+"* [Profiiliisi](%s) ja lähettää ensimmäisen päivityksesi.\n"
+"* Lisäämään [Jabber/GTalk osoitteen](%%%%action.imsettings%%%%), jotta saat "
+"lähetettyä päivitykset pikaviestimen kautta.\n"
+"* [Hakemaan ihmisiä](%%%%action.peoplesearch%%%%), jotka tunnet tai joilla "
+"on samanlaisia kiinnostuksen kohteita. \n"
+"* Päivittämään [profiiliasi](%%%%action.profilesettings%%%%), jotta muut "
+"tietävät enemmän sinusta.\n"
+"* Lukemaan [ohjeista](%%%%doc.help%%%%) muista ominaisuuksista, joista et "
+"vielä tiedä. \n"
+"\n"
+"Kiitokset rekisteröitymisestäsi ja toivomme että pidät palvelustamme."
 
-#: actions/featured.php:71
-#, php-format
-msgid "Featured users, page %d"
-msgstr "Esittelyssä olevat käyttäjät, sivu %d"
+#: actions/register.php:561
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+"(Saat pian sähköpostiisi viestin, jonka ohjeita seuraamalla voit vahvistaa "
+"sähköpostiosoitteesi.)"
 
-# Valikoima, joukko
-#: actions/featured.php:99
+#: actions/remotesubscribe.php:98
 #, php-format
-msgid "A selection of some of the great users on %s"
-msgstr "Valikoima joitakin loistavia palvelun %s käyttäjiä"
-
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
-msgstr "Käyttäjä on estänyt sinua tilaamasta päivityksiä."
-
-#: actions/groupbyid.php:79
-msgid "No ID"
-msgstr "ID-tunnusta ei ole"
-
-#: actions/grouplogo.php:138 actions/grouplogo.php:191
-msgid "Group logo"
-msgstr "Ryhmän logo"
-
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
-msgstr "Voit ladata ryhmälle logon."
+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 ""
+"Tilataksesi päivitykset, voit [kirjautua sisään](%%action.login%%), tai "
+"[rekisteröidä](%%action.register%%) uuden  käyttäjätunnuksen. Jos sinulla on "
+"jo käyttäjätunnus  jossain [yhteensopivassa mikroblogauspalvelussa](%%doc."
+"openmublog%%),  syötä profiilisi URL-osoite alla olevaan kenttään."
 
-#: actions/grouplogo.php:448
-msgid "Logo updated."
-msgstr "Logo päivitetty."
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr "Etätilaus"
 
-#: actions/grouplogo.php:450
-msgid "Failed updating logo."
-msgstr "Logon päivittäminen epäonnistui."
+#: actions/remotesubscribe.php:124
+msgid "Subscribe to a remote user"
+msgstr "Tilaa tämä etäkäyttäjä"
 
-#: actions/groupmembers.php:93 lib/groupnav.php:91
-#, php-format
-msgid "%s group members"
-msgstr "Ryhmän %s jäsenet"
-
-#: actions/groupmembers.php:96
-#, php-format
-msgid "%s group members, page %d"
-msgstr "Ryhmän %s jäsenet, sivu %d"
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "Käyttäjätunnus"
 
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
-msgstr "Lista ryhmän käyttäjistä."
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr "Käyttäjän, jota haluat seurata, käyttäjätunnus"
 
-#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
-msgid "Groups"
-msgstr "Ryhmät"
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "Profiilin URL"
 
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "Ryhmät, sivu %d"
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "Profiilisi URL-osoite toisessa yhteensopivassa mikroblogauspalvelussa"
 
-#: actions/groups.php:90
-#, php-format
-msgid "%%%%site.name%%%% groups let you find and talk with "
-msgstr "%%%%site.name%%%%-ryhmissä voit löytää ja keskustella "
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
+msgstr "Tilaa"
 
-#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-msgid "Create a new group"
-msgstr "Luo uusi ryhmä"
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr "Profiilin URL-osoite '%s' ei kelpaa (virheellinen muoto)."
 
-#: actions/groupsearch.php:57
-#, php-format
+#: actions/remotesubscribe.php:168
+#, fuzzy
 msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
 msgstr ""
-"Hae %%site.name%% ryhmiä niiden nimen, paikan tai kuvauksen perusteella. "
+"Tuo ei ole kelvollinen profiilin verkko-osoite (YADIS dokumenttia ei "
+"löytynyt)."
 
-#: actions/groupsearch.php:63
-msgid "Group search"
-msgstr "Ryhmähaku"
+#: actions/remotesubscribe.php:176
+msgid "That’s a local profile! Login to subscribe."
+msgstr ""
+"Tämä on paikallinen profiili. Kirjaudu sisään, jotta voit tilata päivitykset."
 
-#: actions/imsettings.php:70
-msgid "You can send and receive notices through "
-msgstr "Voit lähettää ja vastaaottaa päivityksiä "
+#: actions/remotesubscribe.php:183
+msgid "Couldn’t get a request token."
+msgstr "Ei saatu request tokenia."
 
-#: actions/imsettings.php:120
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
 #, php-format
-msgid "Jabber or GTalk address, "
-msgstr "Jabber tai GTalk -osoite, "
-
-#: actions/imsettings.php:147
-msgid "Send me replies through Jabber/GTalk "
-msgstr "Lähetä minulle vastaukset Jabberin/GTalkin kautta "
+msgid "Replies to %s"
+msgstr "Vastaukset käyttäjälle %s"
 
-#: actions/imsettings.php:321
+#: actions/replies.php:127
 #, php-format
-msgid "A confirmation code was sent "
-msgstr "Varmistuskoodi lähetettiin "
+msgid "Replies to %s, page %d"
+msgstr "Vastaukset käyttäjälle %s, sivu %d"
 
-#: actions/joingroup.php:65
-msgid "You must be logged in to join a group."
-msgstr "Sinun pitää olla kirjautunut sisään, jos haluat liittyä ryhmään."
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Päivityksien syöte käyttäjälle %s"
 
-#: actions/joingroup.php:95
-msgid "You are already a member of that group"
-msgstr "Sinä kuulut jo tähän ryhmään "
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Päivityksien syöte käyttäjälle %s"
 
-#: actions/joingroup.php:128
+#: actions/replies.php:158
 #, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Käyttäjää %s ei voinut liittää ryhmään %s"
+msgid "Replies feed for %s (Atom)"
+msgstr "Päivityksien syöte käyttäjälle %s"
 
-#: actions/joingroup.php:135
+#: actions/replies.php:198
 #, php-format
-msgid "%s joined group %s"
-msgstr "%s liittyi ryhmään %s"
-
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
 msgstr ""
-"Postilaatikkojen täytyy olla otettu käyttöön, jotta ryhmäominaisuus toimii."
-
-#: actions/leavegroup.php:65
-msgid "You must be logged in to leave a group."
-msgstr "Sinun pitää olla kirjautunut sisään, jotta voit erota ryhmästä."
-
-#: actions/leavegroup.php:88
-msgid "No such group."
-msgstr "Tuota ryhmää ei ole."
-
-#: actions/leavegroup.php:95
-msgid "You are not a member of that group."
-msgstr "Sinä et kuulu tähän ryhmään."
-
-#: actions/leavegroup.php:100
-msgid "You may not leave a group while you are its administrator."
-msgstr "Et voi erota ryhmästä, kun olet sen ylläpitäjä."
-
-#: actions/leavegroup.php:130
-msgid "Could not find membership record."
-msgstr "Ei löydetty käyttäjän jäsenyystietoja."
 
-#: actions/leavegroup.php:138
+#: actions/replies.php:203
 #, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "Ei voitu poistaa käyttäjää %s ryhmästä %s"
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
 
-#: actions/leavegroup.php:145
+#: actions/replies.php:205
 #, php-format
-msgid "%s left group %s"
-msgstr "%s erosi ryhmästä %s"
-
-#: actions/login.php:225 lib/facebookaction.php:304
-msgid "Login to site"
-msgstr "Kirjaudu sisään"
-
-#: actions/microsummary.php:69
-msgid "No current status"
-msgstr "Ei nykyistä tilatietoa"
-
-#: actions/newgroup.php:53
-msgid "New group"
-msgstr "Uusi ryhmä"
-
-#: actions/newgroup.php:115
-msgid "Use this form to create a new group."
-msgstr "Käytä tätä lomaketta luodaksesi ryhmän."
-
-#: actions/newgroup.php:177
-msgid "Could not create group."
-msgstr "Ryhmän luonti ei onnistunut."
-
-#: actions/newgroup.php:191
-msgid "Could not set group membership."
-msgstr "Ryhmän jäsenyystietoja ei voitu asettaa."
-
-#: actions/newmessage.php:119 actions/newnotice.php:132
-msgid "That's too long. "
-msgstr "Liikaa merkkejä. "
-
-#: actions/newmessage.php:134
-msgid "Don't send a message to yourself; "
-msgstr "Älä lähetä viestiä itsellesi; "
-
-#: actions/newnotice.php:166
-msgid "Notice posted"
-msgstr "Päivitys lähetetty"
-
-#: actions/newnotice.php:200 classes/Channel.php:163
-msgid "Ajax Error"
-msgstr "Ajax-virhe"
-
-#: actions/nudge.php:85
 msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
-"Käyttäjä ei ole sallinut tönäisyjä tai ei ole vahvistanut "
-"sähköpostiosoitettaan."
 
-#: actions/nudge.php:94
-msgid "Nudge sent"
-msgstr "Tönäisy lähetetty"
-
-#: actions/nudge.php:97
-msgid "Nudge sent!"
-msgstr "Tönäisy lähetetty!"
-
-#: actions/openidlogin.php:97
-msgid "OpenID login"
-msgstr "OpenID sisäänkirjautuminen"
-
-#: actions/openidsettings.php:128
-msgid "Removing your only OpenID "
-msgstr "Viimeisen OpenID-tunnuksesi poistaminen  "
-
-#: actions/othersettings.php:60
-msgid "Other Settings"
-msgstr "Muita Asetuksia"
-
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Hallinnoi muita asetuksia."
-
-#: actions/othersettings.php:93
-msgid "URL Auto-shortening"
-msgstr "URL-osoitteen automaattinen lyhennys"
-
-#: actions/othersettings.php:112
-msgid "Service"
-msgstr "Palvelu"
-
-#: actions/othersettings.php:113
-msgid "Automatic shortening service to use."
-msgstr "Käytettävä automaattinen lyhennyspalvelu."
-
-#: actions/othersettings.php:144
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "URL-lyhennyspalvelun nimi on liian pitkä (max 50 merkkiä)."
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Viesti käyttäjälle %1$s, %2$s"
 
-#: actions/passwordsettings.php:69
-msgid "Change your password."
-msgstr "Vaihda salasanasi."
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "Käyttäjän %s suosikkipäivitykset, sivu %d"
 
-#: actions/passwordsettings.php:89
-msgid "Password change"
-msgstr "Salasanan vaihto"
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
+msgstr "Ei saatu haettua suosikkipäivityksiä."
 
-#: actions/peopletag.php:35
+#: actions/showfavorites.php:170
 #, php-format
-msgid "Not a valid people tag: %s"
-msgstr "Ei sallittu henkilötagi: %s"
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Käyttäjän %s kavereiden syöte (RSS 1.0)"
 
-#: actions/peopletag.php:47
+#: actions/showfavorites.php:177
 #, php-format
-msgid "Users self-tagged with %s - page %d"
-msgstr "Käyttäjät joilla henkilötagi %s - sivu %d"
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Käyttäjän %s kavereiden syöte (RSS 2.0)"
 
-#: actions/peopletag.php:91
+#: actions/showfavorites.php:184
 #, php-format
-msgid "These are users who have tagged themselves \"%s\" "
-msgstr "Näillä käyttäjillä on henkilötagi \"%s\" "
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Käyttäjän %s kavereiden syöte (Atom)"
 
-#: actions/profilesettings.php:91
-msgid "Profile information"
-msgstr "Profiilitieto"
-
-#: actions/profilesettings.php:124
+#: actions/showfavorites.php:205
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""
-"Kuvaa itseäsi henkilötageilla (sanoja joissa voi olla muita kirjaimia kuin "
-"ääkköset, numeroita, -, ., ja _), pilkulla tai välilyönnillä erotettuna"
-
-#: actions/profilesettings.php:144
-msgid "Automatically subscribe to whoever "
-msgstr "Tilaa automaattisesti kaikki, jotka "
-
-#: actions/profilesettings.php:229 actions/tagother.php:176
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Virheellinen tagi: \"%s\""
-
-#: actions/profilesettings.php:311
-msgid "Couldn't save tags."
-msgstr "Tageja ei voitu tallentaa."
-
-#: actions/public.php:107
-#, php-format
-msgid "Public timeline, page %d"
-msgstr "Julkinen aikajana, sivu %d"
 
-#: actions/public.php:173
-msgid "Could not retrieve public stream."
-msgstr "Julkista päivitysvirtaa ei saatu."
-
-#: actions/public.php:220
+#: actions/showfavorites.php:207
 #, php-format
 msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
 msgstr ""
-"Tämä on %%site.name%%, [mikroblogaus](http://en.wikipedia.org/wiki/Micro-"
-"blogging)palvelu "
-
-#: actions/publictagcloud.php:57
-msgid "Public tag cloud"
-msgstr "Julkinen tagipilvi"
-
-# ssa pääte ensimmäistä kertaa
-#: actions/publictagcloud.php:63
-#, php-format
-msgid "These are most popular recent tags on %s "
-msgstr "Nämä ovat suosituimmat viimeaikaiset tagit %s -palvelussa"
-
-#: actions/publictagcloud.php:119
-msgid "Tag cloud"
-msgstr "Tagipilvi"
-
-#: actions/register.php:139 actions/register.php:349
-msgid "Sorry, only invited people can register."
-msgstr "Valitettavasti vain kutsutut ihmiset voivat rekisteröityä."
-
-#: actions/register.php:149
-msgid "You can't register if you don't "
-msgstr "Et voi rekisteröityä, jos sinulla ei ole "
-
-#: actions/register.php:286
-msgid "With this form you can create "
-msgstr "Tällä lomakkeella voit luoda "
-
-#: actions/register.php:368
-msgid "1-64 lowercase letters or numbers, "
-msgstr "1-64 pientä kirjainta tai numeroa, ei ääkkösiä"
-
-#: actions/register.php:382 actions/register.php:386
-msgid "Used only for updates, announcements, "
-msgstr "Käytetään ainoastaan päivityksiin, ilmoituksiin, "
-
-#: actions/register.php:398
-msgid "URL of your homepage, blog, "
-msgstr "Verkko-osoite kotivullesi, blogiin, "
-
-#: actions/register.php:404
-msgid "Describe yourself and your "
-msgstr "Kuvaile itseäsi ja"
-
-#: actions/register.php:410
-msgid "Where you are, like \"City, "
-msgstr "Missä olet, kuten \"Kaupunki, "
 
-#: actions/register.php:432
-msgid " except this private data: password, "
-msgstr " poislukien yksityinen tieto: salasana, "
-
-#: actions/register.php:471
+#: actions/showfavorites.php:211
 #, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
-msgstr "Onnittelut, %s! Ja tervetuloa palveluun %%%%site.name%%%%. "
-
-#: actions/register.php:495
-msgid "(You should receive a message by email "
-msgstr "(Sinun pitäisi saada viesti sähköpostilla "
-
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
 msgstr ""
-"Tämä on paikallinen profiili. Kirjaudu sisään, jotta voit tilata "
-"päivitykset."
 
-#: actions/replies.php:118
-#, php-format
-msgid "Replies to %s, page %d"
-msgstr "Vastaukset käyttäjälle %s, sivu %d"
-
-#: actions/showfavorites.php:79
-#, php-format
-msgid "%s favorite notices, page %d"
-msgstr "Käyttäjän %s suosikkipäivitykset, sivu %d"
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:82 lib/groupnav.php:86
 #, php-format
 msgid "%s group"
 msgstr "Ryhmä %s"
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr "Ryhmä %s, sivu %d"
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:218
 msgid "Group profile"
 msgstr "Ryhmän profiili"
 
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
 msgid "URL"
 msgstr "URL"
 
-# Missähän yhteydessä tämä oikein on. pitää tarkistaa vielä
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
 msgid "Note"
 msgstr "Huomaa"
 
-# Pitää tarkistaa
-#: actions/showgroup.php:270
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr "Aliakset"
+
+#: actions/showgroup.php:293
 msgid "Group actions"
 msgstr "Ryhmän toiminnot"
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:328
 #, php-format
-msgid "Notice feed for %s group"
-msgstr "Päivityssyöte ryhmälle %s"
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Syöte ryhmän %s päivityksille (RSS 1.0)"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:334
+#, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Syöte ryhmän %s päivityksille (RSS 2.0)"
+
+#: actions/showgroup.php:340
+#, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Syöte ryhmän %s päivityksille (Atom)"
+
+#: actions/showgroup.php:345
+#, php-format
+msgid "FOAF for %s group"
+msgstr "Käyttäjän %s lähetetyt viestit"
+
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
 msgid "Members"
 msgstr "Jäsenet"
 
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
 #: lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Tyhjä)"
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:392
 msgid "All members"
 msgstr "Kaikki jäsenet"
 
-#: actions/showgroup.php:378
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "Tilastot"
+
+#: actions/showgroup.php:432
+msgid "Created"
+msgstr "Luotu"
+
+#: actions/showgroup.php:448
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
-"**%s** on ryhmä palvelussa %%%%site.name%%%%, joka on "
-"[mikroblogauspalvelu](http://en.wikipedia.org/wiki/Micro-blogging)"
+
+#: actions/showgroup.php:454
+#, fuzzy, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
+msgstr ""
+"**%s** on ryhmä palvelussa %%%%site.name%%%%, joka on [mikroblogauspalvelu]"
+"(http://en.wikipedia.org/wiki/Micro-blogging)"
+
+#: actions/showgroup.php:482
+msgid "Admins"
+msgstr "Ylläpitäjät"
+
+#: actions/showmessage.php:81
+msgid "No such message."
+msgstr "Tuota viestiä ei ole."
 
 #: actions/showmessage.php:98
-msgid "Only the sender and recipient "
-msgstr "Vain lähettäjä ja vastaanottaja "
+msgid "Only the sender and recipient may read this message."
+msgstr "Vain lähettäjä ja vastaanottaja voivat lukea tämän viestin."
+
+#: actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr "Viesti käyttäjälle %1$s, %2$s"
+
+#: actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr "Viesti käyttäjältä %1$s, %2$s"
+
+#: actions/shownotice.php:90
+msgid "Notice deleted."
+msgstr "Päivitys on poistettu."
 
 #: actions/showstream.php:73
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "Päivitykset joilla on tagi %s"
+
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, sivu %d"
 
-#: actions/showstream.php:143
-msgid "'s profile"
-msgstr "nimisen käyttäjän profiili"
+#: actions/showstream.php:122
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Päivityssyöte ryhmälle %s"
 
-#: actions/showstream.php:236 actions/tagother.php:77
-msgid "User profile"
-msgstr "Käyttäjän profiili"
+#: actions/showstream.php:129
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Päivityksien syöte käyttäjälle %s"
 
-#: actions/showstream.php:240 actions/tagother.php:81
-msgid "Photo"
-msgstr "Kuva"
+#: actions/showstream.php:136
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Päivityksien syöte käyttäjälle %s"
 
-#: actions/showstream.php:317
-msgid "User actions"
-msgstr "Käyttäjän toiminnot"
+#: actions/showstream.php:143
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Päivityksien syöte käyttäjälle %s"
 
-#: actions/showstream.php:342
-msgid "Send a direct message to this user"
-msgstr "Lähetä suora viesti tälle käyttäjälle"
+#: actions/showstream.php:148
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Käyttäjän %s lähetetyt viestit"
 
-#: actions/showstream.php:343
-msgid "Message"
-msgstr "Viesti"
+#: actions/showstream.php:191
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+"Tämä on käyttäjän %s aikajana, mutta %s ei ole lähettänyt vielä yhtään "
+"päivitystä."
 
-#: actions/showstream.php:451
-msgid "All subscribers"
-msgstr "Kaikki tilaajat"
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
 
-#: actions/showstream.php:533
-msgid "All groups"
-msgstr "Kaikki ryhmät"
+#: actions/showstream.php:198
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
 
-#: actions/showstream.php:542
+#: actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+
+#: actions/showstream.php:239
+#, fuzzy, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
 msgstr ""
 "Käyttäjällä **%s** on käyttäjätili palvelussa %%%%site.name%%%%, joka on "
 "[mikroblogauspalvelu](http://en.wikipedia.org/wiki/Micro-blogging)"
 
-#: actions/smssettings.php:128
-msgid "Phone number, no punctuation or spaces, "
-msgstr "Puhelinnumero, ei välimerkkejä tai välilyöntejä, "
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "SMS-asetukset"
+
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+"Voit saada SMS viestit sähköpostin välityksellä %%site.name%% -palvelusta."
+
+#: actions/smssettings.php:91
+msgid "SMS is not available."
+msgstr "SMS ei ole käytettävissä."
+
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Tämän hetken vahvistettu SMS puhelinnumero."
+
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
+msgstr "Odotetaan vahvistusta tälle puhelinnumerolle."
+
+#: actions/smssettings.php:130
+msgid "Confirmation code"
+msgstr "Vahvistuskoodi"
+
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
+msgstr "Syötä koodi jonka sait puhelimeesi."
+
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
+msgstr "SMS puhelinnumero"
+
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "Puhelinnumero, ei välimerkkejä tai välilyöntejä, suuntanumerollinen"
+
+#: actions/smssettings.php:174
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+"Lähetä päivityksiä SMS:llä; Ymmärrän, että voin saada kohtuuttomia laskuja "
+"tästä matkapuhelinoperaattoriltani."
+
+#: actions/smssettings.php:306
+msgid "No phone number."
+msgstr "Puhelinnumeroa ei ole."
 
-#: actions/smssettings.php:162
-msgid "Send me notices through SMS; "
-msgstr "Lähetä minulle päivitykset SMS:n välityksellä; "
+#: actions/smssettings.php:311
+msgid "No carrier selected."
+msgstr "Operaattoria ei ole valittu."
 
-#: actions/smssettings.php:335
-msgid "A confirmation code was sent to the phone number you added. "
-msgstr "Vahvistuskoodi on lähetetty antamaasi puhelinnumeroon. "
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
+msgstr "Tämä on jo puhelinnumerosi."
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
+msgstr "Tämä puhelinnumero kuuluu jo toiselle käyttäjälle."
+
+#: actions/smssettings.php:347
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"Vahvistuskoodi on lähetetty puhelinnumeroosi. Katso tekstiviesteistäsi "
+"vahvistuskoodisi ja ohjeet miten sitä käytetään."
+
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
+msgstr "Tämä on väärä vahvistukoodi."
+
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
+msgstr "Tämä ei ole puhelinnumerosi."
+
+#: actions/smssettings.php:465
 msgid "Mobile carrier"
 msgstr "Matkapuhelinoperaattori"
 
+#: actions/smssettings.php:469
+msgid "Select a carrier"
+msgstr "Valitse operaattori"
+
+#: actions/smssettings.php:476
+#, 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 ""
+"Matkapuhelinoperaattorisi. Jos tiedät operaattorin, joka ottaa vastaan SMS "
+"viestilähetyksiä sähköpostilla, mutta ei ole listattu tänne, lähetä "
+"sähköpostia meille osoitteeseen %s."
+
+#: actions/smssettings.php:498
+msgid "No code entered"
+msgstr "Koodia ei ole syötetty."
+
 #: actions/subedit.php:70
 msgid "You are not subscribed to that profile."
 msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
@@ -4339,13 +3014,31 @@ msgid "%s subscribers, page %d"
 msgstr "Käyttäjän %s tilaajat, sivu %d"
 
 #: actions/subscribers.php:63
-msgid "These are the people who listen to "
-msgstr "Tässä ovat ihmiset, jotka seuraavat "
+msgid "These are the people who listen to your notices."
+msgstr "Nämä ihmiset seuraavat sinun päivityksiäsi."
 
 #: actions/subscribers.php:67
 #, php-format
-msgid "These are the people who "
-msgstr "Tässä ovat ihmiset, jotka "
+msgid "These are the people who listen to %s's notices."
+msgstr "Nämä ihmiset seuraavat käyttäjän %s päivityksiä."
+
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
+msgstr ""
+
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr ""
+
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
 
 #: actions/subscriptions.php:52
 #, php-format
@@ -4358,28 +3051,36 @@ msgid "%s subscriptions, page %d"
 msgstr "Käyttäjän %s tilaukset, sivu %d"
 
 #: actions/subscriptions.php:65
-msgid "These are the people whose notices "
-msgstr "Tässä ovat ihmiset, joiden päivityksiä "
+msgid "These are the people whose notices you listen to."
+msgstr "Näiden ihmisten päivityksiä sinä seuraat."
 
 #: actions/subscriptions.php:69
 #, php-format
-msgid "These are the people whose "
-msgstr "Tässä ovat ihmiset, joiden "
-
-#: actions/subscriptions.php:122
-msgid "Jabber"
-msgstr "Jabber"
+msgid "These are the people whose notices %s listens to."
+msgstr "Käyttäjä %s seuraa näiden ihmisten päivityksiä."
 
-# tagi, tägätty, tagätty, tagatty, tagitetty,
-#: actions/tag.php:43
+#: actions/subscriptions.php:121
 #, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Päivitykset joissa on tagi %s, sivu %d"
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
+msgstr ""
 
-#: actions/tag.php:66
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
 #, php-format
-msgid "Messages tagged \"%s\", most recent first"
-msgstr "Viestit joissa on tagi %s, uusimmat ensin"
+msgid "%s is not listening to anyone."
+msgstr "%s ei seuraa ketään käyttäjää."
+
+#: actions/subscriptions.php:194
+msgid "Jabber"
+msgstr "Jabber"
+
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
+msgstr "SMS"
 
 #: actions/tagother.php:33
 msgid "Not logged in"
@@ -4394,11 +3095,19 @@ msgstr "Ei id parametria."
 msgid "Tag %s"
 msgstr "Tagi %s"
 
+#: actions/tagother.php:77 lib/userprofile.php:75
+msgid "User profile"
+msgstr "Käyttäjän profiili"
+
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
+msgstr "Kuva"
+
 #: actions/tagother.php:141
 msgid "Tag user"
 msgstr "Tagaa käyttäjä"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4406,241 +3115,887 @@ msgstr ""
 "Käyttäjän tagit (kirjaimet, numerot, -, ., ja _), pilkulla tai välilyönnillä "
 "erotettuna"
 
-#: actions/tagother.php:164
-msgid "There was a problem with your session token."
-msgstr "Istuntoavaimesi kanssa oli ongelma."
-
-#: actions/tagother.php:191
+#: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Voit tagata ainoastaan ihmisiä, joita tilaat tai jotka tilaavat sinun "
 "päivityksiäsi."
 
-#: actions/tagother.php:198
+#: actions/tagother.php:200
 msgid "Could not save tags."
 msgstr "Tagien tallennus epäonnistui."
 
-#: actions/tagother.php:233
+#: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Käytä tätä lomaketta lisätäksesi tageja tilaajillesi ja käyttäjille jotka "
 "tilaavat päivityksiäsi."
 
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Päivitykset joissa on tagi %s, sivu %d"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Päivityksien syöte käyttäjälle %s"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Päivityksien syöte käyttäjälle %s"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Päivityksien syöte käyttäjälle %s"
+
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Tuota tagia ei ole."
 
-#: actions/tagrss.php:66
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
+msgstr "API-metodi on työn alla!"
+
+#: actions/unsubscribe.php:77
+msgid "No profile id in request."
+msgstr "Ei profiili id:tä kyselyssä."
+
+#: actions/unsubscribe.php:84
+msgid "No profile with that id."
+msgstr "Ei profiilia tuolla id:llä."
+
+#: actions/unsubscribe.php:98
+msgid "Unsubscribed"
+msgstr "Tilaus lopetettu"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
 #, php-format
-msgid "Microblog tagged with %s"
-msgstr "Mikroblogi merkitty tageillä %s"
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
 
-#: actions/twitapiblocks.php:47
-msgid "Block user failed."
-msgstr "Käyttäjän esto epäonnistui."
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "Valtuuta tilaus"
 
-#: actions/twitapiblocks.php:69
-msgid "Unblock user failed."
-msgstr "Käyttäjän eston poisto epäonnistui."
+#: actions/userauthorization.php:110
+#, fuzzy
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
+msgstr ""
+"Tarkista nämä tiedot varmistaaksesi, että haluat tilata tämän käyttäjän "
+"päivitykset. Jos et valinnut haluavasi tilata jonkin käyttäjän päivityksiä, "
+"paina \"Peruuta\"."
 
-#: actions/twitapiusers.php:48
-msgid "Not found."
-msgstr "Ei löytynyt."
+#: actions/userauthorization.php:188
+msgid "License"
+msgstr "Lisenssi"
 
-#: actions/twittersettings.php:71
-msgid "Add your Twitter account to automatically send "
-msgstr "Lisää Twitter käyttäjätilisi lähettääksesi automaattisesti "
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "Hyväksy"
 
-#: actions/twittersettings.php:119
-msgid "Twitter user name"
-msgstr "Twitter käyttäjätunnus"
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Tilaa tämä käyttäjä"
 
-#: actions/twittersettings.php:126
-msgid "Twitter password"
-msgstr "Twitter salasana"
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "Hylkää"
 
-#: actions/twittersettings.php:228
-msgid "Twitter Friends"
-msgstr "Twitter kaverit"
+#: actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "Käyttäjän %s tilaukset"
 
-#: actions/twittersettings.php:327
-msgid "Username must have only numbers, "
-msgstr "Käyttäjätunnuksessa voi olla ainoastaan numeroita, "
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
+msgstr "Ei valtuutuspyyntöä!"
 
-#: actions/twittersettings.php:341
-#, php-format
-msgid "Unable to retrieve account information "
-msgstr "Käyttäjätietoa ei saatu "
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+msgstr "Tilaus sallittu"
 
-#: actions/unblock.php:108
-msgid "Error removing the block."
-msgstr "Tapahtui virhe, kun estoa poistettiin."
+#: actions/userauthorization.php:249
+#, fuzzy
+msgid ""
+"The subscription has been authorized, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to authorize the "
+"subscription. Your subscription token is:"
+msgstr ""
+"Päivityksen tilaus on hyväksytty, mutta callback-osoitetta palveluun ei ole "
+"saatu. Tarkista sivuston ohjeet miten päivityksen tilaus hyväksytään. "
+"Tilauskoodisi on:"
 
-#: actions/unsubscribe.php:50
-msgid "No profile id in request."
-msgstr "Ei profiili id:tä kyselyssä."
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
+msgstr "Tilaus hylätty"
 
-#: actions/unsubscribe.php:57
-msgid "No profile with that id."
-msgstr "Ei profiilia tuolla id:llä."
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"Päivityksen tilaus on hylätty, mutta callback-osoitetta palveluun ei ole "
+"saatu. Tarkista sivuston ohjeet miten päivityksen tilaus hylätään kokonaan."
 
-#: actions/unsubscribe.php:71
-msgid "Unsubscribed"
-msgstr "Tilaus lopetettu"
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
 
-#: actions/usergroups.php:63
+#: actions/userauthorization.php:301
 #, php-format
-msgid "%s groups"
-msgstr "Käyttäjän %s ryhmät"
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
 
-#: actions/usergroups.php:65
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Kuvan URL-osoitetta '%s' ei voi avata."
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Kuvan '%s' tyyppi on väärä"
+
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr "Id puuttuu."
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "Profiiliasetukset"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "Käyttäjän %s ryhmät, sivu %d"
 
-#: classes/Notice.php:104
+#: actions/usergroups.php:130
+msgid "Search for more groups"
+msgstr "Hae lisää ryhmiä"
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "Sinä et kuulu tähän ryhmään."
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Message.php:55
+msgid "Could not insert message."
+msgstr "Viestin tallennus ei onnistunut."
+
+#: classes/Message.php:65
+msgid "Could not update message with new URI."
+msgstr "Viestin päivittäminen uudella URI-osoitteella ei onnistunut."
+
+#: classes/Notice.php:164
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "Tietokantavirhe tallennettaessa risutagiä: %s"
+
+#: classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Ongelma päivityksen tallentamisessa."
+
+#: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
 msgstr "Virhe tapahtui päivityksen tallennuksessa. Tuntematon käyttäjä."
 
-#: classes/Notice.php:109
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Liian monta päivitystä liian nopeasti; pidä pieni hengähdystauko ja jatka "
 "päivityksien lähettämista muutaman minuutin päästä."
 
-#: classes/Notice.php:116
+#: classes/Notice.php:194
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+"Liian monta päivitystä liian nopeasti; pidä pieni hengähdystauko ja jatka "
+"päivityksien lähettämista muutaman minuutin päästä."
+
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr "Päivityksesi tähän palveluun on estetty."
 
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
+msgstr "Ongelma päivityksen tallentamisessa."
+
+#: classes/Notice.php:1120
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "Tietokantavirhe tallennettaessa vastausta: %s"
+
+#: classes/User.php:347
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Viesti käyttäjälle %1$s, %2$s"
+
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Profiili"
+
 #: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
+msgstr "Vaihda profiiliasetuksesi"
+
+#: lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "Lataa kuva"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr "Vaihda salasanasi"
+
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
+msgstr "Muuta sähköpostin käsittelyasetuksia."
+
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:124
+#, fuzzy
+msgid "Design your profile"
+msgstr "Käyttäjän profiili"
+
+#: lib/accountsettingsaction.php:128
 msgid "Other"
 msgstr "Muut"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:128
 msgid "Other options"
 msgstr "Muita asetuksia"
 
-#: lib/action.php:130
+#: lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: lib/action.php:145
+#: lib/action.php:159
 msgid "Untitled page"
 msgstr "Nimetön sivu"
 
-#: lib/action.php:316
+#: lib/action.php:424
 msgid "Primary site navigation"
 msgstr "Ensisijainen sivunavigointi"
 
-#: lib/action.php:322
+#: lib/action.php:430
+msgid "Home"
+msgstr "Koti"
+
+#: lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr "Henkilökohtainen profiili ja kavereiden aikajana"
 
-#: lib/action.php:325
-msgid "Search for people or text"
-msgstr "Hae ihmisiä tai tekstiä"
-
-#: lib/action.php:328
+#: lib/action.php:432
 msgid "Account"
 msgstr "Käyttäjätili"
 
-#: lib/action.php:328
+#: lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr "Muuta sähköpostiosoitettasi, kuvaasi, salasanaasi, profiiliasi"
 
-#: lib/action.php:330
-msgid "Connect to IM, SMS, Twitter"
-msgstr "Yhdistä pikaviestimeen, SMS, Twitteriin"
+#: lib/action.php:435
+msgid "Connect"
+msgstr "Yhdistä"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Ei voitu uudelleenohjata palvelimelle: %s"
 
-#: lib/action.php:332
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
+msgstr "Kutsu"
+
+#: lib/action.php:440 lib/subgroupnav.php:106
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr "Kutsu kavereita ja työkavereita liittymään palveluun %s"
+
+#: lib/action.php:445
+msgid "Logout"
+msgstr "Kirjaudu ulos"
+
+#: lib/action.php:445
 msgid "Logout from the site"
 msgstr "Kirjaudu ulos palvelusta"
 
-#: lib/action.php:335
-msgid "Login to the site"
-msgstr "Kirjaudu sisään palveluun"
-
-#: lib/action.php:338
+#: lib/action.php:450
 msgid "Create an account"
 msgstr "Luo uusi käyttäjätili"
 
-#: lib/action.php:341
-msgid "Login with OpenID"
-msgstr "Kirjaudu sisään OpenID-tunnuksella"
+#: lib/action.php:453
+msgid "Login to the site"
+msgstr "Kirjaudu sisään palveluun"
 
-#: lib/action.php:344
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
+msgstr "Ohjeet"
+
+#: lib/action.php:456
 msgid "Help me!"
 msgstr "Auta minua!"
 
-#: lib/action.php:362
+#: lib/action.php:459
+msgid "Search"
+msgstr "Haku"
+
+#: lib/action.php:459
+msgid "Search for people or text"
+msgstr "Hae ihmisiä tai tekstiä"
+
+#: lib/action.php:480
 msgid "Site notice"
 msgstr "Palvelun ilmoitus"
 
-#: lib/action.php:417
+#: lib/action.php:546
 msgid "Local views"
 msgstr "Paikalliset näkymät"
 
-#: lib/action.php:472
+#: lib/action.php:612
 msgid "Page notice"
 msgstr "Sivuilmoitus"
 
-#: lib/action.php:562
+#: lib/action.php:714
 msgid "Secondary site navigation"
 msgstr "Toissijainen sivunavigointi"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:721
+msgid "About"
+msgstr "Tietoa"
+
+#: lib/action.php:723
+msgid "FAQ"
+msgstr "UKK"
+
+#: lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/action.php:730
+msgid "Privacy"
+msgstr "Yksityisyys"
+
+#: lib/action.php:732
+msgid "Source"
+msgstr "Lähdekoodi"
+
+#: lib/action.php:734
+msgid "Contact"
+msgstr "Ota yhteyttä"
+
+#: lib/action.php:736
+#, fuzzy
+msgid "Badge"
+msgstr "Tönäise"
+
+#: lib/action.php:764
 msgid "StatusNet software license"
 msgstr "StatusNet-ohjelmiston lisenssi"
 
-#: lib/action.php:630
+#: lib/action.php:767
+#, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
+msgstr ""
+"**%%site.name%%** on mikroblogipalvelu, jonka tarjoaa [%%site.broughtby%%](%%"
+"site.broughtbyurl%%). "
+
+#: lib/action.php:769
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** on mikroblogipalvelu. "
+
+#: lib/action.php:771
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+"Sivusto käyttää [StatusNet](http://status.net/) mikroblogausohjelmistoa, "
+"versio %s, saatavilla lisenssillä [GNU Affero General Public License](http://"
+"www.fsf.org/licensing/licenses/agpl-3.0.html)."
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "StatusNet-ohjelmiston lisenssi"
+
+#: lib/action.php:794
 msgid "All "
 msgstr "Kaikki "
 
-#: lib/action.php:635
+#: lib/action.php:799
 msgid "license."
 msgstr "lisenssi."
 
-#: lib/blockform.php:123 lib/blockform.php:153
-msgid "Block this user"
-msgstr "Estä tämä käyttäjä"
+#: lib/action.php:1052
+msgid "Pagination"
+msgstr "Sivutus"
 
-#: lib/blockform.php:153
-msgid "Block"
-msgstr "Estä"
+#: lib/action.php:1061
+msgid "After"
+msgstr "Myöhemmin"
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
-msgid "Disfavor this notice"
-msgstr "Poista tämä päivitys suosikeista"
+#: lib/action.php:1069
+msgid "Before"
+msgstr "Aiemmin"
+
+#: lib/action.php:1117
+msgid "There was a problem with your session token."
+msgstr "Istuntoavaimesi kanssa oli ongelma."
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "Profiili"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
 
-#: lib/facebookaction.php:268
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
+msgstr "Komennon tulos"
+
+#: lib/channel.php:210
+msgid "Command complete"
+msgstr "Komento suoritettu"
+
+#: lib/channel.php:221
+msgid "Command failed"
+msgstr "Komento epäonnistui"
+
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr "Valitettavasti tätä komentoa  ei ole vielä toteutettu."
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Ei voitu päivittää käyttäjälle vahvistettua sähköpostiosoitetta."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "Tönäisy lähetetty"
+
+#: lib/command.php:126
 #, php-format
-msgid "To use the %s Facebook Application you need to login "
-msgstr "Käyttääksesi %s Facebook-sovellusta sinun pitää kirjautua sisään "
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
 
-#: lib/facebookaction.php:271
-msgid " a new account."
-msgstr " uusi käyttäjätili."
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
+msgstr "Käyttäjällä ei ole viimeistä päivitystä"
 
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-msgid "Published"
-msgstr "Julkaistu"
+#: lib/command.php:190
+msgid "Notice marked as fave."
+msgstr "Päivitys on merkitty suosikiksi."
+
+#: lib/command.php:315
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#: lib/command.php:318
+#, php-format
+msgid "Fullname: %s"
+msgstr "Koko nimi: %s"
+
+#: lib/command.php:321
+#, php-format
+msgid "Location: %s"
+msgstr "Kotipaikka: %s"
+
+#: lib/command.php:324
+#, php-format
+msgid "Homepage: %s"
+msgstr "Kotisivu: %s"
+
+#: lib/command.php:327
+#, php-format
+msgid "About: %s"
+msgstr "Tietoa: %s"
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
+
+#: lib/command.php:377
+msgid "Error sending direct message."
+msgstr "Tapahtui virhe suoran viestin lähetyksessä."
+
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Vastaa tähän päivitykseen"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Ongelma päivityksen tallentamisessa."
+
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
+msgstr "Anna käyttäjätunnus, jonka päivitykset haluat tilata"
+
+#: lib/command.php:502
+#, php-format
+msgid "Subscribed to %s"
+msgstr "Käyttäjän %s päivitykset tilattu"
+
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
+msgstr "Anna käyttäjätunnus, jonka päivityksien tilauksen haluat lopettaa"
+
+#: lib/command.php:530
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr "Käyttäjän %s päivitysten tilaus lopetettu"
+
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
+msgstr "Komentoa ei ole vielä toteutettu."
+
+#: lib/command.php:551
+msgid "Notification off."
+msgstr "Ilmoitukset pois päältä."
+
+#: lib/command.php:553
+msgid "Can't turn off notification."
+msgstr "Ilmoituksia ei voi pistää pois päältä."
+
+#: lib/command.php:574
+msgid "Notification on."
+msgstr "Ilmoitukset päällä."
+
+#: lib/command.php:576
+msgid "Can't turn on notification."
+msgstr "Ilmoituksia ei voi pistää päälle."
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Ei voitu luoda OpenID lomaketta: %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Toista ei voitu asettaa tilaamaan sinua."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Ihmiset jotka ovat käyttäjän %s tilaajia"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Sinä et kuulu tähän ryhmään."
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "Sinä et kuulu tähän ryhmään."
+
+#: lib/command.php:670
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+
+#: lib/common.php:192
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Varmistuskoodia ei ole annettu."
+
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:195
+#, fuzzy
+msgid "Go to the installer."
+msgstr "Kirjaudu sisään palveluun"
+
+#: lib/connectsettingsaction.php:110
+msgid "IM"
+msgstr "Pikaviestin"
+
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Päivitykset pikaviestintä käyttäen (IM)"
+
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
+msgstr "Päivitykset SMS:llä"
+
+#: lib/dberroraction.php:60
+msgid "Database error"
+msgstr "Tietokantavirhe"
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Lataa"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Vaihda salasanasi"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Yhdistä"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Haku"
+
+#: lib/designsettings.php:217
+msgid "Text"
+msgstr "Teksti"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Kirjaudu sisään"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
+msgstr "Poista tämä päivitys suosikeista"
 
 #: lib/favorform.php:114 lib/favorform.php:140
 msgid "Favor this notice"
 msgstr "Merkitse päivitys suosikkeihin"
 
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr "Lisää suosikiksi"
+
 #: lib/feedlist.php:64
 msgid "Export data"
 msgstr "Vie tietoja"
 
-# Filtteröi, erota,...
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr "RSS 1.0"
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr "RSS 2.0"
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr "Atom"
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr "FOAF"
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Suodata tagien perusteella"
@@ -4649,59 +4004,86 @@ msgstr "Suodata tagien perusteella"
 msgid "All"
 msgstr "Kaikki"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Valitse operaattori"
+
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Tagi"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "Valitse tagi lyhentääksesi listaa"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "Mene"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "Ryhmän tai aiheen kotisivun tai blogin osoite"
 
-#: lib/groupeditform.php:151
-msgid "Description"
-msgstr "Kuvaus"
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Kuvaile ryhmää tai aihetta 140 merkillä"
 
-#: lib/groupeditform.php:153
-msgid "Describe the group or topic in 140 chars"
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
 msgstr "Kuvaile ryhmää tai aihetta 140 merkillä"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:172
+msgid "Description"
+msgstr "Kuvaus"
+
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr ""
-"Ryhmän paikka, jos sellainen on, kuten \"Kaupunki, Maakunta (tai Lääni), Maa\""
+"Ryhmän paikka, jos sellainen on, kuten \"Kaupunki, Maakunta (tai Lääni), Maa"
+"\""
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
 msgid "Group"
 msgstr "Ryhmä"
 
-# Hallinnointi, ylläpitäjä
-#: lib/groupnav.php:100
-msgid "Admin"
-msgstr "Ylläpito"
-
 #: lib/groupnav.php:101
+#, fuzzy
+msgid "Blocked"
+msgstr "Estä"
+
+#: lib/groupnav.php:102
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Estä käyttäjä"
+
+#: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
 msgstr "Muokkaa %s ryhmän ominaisuuksia"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:113
 msgid "Logo"
 msgstr "Logo"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:114
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "Lisää ryhmälle %s logo tai muokkaa sitä "
 
+#: lib/groupnav.php:120
+#, fuzzy, php-format
+msgid "Add or edit %s design"
+msgstr "Lisää ryhmälle %s logo tai muokkaa sitä "
+
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Ryhmät, joissa eniten jäseniä"
@@ -4716,8 +4098,42 @@ msgid "Tags in %s group's notices"
 msgstr "Tagit ryhmän %s päivityksissä"
 
 #: lib/htmloutputter.php:104
-msgid "This page is not available in a "
-msgstr "Tämä sivu ei ole saatavilla "
+msgid "This page is not available in a media type you accept"
+msgstr "Tämä sivu ei ole saatavilla sinulle sopivassa mediatyypissä."
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Voit ladata ryhmälle logon."
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr "Osittain ladattu palvelimelle."
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr "Tiedoston lähetyksessä tapahtui järjestelmävirhe."
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr "Tuo ei ole kelvollinen kuva tai tiedosto on rikkoutunut."
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr "Kuvatiedoston formaattia ei ole tuettu."
+
+#: lib/imagefile.php:118
+msgid "Lost our file."
+msgstr "Tiedosto hävisi."
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr "Tunnistamaton tiedoston tyyppi"
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr ""
 
 #: lib/joinform.php:114
 msgid "Join"
@@ -4727,43 +4143,91 @@ msgstr "Liity"
 msgid "Leave"
 msgstr "Eroa"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr "Kirjaudu sisään käyttäjätunnuksella ja salasanalla"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr "Luo uusi käyttäjätili"
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
-msgstr "Kirjaudu sisään tai rekisteröidy OpenID-tunnuksella"
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "Vain käyttäjä voi lukea omaa postilaatikkoaan."
 
-#: lib/mail.php:175
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr " lähteestä "
+
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "Sähköpostiosoitteen vahvistus"
+
+#: lib/mail.php:174
 #, php-format
 msgid ""
 "Hey, %s.\n"
 "\n"
-msgstr ""
-"Hei, %s.\n"
+"Someone just entered this email address on %s.\n"
 "\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%s\n"
+"\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
+msgstr ""
 
-#: lib/mail.php:236
+#: lib/mail.php:235
 #, php-format
-msgid "%1$s is now listening to "
-msgstr "%1$s seuraa nyt käyttäjää"
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr "%1$s seuraa nyt päivityksiäsi palvelussa %2$s."
+
+#: lib/mail.php:240
+#, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
+"%1$s seuraa nyt päivityksiäsi palvelussa %2$s.\n"
+"\n"
+"%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Terveisin,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Voit vaihtaa sähköpostiosoitetta tai ilmoitusasetuksiasi %8$s\n"
 
-#: lib/mail.php:254
+#: lib/mail.php:253
 #, php-format
 msgid "Location: %s\n"
 msgstr "Kotipaikka: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:255
 #, php-format
 msgid "Homepage: %s\n"
 msgstr "Kotisivu: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
@@ -4772,58 +4236,226 @@ msgstr ""
 "Tietoja: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:285
+#, php-format
+msgid "New email address for posting to %s"
+msgstr "Uusi sähköpostiosoite päivityksien lähettämiseen palveluun %s"
+
+#: lib/mail.php:288
+#, 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 ""
+"Sinulla on uusi päivityksien lähetysosoite palvelussa %1$s.\n"
+"\n"
+"Lähetä sähköposti osoitteeseen %2$s tehdäksesi uuden päivityksen.\n"
+"\n"
+"Lisää sähköpostin käyttöohjeita voit lukea osoitteesta %3$s.\n"
+"\n"
+"Terveisin,\n"
+"%4$s"
+
+#: lib/mail.php:412
+#, php-format
+msgid "%s status"
+msgstr "%s päivitys"
+
+#: lib/mail.php:438
+msgid "SMS confirmation"
+msgstr "SMS vahvistus"
+
+#: lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "%s tönäisi sinua"
 
-# joo, vähän hämärä
-#: lib/mail.php:465
+#: lib/mail.php:466
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
+msgstr ""
+
+#: lib/mail.php:509
+#, php-format
+msgid "New private message from %s"
+msgstr "Uusi yksityisviesti käyttäjältä %s"
+
+#: lib/mail.php:513
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%5$s\n"
+msgstr ""
+
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s lisäsi päivityksesi suosikkeihinsa"
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
+
+#: lib/mail.php:611
 #, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
-msgstr "%1$s (%2$s) miettii mitä hommailet "
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
 
-#: lib/mail.php:555
+#: lib/mail.php:613
 #, php-format
-msgid "%1$s just added your notice from %2$s"
-msgstr "%1$s lisäsi juuri päivityksesi ajalta %2$s"
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+msgstr ""
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
-msgid "From"
-msgstr "Lähettäjä"
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
 
-#: lib/messageform.php:110
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+msgid "Could not determine file's mime-type!"
+msgstr "Julkista päivitysvirtaa ei saatu."
+
+#: lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Lähetä suora viesti"
 
-#: lib/noticeform.php:125
-msgid "Send a notice"
-msgstr "Lähetä päivitys"
+#: lib/messageform.php:146
+msgid "To"
+msgstr "Vastaanottaja"
 
-#: lib/noticeform.php:152
+#: lib/messageform.php:162 lib/noticeform.php:173
 msgid "Available characters"
 msgstr "Sallitut merkit"
 
-#: lib/noticelist.php:426
-msgid "in reply to"
-msgstr "vastaus viestiin"
+#: lib/noticeform.php:145
+msgid "Send a notice"
+msgstr "Lähetä päivitys"
+
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
+msgstr "Mitä teet juuri nyt, %s?"
+
+#: lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "Ei sisältöä!"
+
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr "Vastaa tähän päivitykseen"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "Vastaus"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
-msgid "Delete this notice"
-msgstr "Poista tämä päivitys"
-
-#: lib/noticelist.php:474
-msgid "Delete"
-msgstr "Poista"
-
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Tönäise tätä käyttäjää"
@@ -4836,40 +4468,139 @@ msgstr "Tönäise"
 msgid "Send a nudge to this user"
 msgstr "Lähetä tönäisy tälle käyttäjälle"
 
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "Virhe tapahtui uuden profiilin lisäämisessä"
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "Virhe tapahtui profiilikuvan lisäämisessä"
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "Virhe tapahtui uuden etäprofiilin lisäämisessä"
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Poista päivitys"
+
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
+msgstr "Ei voitu lisätä uutta tilausta."
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "Omat"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "Vastaukset"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr "Suosikit"
+
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr "Käyttäjä"
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr "Saapuneet"
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr "Sinulle saapuneet viestit"
+
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr "Lähetetyt"
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr "Lähettämäsi viestit"
+
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Tagit käyttäjän %s päivityksissä"
 
-#: lib/profilelist.php:182
-msgid "(none)"
-msgstr "(tyhjä)"
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "Tilaukset"
+
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "Kaikki tilaukset"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "Tilaajat"
+
+#: lib/profileaction.php:157
+msgid "All subscribers"
+msgstr "Kaikki tilaajat"
+
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "Käyttäjä"
+
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "Käyttäjänä alkaen"
+
+#: lib/profileaction.php:235
+msgid "All groups"
+msgstr "Kaikki ryhmät"
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Julkinen"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Käyttäjäryhmät"
 
-#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Viimeaikaiset tagit"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Esittelyssä"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Suosituimmat"
 
-# Notice suomennos vielä hakusessa
+#: lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Haku"
+
+#: lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Haku"
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "Henkilö"
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr "Hae ihmisiä tältä sivustolta"
+
 #: lib/searchgroupnav.php:82
 msgid "Notice"
 msgstr "Päivitys"
 
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr "Hae päivityksien sisällöstä"
+
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Etsi ryhmiä tästä palvelusta"
@@ -4878,33 +4609,63 @@ msgstr "Etsi ryhmiä tästä palvelusta"
 msgid "Untitled section"
 msgstr "Nimetön osa"
 
-#: lib/subgroupnav.php:81
+#: lib/section.php:106
+msgid "More..."
+msgstr "Lisää..."
+
+#: lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Ihmiset joiden tilaaja %s on"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:91
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Ihmiset jotka ovat käyttäjän %s tilaajia"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Ryhmät, joiden jäsen %s on"
 
-#: lib/subgroupnav.php:104
-#, php-format
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Kutsu kavereita ja työkavereita liittymään palveluun %s"
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
 
-#: lib/subs.php:53
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(tyhjä)"
+
+#: lib/subs.php:48
+msgid "Already subscribed!"
+msgstr ""
+
+#: lib/subs.php:52
 msgid "User has blocked you."
 msgstr "Käyttäjä on asettanut eston sinulle."
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Tilaa tämä käyttäjä"
+#: lib/subs.php:56
+msgid "Could not subscribe."
+msgstr "Ei voitu tilata."
+
+#: lib/subs.php:75
+msgid "Could not subscribe other to you."
+msgstr "Toista ei voitu asettaa tilaamaan sinua."
+
+#: lib/subs.php:124
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Ei ole tilattu!."
+
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
+msgstr "Ei voitu poistaa tilausta."
 
 #: lib/tagcloudsection.php:56
 msgid "None"
@@ -4914,14 +4675,106 @@ msgstr "Ei mitään"
 msgid "Top posters"
 msgstr "Eniten päivityksiä"
 
-#: lib/unblockform.php:120 lib/unblockform.php:150
-msgid "Unblock this user"
-msgstr "Poista esto tältä käyttäjältä"
-
-#: lib/unblockform.php:150
-msgid "Unblock"
-msgstr "Poista esto"
-
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Peruuta tämän käyttäjän tilaus"
+
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "Peruuta tilaus"
+
+#: lib/userprofile.php:116
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "Kuva"
+
+#: lib/userprofile.php:236
+msgid "User actions"
+msgstr "Käyttäjän toiminnot"
+
+#: lib/userprofile.php:248
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Profiiliasetukset"
+
+#: lib/userprofile.php:249
+msgid "Edit"
+msgstr ""
+
+#: lib/userprofile.php:272
+msgid "Send a direct message to this user"
+msgstr "Lähetä suora viesti tälle käyttäjälle"
+
+#: lib/userprofile.php:273
+msgid "Message"
+msgstr "Viesti"
+
+#: lib/util.php:821
+msgid "a few seconds ago"
+msgstr "muutama sekunti sitten"
+
+#: lib/util.php:823
+msgid "about a minute ago"
+msgstr "noin minuutti sitten"
+
+#: lib/util.php:825
+#, php-format
+msgid "about %d minutes ago"
+msgstr "noin %d minuuttia sitten"
+
+#: lib/util.php:827
+msgid "about an hour ago"
+msgstr "noin tunti sitten"
+
+#: lib/util.php:829
+#, php-format
+msgid "about %d hours ago"
+msgstr "noin %d tuntia sitten"
+
+#: lib/util.php:831
+msgid "about a day ago"
+msgstr "noin päivä sitten"
+
+#: lib/util.php:833
+#, php-format
+msgid "about %d days ago"
+msgstr "noin %d päivää sitten"
+
+#: lib/util.php:835
+msgid "about a month ago"
+msgstr "noin kuukausi sitten"
+
+#: lib/util.php:837
+#, php-format
+msgid "about %d months ago"
+msgstr "noin %d kuukautta sitten"
+
+#: lib/util.php:839
+msgid "about a year ago"
+msgstr "noin vuosi sitten"
+
+#: lib/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "Kotisivun verkko-osoite ei ole toimiva."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr "Ei voitu lukea viestiä."
+
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr "Tuo ei ole rekisteröitynyt käyttäjä."
+
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr "Valitettavasti tuo ei ole oikea osoite sähköpostipäivityksille."
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr "Valitettavasti päivitysten teko sähköpostilla ei ole sallittua."
diff --git a/locale/fr/LC_MESSAGES/statusnet.mo b/locale/fr/LC_MESSAGES/statusnet.mo
index 1d3509af1..6328e2ed9 100644
--- a/locale/fr/LC_MESSAGES/statusnet.mo
+++ b/locale/fr/LC_MESSAGES/statusnet.mo
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 23365960b..62ffbe99f 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -1,5271 +1,3028 @@
-# #-#-#-#-#  statusnet-no-duplicates.po (0.43)  #-#-#-#-#
-# French translations for StatusNet package
-# Traductions françaises du paquet StatusNet.
-# Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the StatusNet package.
-# Florian Birée <florian@biree.name>, 2008.
-# For translation choices and other informations, please read
-# <http://dev.filyb.info/statusnet/wiki/french-translation>
-# #-#-#-#-#  statusnet.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.
-#
-#
+# Translation of StatusNet to French
 #
+# Author@translatewiki.net: IAlex
+# Author@translatewiki.net: Isoph
+# Author@translatewiki.net: Jean-Frédéric
+# Author@translatewiki.net: Peter17
+# Author@translatewiki.net: Zetud
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-05-01 23:42+0000\n"
-"Last-Translator: Nicolas Ritoux <niko@vulusu.ca>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:27+0000\n"
+"Language-Team: French\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: fr\n"
+"X-Message-Group: out-statusnet\n"
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+msgid "No such page"
+msgstr "Page non trouvée"
+
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
+msgstr "Utilisateur non trouvé."
 
-#: ../actions/noticesearchrss.php:64
-#: actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/all.php:84
 #, php-format
-msgid " Search Stream for \"%s\""
-msgstr " Flux de recherche pour « %s »"
-
-# à l'exception de ces données personnelles : mot de passe, adresse e-mail, adresse de messagerie instantanée, numéro de téléphone.
-#: ../actions/finishopenidlogin.php:82
-#: ../actions/register.php:191
-#: actions/finishopenidlogin.php:88
-#: actions/register.php:205
-#: actions/finishopenidlogin.php:110
-msgid " except this private data: password, email address, IM address, phone number."
-msgstr "à l'exception de ces données personnelles : mot de passe, adresse e-mail, adresse de messagerie instantanée, numéro de téléphone. "
-
-#: ../actions/showstream.php:400
-#: ../lib/stream.php:109
-#: actions/showstream.php:418
-#: lib/mailbox.php:164
-#: lib/stream.php:76
-msgid " from "
-msgstr "de"
+msgid "%s and friends, page %d"
+msgstr "%s et ses amis - page %d"
 
-#: ../actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr "%1$s / Réponses à %2$s"
+msgid "%s and friends"
+msgstr "%s et ses amis"
 
-#: ../actions/invite.php:168
-#: actions/invite.php:176
-#: actions/invite.php:211
+#: actions/all.php:99
 #, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s vous invite à vous inscrire sur %2$s"
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Flux pour les amis de %s (RSS 1.0)"
 
-#: ../actions/invite.php:170
+#: actions/all.php:107
 #, 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 vous invite à vous inscrire sur %2$s (%3$s).\n"
-"\n"
-"%2$s est un service de micro-blogging qui vous permet de rester en contact "
-"avec des personnes que vous connaissez et des personnes qui vous "
-"intéressent.\n"
-"\n"
-"Vous pouvez aussi partager des informations sur vous, vos idées, ou votre "
-"vie en ligne avec les personnes qui vous connaissent. C'est également un "
-"outil utile pour rencontrer de nouvelles personnes qui partagent vos "
-"intérêts.\n"
-"\n"
-"%1$s dit:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Vous pouvez voir le profil de %1$s sur %2$s ici:\n"
-"\n"
-"%5$s\n"
-"\n"
-"Si vous souhaitez essayez ce service, cliquez sur le lien ci-dessous pour "
-"accepter l'invitation\n"
-"\n"
-"%6$s\n"
-"\n"
-"Sinon, vous pouvez ignorer ce message. Merci pour votre patience et votre "
-"temps.\n"
-"\n"
-"Cordialement, %2$s\n"
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Flux pour les amis de %s (RSS 2.0)"
 
-#: ../lib/mail.php:124
-#: lib/mail.php:124
-#: lib/mail.php:126
-#: lib/mail.php:241
+#: actions/all.php:115
 #, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s suit maintenant vos statuts dans %2$s."
+msgid "Feed for friends of %s (Atom)"
+msgstr "Flux pour les amis de %s (Atom)"
 
-#: ../lib/mail.php:126
+#: actions/all.php:127
 #, 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"
+"This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
-"%1$s suit maintenant vos statuts dans %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Cordialement,\n"
-"%4$s.\n"
+"Ceci est le flux pour %s et ses amis mais personne n’a rien posté pour le "
+"moment."
 
-#: ../actions/twitapistatuses.php:482
-#: actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/all.php:132
 #, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "%1$s statuts en réponses aux statuts de %2$s / %3$s."
-
-#: ../actions/shownotice.php:45
-#: actions/shownotice.php:45
-#: actions/shownotice.php:161
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr "Statut de %1$s sur %2$s"
-
-#: ../actions/invite.php:84
-#: ../actions/invite.php:92
-#: actions/invite.php:91
-#: actions/invite.php:99
-#: actions/invite.php:123
-#: actions/invite.php:131
-#, php-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
-
-#: ../actions/publicrss.php:62
-#: actions/publicrss.php:48
-#: actions/publicrss.php:90
-#, php-format
-msgid "%s Public Stream"
-msgstr "Flux public 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:155
-#: lib/personal.php:51
-#: actions/all.php:65
-#: actions/allrss.php:103
-#: actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126
-#: lib/personalgroupnav.php:99
-#, php-format
-msgid "%s and friends"
-msgstr "%s et ses amis"
-
-#: ../actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
-#, php-format
-msgid "%s public timeline"
-msgstr "Activité publique %s"
-
-#: ../lib/mail.php:206
-#: lib/mail.php:212
-#: lib/mail.php:411
-#, php-format
-msgid "%s status"
-msgstr "Statut de %s"
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+"Essayez de vous abonner à plus d’utilisateurs, de vous [inscrire à un groupe]"
+"(%%action.groups%%) ou de publier quelque chose vous-même."
 
-#: ../actions/twitapistatuses.php:338
-#: actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/all.php:134
 #, php-format
-msgid "%s timeline"
-msgstr "Activité de %s"
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
 
-#: ../actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
 #, php-format
-msgid "%s updates from everyone!"
-msgstr "%s statuts  "
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
 
-#: ../actions/register.php:213
-msgid "(You should receive a message by email momentarily, with instructions on how to confirm your email address.)"
-msgstr "(Vous recevrez bientôt un courriel contenant les instructions pour confirmer votre adresse.)"
+#: actions/all.php:165
+msgid "You and friends"
+msgstr "Vous et vos amis"
 
-#: ../lib/util.php:257
-#: lib/util.php:273
-#: lib/action.php:605
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
 #, php-format
-msgid "**%%site.name%%** is a microblogging service brought to you by [%%site.broughtby%%](%%site.broughtbyurl%%). "
-msgstr "**%%site.name%%** est un service de microblogging qui vous est proposé par  [%%site.broughtby%%](%%site.broughtbyurl%%)."
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr "Statuts de %1$s et ses amis dans %2$s!"
 
-#: ../lib/util.php:259
-#: lib/util.php:275
-#: lib/action.php:607
-#, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** est un service de micro-blogging."
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+msgid "API method not found."
+msgstr "Méthode API non trouvée !"
 
-#: ../lib/util.php:274
-#: lib/util.php:290
-msgid ". Contributors should be attributed by full name or nickname."
-msgstr "Les utilisateurs doivent être désignés par leur nom complet ou leur pseudo."
-
-#: ../actions/finishopenidlogin.php:73
-#: ../actions/profilesettings.php:43
-#: actions/finishopenidlogin.php:79
-#: actions/profilesettings.php:76
-#: actions/finishopenidlogin.php:101
-#: actions/profilesettings.php:100
-#: lib/groupeditform.php:139
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces"
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
+msgstr "Ce processus requiert un POST."
 
-#: ../actions/register.php:152
-#: actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
 msgstr ""
-"1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces. Requis."
 
-#: ../actions/password.php:42
-#: actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr "6 caractères ou plus"
+#: actions/apiaccountupdatedeliverydevice.php:132
+msgid "Could not update user."
+msgstr "Impossible de mettre à jour l’utilisateur."
 
-#: ../actions/recoverpassword.php:180
-#: actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
-msgid "6 or more characters, and don't forget it!"
-msgstr "6 caractères ou plus, et ne l'oubliez pas !"
-
-#: ../actions/register.php:154
-#: actions/register.php:168
-#: actions/register.php:373
-msgid "6 or more characters. Required."
-msgstr "6 caractères ou plus. Requis."
-
-#: ../actions/imsettings.php:197
-#: actions/imsettings.php:205
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
 #, 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é à votre adresse de messagerie instantanée. Vous devez approuver %s pour recevoir des messages."
-
-#: ../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."
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
 msgstr ""
-"Un code de confirmation a été envoyé à l'adresse courriel indiquée. Vérifiez "
-"votre boîte de réception pour récupérer le code et les instructions."
 
-#: ../actions/smssettings.php:216
-#: actions/smssettings.php:224
-msgid "A confirmation code was sent to the phone number you added. Check your inbox (and spam box!) for the code and instructions on how to use it."
-msgstr ""
-"Un code de confirmation a été envoyé au numéro de téléphone indiqué. "
-"Vérifiez votre boîte de réception pour récupérer le code et les "
-"instructions."
-
-#: ../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
-#: actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111
-#: actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102
-#: actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44
-#: actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151
-#: actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147
-#: actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239
-#: actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402
-#: actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
-msgid "API method not found!"
-msgstr "Méthode API non trouvée !"
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
+msgstr "Impossible de sauvegarder les parmètres de la conception."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+msgid "Could not update your design."
+msgstr "Impossible de mettre à jour votre conception."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Aucun profil ne correspond à cet utilisateur."
 
-#: ../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
-#: actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97
-#: actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184
-#: actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52
-#: actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31
-#: actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
-msgid "API method under construction."
-msgstr "Méthode API en construction."
+#: actions/apiaccountupdateprofile.php:147
+msgid "Could not save profile."
+msgstr "Impossible d’enregistrer le profil."
 
-#: ../lib/util.php:324
-#: lib/util.php:340
-#: lib/action.php:568
-msgid "About"
-msgstr "À propos"
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
+msgstr "Le blocage de l’utilisateur a échoué."
 
-#: ../actions/userauthorization.php:119
-#: actions/userauthorization.php:126
-#: actions/userauthorization.php:143
-msgid "Accept"
-msgstr "Accepter"
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
+msgstr "Le déblocage de l’utilisateur a échoué."
 
-#: ../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
-#: actions/emailsettings.php:120
-#: actions/imsettings.php:127
-#: actions/openidsettings.php:111
-#: actions/smssettings.php:133
-#: actions/twittersettings.php:163
-msgid "Add"
-msgstr "Ajouter"
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "Message sans texte !"
 
-#: ../actions/openidsettings.php:43
-#: actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
-msgstr "Ajouter un identifiant OpenID"
-
-#: ../lib/settingsaction.php:97
-#: lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-msgid "Add or remove OpenIDs"
-msgstr "Ajouter ou supprimer des identifiants OpenIDs"
-
-#: ../actions/emailsettings.php:38
-#: ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39
-#: actions/emailsettings.php:39
-#: actions/imsettings.php:40
-#: actions/smssettings.php:39
-#: actions/emailsettings.php:94
-#: actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
-msgstr "Adresse"
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "C’est trop long ! La taille maximale du message est de %d caractères."
 
-#: ../actions/invite.php:131
-#: actions/invite.php:139
-#: actions/invite.php:176
-msgid "Addresses of friends to invite (one per line)"
-msgstr "Adresses d'amis à inviter (un par ligne)"
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "Destinataire non trouvé."
 
-#: ../actions/showstream.php:273
-#: actions/showstream.php:288
-#: actions/showstream.php:422
-msgid "All subscriptions"
-msgstr "Tous les abonnements"
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+"Vous ne pouvez envoyer des messages personnels qu’aux utilisateurs inscrits "
+"comme amis."
 
-#: ../actions/publicrss.php:64
-#: actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/apidirectmessage.php:89
 #, php-format
-msgid "All updates for %s"
-msgstr "Tous les statuts de %s"
+msgid "Direct messages from %s"
+msgstr "Messages direct depuis %s"
 
-#: ../actions/noticesearchrss.php:66
-#: actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/apidirectmessage.php:93
 #, php-format
-msgid "All updates matching search term \"%s\""
-msgstr "Statuts correspondant au(x) terme(s) \"%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
-#: actions/finishopenidlogin.php:34
-#: actions/login.php:77
-#: actions/openidlogin.php:30
-#: actions/register.php:92
-msgid "Already logged in."
-msgstr "Déjà connecté."
-
-#: ../lib/subs.php:42
-#: lib/subs.php:42
-#: lib/subs.php:49
-msgid "Already subscribed!."
-msgstr "Déjà abonné !"
+msgid "All the direct messages sent from %s"
+msgstr "Tous les messages envoyés par %s"
 
-#: ../actions/deletenotice.php:54
-#: actions/deletenotice.php:55
-#: actions/deletenotice.php:113
-msgid "Are you sure you want to delete this notice?"
-msgstr "Êtes-vous sûr(e) de vouloir supprimer ce statut ?"
+#: actions/apidirectmessage.php:101
+#, php-format
+msgid "Direct messages to %s"
+msgstr "Messages envoyés à %s"
 
-#: ../actions/userauthorization.php:77
-#: actions/userauthorization.php:83
-#: actions/userauthorization.php:81
-msgid "Authorize subscription"
-msgstr "Autoriser l'abonnement"
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr "Tous les messages envoyés à %s"
 
-#: ../actions/login.php:104
-#: ../actions/register.php:178
-#: actions/register.php:192
-msgid "Automatically login in the future; not for shared computers!"
-msgstr "Ouvrir automatiquement ma session à l'avenir (déconseillé pour les ordinateurs publics ou partagés)"
-
-#: ../actions/profilesettings.php:65
-#: actions/profilesettings.php:98
-msgid "Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr "M'abonner automatiquement à tous ceux qui s'abonnent à moi (recommandé pour les utilisateurs non-humains)"
-
-#: ../actions/avatar.php:32
-#: ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34
-#: actions/avatarsettings.php:65
-#: actions/showgroup.php:209
-#: lib/accountsettingsaction.php:107
-msgid "Avatar"
-msgstr "Avatar"
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "Méthode API non trouvée !"
 
-#: ../actions/avatar.php:113
-#: actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
-msgid "Avatar updated."
-msgstr "Avatar mis à jour."
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
+msgstr "Aucun statut trouvé avec cet identifiant. "
 
-#: ../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 "En attente d'une confirmation pour cette adresse. Vérifiez votre compte Jabber/GTalk pour recevoir de nouvelles instructions. (Avez-vous ajouté %s à votre liste de contacts ?)"
+#: actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
+msgstr "Ce statut a déjà été ajouté à vos favoris !"
 
-#: ../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 "En attente d'une confirmation pour cette adresse. Vérifiez votre compte Jabber/GTalk pour recevoir de nouvelles instructions."
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+msgstr "Impossible de créer le favori."
 
-#: ../actions/smssettings.php:58
-#: actions/smssettings.php:58
-#: actions/smssettings.php:111
-msgid "Awaiting confirmation on this phone number."
-msgstr "Numéro de téléphone en attente de confirmation."
+#: actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
+msgstr "Ce statut n’est pas un favori !"
 
-#: ../lib/util.php:1318
-#: lib/util.php:1452
-msgid "Before »"
-msgstr "Avant »"
-
-#: ../actions/profilesettings.php:49
-#: ../actions/register.php:170
-#: actions/profilesettings.php:82
-#: actions/register.php:184
-#: actions/profilesettings.php:112
-#: actions/register.php:402
-msgid "Bio"
-msgstr "Bio"
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr "Impossible de supprimer le favori."
 
-#: ../actions/profilesettings.php:101
-#: ../actions/register.php:82
-#: ../actions/updateprofile.php:103
-#: actions/profilesettings.php:216
-#: actions/register.php:89
-#: actions/updateprofile.php:104
-#: actions/profilesettings.php:205
-#: actions/register.php:174
-#: actions/updateprofile.php:107
-msgid "Bio is too long (max 140 chars)."
-msgstr "La bio est trop longue (140 caractères maximum)."
-
-#: ../lib/deleteaction.php:41
-#: lib/deleteaction.php:41
-#: lib/deleteaction.php:69
-msgid "Can't delete this notice."
-msgstr "Impossible de supprimer ce statut."
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
+msgstr "Impossible de suivre l’utilisateur : Utilisateur non trouvé."
 
-#: ../actions/updateprofile.php:119
-#: actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/apifriendshipscreate.php:118
 #, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr "Impossible de lire l'URL '%s'"
+msgid "Could not follow user: %s is already on your list."
+msgstr "Impossible de suivre l’utilisateur : %s est déjà dans votre liste."
 
-#: ../actions/password.php:85
-#: ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404
-#: actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169
-#: actions/recoverpassword.php:347
-msgid "Can't save new password."
-msgstr "Impossible de sauvegarder le nouveau mot de passe."
+#: actions/apifriendshipsdestroy.php:109
+msgid "Could not unfollow user: User not found."
+msgstr "Impossible de ne plus suivre l’utilisateur : utilisateur non trouvé."
 
-#: ../actions/emailsettings.php:57
-#: ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62
-#: actions/emailsettings.php:58
-#: actions/imsettings.php:59
-#: actions/smssettings.php:62
-#: actions/emailsettings.php:111
-#: actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
-msgstr "Annuler"
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr "Vous ne pouvez pas ne plus vous suivre vous-même !"
 
-#: ../lib/openid.php:121
-#: lib/openid.php:121
-#: lib/openid.php:130
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Impossible d'instancier l'objet client pour OpenID."
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
+msgstr "Vous devez fournir 2 identifiants ou pseudos."
 
-#: ../actions/imsettings.php:163
-#: actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
-msgstr "Impossible d'utiliser cet identifiant Jabber"
+#: actions/apifriendshipsshow.php:135
+msgid "Could not determine source user."
+msgstr "Impossible de déterminer l’utilisateur source."
 
-#: ../actions/emailsettings.php:181
-#: actions/emailsettings.php:199
-#: actions/emailsettings.php:311
-msgid "Cannot normalize that email address"
-msgstr "Impossible d'utiliser cette adresse courriel"
+#: actions/apifriendshipsshow.php:143
+msgid "Could not find target user."
+msgstr "Impossible de trouver l’utilisateur cible."
 
-#: ../actions/password.php:45
-#: actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
-msgstr "Modifier"
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
+msgid "Could not create group."
+msgstr "Impossible de créer le groupe."
 
-#: ../lib/settingsaction.php:88
-#: lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
-msgstr "Modifier le traitement des courriels"
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
+msgid "Could not create aliases."
+msgstr "Impossible de créer les alias."
 
-#: ../actions/password.php:32
-#: actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr "Modifier le mot de passe"
-
-#: ../lib/settingsaction.php:94
-#: lib/accountsettingsaction.php:111
-msgid "Change your password"
-msgstr "Modifier votre mot de passe"
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+msgid "Could not set group membership."
+msgstr "Impossible d'établir l’inscription au groupe."
 
-#: ../lib/settingsaction.php:85
-#: lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-msgid "Change your profile settings"
-msgstr "Modifier vos paramètres de profil"
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"Les pseudos ne peuvent contenir que des caractères minuscules et des "
+"chiffres, sans espaces."
 
-#: ../actions/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
-#: actions/passwordsettings.php:105
-#: actions/recoverpassword.php:221
-#: actions/register.php:376
-#: actions/smssettings.php:122
-msgid "Confirm"
-msgstr "Confirmer"
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr "Pseudo déjà utilisé. Essayez-en un autre."
 
-#: ../actions/confirmaddress.php:90
-#: actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "Confirmer l'adresse"
-
-#: ../actions/emailsettings.php:238
-#: ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245
-#: actions/emailsettings.php:256
-#: actions/imsettings.php:230
-#: actions/smssettings.php:253
-#: actions/emailsettings.php:379
-#: actions/imsettings.php:361
-#: actions/smssettings.php:374
-msgid "Confirmation cancelled."
-msgstr "Confirmation annulée."
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "Pseudo invalide."
 
-#: ../actions/smssettings.php:63
-#: actions/smssettings.php:63
-#: actions/smssettings.php:118
-msgid "Confirmation code"
-msgstr "Code de confirmation"
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "L’adresse du site personnel n’est pas un URL valide. "
 
-#: ../actions/confirmaddress.php:38
-#: actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-msgid "Confirmation code not found."
-msgstr "Code de confirmation non trouvé."
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "Nom complet trop long (maximum de 255 caractères)."
 
-#: ../actions/register.php:202
+#: actions/apigroupcreate.php:261
 #, 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 ""
-"Félicitations, %s! Bienvenue dans %%%%site.name%%%%. Vous pouvez maintenant :\n"
-"\n"
-"* Visiter [votre profil](%s) et publier votre premier statut.\n"
-"* Ajouter une adresse [Jabber/GTalk](%%%%action.imsettings%%%%) afin d'envoyer et recevoir vos statuts par messagerie instantanée.\n"
-"* [Chercher des personnes](%%%%action.peoplesearch%%%%) que vous pourriez connaître ou qui partagent vos intêrets.\n"
-"* Mettre votre [profil](%%%%action.profilesettings%%%%) à jour pour en dire plus à votre sujet.\n"
-"* Parcourir la [documentation](%%%%doc.help%%%%) en ligne pour en savoir plus sur le fonctionnement du service.\n"
-"\n"
-"Merci pour votre inscription ! Nous vous souhaitons d'apprécier notre service."
-
-#: ../actions/finishopenidlogin.php:91
-#: actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119
-#: lib/action.php:330
-msgid "Connect"
-msgstr "Connecter"
+msgid "Description is too long (max %d chars)."
+msgstr "La description est trop longue (%d caractères maximum)."
 
-#: ../actions/finishopenidlogin.php:86
-#: actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
-msgid "Connect existing account"
-msgstr "Connecter à un compte existant"
-
-#: ../lib/util.php:332
-#: lib/util.php:348
-#: lib/action.php:576
-msgid "Contact"
-msgstr "Contact"
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "Emplacement trop long (maximum de 255 caractères)."
 
-#: ../lib/openid.php:178
-#: lib/openid.php:178
-#: lib/openid.php:187
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
 #, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "Impossible de créer le formulaire OpenID : %s"
+msgid "Too many aliases! Maximum %d."
+msgstr "Trop d’alias ! Maximum %d."
 
-#: ../actions/twitapifriendships.php:60
-#: ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60
-#: actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48
-#: actions/twitapifriendships.php:64
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
 #, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr "Impossible de suivre l'utilisateur : %s est déjà dans votre liste."
-
-#: ../actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
-msgid "Could not follow user: User not found."
-msgstr "Impossible de suivre l'utilisateur : Utilisateur non trouvé."
-
-#: ../lib/openid.php:160
-#: lib/openid.php:160
-#: lib/openid.php:169
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Impossible de rediriger vers le serveur : %s"
-
-#: ../actions/updateprofile.php:162
-#: actions/updateprofile.php:163
-#: actions/updateprofile.php:166
-msgid "Could not save avatar info"
-msgstr "Impossible de sauvegarder les informations de l'avatar"
-
-#: ../actions/updateprofile.php:155
-#: actions/updateprofile.php:156
-#: actions/updateprofile.php:159
-msgid "Could not save new profile info"
-msgstr "Impossible de sauvegarder les informations du nouveau profil"
-
-#: ../lib/subs.php:54
-#: lib/subs.php:61
-#: lib/subs.php:72
-msgid "Could not subscribe other to you."
-msgstr "Impossible d'abonner une autre personne à votre profil."
-
-#: ../lib/subs.php:46
-#: lib/subs.php:46
-#: lib/subs.php:57
-msgid "Could not subscribe."
-msgstr "Impossible de s'abonner."
+msgid "Invalid alias: \"%s\""
+msgstr "Alias invalide : « %s »"
 
-#: ../actions/recoverpassword.php:102
-#: actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
-msgstr "Impossible de mettre l'utilisateur à jour avec l'adresse courriel confirmée."
-
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101
-#: actions/finishremotesubscribe.php:114
-msgid "Couldn't convert request tokens to access tokens."
-msgstr "Impossible de convertir les jetons de requête en jetons d'accès"
-
-#: ../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
-#: actions/confirmaddress.php:126
-#: actions/emailsettings.php:375
-#: actions/imsettings.php:357
-#: actions/smssettings.php:370
-msgid "Couldn't delete email confirmation."
-msgstr "Impossible de supprimer le courriel de confirmation."
-
-#: ../lib/subs.php:103
-#: lib/subs.php:116
-#: lib/subs.php:134
-msgid "Couldn't delete subscription."
-msgstr "Impossible de cesser l'abonnement"
-
-#: ../actions/twitapistatuses.php:93
-#: actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
-msgid "Couldn't find any statuses."
-msgstr "Aucun statut n'a été trouvé."
-
-#: ../actions/remotesubscribe.php:127
-#: actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-msgid "Couldn't get a request token."
-msgstr "Impossible d'obtenir le jeton de requête."
-
-#: ../actions/emailsettings.php:205
-#: ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206
-#: actions/emailsettings.php:223
-#: actions/imsettings.php:195
-#: actions/smssettings.php:214
-#: actions/emailsettings.php:337
-#: actions/imsettings.php:311
-#: actions/smssettings.php:325
-msgid "Couldn't insert confirmation code."
-msgstr "Impossible d'insérer le code de confirmation."
-
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182
-#: actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
-msgstr "Impossible d'insérer un nouvel abonnement."
-
-#: ../actions/profilesettings.php:184
-#: ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299
-#: actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302
-#: actions/twitapiaccount.php:81
-msgid "Couldn't save profile."
-msgstr "Impossible d'enregistrer le profil."
-
-#: ../actions/profilesettings.php:161
-#: actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
-msgstr "Impossible de mettre à jour l'auto-abonnement."
-
-#: ../actions/emailsettings.php:280
-#: ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298
-#: actions/emailsettings.php:312
-#: actions/emailsettings.php:440
-#: actions/emailsettings.php:462
-msgid "Couldn't update user record."
-msgstr "Impossible de mettre à jour le dossier de l'utilisateur."
-
-#: ../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
-#: actions/confirmaddress.php:114
-#: actions/emailsettings.php:280
-#: actions/emailsettings.php:411
-#: actions/imsettings.php:252
-#: actions/imsettings.php:395
-#: actions/othersettings.php:162
-#: actions/profilesettings.php:259
-#: actions/smssettings.php:266
-#: actions/smssettings.php:408
-msgid "Couldn't update user."
-msgstr "Impossible de mettre à jour l'utilisateur."
-
-#: ../actions/finishopenidlogin.php:84
-#: actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
-msgid "Create"
-msgstr "Créer"
-
-#: ../actions/finishopenidlogin.php:70
-#: actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
-msgid "Create a new user with this nickname."
-msgstr "Créer un nouvel utilisateur avec ce pseudo."
-
-#: ../actions/finishopenidlogin.php:68
-#: actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
-msgid "Create new account"
-msgstr "Créer un nouveau compte"
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Alias « %s » déjà utilisé. Essayez-en un autre."
 
-#: ../actions/finishopenidlogin.php:191
-#: actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
-msgid "Creating new account for OpenID that already has a user."
-msgstr "Création d'un nouveau compte pour un OpenID qui a déjà un utilisateur."
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr "L’alias ne peut pas être le même que le pseudo."
 
-#: ../actions/imsettings.php:45
-#: actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "Adresse Jabber/GTalk actuellement confirmée."
+#: actions/apigroupjoin.php:110
+msgid "You are already a member of that group."
+msgstr "Vous êtes déjà membre de ce groupe."
 
-#: ../actions/smssettings.php:46
-#: actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "Numéro de téléphone actuellement confirmé pour recevoir les SMS."
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr "Vous avez été bloqué de ce groupe par l’administrateur."
 
-#: ../actions/emailsettings.php:44
-#: actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-msgid "Current confirmed email address."
-msgstr "Adresse courriel actuellement confirmée."
+#: actions/apigroupjoin.php:138
+#, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Impossible de joindre l’utilisateur %s au groupe %s."
 
-#: ../actions/showstream.php:356
-#: actions/showstream.php:367
-msgid "Currently"
-msgstr "Actuellement"
+#: actions/apigroupleave.php:114
+msgid "You are not a member of this group."
+msgstr "Vous n'êtes pas membre de ce groupe."
 
-#: ../classes/Notice.php:72
-#: classes/Notice.php:86
-#: classes/Notice.php:91
+#: actions/apigroupleave.php:124
 #, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "Erreur de base de donnée en insérant le hashtag : %s"
+msgid "Could not remove user %s to group %s."
+msgstr "Impossible de retirer l’utilisateur %s du groupe %s"
 
-#: ../lib/util.php:1061
-#: lib/util.php:1110
-#: classes/Notice.php:698
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
 #, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Erreur de base de donnée en insérant la réponse :%s"
-
-# De #-#-#-#-#  statusnet-no-duplicates.po (0.43)  #-#-#-#-#\n
-# Nouveau message\n
-# #-#-#-#-#  statusnet.new.pot (PACKAGE VERSION)  #-#-#-#-#\n
-# à "Supprimer l'avis"
-#: ../actions/deletenotice.php:41
-#: actions/deletenotice.php:41
-#: actions/deletenotice.php:79
-msgid "Delete notice"
-msgstr "Supprimer ce statut"
-
-#: ../actions/profilesettings.php:51
-#: ../actions/register.php:172
-#: actions/profilesettings.php:84
-#: actions/register.php:186
-#: actions/profilesettings.php:114
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "Décrivez vos intérêts en 140 caractères"
-
-#: ../actions/register.php:158
-#: ../actions/register.php:161
-#: ../lib/settingsaction.php:87
-#: actions/register.php:172
-#: actions/register.php:175
-#: lib/settingsaction.php:87
-#: actions/register.php:381
-#: actions/register.php:385
-#: lib/accountsettingsaction.php:113
-msgid "Email"
-msgstr "Courriel"
-
-#: ../actions/emailsettings.php:59
-#: actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-msgid "Email Address"
-msgstr "Adresse courriel"
-
-#: ../actions/emailsettings.php:32
-#: actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
-msgstr "Paramètres du courriel"
-
-#: ../actions/register.php:73
-#: actions/register.php:80
-#: actions/register.php:163
-msgid "Email address already exists."
-msgstr "Cette adresse courriel est déjà utilisée."
-
-#: ../lib/mail.php:90
-#: lib/mail.php:90
-#: lib/mail.php:173
-msgid "Email address confirmation"
-msgstr "Confirmation de l'adresse courriel"
-
-#: ../actions/emailsettings.php:61
-#: actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
-msgstr "Adresse courriel (ex : nom@mondomaine.com)"
-
-#: ../actions/invite.php:129
-#: actions/invite.php:137
-#: actions/invite.php:174
-msgid "Email addresses"
-msgstr "Adresses courriel"
-
-#: ../actions/recoverpassword.php:191
-#: actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
-msgid "Enter a nickname or email address."
-msgstr "Entrez un pseudo ou une adresse courriel."
+msgid "%s groups"
+msgstr "Groupes de %s"
 
-#: ../actions/smssettings.php:64
-#: actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
-msgstr "Entrez le code que vous avez reçu sur votre téléphone."
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr "groupes sur %s"
 
-#: ../actions/userauthorization.php:137
-#: actions/userauthorization.php:144
-#: actions/userauthorization.php:161
-msgid "Error authorizing token"
-msgstr "Erreur d'autorisation du jeton"
-
-#: ../actions/finishopenidlogin.php:253
-#: actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
-msgid "Error connecting user to OpenID."
-msgstr "Erreur lors de la connexion de l'utilisateur sur OpenID"
-
-#: ../actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
-msgstr "Erreur lors de la connexion de l'utilisateur."
-
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153
-#: actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
-msgstr "Erreur lors de l'insertion de l'avatar"
+#: actions/apigrouplist.php:95
+#, php-format
+msgid "%s's groups"
+msgstr "Groupes de %s"
 
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145
-#: actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
-msgstr "Erreur lors de l'insertion du nouveau profil"
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Groupes de %s"
 
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169
-#: actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
-msgstr "Erreur lors de l'insertion du profil distant"
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
+msgstr "Ce processus requiert un POST ou un DELETE."
 
-#: ../actions/recoverpassword.php:240
-#: actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
-msgid "Error saving address confirmation."
-msgstr "Erreur lors de l'enregistrement de la confirmation du courriel."
-
-#: ../actions/userauthorization.php:140
-#: actions/userauthorization.php:147
-#: actions/userauthorization.php:164
-msgid "Error saving remote profile"
-msgstr "Erreur lors de l'enregistrement du profil distant"
-
-#: ../lib/openid.php:226
-#: lib/openid.php:226
-#: lib/openid.php:235
-msgid "Error saving the profile."
-msgstr "Erreur lors de l'enregistrement du profil."
-
-#: ../lib/openid.php:237
-#: lib/openid.php:237
-#: lib/openid.php:246
-msgid "Error saving the user."
-msgstr "Erreur lors de l'enregistrement de l'utilisateur."
-
-#: ../actions/password.php:80
-#: actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
-msgid "Error saving user; invalid."
-msgstr "Erreur lors de l'enregistrement de l'utilisateur ; invalide."
-
-#: ../actions/login.php:47
-#: ../actions/login.php:73
-#: ../actions/recoverpassword.php:307
-#: ../actions/register.php:98
-#: actions/login.php:47
-#: actions/login.php:73
-#: actions/recoverpassword.php:320
-#: actions/register.php:108
-#: actions/login.php:112
-#: actions/login.php:138
-#: actions/recoverpassword.php:354
-#: actions/register.php:198
-msgid "Error setting user."
-msgstr "Erreur lors de la configuration de l'utilisateur."
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
+msgstr "Vous ne pouvez pas supprimer le statut d’un autre utilisateur."
 
-#: ../actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr "Erreur lors de la mise à jour du profil"
+#: actions/apistatusesshow.php:138
+msgid "Status deleted."
+msgstr "Statut supprimé."
 
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163
-#: actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
-msgstr "Erreur lors de la mise à jour du profil distant"
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
+msgstr "Aucun statut trouvé avec cet identifiant."
 
-#: ../actions/recoverpassword.php:80
-#: actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr "Erreur dans le code de confirmation."
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "C’est trop long ! La taille maximale de l’avis est de %d caractères."
 
-#: ../actions/finishopenidlogin.php:89
-#: actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
-msgid "Existing nickname"
-msgstr "Ce pseudo est déjà utilisé"
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
+msgstr "Non trouvé"
 
-#: ../lib/util.php:326
-#: lib/util.php:342
-#: lib/action.php:570
-msgid "FAQ"
-msgstr "FAQ"
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+"La taille maximale du statut est de %d caractères, en incluant l’URL de la "
+"pièce jointe."
 
-#: ../actions/avatar.php:115
-#: actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
-msgid "Failed updating avatar."
-msgstr "La mise à jour de l'avatar a échoué."
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+msgid "Unsupported format."
+msgstr "Format non supporté."
 
-#: ../actions/all.php:61
-#: ../actions/allrss.php:64
-#: actions/all.php:61
-#: actions/allrss.php:64
-#: actions/all.php:75
-#: actions/allrss.php:107
+#: actions/apitimelinefavorites.php:107
 #, php-format
-msgid "Feed for friends of %s"
-msgstr "Flux des amis de %s"
+msgid "%s / Favorites from %s"
+msgstr "%s / Favoris de %s"
 
-#: ../actions/replies.php:65
-#: ../actions/repliesrss.php:80
-#: actions/replies.php:65
-#: actions/repliesrss.php:66
-#: actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/apitimelinefavorites.php:119
 #, php-format
-msgid "Feed for replies to %s"
-msgstr "Flux des réponses à %s"
+msgid "%s updates favorited by %s / %s."
+msgstr "%s statuts ont été ajoutés aux favoris de %s / %s."
 
-#: ../actions/tag.php:55
-#: actions/tag.php:55
-#: actions/tag.php:61
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
-msgid "Feed for tag %s"
-msgstr "Flux du marquage %s"
-
-#: ../lib/searchaction.php:105
-#: lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
-msgstr "Chercher dans le contenu des statuts"
-
-#: ../lib/searchaction.php:101
-#: lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
-msgstr "Chercher des personnes sur ce site"
-
-#: ../actions/login.php:122
-msgid "For security reasons, please re-enter your user name and password before changing your settings."
-msgstr "Pour des raisons de sécurité, veuillez entrer à nouveau votre identifiant et votre mot de passe afin d'enregistrer vos préférences."
-
-#: ../actions/profilesettings.php:44
-#: ../actions/register.php:164
-#: actions/profilesettings.php:77
-#: actions/register.php:178
-#: actions/profilesettings.php:103
-#: actions/register.php:391
-#: actions/showgroup.php:235
-#: actions/showstream.php:262
-#: actions/tagother.php:105
-#: lib/groupeditform.php:142
-msgid "Full name"
-msgstr "Nom complet"
-
-#: ../actions/profilesettings.php:98
-#: ../actions/register.php:79
-#: ../actions/updateprofile.php:93
-#: actions/profilesettings.php:213
-#: actions/register.php:86
-#: actions/updateprofile.php:94
-#: actions/editgroup.php:195
-#: actions/newgroup.php:146
-#: actions/profilesettings.php:202
-#: actions/register.php:171
-#: actions/updateprofile.php:97
-msgid "Full name is too long (max 255 chars)."
-msgstr "Nom complet trop long (maximum de 255 caractères)."
-
-#: ../lib/util.php:322
-#: lib/util.php:338
-#: lib/action.php:344
-#: lib/action.php:566
-msgid "Help"
-msgstr "Aide"
-
-#: ../lib/util.php:298
-#: lib/util.php:314
-#: lib/action.php:322
-#: lib/facebookaction.php:200
-msgid "Home"
-msgstr "Accueil"
-
-#: ../actions/profilesettings.php:46
-#: ../actions/register.php:167
-#: actions/profilesettings.php:79
-#: actions/register.php:181
-#: actions/profilesettings.php:107
-#: actions/register.php:396
-#: lib/groupeditform.php:146
-msgid "Homepage"
-msgstr "Site personnel"
-
-#: ../actions/profilesettings.php:95
-#: ../actions/register.php:76
-#: actions/profilesettings.php:210
-#: actions/register.php:83
-#: actions/editgroup.php:192
-#: actions/newgroup.php:143
-#: actions/profilesettings.php:199
-#: actions/register.php:168
-msgid "Homepage is not a valid URL."
-msgstr "L'adresse du site personnel n'est pas un URL valide. "
-
-#: ../actions/emailsettings.php:91
-#: actions/emailsettings.php:98
-#: actions/emailsettings.php:173
-msgid "I want to post notices by email."
-msgstr "Je veux envoyer mes statuts par courriel."
-
-#: ../lib/settingsaction.php:102
-#: lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
-msgstr "IM"
-
-#: ../actions/imsettings.php:60
-#: actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
-msgstr "Adresse de messagerie instantanée"
-
-#: ../actions/imsettings.php:33
-#: actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
-msgstr "Paramètres de messagerie instantanée"
-
-#: ../actions/finishopenidlogin.php:88
-#: actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
-msgid "If you already have an account, login with your username and password to connect it to your OpenID."
-msgstr "Si vous avez déjà un compte, ouvrez une session avec votre identifiant et votre mot de passe pour les relier à votre 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 "Pour ajouter un OpenID à votre compte, entrez-le dans le champ ci-dessous et cliquez sur « Ajouter »."
-
-#: ../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 "Si vous avez oublié ou perdu votre mot de passe, vous pouvez en recevoir un nouveau à l'adresse courriel indiquée dans votre compte. "
-
-#: ../actions/emailsettings.php:67
-#: ../actions/smssettings.php:76
-#: actions/emailsettings.php:68
-#: actions/smssettings.php:76
-#: actions/emailsettings.php:127
-#: actions/smssettings.php:140
-msgid "Incoming email"
-msgstr "Courriel entrant"
-
-#: ../actions/emailsettings.php:283
-#: actions/emailsettings.php:301
-#: actions/emailsettings.php:443
-msgid "Incoming email address removed."
-msgstr "L'adresse de courriel entrant a été supprimée."
-
-#: ../actions/password.php:69
-#: actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
-msgid "Incorrect old password"
-msgstr "Ancien mot de passe incorrect"
-
-#: ../actions/login.php:67
-#: actions/login.php:67
-#: actions/facebookhome.php:131
-#: actions/login.php:132
-msgid "Incorrect username or password."
-msgstr "Identifiant ou mot de passe incorrect."
+msgid "%s timeline"
+msgstr "Activité de %s"
 
-#: ../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 courriel indiquée dans votre compte."
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "Statuts de %1$s dans %2$s!"
 
-#: ../actions/updateprofile.php:114
-#: actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/apitimelinementions.php:116
 #, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "URL de l'avatar invalide : '%s'"
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Mises à jour mentionnant %2$s"
 
-#: ../actions/invite.php:55
-#: actions/invite.php:62
-#: actions/invite.php:70
+#: actions/apitimelinementions.php:126
 #, php-format
-msgid "Invalid email address: %s"
-msgstr "Adresse courriel invalide : %s"
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr "%1$s statuts en réponses aux statuts de %2$s / %3$s."
 
-#: ../actions/updateprofile.php:98
-#: actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
 #, php-format
-msgid "Invalid homepage '%s'"
-msgstr "Site personnel invalide '%s'"
+msgid "%s public timeline"
+msgstr "Activité publique %s"
 
-#: ../actions/updateprofile.php:82
-#: actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
 #, php-format
-msgid "Invalid license URL '%s'"
-msgstr "URL de la licence invalide '%s'"
+msgid "%s updates from everyone!"
+msgstr "%s statuts  "
 
-#: ../actions/postnotice.php:61
-#: actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
-msgstr "Contenu invalide"
+#: actions/apitimelinetag.php:101 actions/tag.php:66
+#, php-format
+msgid "Notices tagged with %s"
+msgstr "Statuts marqués avec %s"
 
-#: ../actions/postnotice.php:67
-#: actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
-msgstr "URI du statut invalide"
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Mises à jour marquées avec %1$s dans %2$s !"
 
-#: ../actions/postnotice.php:72
-#: actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
-msgstr "URL du statut invalide"
+#: actions/apiusershow.php:96
+msgid "Not found."
+msgstr "Non trouvé."
 
-#: ../actions/updateprofile.php:87
-#: actions/updateprofile.php:88
-#: actions/updateprofile.php:91
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "URL du profil invalide '%s'."
+#: actions/attachment.php:73
+msgid "No such attachment."
+msgstr "Pièce jointe non trouvée."
 
-#: ../actions/remotesubscribe.php:96
-#: actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
-msgstr "URL du profil invalide (mauvais format)"
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+msgstr "Aucun pseudo."
 
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79
-#: actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
-msgstr "URL du profil invalide, retourné par le serveur."
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "Aucune taille"
 
-#: ../actions/avatarbynickname.php:37
-#: actions/avatarbynickname.php:37
 #: actions/avatarbynickname.php:69
 msgid "Invalid size."
 msgstr "Taille incorrecte."
 
-#: ../actions/finishopenidlogin.php:235
-#: ../actions/register.php:93
-#: ../actions/register.php:111
-#: actions/finishopenidlogin.php:241
-#: actions/register.php:103
-#: actions/register.php:121
-#: actions/finishopenidlogin.php:279
-#: actions/register.php:193
-#: actions/register.php:211
-msgid "Invalid username or password."
-msgstr "Identifiant ou mot de passe incorrect."
-
-#: ../actions/invite.php:79
-#: actions/invite.php:86
-#: actions/invite.php:102
-msgid "Invitation(s) sent"
-msgstr "Invitation(s) envoyée(s)"
-
-#: ../actions/invite.php:97
-#: actions/invite.php:104
-#: actions/invite.php:136
-msgid "Invitation(s) sent to the following people:"
-msgstr "Invitation(s) envoyée(s) aux personnes suivantes :"
-
-#: ../lib/util.php:306
-#: lib/util.php:322
-#: lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
-msgid "Invite"
-msgstr "Inviter"
-
-#: ../actions/invite.php:123
-#: actions/invite.php:130
-#: actions/invite.php:104
-msgid "Invite new users"
-msgstr "Inviter de nouveaux utilisateurs"
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "Avatar"
 
-#: ../lib/util.php:261
-#: lib/util.php:277
-#: lib/action.php:609
+#: actions/avatarsettings.php:78
 #, php-format
-msgid "It runs the [StatusNet](http://status.net/) microblogging software, version %s, available under the [GNU Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-msgstr "Il utilise le logiciel de micro-blogging [StatusNet](http://status.net/), version %s, disponible sous la licence [GNU Affero General Public License] (http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr ""
+"Vous pouvez associer un « avatar » (image personnelle) à votre profil. La "
+"taille maximale du fichier est de %s."
 
-#: ../actions/imsettings.php:173
-#: actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
-msgstr "Identifiant Jabber déjà utilisé par un autre utilisateur."
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
+msgstr "Utilisateur sans profil correspondant"
 
-#: ../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 (ex : nom@mondomaine.com). Assurez-vous d'ajouter %s à votre liste d'amis dans votre logiciel de messagerie instantanée ou dans GTalk."
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+msgid "Avatar settings"
+msgstr "Paramètres de l’avatar"
 
-#: ../actions/profilesettings.php:57
-#: actions/profilesettings.php:90
-#: actions/profilesettings.php:128
-msgid "Language"
-msgstr "Langue"
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr "Image originale"
 
-#: ../actions/profilesettings.php:113
-#: actions/profilesettings.php:228
-#: actions/profilesettings.php:217
-msgid "Language is too long (max 50 chars)."
-msgstr "La langue est trop longue (255 caractères maximum)."
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr "Aperçu"
 
-#: ../actions/profilesettings.php:52
-#: ../actions/register.php:173
-#: actions/profilesettings.php:85
-#: actions/register.php:187
-#: actions/profilesettings.php:117
-#: actions/register.php:408
-#: actions/showgroup.php:244
-#: actions/showstream.php:271
-#: actions/tagother.php:113
-#: lib/groupeditform.php:156
-#: lib/grouplist.php:126
-#: lib/profilelist.php:125
-msgid "Location"
-msgstr "Emplacement"
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+msgid "Delete"
+msgstr "Supprimer"
 
-#: ../actions/profilesettings.php:104
-#: ../actions/register.php:85
-#: ../actions/updateprofile.php:108
-#: actions/profilesettings.php:219
-#: actions/register.php:92
-#: actions/updateprofile.php:109
-#: actions/editgroup.php:201
-#: actions/newgroup.php:152
-#: actions/profilesettings.php:208
-#: actions/register.php:177
-#: actions/updateprofile.php:112
-msgid "Location is too long (max 255 chars)."
-msgstr "Emplacement trop long (maximum de 255 caractères)."
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+msgstr "Transfert"
 
-#: ../actions/login.php:97
-#: ../actions/login.php:106
-#: ../actions/openidlogin.php:68
-#: ../lib/util.php:310
-#: actions/login.php:97
-#: actions/login.php:106
-#: actions/openidlogin.php:77
-#: lib/util.php:326
-#: actions/facebooklogin.php:93
-#: actions/login.php:186
-#: actions/login.php:239
-#: actions/openidlogin.php:112
-#: lib/action.php:335
-#: lib/facebookaction.php:288
-#: lib/facebookaction.php:315
-#: lib/logingroupnav.php:75
-#, php-format
-msgid "Login"
-msgstr "Ouvrir une session"
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
+msgstr "Recadrer"
 
-#: ../actions/openidlogin.php:44
-#: actions/openidlogin.php:52
-#: actions/openidlogin.php:62
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Ouvrir une session avec un compte [OpenID](%%doc.openid%%)."
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Un problème est survenu avec votre jeton de session. Veuillez essayer à "
+"nouveau."
 
-#: ../actions/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 "Ouvrez une session avec votre identifiant et votre mot de passe, ou [créez un compte](%%action.register%%), ou utilisez un identifiant [OpenID](%%action.openidlogin%%)."
+#: actions/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Soumission de formulaire inattendue."
 
-#: ../lib/util.php:308
-#: lib/util.php:324
-#: lib/action.php:332
-msgid "Logout"
-msgstr "Fermeture de session"
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
+msgstr "Sélectionnez une zone de forme carrée pour définir votre avatar"
 
-#: ../actions/register.php:166
-#: actions/register.php:180
-#: actions/register.php:393
-msgid "Longer name, preferably your \"real\" name"
-msgstr "Nom plus long, votre \"vrai\" nom de préférence"
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
+msgstr "Données perdues."
 
-#: ../actions/login.php:110
-#: actions/login.php:110
-#: actions/login.php:245
-#: lib/facebookaction.php:320
-msgid "Lost or forgotten password?"
-msgstr "Mot de passe perdu ?"
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+msgstr "Avatar mis à jour."
 
-#: ../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 "Nouvelle adresse courriel pour poster ; annule l'ancienne."
+#: actions/avatarsettings.php:363
+msgid "Failed updating avatar."
+msgstr "La mise à jour de l’avatar a échoué."
 
-#: ../actions/emailsettings.php:27
-#: actions/emailsettings.php:27
-#: actions/emailsettings.php:71
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr "Configurez les courriels que vous souhaitez recevoir de %%site.name%%."
+#: actions/avatarsettings.php:387
+msgid "Avatar deleted."
+msgstr "Avatar supprimé."
 
-#: ../actions/showstream.php:300
-#: actions/showstream.php:315
-#: actions/showstream.php:480
-msgid "Member since"
-msgstr "Membre depuis"
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+msgid "No nickname"
+msgstr "Aucun pseudo"
 
-#: ../actions/userrss.php:70
-#: actions/userrss.php:67
-#: actions/userrss.php:72
-#, php-format
-msgid "Microblog by %s"
-msgstr "Micro-blogging par %s"
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
+msgstr "Aucun groupe trouvé"
 
-#: ../actions/smssettings.php:304
+#: actions/blockedfromgroup.php:90
 #, 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 "Votre fournisseur de téléphonie mobile. Si vous connaissez un fournisseur qui accepte la réception de SMS par courriel mais qui n'est pas listé ici, écrivez-nous à %s."
-
-#: ../actions/finishopenidlogin.php:79
-#: ../actions/register.php:188
-#: actions/finishopenidlogin.php:85
-#: actions/register.php:202
-#: actions/finishopenidlogin.php:107
-#: actions/register.php:429
-msgid "My text and files are available under "
-msgstr "Mes textes et mes fichiers sont disponibles sous"
+msgid "%s blocked profiles"
+msgstr "%s profils bloqués"
 
-#: ../actions/emailsettings.php:82
-#: ../actions/smssettings.php:91
-#: actions/emailsettings.php:83
-#: actions/smssettings.php:91
-#: actions/emailsettings.php:142
-#: actions/smssettings.php:152
-msgid "New"
-msgstr "Nouveau"
-
-#: ../lib/mail.php:144
-#: lib/mail.php:144
-#: lib/mail.php:286
+#: actions/blockedfromgroup.php:93
 #, php-format
-msgid "New email address for posting to %s"
-msgstr "Nouvelle adresse courriel pour poster dans %s"
+msgid "%s blocked profiles, page %d"
+msgstr "%s profils bloqués, page %d"
 
-#: ../actions/emailsettings.php:297
-#: actions/emailsettings.php:315
-#: actions/emailsettings.php:465
-msgid "New incoming email address added."
-msgstr "Nouvelle adresse courriel ajoutée."
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr "Une liste des utilisateurs dont l’inscription à ce groupe est bloquée."
 
-#: ../actions/finishopenidlogin.php:71
-#: actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
-msgid "New nickname"
-msgstr "Nouveau pseudo"
+#: actions/blockedfromgroup.php:281
+msgid "Unblock user from group"
+msgstr "Débloquer l’utilisateur du groupe"
 
-#: ../actions/newnotice.php:87
-#: actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
-msgstr "Nouveau statut"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
+msgstr "Débloquer"
 
-#: ../actions/password.php:41
-#: ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180
-#: actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101
-#: actions/recoverpassword.php:219
-msgid "New password"
-msgstr "Nouveau mot de passe"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+msgid "Unblock this user"
+msgstr "Débloquer cet utilisateur"
 
-#: ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
-msgstr "Nouveau mot de passe créé avec succès. Votre session est maintenant ouverte."
-
-#: ../actions/login.php:101
-#: ../actions/profilesettings.php:41
-#: ../actions/register.php:151
-#: actions/login.php:101
-#: actions/profilesettings.php:74
-#: actions/register.php:165
-#: actions/login.php:228
-#: actions/profilesettings.php:98
-#: actions/register.php:367
-#: actions/showgroup.php:224
-#: actions/showstream.php:251
-#: actions/tagother.php:95
-#: lib/facebookaction.php:308
-#: lib/groupeditform.php:137
-msgid "Nickname"
-msgstr "Pseudo"
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Non connecté."
 
-#: ../actions/finishopenidlogin.php:175
-#: ../actions/profilesettings.php:110
-#: ../actions/register.php:69
-#: actions/finishopenidlogin.php:181
-#: actions/profilesettings.php:225
-#: actions/register.php:76
-#: actions/editgroup.php:183
-#: actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134
-#: actions/profilesettings.php:214
-#: actions/register.php:159
-msgid "Nickname already in use. Try another one."
-msgstr "Pseudo déjà utilisé. Essayez-en un autre."
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
+msgstr "Aucun profil n’a été spécifié."
 
-#: ../actions/finishopenidlogin.php:165
-#: ../actions/profilesettings.php:88
-#: ../actions/register.php:67
-#: ../actions/updateprofile.php:77
-#: actions/finishopenidlogin.php:171
-#: actions/profilesettings.php:203
-#: actions/register.php:74
-#: actions/updateprofile.php:78
-#: actions/finishopenidlogin.php:205
-#: actions/profilesettings.php:192
-#: actions/updateprofile.php:81
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "Les pseudos ne peuvent contenir que des caractères minuscules et des chiffres, sans espaces."
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
+msgstr "Aucun profil ne correspond à cet identifiant."
 
-#: ../actions/finishopenidlogin.php:170
-#: actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
-msgid "Nickname not allowed."
-msgstr "Pseudo non autorisé."
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Bloquer cet utilisateur"
 
-#: ../actions/remotesubscribe.php:72
-#: actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
-msgstr "Pseudo de l'utilisateur que vous voulez suivre"
-
-#: ../actions/recoverpassword.php:162
-#: actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
-msgid "Nickname or email"
-msgstr "Pseudo ou courriel"
-
-#: ../actions/deletenotice.php:59
-#: actions/deletenotice.php:60
-#: actions/block.php:147
-#: actions/deletenotice.php:118
+#: actions/block.php:136
+msgid ""
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
+msgstr ""
+"Êtes-vous certain de vouloir bloquer cet utilisateur ? Après cela, il ne "
+"sera plus abonné à votre compte, ne pourra plus s’y abonner de nouveau, et "
+"vous ne serez pas informé des @-réponses de sa part."
+
+#: actions/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
 msgid "No"
 msgstr "Non"
 
-#: ../actions/imsettings.php:156
-#: actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
-msgstr "Aucun identifiant Jabber"
+#: actions/block.php:149
+msgid "Do not block this user"
+msgstr "Ne pas bloquer cet utilisateur"
 
-#: ../actions/userauthorization.php:129
-#: actions/userauthorization.php:136
-#: actions/userauthorization.php:153
-msgid "No authorization request!"
-msgstr "Pas de requête d'autorisation !"
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
+msgstr "Oui"
 
-#: ../actions/smssettings.php:181
-#: actions/smssettings.php:189
-#: actions/smssettings.php:299
-msgid "No carrier selected."
-msgstr "Aucun fournisseur sélectionné."
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+msgid "Block this user"
+msgstr "Bloquer cet utilisateur"
 
-#: ../actions/smssettings.php:316
-#: actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
-msgstr "Aucun code entré"
+#: actions/block.php:165
+msgid "You have already blocked this user."
+msgstr "Vous avez déjà bloqué cet utilisateur."
+
+#: actions/block.php:170
+msgid "Failed to save block information."
+msgstr "Impossible d’enregistrer les informations de blocage."
+
+#: actions/bookmarklet.php:50
+msgid "Post to "
+msgstr "Poster sur "
 
-#: ../actions/confirmaddress.php:33
-#: actions/confirmaddress.php:33
 #: actions/confirmaddress.php:75
 msgid "No confirmation code."
 msgstr "Aucun code de confirmation."
 
-#: ../actions/newnotice.php:44
-#: actions/newmessage.php:53
-#: actions/newnotice.php:44
-#: classes/Command.php:197
-#: actions/newmessage.php:109
-#: actions/newnotice.php:126
-#: classes/Command.php:223
-msgid "No content!"
-msgstr "Aucun contenu !"
-
-#: ../actions/emailsettings.php:174
-#: actions/emailsettings.php:192
-#: actions/emailsettings.php:304
-msgid "No email address."
-msgstr "Aucune adresse courriel."
-
-#: ../actions/userbyid.php:32
-#: actions/userbyid.php:32
-#: actions/userbyid.php:70
-msgid "No id."
-msgstr "Aucun identifiant."
-
-#: ../actions/emailsettings.php:271
-#: actions/emailsettings.php:289
-#: actions/emailsettings.php:430
-msgid "No incoming email address."
-msgstr "Aucune adresse pour le courriel entrant."
-
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67
-#: actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr "Aucun pseudo proposé par le serveur distant."
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "Code de confirmation non trouvé."
 
-#: ../actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59
-#: actions/leavegroup.php:81
-msgid "No nickname."
-msgstr "Aucun pseudo."
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "Ce code de confirmation n’est pas pour vous !"
 
-#: ../actions/emailsettings.php:222
-#: ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229
-#: actions/emailsettings.php:240
-#: actions/imsettings.php:214
-#: actions/smssettings.php:237
-#: actions/emailsettings.php:363
-#: actions/imsettings.php:345
-#: actions/smssettings.php:358
-msgid "No pending confirmation to cancel."
-msgstr "Aucune confirmation à annuler."
+#: actions/confirmaddress.php:90
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr "Type d’adresse non reconnu : %s"
 
-#: ../actions/smssettings.php:176
-#: actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
-msgstr "Aucun numéro de téléphone."
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr "Cette adresse a déjà été confirmée."
 
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74
-#: actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
-msgstr "Aucun URL de profil renvoyé par le serveur."
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "Impossible de mettre à jour l’utilisateur."
 
-#: ../actions/recoverpassword.php:226
-#: actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
-msgid "No registered email address for that user."
-msgstr "Aucune adresse courriel enregistrée pour cet utilisateur."
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr "Impossible de supprimer le courriel de confirmation."
 
-#: ../actions/userauthorization.php:49
-#: actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr "Aucune requête trouvée !"
-
-#: ../actions/noticesearch.php:64
-#: ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69
-#: actions/peoplesearch.php:69
-#: actions/groupsearch.php:81
-#: actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
-msgid "No results"
-msgstr "Aucun résultat "
-
-#: ../actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
-msgstr "Aucune taille"
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "Confirmer l’adresse"
 
-#: ../actions/twitapistatuses.php:595
-#: actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-#: actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
-msgid "No status found with that ID."
-msgstr "Aucun statut trouvé avec cet identifiant. "
+#: actions/confirmaddress.php:159
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "L'adresse \"%s\" a été validée pour votre compte."
 
-#: ../actions/twitapistatuses.php:555
-#: actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
-msgid "No status with that ID found."
-msgstr "Aucun statut trouvé avec cet identifiant."
+#: actions/conversation.php:99
+msgid "Conversation"
+msgstr "Conversation"
 
-#: ../actions/openidsettings.php:135
-#: actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
-msgstr "OpenID non trouvé."
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
+msgstr "Statuts"
 
-#: ../actions/doc.php:29
-#: actions/doc.php:29
-#: actions/doc.php:64
-msgid "No such document."
-msgstr "Document non trouvé. "
-
-#: ../actions/shownotice.php:32
-#: ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30
-#: actions/shownotice.php:32
-#: actions/shownotice.php:83
-#: lib/deleteaction.php:30
-#: actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
-msgstr "Statut non trouvé. "
-
-#: ../actions/recoverpassword.php:56
-#: actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr "Code de récupération non trouvé. "
-
-#: ../actions/postnotice.php:56
-#: actions/postnotice.php:57
-#: actions/postnotice.php:60
-msgid "No such subscription"
-msgstr "Abonnement non trouvé "
-
-#: ../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
-#: actions/all.php:53
-#: actions/allrss.php:66
-#: actions/avatarbynickname.php:75
-#: actions/favoritesrss.php:64
-#: actions/foaf.php:41
-#: actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130
-#: actions/replies.php:73
-#: actions/repliesrss.php:38
-#: actions/showfavorites.php:105
-#: actions/showstream.php:100
-#: actions/userbyid.php:74
-#: actions/usergroups.php:92
-#: actions/userrss.php:38
-#: actions/xrds.php:73
-#: classes/Command.php:140
-#: classes/Command.php:185
-#: classes/Command.php:234
-#: classes/Command.php:271
-#: lib/galleryaction.php:60
-#: lib/mailbox.php:82
-#: lib/subs.php:34
-#: lib/subs.php:109
-msgid "No such user."
-msgstr "Utilisateur non trouvé."
+msgstr "Statut non trouvé."
 
-#: ../actions/recoverpassword.php:211
-#: actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-msgid "No user with that email address or username."
-msgstr "Aucun utilisateur trouvé avec ce courriel ou ce nom."
-
-#: ../lib/gallery.php:80
-#: lib/gallery.php:85
-msgid "Nobody to show!"
-msgstr "Il n'y a personne à montrer !"
-
-#: ../actions/recoverpassword.php:60
-#: actions/recoverpassword.php:60
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr "Ceci n'est pas un code de récupération."
-
-#: ../scripts/maildaemon.php:50
-#: scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
-msgstr "Ceci n'est pas un utilisateur inscrit."
-
-#: ../lib/twitterapi.php:226
-#: ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332
-#: lib/twitterapi.php:391
-#: lib/twitterapi.php:418
-#: lib/twitterapi.php:502
-#: lib/twitterapi.php:448
-#: lib/twitterapi.php:476
-#: lib/twitterapi.php:566
-msgid "Not a supported data format."
-msgstr "Format de données non supporté."
-
-#: ../actions/imsettings.php:167
-#: actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
-msgstr "Identifiant Jabber invalide."
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "Impossible de supprimer ce statut."
 
-#: ../lib/openid.php:131
-#: lib/openid.php:131
-#: lib/openid.php:140
-msgid "Not a valid OpenID."
-msgstr "OpenID invalide."
+#: actions/deletenotice.php:103
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+"Vous êtes sur le point de supprimer définitivement un message. Une fois cela "
+"fait, il est impossible de l’annuler."
 
-#: ../actions/emailsettings.php:185
-#: actions/emailsettings.php:203
-#: actions/emailsettings.php:315
-msgid "Not a valid email address"
-msgstr "Adresse courriel invalide"
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr "Supprimer ce statut"
 
-#: ../actions/register.php:63
-#: actions/register.php:70
-#: actions/register.php:152
-msgid "Not a valid email address."
-msgstr "Adresse courriel invalide."
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr "Êtes-vous sûr(e) de vouloir supprimer ce statut ?"
 
-#: ../actions/profilesettings.php:91
-#: ../actions/register.php:71
-#: actions/profilesettings.php:206
-#: actions/register.php:78
-#: actions/editgroup.php:186
-#: actions/newgroup.php:137
-#: actions/profilesettings.php:195
-#: actions/register.php:161
-msgid "Not a valid nickname."
-msgstr "Pseudo invalide."
+#: actions/deletenotice.php:145
+msgid "Do not delete this notice"
+msgstr "Ne pas supprimer cet avis"
 
-#: ../actions/remotesubscribe.php:120
-#: actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
-msgstr "URL de profil invalide (services incorrects)."
-
-#: ../actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr "URL de profil invalide (aucun XRDS défini)."
-
-#: ../actions/remotesubscribe.php:104
-#: actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr "URL de profil invalide (aucun document YADIS)."
-
-#: ../actions/avatar.php:95
-#: actions/profilesettings.php:332
-#: lib/imagefile.php:87
-msgid "Not an image or corrupt file."
-msgstr "Ceci n'est pas une image, ou c'est un fichier corrompu."
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+msgid "Delete this notice"
+msgstr "Supprimer ce statut"
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53
-#: actions/finishremotesubscribe.php:54
-msgid "Not authorized."
-msgstr "Non autorisé."
+#: actions/deletenotice.php:157
+msgid "There was a problem with your session token.  Try again, please."
+msgstr ""
+"Un problème est survenu avec votre jeton de session. Veuillez essayer à "
+"nouveau."
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:40
-msgid "Not expecting this response!"
-msgstr "Réponse inattendue !"
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr "Ce statut n’est pas un favori !"
 
-#: ../actions/twitapistatuses.php:422
-#: actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
-msgid "Not found"
-msgstr "Non trouvé"
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "Ajouter aux favoris"
 
-#: ../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
-#: actions/block.php:59
-#: actions/disfavor.php:61
-#: actions/favor.php:64
-#: actions/finishaddopenid.php:67
-#: actions/logout.php:71
-#: actions/newmessage.php:83
-#: actions/newnotice.php:90
-#: actions/nudge.php:63
-#: actions/subedit.php:31
-#: actions/subscribe.php:30
-#: actions/unblock.php:60
-#: actions/unsubscribe.php:27
-#: lib/deleteaction.php:66
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Non connecté."
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "Document non trouvé."
 
-#: ../lib/subs.php:91
-#: lib/subs.php:104
-#: lib/subs.php:122
-msgid "Not subscribed!."
-msgstr "Pas abonné !"
+#: actions/editgroup.php:56
+#, php-format
+msgid "Edit %s group"
+msgstr "Modifier le groupe %s"
 
-#: ../actions/opensearch.php:35
-#: actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
-msgstr "Recherche de statut"
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
+msgstr "Vous devez ouvrir une session pour créer un groupe."
 
-#: ../actions/showstream.php:82
-#: actions/showstream.php:82
-#: actions/showstream.php:180
-#: actions/showstream.php:187
-#: actions/showstream.php:192
-#, php-format
-msgid "Notice feed for %s"
-msgstr "Flux des statuts de %s"
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+msgid "You must be an admin to edit the group"
+msgstr "Seuls les administrateurs d’un groupe peuvent le modifier."
 
-#: ../actions/shownotice.php:39
-#: actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
-msgstr "Le statut n'a pas de profil"
-
-#: ../actions/showstream.php:316
-#: actions/showstream.php:331
-#: actions/showstream.php:504
-#: lib/facebookaction.php:477
-#: lib/mailbox.php:116
-#: lib/noticelist.php:87
-msgid "Notices"
-msgstr "Statuts"
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
+msgstr "Remplissez ce formulaire pour modifier les options du groupe."
 
-#: ../actions/tag.php:35
-#: ../actions/tag.php:81
-#: actions/tag.php:35
-#: actions/tag.php:81
-#: actions/tag.php:41
+#: actions/editgroup.php:201 actions/newgroup.php:145
 #, php-format
-msgid "Notices tagged with %s"
-msgstr "Statuts marqués avec %s"
+msgid "description is too long (max %d chars)."
+msgstr "la description est trop longue (%d caractères maximum)."
 
-#: ../actions/password.php:39
-#: actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
-msgstr "Ancien mot de passe"
+#: actions/editgroup.php:253
+msgid "Could not update group."
+msgstr "Impossible de mettre à jour le groupe."
 
-#: ../lib/settingsaction.php:96
-#: ../lib/util.php:314
-#: lib/settingsaction.php:90
-#: lib/util.php:330
-#: lib/accountsettingsaction.php:116
-#: lib/action.php:341
-#: lib/logingroupnav.php:81
-msgid "OpenID"
-msgstr "OpenID"
-
-#: ../actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
-msgid "OpenID Account Setup"
-msgstr "Configuration du compte OpenID"
-
-#: ../lib/openid.php:180
-#: lib/openid.php:180
-#: lib/openid.php:266
-msgid "OpenID Auto-Submit"
-msgstr "Soumission automatique OpenID"
-
-#: ../actions/finishaddopenid.php:99
-#: ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60
-#: actions/finishaddopenid.php:99
-#: actions/finishopenidlogin.php:146
-#: actions/openidlogin.php:68
-#: actions/finishaddopenid.php:170
-#: actions/openidlogin.php:80
-msgid "OpenID Login"
-msgstr "Connexion OpenID"
-
-#: ../actions/openidlogin.php:65
-#: ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74
-#: actions/openidsettings.php:50
-#: actions/openidlogin.php:102
-#: actions/openidsettings.php:101
-msgid "OpenID URL"
-msgstr "URL OpenID"
-
-#: ../actions/finishaddopenid.php:42
-#: ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42
-#: actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88
-#: actions/finishopenidlogin.php:130
-msgid "OpenID authentication cancelled."
-msgstr "Authentification OpenID annulée."
-
-#: ../actions/finishaddopenid.php:46
-#: ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46
-#: actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92
-#: actions/finishopenidlogin.php:134
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr "L'authentification OpenID a échoué : %s'"
-
-#: ../lib/openid.php:133
-#: lib/openid.php:133
-#: lib/openid.php:142
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "Erreur OpenID : %s"
-
-#: ../actions/openidsettings.php:144
-#: actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr "OpenID retiré."
-
-#: ../actions/openidsettings.php:37
-#: actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
-msgstr "Paramètres OpenID"
-
-#: ../actions/invite.php:135
-#: actions/invite.php:143
-#: actions/invite.php:180
-msgid "Optionally add a personal message to the invitation."
-msgstr "Ajouter un message personnel à l'invitation (optionnel)."
+#: actions/editgroup.php:269
+msgid "Options saved."
+msgstr "Vos options ont été enregistrées."
 
-#: ../actions/avatar.php:84
-#: actions/profilesettings.php:321
-#: lib/imagefile.php:75
-msgid "Partial upload."
-msgstr "Transfert partiel."
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "Paramètres du courriel"
 
-#: ../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
-#: actions/finishopenidlogin.php:118
-#: actions/login.php:231
-#: actions/register.php:372
-#: lib/accountsettingsaction.php:110
-#: lib/facebookaction.php:311
-msgid "Password"
-msgstr "Mot de passe"
+#: actions/emailsettings.php:71
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr "Configurez les courriels que vous souhaitez recevoir de %%site.name%%."
 
-#: ../actions/recoverpassword.php:288
-#: actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
-msgid "Password and confirmation do not match."
-msgstr "Le mot de passe et sa confirmation ne correspondent pas."
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "Adresse"
 
-#: ../actions/recoverpassword.php:284
-#: actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
-msgid "Password must be 6 chars or more."
-msgstr "Le mot de passe doit contenir au moins 6 caractères."
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr "Adresse courriel actuellement confirmée."
 
-#: ../actions/recoverpassword.php:261
-#: ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267
-#: actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199
-#: actions/recoverpassword.php:301
-msgid "Password recovery requested"
-msgstr "Récupération de mot de passe demandée"
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "Retirer"
 
-#: ../actions/password.php:89
-#: ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408
-#: actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173
-#: actions/recoverpassword.php:200
-msgid "Password saved."
-msgstr "Mot de passe enregistré."
+#: actions/emailsettings.php:113
+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 compte "
+"Jabber/GTalk pour recevoir de nouvelles instructions."
 
-#: ../actions/password.php:61
-#: ../actions/register.php:88
-#: actions/profilesettings.php:380
-#: actions/register.php:98
-#: actions/passwordsettings.php:145
-#: actions/register.php:183
-msgid "Passwords don't match."
-msgstr "Les mots de passe ne correspondent pas."
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "Annuler"
 
-#: ../lib/searchaction.php:100
-#: lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
-msgstr "Personnes"
+#: actions/emailsettings.php:121
+msgid "Email Address"
+msgstr "Adresse de courriel"
 
-#: ../actions/opensearch.php:33
-#: actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
-msgstr "Recherche de personnes"
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr "Adresse de courriel (ex : nom@example.org)"
 
-#: ../actions/peoplesearch.php:33
-#: actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
-msgstr "Recherche de personnes"
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "Ajouter"
 
-#: ../lib/stream.php:50
-#: lib/personal.php:50
-#: lib/personalgroupnav.php:98
-msgid "Personal"
-msgstr "Personnel"
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+msgstr "Courriel entrant"
 
-#: ../actions/invite.php:133
-#: actions/invite.php:141
-#: actions/invite.php:178
-msgid "Personal message"
-msgstr "Message personnel"
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
+msgstr "Écrivez à cette adresse courriel pour publier de nouveaux statuts. "
 
-#: ../actions/smssettings.php:69
-#: actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "Numéro de téléphone, sans ponctuation ni espaces, incluant le code régional"
+#: actions/emailsettings.php:145 actions/smssettings.php:162
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr "Nouvelle adresse courriel pour poster ; annule l’ancienne."
 
-#: ../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 "Veuillez vérifier ces détails pour vous assurer que vous souhaitez vous abonner aux statuts de cet utilisateur. Si vous n'avez pas demandé à vous abonner aux statuts de quelqu'un, cliquez \"Annuler\"."
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
+msgstr "Nouveau"
 
-#: ../actions/imsettings.php:73
-#: actions/imsettings.php:74
-#: actions/imsettings.php:142
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Publier un statut chaque fois que mon statut est modifié dans 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
-#: actions/emailsettings.php:147
-#: actions/imsettings.php:133
-#: actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../actions/emailsettings.php:162
-#: ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163
-#: actions/emailsettings.php:180
-#: actions/imsettings.php:152
-#: actions/smssettings.php:171
-#: actions/emailsettings.php:286
-#: actions/imsettings.php:258
-#: actions/othersettings.php:168
-#: actions/smssettings.php:272
-msgid "Preferences saved."
-msgstr "Préférences enregistrées"
-
-#: ../actions/profilesettings.php:57
-#: actions/profilesettings.php:90
-#: actions/profilesettings.php:129
-msgid "Preferred language"
-msgstr "Langue préférée"
-
-#: ../lib/util.php:328
-#: lib/util.php:344
-#: lib/action.php:572
-msgid "Privacy"
-msgstr "Confidentialité"
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
+msgstr "Avertissez-moi par courriel des nouveaux abonnements."
 
-#: ../classes/Notice.php:95
-#: ../classes/Notice.php:106
-#: classes/Notice.php:109
-#: classes/Notice.php:119
-#: classes/Notice.php:145
-#: classes/Notice.php:155
-msgid "Problem saving notice."
-msgstr "Problème lors de l'enregistrement du statut."
-
-#: ../lib/settingsaction.php:84
-#: ../lib/stream.php:60
-#: lib/personal.php:60
-#: lib/settingsaction.php:84
-#: lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
-msgid "Profile"
-msgstr "Profil"
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+"Envoyez-moi un courriel quand un utilisateur ajoute un de mes statuts à ses "
+"favoris."
 
-#: ../actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
-msgstr "URL du profil"
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
+msgstr "Envoyez-moi un courriel quand quelqu’un m’envoie un message personnel."
 
-#: ../actions/profilesettings.php:34
-#: actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
-msgstr "Paramètres du profil"
+#: actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "Envoyez-moi un courriel quand quelqu’un m’envoie une réponse « @ »."
 
-#: ../actions/postnotice.php:51
-#: ../actions/updateprofile.php:52
-#: actions/postnotice.php:52
-#: actions/updateprofile.php:53
-#: actions/postnotice.php:55
-#: actions/updateprofile.php:56
-msgid "Profile unknown"
-msgstr "Profil inconnu"
-
-#: ../actions/public.php:54
-#: actions/public.php:54
-#: actions/public.php:124
-msgid "Public Stream Feed"
-msgstr "Fil du flux public"
-
-#: ../actions/public.php:33
-#: actions/public.php:33
-#: actions/public.php:109
-#: lib/publicgroupnav.php:77
-msgid "Public timeline"
-msgstr "Flux public"
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
+msgstr "Autoriser mes amis à m’envoyer des courriels et des clins d’œil."
 
-#: ../actions/imsettings.php:79
-#: actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Publier un MicroID pour mon adresse Jabber/GTalk."
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
+msgstr "Je veux envoyer mes statuts par courriel."
 
-#: ../actions/emailsettings.php:94
-#: actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr "Publier un MicroID pour mon adresse courriel."
 
-#: ../actions/tag.php:75
-#: ../actions/tag.php:76
-#: actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr "Marquages récents"
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Enregistrer"
 
-#: ../actions/recoverpassword.php:166
-#: actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
-msgid "Recover"
-msgstr "Récupérer"
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+msgstr "Préférences enregistrées"
 
-#: ../actions/recoverpassword.php:156
-#: actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
-msgid "Recover password"
-msgstr "Récupérer le mot de passe"
+#: actions/emailsettings.php:319
+msgid "No email address."
+msgstr "Aucune adresse courriel."
 
-#: ../actions/recoverpassword.php:67
-#: actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-msgid "Recovery code for unknown user."
-msgstr "Code de récupération d'un utilisateur inconnu."
-
-#: ../actions/register.php:142
-#: ../actions/register.php:193
-#: ../lib/util.php:312
-#: actions/register.php:152
-#: actions/register.php:207
-#: lib/util.php:328
-#: actions/register.php:69
-#: actions/register.php:436
-#: lib/action.php:338
-#: lib/facebookaction.php:277
-#: lib/logingroupnav.php:78
-msgid "Register"
-msgstr "Créer un compte"
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
+msgstr "Impossible d’utiliser cette adresse courriel"
 
-#: ../actions/register.php:28
-#: actions/register.php:28
-#: actions/finishopenidlogin.php:196
-#: actions/register.php:90
-msgid "Registration not allowed."
-msgstr "Création de compte non autorisée."
+#: actions/emailsettings.php:330
+msgid "Not a valid email address"
+msgstr "Adresse courriel invalide"
 
-#: ../actions/register.php:200
-#: actions/register.php:214
-#: actions/register.php:67
-msgid "Registration successful"
-msgstr "Compte créé avec succès"
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
+msgstr "Vous utilisez déjà cette adresse courriel."
 
-#: ../actions/userauthorization.php:120
-#: actions/userauthorization.php:127
-#: actions/userauthorization.php:144
-msgid "Reject"
-msgstr "Refuser"
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another user."
+msgstr "Cette adresse courriel appartient déjà à un autre utilisateur."
 
-#: ../actions/login.php:103
-#: ../actions/register.php:176
-#: actions/login.php:103
-#: actions/register.php:190
-#: actions/login.php:234
-#: actions/openidlogin.php:107
-#: actions/register.php:414
-msgid "Remember me"
-msgstr "Se souvenir de moi"
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+msgstr "Impossible d’insérer le code de confirmation."
 
-#: ../actions/updateprofile.php:70
-#: actions/updateprofile.php:71
-#: actions/updateprofile.php:74
-msgid "Remote profile with no matching profile"
-msgstr "Profil distant sans profil correspondant"
+#: actions/emailsettings.php:358
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr ""
+"Un code de confirmation a été envoyé à l’adresse courriel indiquée. Vérifiez "
+"votre boîte de réception pour récupérer le code et les instructions."
 
-#: ../actions/remotesubscribe.php:65
-#: actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
-msgstr "Abonnement à distance "
-
-#: ../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
-#: actions/emailsettings.php:101
-#: actions/emailsettings.php:134
-#: actions/imsettings.php:102
-#: actions/openidsettings.php:166
-#: actions/smssettings.php:103
-#: actions/smssettings.php:146
-#: actions/twittersettings.php:115
-msgid "Remove"
-msgstr "Retirer "
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
+msgstr "Aucune confirmation à annuler."
 
-#: ../actions/openidsettings.php:68
-#: actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
-msgstr "Retirer l'OpenID"
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "Cette adresse de messagerie instantanée est erronée."
 
-#: ../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 "Vous ne pourrez plus ouvrir de session si vous retirez votre seul OpenID ! Si vous avez besoin de le retirer, ajoutez d'abord un autre OpenID."
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "Confirmation annulée."
 
-#: ../lib/stream.php:55
-#: lib/personal.php:55
-#: lib/personalgroupnav.php:103
-msgid "Replies"
-msgstr "Réponses"
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
+msgstr "Ceci n’est pas votre adresse courriel."
 
-#: ../actions/replies.php:47
-#: ../actions/repliesrss.php:76
-#: ../lib/stream.php:56
-#: actions/replies.php:47
-#: actions/repliesrss.php:62
-#: lib/personal.php:56
-#: actions/replies.php:116
-#: actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
-#, php-format
-msgid "Replies to %s"
-msgstr "Réponses à %s"
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "L’adresse a été supprimée."
 
-#: ../actions/recoverpassword.php:183
-#: actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
-msgid "Reset"
-msgstr "Réinitialiser"
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
+msgstr "Aucune adresse pour le courriel entrant."
 
-#: ../actions/recoverpassword.php:173
-#: actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
-msgid "Reset password"
-msgstr "Réinitialiser le mot de passe"
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
+msgstr "Impossible de mettre à jour le dossier de l’utilisateur."
 
-#: ../lib/settingsaction.php:99
-#: lib/settingsaction.php:93
-#: actions/subscriptions.php:123
-#: lib/connectsettingsaction.php:107
-msgid "SMS"
-msgstr "SMS"
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
+msgstr "L’adresse de courriel entrant a été supprimée."
 
-#: ../actions/smssettings.php:67
-#: actions/smssettings.php:67
-#: actions/smssettings.php:126
-msgid "SMS Phone number"
-msgstr "Numéro SMS"
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
+msgstr "Nouvelle adresse courriel ajoutée."
 
-#: ../actions/smssettings.php:33
-#: actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
-msgstr "Paramètres SMS"
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+msgid "Popular notices"
+msgstr "Statuts populaires"
 
-#: ../lib/mail.php:219
-#: lib/mail.php:225
-#: lib/mail.php:437
-msgid "SMS confirmation"
-msgstr "Confirmation SMS"
+#: actions/favorited.php:67
+#, php-format
+msgid "Popular notices, page %d"
+msgstr "Statuts populaires - page %d"
 
-#: ../actions/recoverpassword.php:182
-#: actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
-msgid "Same as password above"
-msgstr "Identique au mot de passe ci-dessus"
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
+msgstr "Statuts les plus populaires sur le site en ce moment."
 
-#: ../actions/register.php:156
-#: actions/register.php:170
-#: actions/register.php:377
-msgid "Same as password above. Required."
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
-"Identique au mot de passe ci-dessus. Requis."
-
-#: ../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
-#: actions/emailsettings.php:182
-#: actions/facebooksettings.php:114
-#: actions/imsettings.php:157
-#: actions/othersettings.php:117
-#: actions/profilesettings.php:150
-#: actions/smssettings.php:169
-#: actions/subscriptions.php:124
-#: actions/tagother.php:152
-#: actions/twittersettings.php:161
-#: lib/groupeditform.php:171
-msgid "Save"
-msgstr "Enregistrer"
-
-#: ../lib/searchaction.php:84
-#: ../lib/util.php:300
-#: lib/searchaction.php:84
-#: lib/util.php:316
-#: lib/action.php:325
-msgid "Search"
-msgstr "Rechercher"
+"Les statuts favoris apparaissent sur cette page mais personne ne n’en a mis "
+"un en favori actuellement."
 
-#: ../actions/noticesearch.php:80
-#: actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
-msgstr "Rechercher dans le flux de recherche"
+#: actions/favorited.php:153
+msgid ""
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
+msgstr ""
+"Soyez le premier à un statut dans vos favoris en cliquant sur le bouton "
+"favori à côté d’un statut que vous aimez."
 
-#: ../actions/noticesearch.php:30
-#: actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/favorited.php:156
 #, 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 "Recherchez les statuts %%site.name%% par leur contenu. Séparez les termes de recherche par des espaces. Ils doivent contenir au moins 3 caractères."
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
+msgstr ""
+"Pourquoi ne pas [créer un nouveau compte](%%action.register%%) et être le "
+"premier à ajouter un avis à vos favoris !"
 
-#: ../actions/peoplesearch.php:28
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
 #, 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 "Recherchez des personnes dans %%site.name%% par leur nom, leur emplacement ou leurs intérêts. Séparez les termes de recherche par des espaces. Ils doivent contenir au moins 3 caractères."
-
-#: ../actions/smssettings.php:296
-#: actions/smssettings.php:304
-#: actions/smssettings.php:457
-msgid "Select a carrier"
-msgstr "Sélectionnez un fournisseur de téléphone mobile"
+msgid "%s's favorite notices"
+msgstr "Statuts favoris de %s"
 
-#: ../actions/invite.php:137
-#: ../lib/util.php:1172
-#: actions/invite.php:145
-#: lib/util.php:1306
-#: lib/util.php:1731
-#: actions/invite.php:182
-#: lib/messageform.php:167
-#: lib/noticeform.php:177
-msgid "Send"
-msgstr "Envoyer"
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Statuts de %1$s dans %2$s!"
 
-#: ../actions/emailsettings.php:73
-#: ../actions/smssettings.php:82
-#: actions/emailsettings.php:74
-#: actions/smssettings.php:82
-#: actions/emailsettings.php:132
-#: actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
-msgstr "Écrivez à cette adresse courriel pour publier de nouveaux statuts. "
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Ce statut a déjà été ajouté à vos favoris !"
 
-#: ../actions/emailsettings.php:88
-#: actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
-msgstr ""
-"Avertissez-moi par courriel des nouveaux abonnements."
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Retirer ce favori"
 
-#: ../actions/imsettings.php:70
-#: actions/imsettings.php:71
-#: actions/imsettings.php:137
-msgid "Send me notices through Jabber/GTalk."
-msgstr "Envoyez-moi les statuts par Jabber/GTalk."
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr "Utilisateurs en vedette"
 
-#: ../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 "Envoyez-moi les statuts par SMS ; je comprends que cela pourrait affecter ma facture de téléphonie mobile."
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr "Utilisateurs en vedette - page %d"
 
-#: ../actions/imsettings.php:76
-#: actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr ""
-"Envoyez-moi par Jabber/GTalk les réponses des personnes auxquelles je ne suis pas abonné."
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
+msgstr "Les utilisateurs à ne pas manquer dans %s"
 
-#: ../lib/util.php:304
-#: lib/util.php:320
-#: lib/facebookaction.php:215
-msgid "Settings"
-msgstr "Préférences"
+#: actions/file.php:34
+msgid "No notice id"
+msgstr "Pas d’identifiant de statut"
 
-#: ../actions/profilesettings.php:192
-#: actions/profilesettings.php:307
-#: actions/profilesettings.php:319
-msgid "Settings saved."
-msgstr "Préférences enregistrées."
+#: actions/file.php:38
+msgid "No notice"
+msgstr "Aucun statut"
 
-#: ../actions/tag.php:60
-#: actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr "Marquages les plus populaires des 7 derniers jours"
-
-#: ../actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:114
-msgid "Someone else already has this OpenID."
-msgstr "Quelqu'un utilise déjà cet OpenID."
-
-#: ../actions/finishopenidlogin.php:42
-#: ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47
-#: actions/openidsettings.php:135
-#: actions/finishopenidlogin.php:52
-#: actions/openidsettings.php:202
-msgid "Something weird happened."
-msgstr "Quelque chose de bizarre est arrivé."
-
-#: ../scripts/maildaemon.php:58
-#: scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
-msgstr "Désolé, la réception de courriels n'est pas permise. "
+#: actions/file.php:42
+msgid "No attachments"
+msgstr "Aucune pièce jointe"
 
-#: ../scripts/maildaemon.php:54
-#: scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-"Désolé, ceci n'est pas votre adresse de courriel entrant."
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr "Aucune pièce jointe importée"
 
-#: ../lib/util.php:330
-#: lib/util.php:346
-#: lib/action.php:574
-msgid "Source"
-msgstr "Source"
+#: actions/finishremotesubscribe.php:69
+msgid "Not expecting this response!"
+msgstr "Réponse inattendue !"
 
-#: ../actions/showstream.php:296
-#: actions/showstream.php:311
-#: actions/showstream.php:476
-msgid "Statistics"
-msgstr "Statistiques"
+#: actions/finishremotesubscribe.php:80
+msgid "User being listened to does not exist."
+msgstr "L’utilisateur suivi n’existe pas."
 
-#: ../actions/finishopenidlogin.php:182
-#: ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188
-#: actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222
-#: actions/finishopenidlogin.php:290
-msgid "Stored OpenID not found."
-msgstr "OpenID non trouvé."
-
-#: ../actions/remotesubscribe.php:75
-#: ../actions/showstream.php:188
-#: ../actions/showstream.php:197
-#: actions/remotesubscribe.php:84
-#: actions/showstream.php:197
-#: actions/showstream.php:206
-#: actions/remotesubscribe.php:113
-#: actions/showstream.php:376
-#: lib/subscribeform.php:139
-msgid "Subscribe"
-msgstr "S'abonner"
-
-#: ../actions/showstream.php:313
-#: ../actions/subscribers.php:27
-#: actions/showstream.php:328
-#: actions/subscribers.php:27
-#: actions/showstream.php:436
-#: actions/showstream.php:498
-#: lib/subgroupnav.php:88
-msgid "Subscribers"
-msgstr "Abonnés"
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+msgstr "Vous pouvez utiliser l’abonnement local."
 
-#: ../actions/userauthorization.php:310
-#: actions/userauthorization.php:322
-#: actions/userauthorization.php:338
-msgid "Subscription authorized"
-msgstr "Abonnement autorisé"
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
+msgstr "Cet utilisateur vous a empêché de vous inscrire."
 
-#: ../actions/userauthorization.php:320
-#: actions/userauthorization.php:332
-#: actions/userauthorization.php:349
-msgid "Subscription rejected"
-msgstr "Abonnement refusé"
+#: actions/finishremotesubscribe.php:106
+msgid "You are not authorized."
+msgstr "Vous n'êtes pas autorisé."
 
-#: ../actions/showstream.php:230
-#: ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27
-#: actions/showstream.php:240
-#: actions/showstream.php:322
-#: actions/subscriptions.php:27
-#: actions/showstream.php:407
-#: actions/showstream.php:489
-#: lib/subgroupnav.php:80
-msgid "Subscriptions"
-msgstr "Abonnements"
+#: actions/finishremotesubscribe.php:109
+msgid "Could not convert request token to access token."
+msgstr "Impossible de convertir le jeton de requête en jeton d’accès."
 
-#: ../actions/avatar.php:87
-#: actions/profilesettings.php:324
-#: lib/imagefile.php:78
-msgid "System error uploading file."
-msgstr "Erreur système lors du transfert du fichier."
+#: actions/finishremotesubscribe.php:114
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Le service distant utilise une version inconnue du protocole OMB."
 
-#: ../actions/tag.php:41
-#: ../lib/util.php:301
-#: actions/tag.php:41
-#: lib/util.php:317
-#: actions/profilesettings.php:122
-#: actions/showstream.php:297
-#: actions/tagother.php:147
-#: actions/tagother.php:207
-#: lib/profilelist.php:162
-#: lib/profilelist.php:164
-msgid "Tags"
-msgstr "Marquages"
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "Erreur lors de la mise à jour du profil distant"
 
-#: ../lib/searchaction.php:104
-#: lib/searchaction.php:104
-msgid "Text"
-msgstr "Texte"
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+msgid "No such group."
+msgstr "Aucun groupe trouvé."
 
-#: ../actions/noticesearch.php:34
-#: actions/noticesearch.php:34
-#: actions/noticesearch.php:67
-msgid "Text search"
-msgstr "Recherche de texte"
+#: actions/getfile.php:75
+msgid "No such file."
+msgstr "Fichier non trouvé."
 
-#: ../actions/openidsettings.php:140
-#: actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
-msgstr "Cet OpenID ne vous appartient pas."
+#: actions/getfile.php:79
+msgid "Cannot read file."
+msgstr "Impossible de lire le fichier"
 
-#: ../actions/confirmaddress.php:52
-#: actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
-msgstr "Cette adresse a déjà été confirmée."
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
+msgstr "Aucun groupe n’a été spécifié."
 
-#: ../actions/confirmaddress.php:43
-#: actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
-msgstr "Ce code de confirmation n'est pas pour vous !"
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr "Seul un administrateur peut bloquer des membres du groupe."
 
-#: ../actions/emailsettings.php:191
-#: actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr ""
-"Cette adresse courriel appartient déjà à un autre utilisateur."
+#: actions/groupblock.php:95
+msgid "User is already blocked from group."
+msgstr "Cet utilisateur est déjà bloqué pour le groupe."
 
-#: ../actions/avatar.php:80
-#: actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
-msgstr "Ce fichier est trop gros."
+#: actions/groupblock.php:100
+msgid "User is not a member of group."
+msgstr "L’utilisateur n’est pas membre du groupe."
 
-#: ../actions/imsettings.php:170
-#: actions/imsettings.php:178
-#: actions/imsettings.php:293
-msgid "That is already your Jabber ID."
-msgstr "Vous utilisez déjà cet idenfiant Jabber."
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+msgid "Block user from group"
+msgstr "Bloquer cet utilisateur du groupe"
 
-#: ../actions/emailsettings.php:188
-#: actions/emailsettings.php:206
-#: actions/emailsettings.php:318
-msgid "That is already your email address."
+#: actions/groupblock.php:162
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
 msgstr ""
-"Vous utilisez déjà cette adresse courriel."
+"Êtes-vous sûr(e) de vouloir bloquer l’utilisateur \"%s\" du groupe \"%s\"? "
+"Ils seront supprimés du groupe, il leur sera interdit d’y publier, et de s’y "
+"abonner à l’avenir."
 
-#: ../actions/smssettings.php:188
-#: actions/smssettings.php:196
-#: actions/smssettings.php:306
-msgid "That is already your phone number."
-msgstr ""
-"Vous utilisez déjà ce numéro de téléphone."
+#: actions/groupblock.php:178
+msgid "Do not block this user from this group"
+msgstr "Ne pas bloquer cet utilisateur pour ce groupe"
 
-#: ../actions/imsettings.php:233
-#: actions/imsettings.php:241
-#: actions/imsettings.php:381
-msgid "That is not your Jabber ID."
-msgstr "Ceci n'est pas votre identifiant Jabber."
+#: actions/groupblock.php:179
+msgid "Block this user from this group"
+msgstr "Bloquer cet utilisateur de de groupe"
 
-#: ../actions/emailsettings.php:249
-#: actions/emailsettings.php:267
-#: actions/emailsettings.php:397
-msgid "That is not your email address."
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
 msgstr ""
-"Ceci n'est pas votre adresse courriel."
+"Erreur de la base de données lors du blocage de l’utilisateur du groupe."
 
-#: ../actions/smssettings.php:257
-#: actions/smssettings.php:265
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
-msgstr ""
-"Ceci n'est pas votre numéro de téléphone."
+#: actions/groupbyid.php:74
+msgid "No ID"
+msgstr "Aucun identifiant"
 
-#: ../actions/emailsettings.php:226
-#: ../actions/imsettings.php:210
-#: actions/emailsettings.php:244
-#: actions/imsettings.php:218
-#: actions/emailsettings.php:367
-#: actions/imsettings.php:349
-msgid "That is the wrong IM address."
-msgstr "Cette adresse de messagerie instantanée est erronée."
+#: actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
+msgstr "Vous devez ouvrir une session pour modifier un groupe."
 
-#: ../actions/smssettings.php:233
-#: actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
-msgstr ""
-"Ce code de confirmation est incorrect."
+#: actions/groupdesignsettings.php:141
+msgid "Group design"
+msgstr "Conception du groupe"
 
-#: ../actions/smssettings.php:191
-#: actions/smssettings.php:199
-#: actions/smssettings.php:309
-msgid "That phone number already belongs to another user."
+#: actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
 msgstr ""
-"Ce numéro de téléphone est déjà utilisé."
-
-#: ../actions/newnotice.php:49
-#: ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49
-#: actions/twitapistatuses.php:330
-#: actions/facebookhome.php:243
-#: actions/twitapistatuses.php:276
-msgid "That's too long. Max notice size is 140 chars."
-msgstr "C'est trop long ! Vous n'avez droit qu'à 140 caractères."
-
-#: ../actions/twitapiaccount.php:74
-#: actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "C'est trop long ! Vous n'avez droit qu'à 255 caractères."
-
-#: ../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é validée pour votre compte."
-
-#: ../actions/emailsettings.php:264
-#: ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274
-#: actions/emailsettings.php:282
-#: actions/imsettings.php:258
-#: actions/smssettings.php:282
-#: actions/emailsettings.php:416
-#: actions/imsettings.php:402
-#: actions/smssettings.php:413
-msgid "The address was removed."
-msgstr "L'adresse a été supprimée."
 
-#: ../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 "L'abonnement a été autorisé, mais l'URL de rappel n'a pas été validé. Vérifiez les instructions du site pour savoir comment compléter l'autorisation de l'abonnement. Votre jeton d'abonnement est :"
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+msgid "Couldn't update your design."
+msgstr "Impossible de mettre à jour votre conception."
 
-#: ../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 "L'abonnement a été refusé, mais l'URL de rappel n'a pas été validé. Vérifiez les instructions du site pour savoir comment refuser pleinement l'abonnement. "
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "L’enregistrement de votre configuration Twitter a échoué !"
 
-#: ../actions/subscribers.php:35
-#: actions/subscribers.php:35
-#, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr "Ces personnes suivent les statuts de %s."
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Préférences de synchronisation enregistrées."
 
-#: ../actions/subscribers.php:33
-#: actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr "Ces personnes suivent vos statuts. "
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
+msgstr "Logo du groupe"
 
-#: ../actions/subscriptions.php:35
-#: actions/subscriptions.php:35
+#: actions/grouplogo.php:150
 #, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr "Les statuts de ces personnes sont suivis par %s."
-
-#: ../actions/subscriptions.php:33
-#: actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr "Vous suivez les statuts de ces personnes. "
-
-#: ../actions/invite.php:89
-#: actions/invite.php:96
-#: actions/invite.php:128
-msgid "These people are already users and you were automatically subscribed to them:"
-msgstr "Vous avez été automatiquement abonné aux utilisateurs suivants :"
-
-#: ../actions/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
-msgstr "Ce code de validation est périmé. Veuillez recommencer. "
-
-#: ../lib/openid.php:195
-msgid "This form should automatically submit itself. If not, click the submit button to go to your OpenID provider."
-msgstr "Ce formulaire devrait se transmettre automatiquement. Si ce n'est pas le cas, cliquez sur le bouton de soumission pour accéder à votre fournisseur OpenID."
-
-#: ../actions/finishopenidlogin.php:56
-#: actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
-#, 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 "C'est votre première ouverture de session dans %s, et nous devons relier votre OpenID à un compte local. Vous pouvez soit créer un nouveau compte, soit relier votre OpenID à un compte existant."
-
-#: ../actions/twitapifriendships.php:108
-#: ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127
-#: actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
-#: actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85
-#: actions/twitapistatuses.php:436
-msgid "This method requires a POST or DELETE."
-msgstr "Ce processus requiert un POST ou un 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
-#: actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122
-#: actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
-msgid "This method requires a POST."
-msgstr "Ce processus requiert un POST."
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
+"Vous pouvez choisir un logo pour votre groupe. La taille maximale du fichier "
+"est de %s."
 
-#: ../lib/util.php:164
-#: lib/util.php:246
-msgid "This page is not available in a media type you accept"
-msgstr "Cette page n'est pas disponible dans un des formats que vous avez autorisés."
+#: actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
+msgstr "Sélectionnez une zone de forme carrée sur l’image qui sera le logo."
 
-#: ../actions/profilesettings.php:63
-#: actions/profilesettings.php:96
-#: actions/profilesettings.php:138
-msgid "Timezone"
-msgstr "Fuseau horaire"
+#: actions/grouplogo.php:396
+msgid "Logo updated."
+msgstr "Logo mis à jour."
 
-#: ../actions/profilesettings.php:107
-#: actions/profilesettings.php:222
-#: actions/profilesettings.php:211
-msgid "Timezone not selected."
-msgstr "Aucun fuseau horaire n'a été choisi."
+#: actions/grouplogo.php:398
+msgid "Failed updating logo."
+msgstr "La mise à jour du logo a échoué."
 
-#: ../actions/remotesubscribe.php:43
+#: actions/groupmembers.php:93 lib/groupnav.php:92
 #, 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 "Pour vous abonner, vous devez [ouvrir une session](%%action.login%%), ou [créer un nouveau compte](%%action.register%%). Si vous avez déjà un compte sur un [site de micro-blogging compatible](%%doc.openmublog%%), entrez l'URL de votre profil ci-dessous."
-
-#: ../actions/twitapifriendships.php:163
-#: actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
-msgid "Two user ids or screen_names must be supplied."
-msgstr "Vous devez fournir 2 identifiants ou pseudos."
-
-#: ../actions/profilesettings.php:48
-#: ../actions/register.php:169
-#: actions/profilesettings.php:81
-#: actions/register.php:183
-#: actions/profilesettings.php:109
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "Adresse de votre site Web, blogue, ou profil dans un autre site"
+msgid "%s group members"
+msgstr "Membres du groupe %s"
 
-#: ../actions/remotesubscribe.php:74
-#: actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-msgid "URL of your profile on another compatible microblogging service"
-msgstr "URL de votre profil sur un autre service de micro-blogging compatible"
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
+msgstr "Membres du groupe %s - page %d"
 
-#: ../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
-#: actions/avatarsettings.php:258
-#: actions/emailsettings.php:242
-#: actions/grouplogo.php:317
-#: actions/imsettings.php:214
-#: actions/recoverpassword.php:44
-#: actions/smssettings.php:236
-#: actions/twittersettings.php:302
-msgid "Unexpected form submission."
-msgstr "Soumission de formulaire inattendue."
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr "Liste des utilisateurs inscrits à ce groupe."
 
-#: ../actions/recoverpassword.php:276
-#: actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
-msgid "Unexpected password reset."
-msgstr "Réinitialisation inattendue du mot de passe."
+#: actions/groupmembers.php:175 lib/groupnav.php:107
+msgid "Admin"
+msgstr "Administrer"
 
-#: ../index.php:57
-#: index.php:57
-#: actions/recoverpassword.php:202
-msgid "Unknown action"
-msgstr "Action inconnue"
+#: actions/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
+msgstr "Bloquer"
 
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60
-#: actions/finishremotesubscribe.php:61
-msgid "Unknown version of OMB protocol."
-msgstr "Version inconnue du protocole OMB"
+#: actions/groupmembers.php:441
+msgid "Make user an admin of the group"
+msgstr "Faire de cet utilisateur un administrateur du groupe"
 
-#: ../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 précision contraire, les contenus de ce site sont la propriété de leurs auteurs et sont disponibles sous"
+#: actions/groupmembers.php:473
+msgid "Make Admin"
+msgstr "Faire un administrateur"
 
-#: ../actions/confirmaddress.php:48
-#: actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
-#, php-format
-msgid "Unrecognized address type %s"
-msgstr "Type d'adresse non reconnu : %s"
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr "Faire de cet utilisateur un administrateur"
 
-#: ../actions/showstream.php:209
-#: actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
-msgstr "Désabonnement"
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Statuts de %1$s dans %2$s!"
 
-#: ../actions/postnotice.php:44
-#: ../actions/updateprofile.php:45
-#: actions/postnotice.php:45
-#: actions/updateprofile.php:46
-#: actions/postnotice.php:48
-#: actions/updateprofile.php:49
-msgid "Unsupported OMB version"
-msgstr "Version de OMB non supportée"
-
-#: ../actions/avatar.php:105
-#: actions/profilesettings.php:342
-#: lib/imagefile.php:102
-msgid "Unsupported image file format."
-msgstr "Format de fichier d'image non supporté."
+#: actions/groupsearch.php:52
+#, fuzzy, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"Recherchez des personnes dans %%site.name%% par leur nom, leur emplacement "
+"ou leurs intérêts. Séparez les termes de recherche par des espaces. Ils "
+"doivent contenir au moins 3 caractères."
 
-#: ../lib/settingsaction.php:100
-#: lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
-msgstr "Suivi des statuts par SMS"
+#: actions/groupsearch.php:58
+msgid "Group search"
+msgstr "Rechercher des groupes"
 
-#: ../lib/settingsaction.php:103
-#: lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
-msgstr "Suivi des statuts par messagerie instantanée"
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+msgid "No results."
+msgstr "Aucun résultat."
 
-#: ../actions/twitapistatuses.php:241
-#: actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/groupsearch.php:82
 #, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr "Statuts de %1$s et ses amis dans %2$s!"
+msgid ""
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
+msgstr ""
 
-#: ../actions/twitapistatuses.php:341
-#: actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/groupsearch.php:85
 #, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr "Statuts de %1$s dans %2$s!"
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
 
-#: ../actions/avatar.php:68
-#: actions/profilesettings.php:161
-#: actions/avatarsettings.php:162
-#: actions/grouplogo.php:232
-msgid "Upload"
-msgstr "Transfert"
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Groupes"
 
-#: ../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 "Ajoutez un nouvel « avatar » (votre image d'utilisateur). Vous ne pouvez modifier l'image après l'envoi, alors faites en sorte qu'elle soit plus ou moins carrée. Elle doit aussi être compatible avec la licence d'utilisation du site ; utilisez de préférence une image qui vous appartient et que vous voulez partager."
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Groupes - page %d"
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
 msgstr ""
-"Ajouter une nouvelle image pour le profil"
 
-#: ../actions/invite.php:114
-#: actions/invite.php:121
-#: actions/invite.php:154
-msgid "Use this form to invite your friends and colleagues to use this service."
-msgstr "Remplissez ce formulaire pour inviter vos amis et collègues à utiliser ce service."
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Créer un nouveau groupe"
 
-#: ../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é uniquement pour les mises à jour de statut, les avertissements, et la récupération de mot de passe"
-
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88
-#: actions/finishremotesubscribe.php:94
-msgid "User being listened to doesn't exist."
-msgstr "L'utilisateur suivi n'existe pas."
-
-#: ../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
-#: actions/avatarbynickname.php:80
-#: actions/foaf.php:48
-#: actions/replies.php:80
-#: actions/showstream.php:107
-#: actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42
-#: actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503
-#: actions/twitapiusers.php:55
-#: actions/usergroups.php:99
-#: lib/galleryaction.php:67
-#: lib/twitterapi.php:626
-msgid "User has no profile."
-msgstr "Aucun profil ne correspond à cet utilisateur."
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr "Seul un administrateur peut débloquer les membres du groupes."
 
-#: ../actions/remotesubscribe.php:71
-#: actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
-msgstr "Pseudo de l'utilisateur"
+#: actions/groupunblock.php:95
+msgid "User is not blocked from group."
+msgstr "Cet utilisateur n’est pas bloqué du groupe."
 
-#: ../actions/twitapiusers.php:75
-#: actions/twitapiusers.php:80
-msgid "User not found."
-msgstr "Utilisateur non trouvé."
+#: actions/groupunblock.php:128 actions/unblock.php:108
+msgid "Error removing the block."
+msgstr "Erreur lors de l’annulation du blocage."
 
-#: ../actions/profilesettings.php:63
-#: actions/profilesettings.php:96
-#: actions/profilesettings.php:139
-msgid "What timezone are you normally in?"
-msgstr "Quel est votre fuseau horaire habituel ?"
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "Paramètres de messagerie instantanée"
 
-#: ../lib/util.php:1159
-#: lib/util.php:1293
-#: lib/noticeform.php:141
+#: actions/imsettings.php:70
 #, php-format
-msgid "What's up, %s?"
-msgstr "Quoi de neuf, %s ?"
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+"Vous pouvez envoyer et recevoir des messages via [la messagerie instantanée]"
+"(%%doc.im%%) Jabber/GTalk. Configurez votre adresse et vos paramètres ci-"
+"dessous."
 
-#: ../actions/profilesettings.php:54
-#: ../actions/register.php:175
-#: actions/profilesettings.php:87
-#: actions/register.php:189
-#: actions/profilesettings.php:119
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Indiquez votre emplacement, ex.: \"Ville, État (ou région), Pays\""
+#: actions/imsettings.php:89
+msgid "IM is not available."
+msgstr "La messagerie instantanée n’est pas disponible."
 
-#: ../actions/updateprofile.php:128
-#: actions/updateprofile.php:129
-#: actions/updateprofile.php:132
-#, php-format
-msgid "Wrong image type for '%s'"
-msgstr "Format d'image invalide pour '%s'"
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Adresse Jabber/GTalk actuellement confirmée."
 
-#: ../actions/updateprofile.php:123
-#: actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/imsettings.php:114
 #, php-format
-msgid "Wrong size image at '%s'"
-msgstr "Dimensions d'image invalides pour '%s'"
+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 ""
+"En attente d’une confirmation pour cette adresse. Vérifiez votre compte "
+"Jabber/GTalk pour recevoir de nouvelles instructions. (Avez-vous ajouté %s à "
+"votre liste de contacts ?)"
 
-#: ../actions/deletenotice.php:63
-#: ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64
-#: actions/deletenotice.php:79
-#: actions/block.php:148
-#: actions/deletenotice.php:122
-#: actions/deletenotice.php:141
-msgid "Yes"
-msgstr "Oui"
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "Adresse de messagerie instantanée"
 
-#: ../actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-msgid "You already have this OpenID!"
-msgstr "Vous utilisez déjà cet OpenID !"
+#: actions/imsettings.php:126
+#, 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 (ex : nom@mondomaine.com). Assurez-vous d’ajouter %s "
+"à votre liste d’amis dans votre logiciel de messagerie instantanée ou dans "
+"GTalk."
 
-#: ../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 "Ce message va être définitivement supprimé. Il sera impossible de le récupérer."
+#: actions/imsettings.php:143
+msgid "Send me notices through Jabber/GTalk."
+msgstr "Envoyez-moi les statuts par Jabber/GTalk."
 
-#: ../actions/recoverpassword.php:31
-#: actions/recoverpassword.php:31
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
-msgstr "Votre session est déjà ouverte !"
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr ""
+"Publier un statut chaque fois que mon statut est modifié dans Jabber/GTalk"
 
-#: ../actions/invite.php:81
-#: actions/invite.php:88
-#: actions/invite.php:120
-msgid "You are already subscribed to these users:"
-msgstr "Vous êtes déjà abonné à ces utilisateurs :"
+#: actions/imsettings.php:153
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+"Envoyez-moi par Jabber/GTalk les réponses des personnes auxquelles je ne "
+"suis pas abonné."
 
-#: ../actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
-msgid "You are not friends with the specified user."
-msgstr "Vous n'êtes pas ami(e) avec l'utilisateur spécifié."
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Publier un MicroID pour mon adresse Jabber/GTalk."
 
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr "Vous pouvez modifier ici votre mot de passe. Choisissez-en un bon !"
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "Aucun identifiant Jabber"
 
-#: ../actions/register.php:135
-#: actions/register.php:145
-msgid "You can create a new account to start posting notices."
-msgstr "Créez un nouveau compte pour commencer à envoyer des messages."
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr "Impossible d’utiliser cet identifiant Jabber"
 
-#: ../actions/smssettings.php:28
-#: actions/smssettings.php:28
-#: actions/smssettings.php:69
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "Vous pouvez recevoir des messages SMS par courriel en provenance de %%site.name%%."
-
-#: ../actions/openidsettings.php:86
-msgid "You can remove an OpenID from your account by clicking the button marked \"Remove\"."
-msgstr "Vous pouvez retirer un OpenID de votre compte en cliquant sur le bouton « Retirer »."
-
-#: ../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 "Vous pouvez envoyer et recevoir des messages via [la messagerie instantanée](%%doc.im%%) Jabber/GTalk. Configurez votre adresse et vos paramètres ci-dessous."
-
-#: ../actions/profilesettings.php:27
-msgid "You can update your personal profile info here so people know more about you."
-msgstr "Vous pouvez mettre à jour les informations de votre profil pour qu'on en sache plus à votre sujet."
-
-#: ../actions/finishremotesubscribe.php:31
-#: ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31
-#: actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:33
-#: actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101
-#: actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
-msgstr "Vous pouvez utiliser l'abonnement local."
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "Identifiant Jabber invalide."
 
-#: ../actions/finishopenidlogin.php:33
-#: ../actions/register.php:61
-#: actions/finishopenidlogin.php:38
-#: actions/register.php:68
-#: actions/finishopenidlogin.php:43
-msgid "You can't register if you don't agree to the license."
-msgstr "Vous devez accepter les termes de la licence pour créer un compte."
+#: actions/imsettings.php:299
+msgid "That is already your Jabber ID."
+msgstr "Vous utilisez déjà cet idenfiant Jabber."
 
-#: ../actions/updateprofile.php:63
-#: actions/updateprofile.php:64
-#: actions/updateprofile.php:67
-msgid "You did not send us that profile"
-msgstr "Vous n'avez pas envoyé ce profil"
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr "Identifiant Jabber déjà utilisé par un autre utilisateur."
 
-#: ../lib/mail.php:147
+#: actions/imsettings.php:327
 #, 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"
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
 msgstr ""
-"Une nouvelle adresse vous a été attribuée pour publier vos statuts dans %1$s.\n"
-"\n"
-"Écrivez à %2$s pour mettre à jour votre statut.\n"
-"\n"
-"Plus d'info : %3$s.\n"
-"\n"
-"Amicalement vôtre,\n"
-"%4$s"
+"Un code de confirmation a été envoyé à votre adresse de messagerie "
+"instantanée. Vous devez approuver %s pour recevoir des messages."
 
-#: ../actions/twitapistatuses.php:612
-#: actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
-msgid "You may not delete another user's status."
-msgstr "Vous ne pouvez pas supprimer le statut d'un autre utilisateur."
+#: actions/imsettings.php:387
+msgid "That is not your Jabber ID."
+msgstr "Ceci n’est pas votre identifiant Jabber."
 
-#: ../actions/invite.php:31
-#: actions/invite.php:31
-#: actions/invite.php:39
+#: actions/inbox.php:59
 #, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr "Vous devez ouvrir une session pour inviter d'autres utilisateurs dans %s"
-
-#: ../actions/invite.php:103
-#: actions/invite.php:110
-#: actions/invite.php:142
-msgid "You will be notified when your invitees accept the invitation and register on the site. Thanks for growing the community!"
-msgstr "Un avertissement vous sera envoyé quand vos invités auront accepté votre invitation et se seront inscrits sur le site. Merci de faire grandir notre communauté !"
-
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr "Vous avez été identifié(e) avec succès. Veuillez entrer votre nouveau mot de passe ci-dessous."
-
-#: ../actions/openidlogin.php:67
-#: actions/openidlogin.php:76
-#: actions/openidlogin.php:104
-msgid "Your OpenID URL"
-msgstr "Votre URL OpenID"
-
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
-msgstr "Votre pseudo sur ce serveur, ou l'adresse courriel que vous avez enregistrée."
+msgid "Inbox for %s - page %d"
+msgstr "Boîte de réception de %s - page %d"
 
-#: ../actions/openidsettings.php:28
+#: actions/inbox.php:62
 #, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user account.  Manage your associated OpenIDs from here."
-msgstr "[OpenID](%%doc.openid%%) vous permet de vous connecter à différents sites avec le même compte utilisateur. Gérez vos OpenID associés à partir d'ici."
-
-#: ../lib/util.php:943
-#: lib/util.php:992
-#: lib/util.php:945
-msgid "a few seconds ago"
-msgstr "il y a quelques secondes "
+msgid "Inbox for %s"
+msgstr "Boîte de réception de %s"
 
-#: ../lib/util.php:955
-#: lib/util.php:1004
-#: lib/util.php:957
-#, php-format
-msgid "about %d days ago"
-msgstr "il y a %d jours"
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+"Cette boîte de réception regroupe les messages personnels qui vous sont "
+"envoyés."
 
-#: ../lib/util.php:951
-#: lib/util.php:1000
-#: lib/util.php:953
-#, php-format
-msgid "about %d hours ago"
-msgstr "il y a %d heures"
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr "Les invitation ont été désactivées."
 
-#: ../lib/util.php:947
-#: lib/util.php:996
-#: lib/util.php:949
+#: actions/invite.php:41
 #, php-format
-msgid "about %d minutes ago"
-msgstr "il y a %d minutes"
+msgid "You must be logged in to invite other users to use %s"
+msgstr ""
+"Vous devez ouvrir une session pour inviter d’autres utilisateurs dans %s"
 
-#: ../lib/util.php:959
-#: lib/util.php:1008
-#: lib/util.php:961
+#: actions/invite.php:72
 #, php-format
-msgid "about %d months ago"
-msgstr "il y a %d mois"
-
-#: ../lib/util.php:953
-#: lib/util.php:1002
-#: lib/util.php:955
-msgid "about a day ago"
-msgstr "il y a 1 jour"
-
-#: ../lib/util.php:945
-#: lib/util.php:994
-#: lib/util.php:947
-msgid "about a minute ago"
-msgstr "il y a 1 minute"
-
-#: ../lib/util.php:957
-#: lib/util.php:1006
-#: lib/util.php:959
-msgid "about a month ago"
-msgstr "il y a 1 mois"
-
-#: ../lib/util.php:961
-#: lib/util.php:1010
-#: lib/util.php:963
-msgid "about a year ago"
-msgstr "il y a environ 1 an"
-
-#: ../lib/util.php:949
-#: lib/util.php:998
-#: lib/util.php:951
-msgid "about an hour ago"
-msgstr "il y a 1 heure"
+msgid "Invalid email address: %s"
+msgstr "Adresse courriel invalide : %s"
 
-#: ../actions/showstream.php:423
-#: ../lib/stream.php:132
-#: actions/showstream.php:441
-#: lib/stream.php:99
-msgid "delete"
-msgstr "supprimer"
-
-#: ../actions/noticesearch.php:130
-#: ../actions/showstream.php:408
-#: ../lib/stream.php:117
-#: actions/noticesearch.php:136
-#: actions/showstream.php:426
-#: lib/stream.php:84
-#: actions/noticesearch.php:187
-msgid "in reply to..."
-msgstr "en réponse à..."
-
-#: ../actions/noticesearch.php:137
-#: ../actions/showstream.php:415
-#: ../lib/stream.php:124
-#: actions/noticesearch.php:143
-#: actions/showstream.php:433
-#: lib/stream.php:91
-#: actions/noticesearch.php:194
-msgid "reply"
-msgstr "répondre"
-
-#: ../actions/password.php:44
-#: actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-msgid "same as password above"
-msgstr "identique au mot de passe ci-dessus"
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
+msgstr "Invitation(s) envoyée(s)"
 
-#: ../actions/twitapistatuses.php:755
-#: actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
-msgid "unsupported file type"
-msgstr ""
-"type de fichier non supporté"
-
-#: ../lib/util.php:1309
-#: lib/util.php:1443
-msgid "« After"
-msgstr "« Après"
-
-#: 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
-#: actions/block.php:64
-#: actions/disfavor.php:74
-#: actions/favor.php:77
-#: actions/finishopenidlogin.php:38
-#: actions/invite.php:54
-#: actions/nudge.php:80
-#: actions/openidlogin.php:37
-#: actions/recoverpassword.php:316
-#: actions/subscribe.php:46
-#: actions/unblock.php:65
-#: actions/unsubscribe.php:43
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Un problème est survenu avec votre jeton de session. Veuillez essayer à nouveau."
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr "Inviter de nouveaux utilisateurs"
 
-#: actions/disfavor.php:55
-#: actions/disfavor.php:81
-msgid "This notice is not a favorite!"
-msgstr "Ce statut n'est pas un favori !"
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr "Vous êtes déjà abonné à ces utilisateurs :"
 
-#: actions/disfavor.php:63
-#: actions/disfavor.php:87
-msgid "Could not delete favorite."
-msgstr "Impossible de supprimer le favori."
+#: actions/invite.php:131 actions/invite.php:139
+#, php-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: actions/disfavor.php:72
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "Ajouter à mes favoris"
+#: actions/invite.php:136
+msgid ""
+"These people are already users and you were automatically subscribed to them:"
+msgstr "Vous avez été automatiquement abonné aux utilisateurs suivants :"
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
-msgstr "Envoyez-moi un courriel quand un utilisateur ajoute un de mes statuts à ses favoris."
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
+msgstr "Invitation(s) envoyée(s) aux personnes suivantes :"
 
-#: actions/emailsettings.php:95
-#: actions/emailsettings.php:163
-msgid "Send me email when someone sends me a private message."
-msgstr "Envoyez-moi un courriel quand quelqu'un m'envoie un message personnel."
+#: actions/invite.php:150
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr ""
+"Un avertissement vous sera envoyé quand vos invités auront accepté votre "
+"invitation et se seront inscrits sur le site. Merci de faire grandir notre "
+"communauté !"
 
-#: actions/favor.php:53
-#: actions/twitapifavorites.php:142
-#: actions/favor.php:81
-#: actions/twitapifavorites.php:118
-msgid "This notice is already a favorite!"
-msgstr "Ce statut a déjà été ajouté à vos favoris !"
+#: actions/invite.php:162
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
+msgstr ""
+"Remplissez ce formulaire pour inviter vos amis et collègues à utiliser ce "
+"service."
 
-#: actions/favor.php:60
-#: actions/twitapifavorites.php:151
-#: classes/Command.php:132
-#: actions/favor.php:86
-#: actions/twitapifavorites.php:125
-#: classes/Command.php:152
-msgid "Could not create favorite."
-msgstr "Impossible de créer le favori."
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "Adresses courriel"
 
-#: actions/favor.php:70
-msgid "Disfavor"
-msgstr "Retirer des favoris"
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr "Adresses d’amis à inviter (un par ligne)"
 
-#: actions/favoritesrss.php:60
-#: actions/showfavorites.php:47
-#: actions/favoritesrss.php:100
-#: actions/showfavorites.php:77
-#, php-format
-msgid "%s favorite notices"
-msgstr "Statuts favoris de %s"
+#: actions/invite.php:192
+msgid "Personal message"
+msgstr "Message personnel"
 
-#: actions/favoritesrss.php:64
-#: actions/favoritesrss.php:104
-#, php-format
-msgid "Feed of favorite notices of %s"
-msgstr "Fil des statuts favoris de %s"
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
+msgstr "Ajouter un message personnel à l’invitation (optionnel)."
 
-#: actions/inbox.php:28
-#: actions/inbox.php:59
-#, php-format
-msgid "Inbox for %s - page %d"
-msgstr "Boîte de réception de %s - page %d"
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
+msgstr "Envoyer"
 
-#: actions/inbox.php:30
-#: actions/inbox.php:62
+#: actions/invite.php:226
 #, php-format
-msgid "Inbox for %s"
-msgstr "Boîte de réception de %s"
-
-#: actions/inbox.php:53
-#: actions/inbox.php:115
-msgid "This is your inbox, which lists your incoming private messages."
-msgstr "Cette boîte de réception regroupe les messages personnels qui vous sont envoyés."
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s vous invite à vous inscrire sur %2$s"
 
-#: actions/invite.php:178
-#: actions/invite.php:213
+#: actions/invite.php:228
 #, 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 vous invite à vous inscrire à %2$s (%3$s).\n"
+"%1$s vous invite à vous inscrire sur %2$s (%3$s).\n"
 "\n"
+"%2$s est un service de micro-blogging qui vous permet de rester en contact "
+"avec des personnes que vous connaissez et des personnes qui vous "
+"intéressent.\n"
+"\n"
+"Vous pouvez aussi partager des informations sur vous, vos idées, ou votre "
+"vie en ligne avec les personnes qui vous connaissent. C’est également un "
+"outil utile pour rencontrer de nouvelles personnes qui partagent vos "
+"intérêts.\n"
+"\n"
+"%1$s dit:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Vous pouvez voir le profil de %1$s sur %2$s ici:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Si vous souhaitez essayez ce service, cliquez sur le lien ci-dessous pour "
+"accepter l’invitation\n"
+"\n"
+"%6$s\n"
+"\n"
+"Sinon, vous pouvez ignorer ce message. Merci pour votre patience et votre "
+"temps.\n"
+"\n"
+"Cordialement, %2$s\n"
 
-#: actions/login.php:104
-#: actions/login.php:235
-#: actions/openidlogin.php:108
-#: actions/register.php:416
-msgid "Automatically login in the future; "
-msgstr "Ouvrez automatiquement une session à l'avenir ;"
-
-#: actions/login.php:122
-#: actions/login.php:264
-msgid "For security reasons, please re-enter your "
-msgstr "Pour des raisons de sécurité, veuillez entrer à nouveau votre "
-
-#: actions/login.php:126
-#: actions/login.php:268
-msgid "Login with your username and password. "
-msgstr "Entrez votre identifiant et votre mot de passe."
-
-#: actions/newmessage.php:58
-#: actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
-msgid "That's too long. Max message size is 140 chars."
-msgstr "C'est trop long ! Vous n'avez droit qu'à 140 caractères."
-
-#: actions/newmessage.php:65
-#: actions/newmessage.php:128
-msgid "No recipient specified."
-msgstr "Aucun destinataire n'a été spécifié."
-
-#: actions/newmessage.php:68
-#: actions/newmessage.php:113
-#: classes/Command.php:206
-#: actions/newmessage.php:131
-#: actions/newmessage.php:168
-#: classes/Command.php:237
-msgid "You can't send a message to this user."
-msgstr "Vous ne pouvez pas envoyer de messages à cet utilisateur."
-
-#: actions/newmessage.php:71
-#: actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
-#: actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
-msgid "Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "N'envoyez pas de message à vous-même ; dites-le plutôt dans votre tête..."
-
-#: actions/newmessage.php:108
-#: actions/microsummary.php:62
-#: actions/newmessage.php:163
-msgid "No such user"
-msgstr "Utilisateur inexistant"
-
-#: actions/newmessage.php:117
-#: actions/newmessage.php:67
-msgid "New message"
-msgstr "Nouveau message"
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
+msgstr "Vous devez ouvrir une session pour rejoindre un groupe."
 
-#: actions/noticesearch.php:95
-#: actions/noticesearch.php:146
-msgid "Notice without matching profile"
-msgstr "Message sans profil correspondant"
+#: actions/joingroup.php:90 lib/command.php:217
+msgid "You are already a member of that group"
+msgstr "Vous êtes déjà membre de ce groupe"
 
-#: actions/openidsettings.php:28
-#: actions/openidsettings.php:70
+#: actions/joingroup.php:128 lib/command.php:234
 #, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr "[OpenID](%%doc.openid%%) permet de vous connecter à de nombreux sites "
+msgid "Could not join user %s to group %s"
+msgstr "Impossible d’inscrire l’utilisateur %s au groupe %s"
 
-#: actions/openidsettings.php:46
-#: actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
-msgstr "Si vous ne souhaitez pas ajouter un identifiant OpenID à votre compte, "
+#: actions/joingroup.php:135 lib/command.php:239
+#, php-format
+msgid "%s joined group %s"
+msgstr "%s a rejoint le groupe %s"
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr "C'est votre seul identifiant OpenID ; si vous le supprimez, vous ne pourrez plus vous identifier !"
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
+msgstr "Vous devez ouvrir une session pour quitter un groupe."
 
-#: actions/openidsettings.php:87
-#: actions/openidsettings.php:143
-msgid "You can remove an OpenID from your account "
-msgstr "Vous pouvez retirer un identifiant OpenID de votre compte "
+#: actions/leavegroup.php:90 lib/command.php:268
+msgid "You are not a member of that group."
+msgstr "Vous n'êtes pas membre de ce groupe."
 
-#: actions/outbox.php:28
-#: actions/outbox.php:58
-#, php-format
-msgid "Outbox for %s - page %d"
-msgstr "Boîte d'envoi de %s - page %d"
+#: actions/leavegroup.php:119 lib/command.php:278
+msgid "Could not find membership record."
+msgstr "Aucun enregistrement à ce groupe n’a été trouvé."
 
-#: actions/outbox.php:30
-#: actions/outbox.php:61
+#: actions/leavegroup.php:127 lib/command.php:284
 #, php-format
-msgid "Outbox for %s"
-msgstr "Boîte d'envoi de %s"
-
-#: actions/outbox.php:53
-#: actions/outbox.php:116
-msgid "This is your outbox, which lists private messages you have sent."
-msgstr "Cette boîte d'envoi regroupe les messages personnels que vous avez envoyés."
+msgid "Could not remove user %s to group %s"
+msgstr "Impossible de retirer l’utilisateur %s du groupe %s"
 
-#: actions/peoplesearch.php:28
-#: actions/peoplesearch.php:52
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
-msgid "Search for people on %%site.name%% by their name, location, or interests. "
-msgstr "Recherchez des utilisateurs de %%site.name%% par nom, par emplacement, ou par intérêts. "
-
-#: actions/profilesettings.php:27
-#: actions/profilesettings.php:69
-msgid "You can update your personal profile info here "
-msgstr "Vous pouvez mettre votre profil à jour ici  "
-
-#: actions/profilesettings.php:115
-#: actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159
-#: actions/userrss.php:76
-#: actions/avatarsettings.php:104
-#: actions/avatarsettings.php:179
-#: actions/grouplogo.php:177
-#: actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176
-#: actions/userrss.php:82
-msgid "User without matching profile"
-msgstr "Utilisateur sans profil correspondant"
-
-#: actions/recoverpassword.php:91
-#: actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
-msgstr "Ce code de validation est périmé."
-
-#: actions/recoverpassword.php:141
-#: actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
-msgstr "Si vous avez oublié ou perdu votre "
-
-# Entrez un : masculin ou féminin ? De quoi s'agit-il ? Contexte ?
-#: actions/recoverpassword.php:154
-#: actions/recoverpassword.php:158
-msgid "You've been identified. Enter a "
-msgstr "Vous avez été identifié(e) avec succès. Entrez un "
+msgid "%s left group %s"
+msgstr "%s a quitté le groupe %s"
 
-#: actions/recoverpassword.php:169
-#: actions/recoverpassword.php:188
-msgid "Your nickname on this server, "
-msgstr "Votre pseudo sur ce serveur, "
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "Déjà connecté."
 
-#: actions/recoverpassword.php:271
-#: actions/recoverpassword.php:304
-msgid "Instructions for recovering your password "
-msgstr "Instructions pour récupérer votre mot de passe"
+#: actions/login.php:110 actions/login.php:120
+msgid "Invalid or expired token."
+msgstr "Jeton invalide ou expiré."
 
-#: actions/recoverpassword.php:327
-#: actions/recoverpassword.php:361
-msgid "New password successfully saved. "
-msgstr "Votre nouveau mot de passe a été enregistré avec succès."
+#: actions/login.php:143
+msgid "Incorrect username or password."
+msgstr "Identifiant ou mot de passe incorrect."
 
-#: actions/register.php:95
-#: actions/register.php:180
-msgid "Password must be 6 or more characters."
-msgstr "Votre mot de passe doit contenir au moins 6 caractères."
+#: actions/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
+msgstr "Erreur lors de la configuration de l’utilisateur."
 
-#: actions/register.php:216
-#, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may want to..."
-msgstr "Félicitations, %s ! Bienvenue dans %%%%site.name%%%%. Plusieurs choix s'offrent maintenant à vous :"
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "Ouvrir une session"
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
-msgstr "(Vous recevrez sous peu un courriel avec "
+#: actions/login.php:243
+msgid "Login to site"
+msgstr "Ouverture de session"
 
-#: actions/remotesubscribe.php:51
-#: actions/remotesubscribe.php:74
-#, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr "Pour vous abonner, vous pouvez [login](%%action.login%%), "
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Pseudo"
 
-#: actions/showfavorites.php:61
-#: actions/showfavorites.php:145
-#, php-format
-msgid "Feed for favorites of %s"
-msgstr "Fil des favoris de %s"
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Mot de passe"
 
-#: actions/showfavorites.php:84
-#: actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202
-#: actions/twitapifavorites.php:59
-msgid "Could not retrieve favorite notices."
-msgstr "Impossible d'afficher les favoris."
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "Se souvenir de moi"
 
-#: actions/showmessage.php:33
-#: actions/showmessage.php:81
-msgid "No such message."
-msgstr "Message introuvable."
+#: actions/login.php:253 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
+msgstr ""
+"Ouvrir automatiquement ma session à l’avenir (déconseillé pour les "
+"ordinateurs publics ou partagés)"
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
-msgstr "Ce message personnel ne peut être lu que par son expéditeur et son destinataire."
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "Mot de passe perdu ?"
 
-#: actions/showmessage.php:61
-#: actions/showmessage.php:108
-#, php-format
-msgid "Message to %1$s on %2$s"
-msgstr "Message adressé à %1$s le %2$s"
+#: actions/login.php:282
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr ""
+"Pour des raisons de sécurité, veuillez entrer à nouveau votre identifiant et "
+"votre mot de passe afin d’enregistrer vos préférences."
 
-#: actions/showmessage.php:66
-#: actions/showmessage.php:113
-#, php-format
-msgid "Message from %1$s on %2$s"
-msgstr "Message reçu de %1$s le %2$s"
+#: actions/login.php:286
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"Ouvrez une session avec votre identifiant et votre mot de passe, ou [créez "
+"un compte](%%action.register%%), ou utilisez un identifiant [OpenID](%%"
+"action.openidlogin%%)."
 
-#: actions/showstream.php:154
-msgid "Send a message"
-msgstr "Envoyer un message"
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+"Seul un administrateur peut faire d’un autre utilisateur un administrateur."
 
-#: actions/smssettings.php:312
-#: actions/smssettings.php:464
+#: actions/makeadmin.php:95
 #, php-format
-msgid "Mobile carrier for your phone. "
-msgstr "Votre fournisseur de téléphone mobile."
+msgid "%s is already an admin for group \"%s\"."
+msgstr "%s est déjà un administrateur du groupe « %s »."
 
-#: actions/twitapidirect_messages.php:76
-#: actions/twitapidirect_messages.php:68
+#: actions/makeadmin.php:132
 #, php-format
-msgid "Direct messages to %s"
-msgstr "Messages envoyés à %s"
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
 
-#: actions/twitapidirect_messages.php:77
-#: actions/twitapidirect_messages.php:69
+#: actions/makeadmin.php:145
 #, php-format
-msgid "All the direct messages sent to %s"
-msgstr "Tous les messages envoyés à %s"
-
-#: actions/twitapidirect_messages.php:81
-#: actions/twitapidirect_messages.php:73
-msgid "Direct Messages You've Sent"
-msgstr "Messages envoyés"
+msgid "Can't make %s an admin for group %s"
+msgstr "Impossible de faire %s un administrateur du groupe %s"
 
-#: actions/twitapidirect_messages.php:82
-#: actions/twitapidirect_messages.php:74
-#, php-format
-msgid "All the direct messages sent from %s"
-msgstr "Tous les messages envoyés par %s"
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr "Aucun statut actuel"
 
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-msgid "No message text!"
-msgstr "Message sans texte !"
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr "Nouveau groupe"
 
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-msgid "Recipient user not found."
-msgstr "Destinataire non trouvé."
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
+msgstr "Remplissez les champs ci-dessous pour créer un nouveau groupe :"
 
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr "Vous ne pouvez envoyer des messages personnels qu'aux utilisateurs inscrits comme amis."
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr "Nouveau message"
 
-#: actions/twitapifavorites.php:92
-#: actions/twitapifavorites.php:66
-#, php-format
-msgid "%s / Favorites from %s"
-msgstr "%s / Favoris de %s"
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
+msgstr "Vous ne pouvez pas envoyer de messages à cet utilisateur."
 
-#: actions/twitapifavorites.php:95
-#: actions/twitapifavorites.php:69
-#, php-format
-msgid "%s updates favorited by %s / %s."
-msgstr "%s statuts ont été ajoutés aux favoris de %s / %s."
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+msgstr "Aucun contenu !"
 
-#: actions/twitapifavorites.php:187
-#: lib/mail.php:275
-#: actions/twitapifavorites.php:164
-#: lib/mail.php:553
-#, php-format
-msgid "%s added your notice as a favorite"
-msgstr "%s a ajouté un de vos messages à ses favoris"
+#: actions/newmessage.php:158
+msgid "No recipient specified."
+msgstr "Aucun destinataire n’a été spécifié."
 
-#: actions/twitapifavorites.php:188
-#: lib/mail.php:276
-#: actions/twitapifavorites.php:165
-#, php-format
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
-"%1$s a ajouté à ses favoris un de vos statuts dans %2$s.\n"
-"\n"
-
-#: actions/twittersettings.php:27
-msgid "Add your Twitter account to automatically send your notices to Twitter, "
-msgstr "Inscrivez votre compte Twitter pour transférer automatiquement vos statuts vers Twitter, "
-
-#: actions/twittersettings.php:41
-#: actions/twittersettings.php:60
-msgid "Twitter settings"
-msgstr "Préférences Twitter"
-
-#: actions/twittersettings.php:48
-#: actions/twittersettings.php:105
-msgid "Twitter Account"
-msgstr "Votre compte Twitter"
-
-#: actions/twittersettings.php:56
-#: actions/twittersettings.php:113
-msgid "Current verified Twitter account."
-msgstr "Compte Twitter actuellement utilisé."
-
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr "Identifiant Twitter"
-
-#: actions/twittersettings.php:65
-#: actions/twittersettings.php:123
-msgid "No spaces, please."
-msgstr "Veuillez éviter les espaces."
-
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
-msgstr "Mot de passe Twitter"
-
-#: actions/twittersettings.php:72
-#: actions/twittersettings.php:139
-msgid "Automatically send my notices to Twitter."
-msgstr "Envoyer automatiquement mes statuts dans Twitter."
-
-#: actions/twittersettings.php:75
-#: actions/twittersettings.php:146
-msgid "Send local \"@\" replies to Twitter."
-msgstr "Envoyer mes réponses locales \"@\" dans Twitter."
-
-#: actions/twittersettings.php:78
-#: actions/twittersettings.php:153
-msgid "Subscribe to my Twitter friends here."
-msgstr "Je veux m'abonner à mes amis de Twitter qui ont enregistré un compte ici."
-
-#: actions/twittersettings.php:122
-msgid "Username must have only numbers, upper- and lowercase letters, and underscore (_). 15 chars max."
-msgstr "L'identifiant ne doit pas dépasser 15 caractères, et ne peut contenir que des chiffres, des lettres minuscules ou majuscules, et des barres de soulignement (_). "
-
-#: actions/twittersettings.php:128
-#: actions/twittersettings.php:334
-msgid "Could not verify your Twitter credentials!"
-msgstr "La vérification de vos informations de Twitter a échoué !"
-
-#: actions/twittersettings.php:137
-#, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr "Impossible de récupérer l'information du compte de \"%s\" dans Twitter."
-
-#: actions/twittersettings.php:151
-#: actions/twittersettings.php:170
-#: actions/twittersettings.php:348
-#: actions/twittersettings.php:368
-msgid "Unable to save your Twitter settings!"
-msgstr "L'enregistrement de votre configuration Twitter a échoué !"
-
-#: actions/twittersettings.php:174
-#: actions/twittersettings.php:376
-msgid "Twitter settings saved."
-msgstr "Configuration Twitter enregistrée avec succès."
-
-#: actions/twittersettings.php:192
-#: actions/twittersettings.php:395
-msgid "That is not your Twitter account."
-msgstr "Ce compte Twitter ne vous appartient pas."
-
-#: actions/twittersettings.php:200
-#: actions/twittersettings.php:208
-#: actions/twittersettings.php:403
-msgid "Couldn't remove Twitter user."
-msgstr "Impossible de retirer cet utilisateur de Twitter."
-
-#: actions/twittersettings.php:212
-#: actions/twittersettings.php:407
-msgid "Twitter account removed."
-msgstr "Le compte Twitter a été retiré."
-
-#: actions/twittersettings.php:225
-#: actions/twittersettings.php:239
-#: actions/twittersettings.php:428
-#: actions/twittersettings.php:439
-#: actions/twittersettings.php:453
-msgid "Couldn't save Twitter preferences."
-msgstr "Impossible d'enregistrer vos préférences Twitter."
-
-#: actions/twittersettings.php:245
-#: actions/twittersettings.php:461
-msgid "Twitter preferences saved."
-msgstr "Préférences Twitter enregistrées avec succès."
-
-#: actions/userauthorization.php:84
-#: actions/userauthorization.php:86
-msgid "Please check these details to make sure "
-msgstr "Veuillez vérifier ces informations pour vous assurer que "
-
-# we are missing context here
-#: actions/userauthorization.php:324
-#: actions/userauthorization.php:340
-#, fuzzy
-msgid "The subscription has been authorized, but no "
-msgstr "L'abonnement a été autorisé, mais pas "
+"N’envoyez pas de message à vous-même ; dites-le plutôt dans votre tête..."
 
-# missing context
-#: actions/userauthorization.php:334
-#: actions/userauthorization.php:351
-#, fuzzy
-msgid "The subscription has been rejected, but no "
-msgstr "L'abonnement a été refusé, mais pas "
+#: actions/newmessage.php:181
+msgid "Message sent"
+msgstr "Message envoyé"
 
-#: classes/Channel.php:113
-#: classes/Channel.php:132
-#: classes/Channel.php:151
-msgid "Command results"
-msgstr "Résultats de la commande"
+#: actions/newmessage.php:185 lib/command.php:375
+#, php-format
+msgid "Direct message to %s sent"
+msgstr "Votre message a été envoyé à %s"
 
-#: classes/Channel.php:148
-#: classes/Channel.php:204
-msgid "Command complete"
-msgstr "Commande complétée"
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
+msgstr "Erreur Ajax"
 
-#: classes/Channel.php:158
-#: classes/Channel.php:215
-msgid "Command failed"
-msgstr "Échec de la commande"
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "Nouveau statut"
 
-#: classes/Command.php:39
-#: classes/Command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Désolé, cette commande n'a pas encore été implémantée."
+#: actions/newnotice.php:199
+msgid "Notice posted"
+msgstr "Statut publié"
 
-#: classes/Command.php:96
-#: classes/Command.php:113
+#: actions/noticesearch.php:68
 #, php-format
-msgid "Subscriptions: %1$s\n"
-msgstr "Abonnements : %1$s\n"
-
-#: classes/Command.php:125
-#: classes/Command.php:242
-#: classes/Command.php:145
-#: classes/Command.php:276
-msgid "User has no last notice"
-msgstr "Aucun statut récent pour cet utilisateur"
+msgid ""
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
+msgstr ""
+"Recherchez les statuts %%site.name%% par leur contenu. Séparez les termes de "
+"recherche par des espaces. Ils doivent contenir au moins 3 caractères."
 
-#: classes/Command.php:146
-#: classes/Command.php:166
-msgid "Notice marked as fave."
-msgstr "Statut ajouté aux favoris."
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "Recherche de texte"
 
-#: classes/Command.php:166
-#: classes/Command.php:189
+#: actions/noticesearch.php:91
 #, php-format
-msgid "%1$s (%2$s)"
-msgstr "%1$s (%2$s)"
+msgid "Search results for \"%s\" on %s"
+msgstr "Résultat de la recherche pour « %s » sur %s"
 
-#: classes/Command.php:169
-#: classes/Command.php:192
+#: actions/noticesearch.php:121
 #, php-format
-msgid "Fullname: %s"
-msgstr "Nom complet : %s"
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
 
-#: classes/Command.php:172
-#: classes/Command.php:195
+#: actions/noticesearch.php:124
 #, php-format
-msgid "Location: %s"
-msgstr "Emplacement : %s"
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
+msgstr ""
 
-#: classes/Command.php:175
-#: classes/Command.php:198
+#: actions/noticesearchrss.php:89
 #, php-format
-msgid "Homepage: %s"
-msgstr "Site Web : %s"
+msgid "Updates with \"%s\""
+msgstr "Mises à jour avec « %s »"
 
-#: classes/Command.php:178
-#: classes/Command.php:201
-#, php-format
-msgid "About: %s"
-msgstr "À propos : %s"
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Statuts correspondant au(x) terme(s) \"%s\""
 
-#: classes/Command.php:200
-#: classes/Command.php:228
-#, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
-msgstr "Message trop long ! La taille maximale est de 140 caractères ; vous en avez entré %d."
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+"Cet utilisateur n’accepte pas les clins d’œil ou n’a pas encore validé son "
+"adresse courriel."
 
-#: classes/Command.php:214
-#: classes/Command.php:245
-#, php-format
-msgid "Direct message to %s sent"
-msgstr "Votre message a été envoyé à %s"
+#: actions/nudge.php:94
+msgid "Nudge sent"
+msgstr "Clin d’œil envoyé"
 
-#: classes/Command.php:216
-#: classes/Command.php:247
-msgid "Error sending direct message."
-msgstr "Une erreur est survenue pendant l'envoi de votre message."
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr "Clin d’œil envoyé !"
 
-#: classes/Command.php:263
-#: classes/Command.php:300
-msgid "Specify the name of the user to subscribe to"
-msgstr "Indiquez le nom de l'utilisateur auquel vous souhaitez vous abonner "
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+msgstr "Le statut n’a pas de profil"
 
-# could it be plural?
-#: classes/Command.php:270
-#: classes/Command.php:307
-#, fuzzy
+#: actions/oembed.php:86 actions/shownotice.php:180
 #, php-format
-msgid "Subscribed to %s"
-msgstr "Abonné à %s"
+msgid "%1$s's status on %2$s"
+msgstr "Statut de %1$s sur %2$s"
 
-#: classes/Command.php:288
-#: classes/Command.php:328
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Indiquez le nom de l'utilisateur duquel vous souhaitez vous désabonner"
+#: actions/oembed.php:157
+msgid "content type "
+msgstr "type de contenu "
 
-#: classes/Command.php:295
-#: classes/Command.php:335
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "Désabonné de %s"
+#: actions/oembed.php:160
+msgid "Only "
+msgstr "Seulement "
 
-#: classes/Command.php:310
-#: classes/Command.php:330
-#: classes/Command.php:353
-#: classes/Command.php:376
-msgid "Command not yet implemented."
-msgstr "Cette commande n'a pas encore été implémantée."
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
+msgstr "Format de données non supporté."
 
-#: classes/Command.php:313
-#: classes/Command.php:356
-msgid "Notification off."
-msgstr "Avertissements désactivés."
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "Recherche de personnes"
 
-#: classes/Command.php:315
-#: classes/Command.php:358
-msgid "Can't turn off notification."
-msgstr "Impossible de désactiver les avertissements."
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "Recherche de statut"
 
-#: classes/Command.php:333
-#: classes/Command.php:379
-msgid "Notification on."
-msgstr "Avertissements activés."
+#: actions/othersettings.php:60
+msgid "Other Settings"
+msgstr "Autres paramètres"
 
-#: classes/Command.php:335
-#: classes/Command.php:381
-msgid "Can't turn on notification."
-msgstr "Impossible d'activer les avertissements."
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr "Autres options à configurer"
 
-#: classes/Command.php:344
-#: classes/Command.php:392
-msgid "Commands:\n"
-msgstr "Commandes : \n"
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr " (service gratuit)"
 
-#: classes/Message.php:53
-#: classes/Message.php:56
-msgid "Could not insert message."
-msgstr "Impossible d'insérer le message."
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
+msgstr "Raccourcir les URL avec"
 
-#: classes/Message.php:63
-#: classes/Message.php:66
-msgid "Could not update message with new URI."
-msgstr "Impossible de mettre à jour le message avec un nouvel URI."
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
+msgstr "Sélectionnez un service de réduction d’URL."
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
-msgstr "Utilisateur sans profil correspondant dans le système."
+#: actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "Paramètres du profil"
 
-#: lib/mail.php:147
-#: lib/mail.php:289
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
 msgstr ""
-"Vous avez une nouvelle adresse pour publier vos statuts dans %1$s.\n"
-"\n"
 
-#: lib/mail.php:249
-#: lib/mail.php:508
+#: actions/othersettings.php:153
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Le service de réduction d’URL est trop long (50 caractères maximum)."
+
+#: actions/outbox.php:58
 #, php-format
-msgid "New private message from %s"
-msgstr "Nouveau message personnel de %s"
+msgid "Outbox for %s - page %d"
+msgstr "Boîte d’envoi de %s - page %d"
 
-#: lib/mail.php:253
-#: lib/mail.php:512
+#: actions/outbox.php:61
 #, php-format
-msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+msgid "Outbox for %s"
+msgstr "Boîte d’envoi de %s"
+
+#: actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
-"%1$s (%2$s) vous a envoyé un message personnel :\n"
-"\n"
+"Cette boîte d’envoi regroupe les messages personnels que vous avez envoyés."
 
-#: lib/mailbox.php:43
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "L'accès à cette boîte de réception est réservé à son utilisateur."
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "Modifier le mot de passe"
 
-#: lib/openid.php:195
-#: lib/openid.php:203
-msgid "This form should automatically submit itself. "
-msgstr "Ce formulaire devrait être soumis automatiquement."
+#: actions/passwordsettings.php:69
+msgid "Change your password."
+msgstr "Modifier votre mot de passe."
 
-#: lib/personal.php:65
-#: lib/personalgroupnav.php:113
-msgid "Favorites"
-msgstr "Favoris"
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+msgid "Password change"
+msgstr "Modification du mot de passe"
 
-#: lib/personal.php:66
-#: lib/personalgroupnav.php:114
-#, php-format
-msgid "%s's favorite notices"
-msgstr "Statuts favoris de %s"
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "Ancien mot de passe"
 
-#: lib/personal.php:66
-#: lib/personalgroupnav.php:114
-msgid "User"
-msgstr "Utilisateur"
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "Nouveau mot de passe"
 
-#: lib/personal.php:75
-#: lib/personalgroupnav.php:123
-msgid "Inbox"
-msgstr "Boîte de réception"
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6 caractères ou plus"
 
-#: lib/personal.php:76
-#: lib/personalgroupnav.php:124
-msgid "Your incoming messages"
-msgstr "Vos messages reçus"
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "Confirmer"
 
-#: lib/personal.php:80
-#: lib/personalgroupnav.php:128
-msgid "Outbox"
-msgstr "Boîte d'envoi"
+#: actions/passwordsettings.php:113
+msgid "same as password above"
+msgstr "identique au mot de passe ci-dessus"
 
-#: lib/personal.php:81
-#: lib/personalgroupnav.php:129
-msgid "Your sent messages"
-msgstr "Vos messages envoyés"
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "Modifier"
 
-#: lib/settingsaction.php:99
-#: lib/connectsettingsaction.php:110
-msgid "Twitter"
-msgstr "Twitter"
+#: actions/passwordsettings.php:154 actions/register.php:230
+msgid "Password must be 6 or more characters."
+msgstr "Votre mot de passe doit contenir au moins 6 caractères."
 
-#: lib/settingsaction.php:100
-#: lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
-msgstr "Configuration Twitter"
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "Les mots de passe ne correspondent pas."
 
-#: lib/util.php:1718
-#: lib/messageform.php:139
-#: lib/noticelist.php:422
-msgid "To"
-msgstr "À "
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "Ancien mot de passe incorrect"
 
-#: scripts/maildaemon.php:45
-#: scripts/maildaemon.php:48
-msgid "Could not parse message."
-msgstr "Impossible de déchiffrer ce message."
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "Erreur lors de l’enregistrement de l’utilisateur ; invalide."
 
-#: actions/all.php:63
-#: actions/facebookhome.php:162
-#, php-format
-msgid "%s and friends, page %d"
-msgstr "%s et ses amis - page %d"
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "Impossible de sauvegarder le nouveau mot de passe."
 
-#: actions/avatarsettings.php:76
-msgid "You can upload your personal avatar."
-msgstr "Vous pouvez associer un « avatar » (image personnelle) à votre profil."
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "Mot de passe enregistré."
 
-#: actions/avatarsettings.php:117
-#: actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
-msgid "Avatar settings"
-msgstr "Paramètres de l'avatar"
+#: actions/peoplesearch.php:52
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"Recherchez des personnes dans %%site.name%% par leur nom, leur emplacement "
+"ou leurs intérêts. Séparez les termes de recherche par des espaces. Ils "
+"doivent contenir au moins 3 caractères."
 
-#: actions/avatarsettings.php:124
-#: actions/avatarsettings.php:199
-#: actions/grouplogo.php:198
-#: actions/grouplogo.php:258
-msgid "Original"
-msgstr "Image originale"
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "Recherche de personnes"
 
-#: actions/avatarsettings.php:139
-#: actions/avatarsettings.php:211
-#: actions/grouplogo.php:209
-#: actions/grouplogo.php:270
-msgid "Preview"
-msgstr "Aperçu"
+#: actions/peopletag.php:70
+#, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Ce marquage est invalide : %s"
 
-#: actions/avatarsettings.php:225
-#: actions/grouplogo.php:284
-msgid "Crop"
-msgstr "Recadrer"
+#: actions/peopletag.php:144
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr "Utilisateurs marqués &s - page %d"
 
-#: actions/avatarsettings.php:248
-#: actions/deletenotice.php:133
-#: actions/emailsettings.php:224
-#: actions/grouplogo.php:307
-#: actions/imsettings.php:200
-#: actions/login.php:102
-#: actions/newmessage.php:100
-#: actions/newnotice.php:96
-#: actions/openidsettings.php:188
-#: actions/othersettings.php:136
-#: actions/passwordsettings.php:131
-#: actions/profilesettings.php:172
-#: actions/register.php:113
-#: actions/remotesubscribe.php:53
-#: actions/smssettings.php:216
-#: actions/subedit.php:38
-#: actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-msgid "There was a problem with your session token. "
-msgstr "Un problème est survenu avec vos informations de session. "
-
-#: actions/avatarsettings.php:303
-#: actions/grouplogo.php:360
-msgid "Pick a square area of the image to be your avatar"
-msgstr "Sélectionnez une zone de forme carrée pour définir votre avatar"
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "Contenu invalide"
 
-#: actions/avatarsettings.php:327
-#: actions/grouplogo.php:384
-msgid "Lost our file data."
-msgstr "Données perdues."
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
 
-#: actions/avatarsettings.php:334
-#: actions/grouplogo.php:391
-#: classes/User_group.php:112
-msgid "Lost our file."
-msgstr "Fichier perdu."
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "Paramètres du profil"
 
-#: actions/avatarsettings.php:349
-#: actions/avatarsettings.php:383
-#: actions/grouplogo.php:406
-#: actions/grouplogo.php:440
-#: classes/User_group.php:129
-#: classes/User_group.php:161
-msgid "Unknown file type"
+#: actions/profilesettings.php:71
+msgid ""
+"You can update your personal profile info here so people know more about you."
 msgstr ""
-"Type de fichier inconnu"
+"Vous pouvez mettre à jour les informations de votre profil pour qu’on en "
+"sache plus à votre sujet."
 
-#: actions/block.php:69
-#: actions/subedit.php:46
-#: actions/unblock.php:70
-msgid "No profile specified."
-msgstr "Aucun profil n'a été spécifié."
-
-#: actions/block.php:74
-#: actions/subedit.php:53
-#: actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "Aucun profil ne correspond à cet identifiant."
+#: actions/profilesettings.php:99
+msgid "Profile information"
+msgstr "Information de profil"
 
-#: actions/block.php:111
-msgid "Block user"
-msgstr "Bloquer cet utilisateur"
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces"
 
-#: actions/block.php:129
-msgid "Are you sure you want to block this user? "
-msgstr "Êtes-vous sûr(e) de bloquer cet utilisateur ?"
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full name"
+msgstr "Nom complet"
 
-#: actions/block.php:162
-msgid "You have already blocked this user."
-msgstr "Vous avez déjà bloqué cet utilisateur."
+#: actions/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "Site personnel"
 
-#: actions/block.php:167
-msgid "Failed to save block information."
-msgstr "Impossible d'enregistrer les informations de blocage."
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "Adresse de votre site Web, blogue, ou profil dans un autre site"
 
-#: actions/confirmaddress.php:159
+#: actions/profilesettings.php:122 actions/register.php:460
 #, php-format
-msgid "The address \"%s\" has been "
-msgstr "L'adresse \"%s\" a été "
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Décrivez vous et vos intérêts en %d caractères"
 
-#: actions/deletenotice.php:73
-msgid "You are about to permanently delete a notice. "
-msgstr "Ce statut va être définitivement supprimé. "
+#: actions/profilesettings.php:125 actions/register.php:463
+msgid "Describe yourself and your interests"
+msgstr "Décrivez vous et vos interêts"
 
-#: actions/disfavor.php:94
-msgid "Add to favorites"
-msgstr "Ajouter aux favoris"
-
-#: actions/editgroup.php:54
-#, php-format
-msgid "Edit %s group"
-msgstr "Modifier le groupe %s"
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "Bio"
 
-#: actions/editgroup.php:66
-#: actions/groupbyid.php:72
-#: actions/grouplogo.php:66
-#: actions/joingroup.php:60
-#: actions/newgroup.php:65
-#: actions/showgroup.php:100
-msgid "Inboxes must be enabled for groups to work"
-msgstr "Les boîtes de réception doivent être activées pour que les groupes fonctionnent "
-
-#: actions/editgroup.php:71
-#: actions/grouplogo.php:71
-#: actions/newgroup.php:70
-msgid "You must be logged in to create a group."
-msgstr "Vous devez ouvrir une session pour créer un groupe."
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "Emplacement"
 
-#: actions/editgroup.php:87
-#: actions/grouplogo.php:87
-#: actions/groupmembers.php:76
-#: actions/joingroup.php:81
-#: actions/showgroup.php:121
-msgid "No nickname"
-msgstr "Aucun pseudo"
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "Indiquez votre emplacement, ex.: « Ville, État (ou région), Pays »"
 
-#: actions/editgroup.php:99
-#: actions/groupbyid.php:88
-#: actions/grouplogo.php:100
-#: actions/groupmembers.php:83
-#: actions/joingroup.php:88
-#: actions/showgroup.php:128
-msgid "No such group"
-msgstr "Aucun groupe trouvé"
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
+msgstr "Marquages"
 
-#: actions/editgroup.php:106
-#: actions/editgroup.php:165
-#: actions/grouplogo.php:107
-msgid "You must be an admin to edit the group"
-msgstr "Seuls les administrateurs d'un groupe peuvent le modifier."
+#: actions/profilesettings.php:140
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+"Marquages (tags) pour votre profil, séparés par des virgules ou des espaces"
 
-#: actions/editgroup.php:157
-msgid "Use this form to edit the group."
-msgstr "Remplissez ce formulaire pour modifier les options du groupe."
+#: actions/profilesettings.php:144
+msgid "Language"
+msgstr "Langue"
 
-#: actions/editgroup.php:179
-#: actions/newgroup.php:130
-#: actions/register.php:156
-msgid "Nickname must have only lowercase letters "
-msgstr "Le pseudo ne peut contenir que des caractères minuscules "
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr "Langue préférée"
 
-#: actions/editgroup.php:198
-#: actions/newgroup.php:149
-msgid "description is too long (max 140 chars)."
-msgstr "la description est trop longue (140 caractères maximum)."
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr "Fuseau horaire"
 
-#: actions/editgroup.php:218
-msgid "Could not update group."
-msgstr "Impossible de mettre à jour le groupe."
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
+msgstr "Quel est votre fuseau horaire habituel ?"
 
-#: actions/editgroup.php:226
-msgid "Options saved."
-msgstr "Vos options ont été enregistrées."
+#: actions/profilesettings.php:160
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+"M’abonner automatiquement à tous ceux qui s’abonnent à moi (recommandé pour "
+"les utilisateurs non-humains)"
 
-#: actions/emailsettings.php:107
-#: actions/imsettings.php:108
+#: actions/profilesettings.php:221 actions/register.php:223
 #, php-format
-msgid "Awaiting confirmation on this address. "
-msgstr "En attente de confirmation de cette adresse."
+msgid "Bio is too long (max %d chars)."
+msgstr "La bio est trop longue (%d caractères maximum)."
 
-# using the infinitive form here?
-#: actions/emailsettings.php:139
-#: actions/smssettings.php:150
-msgid "Make a new email address for posting to; "
-msgstr "Créer une nouvelle adresse courriel pour publier vos statuts ; "
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr "Aucun fuseau horaire n’a été choisi."
 
-#: actions/emailsettings.php:157
-msgid "Send me email when someone "
-msgstr "Envoyez-moi un courriel quand quelqu'un "
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr "La langue est trop longue (255 caractères maximum)."
 
-#: actions/emailsettings.php:168
-msgid "Allow friends to nudge me and send me an email."
-msgstr "Autoriser mes amis à m'envoyer des courriels et des clins d'oeil."
+#: actions/profilesettings.php:246 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Marquage invalide : « %s »"
 
-# Missing context
-#: actions/emailsettings.php:321
-#, fuzzy
-msgid "That email address already belongs "
-msgstr ""
-"Cette adresse courriel appartient déjà "
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
+msgstr "Impossible de mettre à jour l’auto-abonnement."
 
-#: actions/emailsettings.php:343
-msgid "A confirmation code was sent to the email address you added. "
-msgstr "Un code de confirmation a été envoyé à l'adresse courriel indiquée."
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+msgstr "Impossible d’enregistrer le profil."
 
-#: actions/facebookhome.php:110
-msgid "Server error - couldn't get user!"
-msgstr "Erreur du serveur - impossible d'accéder à cet utilisateur !"
+#: actions/profilesettings.php:336
+msgid "Couldn't save tags."
+msgstr "Impossible d’enregistrer les marquages."
 
-#: actions/facebookhome.php:196
-#, php-format
-msgid "If you would like the %s app to automatically update "
-msgstr "Si vous souhaitez que l'application %s soit mise à jour automatiquement "
+#: actions/profilesettings.php:344
+msgid "Settings saved."
+msgstr "Préférences enregistrées."
 
-#: actions/facebookhome.php:213
-#: actions/facebooksettings.php:137
+#: actions/public.php:83
 #, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "Autoriser %s à mettre à jour mon statut dans Facebook"
-
-# context???
-#: actions/facebookhome.php:218
-msgid "Skip"
-msgstr "Sauter"
+msgid "Beyond the page limit (%s)"
+msgstr ""
 
-# i originally put 'aucun statut!' here, but the original translation seems better
-#: actions/facebookhome.php:235
-#, fuzzy
-msgid "No notice content!"
-msgstr "Statut sans contenu!"
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
+msgstr "Impossible de récupérer le flux public."
 
-#: actions/facebookhome.php:295
-#: lib/action.php:870
-#: lib/facebookaction.php:399
-msgid "Pagination"
-msgstr "Pagination"
+#: actions/public.php:129
+#, php-format
+msgid "Public timeline, page %d"
+msgstr "Flux public - page %d"
 
-#: actions/facebookhome.php:304
-#: lib/action.php:879
-#: lib/facebookaction.php:408
-msgid "After"
-msgstr "Après"
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr "Flux public"
 
-#: actions/facebookhome.php:312
-#: lib/action.php:887
-#: lib/facebookaction.php:416
-msgid "Before"
-msgstr "Avant"
+#: actions/public.php:151
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Fil du flux public (RSS 1.0)"
 
-#: actions/facebookinvite.php:70
-#, php-format
-msgid "Thanks for inviting your friends to use %s"
-msgstr "Merci d'inviter vos amis à utiliser %s"
+#: actions/public.php:155
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Fil du flux public (RSS 2.0)"
 
-#: actions/facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Invitation(s) envoyée(s) aux personnes suivantes :"
+#: actions/public.php:159
+msgid "Public Stream Feed (Atom)"
+msgstr "Fil du flux public (Atom)"
 
-#: actions/facebookinvite.php:96
+#: actions/public.php:179
 #, php-format
-msgid "You have been invited to %s"
-msgstr "Vous avez reçu une invitation à %s"
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
 
-#: actions/facebookinvite.php:105
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Invitez vos amis dans %s"
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr "Soyez le premier à poster !"
 
-#: actions/facebookinvite.php:113
+#: actions/public.php:186
 #, php-format
-msgid "Friends already using %s:"
-msgstr "Amis déjà inscrits à %s :"
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
 
-#: actions/facebookinvite.php:130
+#: actions/public.php:233
 #, php-format
-msgid "Send invitations"
-msgstr "Envoyer des invitations"
-
-#: actions/facebookremove.php:56
-msgid "Couldn't remove Facebook user."
-msgstr "Impossible de retirer l'utilisateur Facebook."
-
-#: actions/facebooksettings.php:65
-msgid "There was a problem saving your sync preferences!"
-msgstr "Un problème est survenu lors de l'enregistrement de vos préférences de synchronisation !"
-
-#: actions/facebooksettings.php:67
-msgid "Sync preferences saved."
-msgstr "Préférences de synchronisation enregistrées."
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
+msgstr ""
+"Vous êtes sur %%site.name%% un service de [microblog] (http://fr.wikipedia."
+"org/wiki/Microblog) basé sur le logiciel libre [StatusNet](http://status."
+"net/). [Inscrivez-vous](%%action.register%%) pour partager des messages sur "
+"vous avec vos amis, famille et collègues ! ([Plus d’informations](%%doc.help%"
+"%))"
+
+#: actions/public.php:238
+#, fuzzy, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
+msgstr ""
+"%%site.name%% est un service de [micro-blogging](http://fr.wikipedia.org/"
+"wiki/Microblog) "
 
-#: actions/facebooksettings.php:90
-msgid "Automatically update my Facebook status with my notices."
-msgstr "Mettre à jour automatiquement mon statut Facebook."
+#: actions/publictagcloud.php:57
+msgid "Public tag cloud"
+msgstr "Nuage de mots clefs public"
 
-#: actions/facebooksettings.php:97
-msgid "Send \"@\" replies to Facebook."
-msgstr "Envoyer mes réponses \"@\" dans Facebook."
+#: actions/publictagcloud.php:63
+#, php-format
+msgid "These are most popular recent tags on %s "
+msgstr "Derniers marquages les plus populaires dans %s "
 
-#: actions/facebooksettings.php:106
-msgid "Prefix"
-msgstr "Préfixe"
+#: actions/publictagcloud.php:69
+#, php-format
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
+msgstr ""
 
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
-msgstr "Préfixe à insérer dans les statuts."
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
+msgstr "Soyez le premier à en poster une !"
 
-#: actions/facebooksettings.php:124
+#: actions/publictagcloud.php:75
 #, php-format
-msgid "If you would like %s to automatically update "
-msgstr "Si vous souhaitez une mise à jour automatique de %s "
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
 
-#: actions/facebooksettings.php:147
-msgid "Sync preferences"
-msgstr "Préférences de synchronisation"
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
+msgstr "Nuage de mots clefs"
 
-#: actions/favor.php:94
-#: lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "Retirer ce favori"
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "Votre session est déjà ouverte !"
 
-#: actions/favorited.php:65
-#: lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
-msgid "Popular notices"
-msgstr "Statuts populaires"
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "Code de récupération non trouvé."
 
-#: actions/favorited.php:67
-#, php-format
-msgid "Popular notices, page %d"
-msgstr "Statuts populaires - page %d"
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "Ceci n’est pas un code de récupération."
 
-#: actions/favorited.php:79
-msgid "The most popular notices on the site right now."
-msgstr "Statuts les plus populaires sur le site en ce moment."
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr "Code de récupération d’un utilisateur inconnu."
 
-#: actions/featured.php:69
-#: lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
-msgid "Featured users"
-msgstr "Utilisateurs en vedette"
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "Erreur dans le code de confirmation."
 
-#: actions/featured.php:71
-#, php-format
-msgid "Featured users, page %d"
-msgstr "Utilisateurs en vedette - page %d"
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
+msgstr "Ce code de validation est périmé. Veuillez recommencer."
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some of the great users on %s"
-msgstr "Les utilisateurs à ne pas manquer dans %s"
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
+msgstr ""
+"Impossible de mettre l’utilisateur à jour avec l’adresse courriel confirmée."
 
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
-msgstr "Cet utilisateur vous a empêché de vous inscrire."
+#: actions/recoverpassword.php:152
+msgid ""
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
+msgstr ""
 
-#: actions/groupbyid.php:79
-msgid "No ID"
-msgstr "Aucun identifiant"
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
+msgstr "Vous avez été identifié. Entrez un nouveau mot de passe ci-dessous. "
 
-#: actions/grouplogo.php:138
-#: actions/grouplogo.php:191
-msgid "Group logo"
-msgstr "Logo du groupe"
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
+msgstr "Récupération de mot de passe"
 
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
-msgstr "Choisissez un logo pour votre groupe."
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
+msgstr "Pseudo ou adresse de courriel"
 
-#: actions/grouplogo.php:448
-msgid "Logo updated."
-msgstr "Logo mis à jour."
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
+msgstr ""
+"Votre pseudo sur ce serveur, ou l’adresse courriel que vous avez enregistrée."
 
-#: actions/grouplogo.php:450
-msgid "Failed updating logo."
-msgstr "La mise à jour du logo a échoué."
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
+msgstr "Récupérer"
 
-#: actions/groupmembers.php:93
-#: lib/groupnav.php:91
-#, php-format
-msgid "%s group members"
-msgstr "Membres du groupe %s"
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "Réinitialiser le mot de passe"
 
-#: actions/groupmembers.php:96
-#, php-format
-msgid "%s group members, page %d"
-msgstr "Membres du groupe %s - page %d"
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr "Récupérer le mot de passe"
 
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
-msgstr "Liste des utilisateurs inscrits à ce groupe."
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
+msgstr "Récupération de mot de passe demandée"
 
-#: actions/groups.php:62
-#: actions/showstream.php:518
-#: lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
-msgid "Groups"
-msgstr "Groupes"
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
+msgstr "Action inconnue"
 
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "Groupes - page %d"
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 caractères ou plus, et ne l’oubliez pas !"
 
-# missing context
-#: actions/groups.php:90
-#, fuzzy
-#, php-format
-msgid "%%%%site.name%%%% groups let you find and talk with "
-msgstr "Les groupes %%%%site.name%%%% vous permettent d'échanger avec "
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Identique au mot de passe ci-dessus"
 
-#: actions/groups.php:106
-#: actions/usergroups.php:124
-#: lib/groupeditform.php:123
-msgid "Create a new group"
-msgstr "Créer un nouveau groupe"
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "Réinitialiser"
 
-#: actions/groupsearch.php:57
-#, php-format
-msgid "Search for groups on %%site.name%% by their name, location, or description. "
-msgstr "Recherchez des groupes dans %%site.name%% par nom, par emplacement ou par intérêts. Séparez les termes de recherches par des espaces. Ils doivent contenir au moins 3 caractères."
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "Entrez un pseudo ou une adresse courriel."
 
-#: actions/groupsearch.php:63
-msgid "Group search"
-msgstr "Rechercher des groupes"
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
+msgstr "Aucun utilisateur trouvé avec ce courriel ou ce nom."
 
-# missing context
-#: actions/imsettings.php:70
-#, fuzzy
-msgid "You can send and receive notices through "
-msgstr "Vous pouvez publier et lire les statuts via "
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr "Aucune adresse courriel enregistrée pour cet utilisateur."
 
-# missing context
-#: actions/imsettings.php:120
-#, fuzzy
-#, php-format
-msgid "Jabber or GTalk address, "
-msgstr "Adresse Jabber ou GTalk, "
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "Erreur lors de l’enregistrement de la confirmation du courriel."
 
-#: actions/imsettings.php:147
-msgid "Send me replies through Jabber/GTalk "
+#: actions/recoverpassword.php:325
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
 msgstr ""
-"Envoyez-moi les réponses par Jabber/GTalk"
+"Les instructions pour récupérer votre mot de passe ont été envoyées à "
+"l’adresse courriel indiquée dans votre compte."
 
-#: actions/imsettings.php:321
-#, php-format
-msgid "A confirmation code was sent "
-msgstr "Un code de confirmation a été envoyé "
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
+msgstr "Réinitialisation inattendue du mot de passe."
 
-#: actions/joingroup.php:65
-msgid "You must be logged in to join a group."
-msgstr "Vous devez ouvrir une session pour rejoindre un groupe."
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "Le mot de passe doit contenir au moins 6 caractères."
 
-#: actions/joingroup.php:95
-msgid "You are already a member of that group"
-msgstr "Vous êtes déjà membre de ce groupe "
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
+msgstr "Le mot de passe et sa confirmation ne correspondent pas."
 
-#: actions/joingroup.php:128
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Impossible d'inscrire l'utilisateur %s au groupe %s"
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
+msgstr ""
+"Nouveau mot de passe créé avec succès. Votre session est maintenant ouverte."
 
-#: actions/joingroup.php:135
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s a rejoint le groupe %s"
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
+msgstr "Désolé ! Seules les personnes invitées peuvent s’inscrire."
 
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
-msgstr "Les boîtes de réception doivent être activées pour que les groupes fonctionnent."
+#: actions/register.php:92
+msgid "Sorry, invalid invitation code."
+msgstr "Désolé, code d’invitation invalide."
 
-#: actions/leavegroup.php:65
-msgid "You must be logged in to leave a group."
-msgstr "Vous devez ouvrir une session pour quitter un groupe."
+#: actions/register.php:112
+msgid "Registration successful"
+msgstr "Compte créé avec succès"
 
-#: actions/leavegroup.php:88
-msgid "No such group."
-msgstr "Aucun groupe trouvé."
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "Créer un compte"
 
-#: actions/leavegroup.php:95
-msgid "You are not a member of that group."
-msgstr "Vous n'êtes pas membre de ce groupe."
+#: actions/register.php:135
+msgid "Registration not allowed."
+msgstr "Création de compte non autorisée."
 
-#: actions/leavegroup.php:100
-msgid "You may not leave a group while you are its administrator."
-msgstr "Il est recommandé de ne pas quitter un groupe dont vous êtes administrateur."
+#: actions/register.php:198
+msgid "You can't register if you don't agree to the license."
+msgstr "Vous devez accepter les termes de la licence pour créer un compte."
 
-#: actions/leavegroup.php:130
-msgid "Could not find membership record."
-msgstr "Aucun enregistrement à ce groupe n'a été trouvé."
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "Adresse courriel invalide."
 
-#: actions/leavegroup.php:138
-#, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "Impossible de retirer l'utilisateur %s du groupe %s"
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "Cette adresse courriel est déjà utilisée."
 
-#: actions/leavegroup.php:145
-#, php-format
-msgid "%s left group %s"
-msgstr "%s a quitté le groupe %s"
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "Identifiant ou mot de passe incorrect."
 
-#: actions/login.php:225
-#: lib/facebookaction.php:304
-msgid "Login to site"
-msgstr "Ouverture de session"
+#: actions/register.php:342
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
 
-#: actions/microsummary.php:69
-msgid "No current status"
-msgstr "Aucun statut "
+#: actions/register.php:424
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+"1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces. Requis."
 
-#: actions/newgroup.php:53
-msgid "New group"
-msgstr "Nouveau groupe"
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr "6 caractères ou plus. Requis."
 
-#: actions/newgroup.php:115
-msgid "Use this form to create a new group."
-msgstr "Remplissez les champs ci-dessous pour créer un nouveau groupe :"
+#: actions/register.php:433
+msgid "Same as password above. Required."
+msgstr "Identique au mot de passe ci-dessus. Requis."
 
-#: actions/newgroup.php:177
-msgid "Could not create group."
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "Courriel"
+
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
-"Impossible de créer le groupe."
+"Utilisé uniquement pour les mises à jour de statut, les avertissements, et "
+"la récupération de mot de passe"
 
-#: actions/newgroup.php:191
-msgid "Could not set group membership."
-msgstr "Impossible d'établir l'inscription au groupe."
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
+msgstr "Nom plus long, votre \"vrai\" nom de préférence"
 
-#: actions/newmessage.php:119
-#: actions/newnotice.php:132
-msgid "That's too long. "
-msgstr "C'est trop long."
+#: actions/register.php:493
+msgid "My text and files are available under "
+msgstr "Mes textes et mes fichiers sont disponibles sous"
 
-#: actions/newmessage.php:134
-msgid "Don't send a message to yourself; "
-msgstr "N'envoyez pas de message à vous-même ; "
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
+msgstr "Creative Commons Paternité 3.0"
 
-#: actions/newnotice.php:166
-msgid "Notice posted"
+#: actions/register.php:496
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
 msgstr ""
-"Statut publié"
+" à l’exception de ces données personnelles : mot de passe, adresse e-mail, "
+"adresse de messagerie instantanée, numéro de téléphone."
 
-#: actions/newnotice.php:200
-#: classes/Channel.php:163
-msgid "Ajax Error"
-msgstr "Erreur Ajax"
+#: actions/register.php:537
+#, 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 ""
+"Félicitations, %s! Bienvenue dans %%%%site.name%%%%. Vous pouvez "
+"maintenant :\n"
+"\n"
+"* Visiter [votre profil](%s) et publier votre premier statut.\n"
+"* Ajouter une adresse [Jabber/GTalk](%%%%action.imsettings%%%%) afin "
+"d’envoyer et recevoir vos statuts par messagerie instantanée.\n"
+"* [Chercher des personnes](%%%%action.peoplesearch%%%%) que vous pourriez "
+"connaître ou qui partagent vos intêrets.\n"
+"* Mettre votre [profil](%%%%action.profilesettings%%%%) à jour pour en dire "
+"plus à votre sujet.\n"
+"* Parcourir la [documentation](%%%%doc.help%%%%) en ligne pour en savoir "
+"plus sur le fonctionnement du service.\n"
+"\n"
+"Merci pour votre inscription ! Nous vous souhaitons d’apprécier notre "
+"service."
 
-#: actions/nudge.php:85
-msgid "This user doesn't allow nudges or hasn't confirmed or set his email yet."
-msgstr "Cet utilisateur n'accepte pas les clins d'œil ou n'a pas encore validé son adresse courriel."
+#: actions/register.php:561
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+"(Vous recevrez bientôt un courriel contenant les instructions pour confirmer "
+"votre adresse.)"
 
-#: actions/nudge.php:94
-msgid "Nudge sent"
-msgstr "Clin d'œil envoyé"
+#: actions/remotesubscribe.php:98
+#, php-format
+msgid ""
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
+msgstr ""
+"Pour vous abonner, vous devez [ouvrir une session](%%action.login%%), ou "
+"[créer un nouveau compte](%%action.register%%). Si vous avez déjà un compte "
+"sur un [site de micro-blogging compatible](%%doc.openmublog%%), entrez l’URL "
+"de votre profil ci-dessous."
 
-#: actions/nudge.php:97
-msgid "Nudge sent!"
-msgstr "Clin d'œil envoyé !"
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr "Abonnement à distance"
 
-#: actions/openidlogin.php:97
-msgid "OpenID login"
-msgstr "Connexion OpenID"
+#: actions/remotesubscribe.php:124
+msgid "Subscribe to a remote user"
+msgstr "S’abonner à un utilisateur distant"
 
-#: actions/openidsettings.php:128
-msgid "Removing your only OpenID "
-msgstr "Retirer votre OpenID "
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "Pseudo de l’utilisateur"
 
-#: actions/othersettings.php:60
-msgid "Other Settings"
-msgstr "Autres paramètres"
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr "Pseudo de l’utilisateur que vous voulez suivre"
 
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Autres options à configurer"
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "URL du profil"
 
-#: actions/othersettings.php:93
-msgid "URL Auto-shortening"
-msgstr "Réduction automatique des adresses Web (URL)"
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "URL de votre profil sur un autre service de micro-blogging compatible"
 
-#: actions/othersettings.php:112
-msgid "Service"
-msgstr "Service"
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
+msgstr "S’abonner"
 
-#: actions/othersettings.php:113
-msgid "Automatic shortening service to use."
-msgstr "Sélectionnez un service de réduction d'URL."
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr "URL du profil invalide (mauvais format)"
 
-#: actions/othersettings.php:144
-msgid "URL shortening service is too long (max 50 chars)."
+#: actions/remotesubscribe.php:168
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
 msgstr ""
-"Le service de réduction d'URL est trop long (50 caractères maximum)."
+"URL de profil invalide (aucun document YADIS ou définition XRDS invalide)."
 
-#: actions/passwordsettings.php:69
-msgid "Change your password."
-msgstr "Modifier votre mot de passe."
+#: actions/remotesubscribe.php:176
+msgid "That’s a local profile! Login to subscribe."
+msgstr "Ce profil est local ! Connectez-vous pour vous abonner."
 
-#: actions/passwordsettings.php:89
-msgid "Password change"
-msgstr "Modification du mot de passe"
+#: actions/remotesubscribe.php:183
+msgid "Couldn’t get a request token."
+msgstr "Impossible d’obtenir un jeton de requête."
 
-#: actions/peopletag.php:35
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
 #, php-format
-msgid "Not a valid people tag: %s"
-msgstr ""
-"Ce marquage est invalide : %s"
+msgid "Replies to %s"
+msgstr "Réponses à %s"
 
-# can it be plural?
-#: actions/peopletag.php:47
+#: actions/replies.php:127
 #, php-format
-msgid "Users self-tagged with %s - page %d"
-msgstr "Utilisateurs marqués &s - page %d"
+msgid "Replies to %s, page %d"
+msgstr "Réponses à %s - page %d"
 
-# can it be plural?
-#: actions/peopletag.php:91
+#: actions/replies.php:144
 #, php-format
-msgid "These are users who have tagged themselves \"%s\" "
-msgstr "Les utilisateurs suivants se sont marqués  \"%s\" :"
-
-#: actions/profilesettings.php:91
-msgid "Profile information"
-msgstr "Information de profil"
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Flux des réponses pour %s (RSS 1.0)"
 
-#: actions/profilesettings.php:124
-msgid "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
-msgstr "Marquages (tags) pour votre profil, séparés par des virgules ou des espaces"
-
-# missing context
-#: actions/profilesettings.php:144
-#, fuzzy
-msgid "Automatically subscribe to whoever "
-msgstr "M'abonner automatiquement à quiconque "
-
-#: actions/profilesettings.php:229
-#: actions/tagother.php:176
+#: actions/replies.php:151
 #, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Marquage invalide : \"%s\""
-
-#: actions/profilesettings.php:311
-msgid "Couldn't save tags."
-msgstr "Impossible d'enregistrer les marquages. "
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Flux des réponses pour %s (RSS 2.0)"
 
-#: actions/public.php:107
+#: actions/replies.php:158
 #, php-format
-msgid "Public timeline, page %d"
-msgstr "Flux public - page %d"
+msgid "Replies feed for %s (Atom)"
+msgstr "Flux des réponses pour %s (Atom)"
 
-#: actions/public.php:173
-msgid "Could not retrieve public stream."
+#: actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
 msgstr ""
-"Impossible de récupérer le flux public."
 
-#: actions/public.php:220
+#: actions/replies.php:203
 #, php-format
-msgid "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service "
-msgstr "%%site.name%% est un service de [micro-blogging](http://fr.wikipedia.org/wiki/Microblog) "
-
-#: actions/publictagcloud.php:57
-#, fuzzy
-msgid "Public tag cloud"
-msgstr "Marquages publics"
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
 
-#: actions/publictagcloud.php:63
+#: actions/replies.php:205
 #, php-format
-msgid "These are most popular recent tags on %s "
-msgstr "Derniers marquages les plus populaires dans %s "
-
-#: actions/publictagcloud.php:119
-#, fuzzy
-msgid "Tag cloud"
-msgstr "Marquages "
-
-#: actions/register.php:139
-#: actions/register.php:349
-msgid "Sorry, only invited people can register."
-msgstr "Désolé ! Seules les personnes invitées peuvent s'inscrire."
-
-# missing context
-#: actions/register.php:149
-#, fuzzy
-msgid "You can't register if you don't "
-msgstr "Vous ne pouvez pas créer un compte si vous ne "
-
-# missing context
-#: actions/register.php:286
-#, fuzzy
-msgid "With this form you can create "
-msgstr "Ce formulaire permet de créer "
-
-# missing context
-#: actions/register.php:368
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, "
-msgstr "1 à 64 lettres minuscules ou chiffres, "
-
-# missing context
-#: actions/register.php:382
-#: actions/register.php:386
-#, fuzzy
-msgid "Used only for updates, announcements, "
-msgstr "Utilisé seulement pour les mises à jour, nouvelles du site, "
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+"Vous pouvez essayer de [faire un clin d’œil à %s](../%s) ou de [publier "
+"quelque chose à son attention](%%%%action.newnotice%%%%?status_textarea=%s)"
 
-# missing context
-#: actions/register.php:398
-#, fuzzy
-msgid "URL of your homepage, blog, "
-msgstr "URL de votre site Web, blogue, "
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Message adressé à %1$s le %2$s"
 
-# missing context
-#: actions/register.php:404
-#, fuzzy
-msgid "Describe yourself and your "
-msgstr "Décrivez qui vous êtes et vos "
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "Avis favoris de %s, page %d"
 
-# missing context
-#: actions/register.php:410
-#, fuzzy
-msgid "Where you are, like \"City, "
-msgstr "Votre emplacement, ex.: \"Ville, "
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
+msgstr "Impossible d’afficher les favoris."
 
-# missing context
-#: actions/register.php:432
-#, fuzzy
-msgid " except this private data: password, "
-msgstr " à l'exception de ces données personnelles : mot de passe, "
+#: actions/showfavorites.php:170
+#, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Flux pour les amis de %s (RSS 1.0)"
 
-#: actions/register.php:471
+#: actions/showfavorites.php:177
 #, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
-msgstr "Félicitations, %s ! Bienvenue dans %%%%site.name%%%%. "
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Flux pour les amis de %s (RSS 2.0)"
 
-# missing context
-#: actions/register.php:495
-#, fuzzy
-msgid "(You should receive a message by email "
-msgstr "(Vous recevrez bientôt un courriel "
+#: actions/showfavorites.php:184
+#, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Flux pour les amis de %s (Atom)"
 
-#: actions/remotesubscribe.php:166
-#: actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
-msgstr "Ce profil est local ! Ouvrez une session pour vous abonner."
+#: actions/showfavorites.php:205
+msgid ""
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
+msgstr ""
+"Vous n’avez pas choisi d’avis favori pour le moment. Cliquez sur le bouton "
+"favori sur les avis que vous aimez pour les mémoriser à l’avenir ou les "
+"mettre en lumière."
 
-#: actions/replies.php:118
+#: actions/showfavorites.php:207
 #, php-format
-msgid "Replies to %s, page %d"
-msgstr "Réponses à %s - page %d"
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+"%s n’a pas ajouté d’avis à ses favoris pour le moment. Publiez quelque chose "
+"d’intéressant, et cela pourrait être ajouté à ses favoris :)"
 
-#: actions/showfavorites.php:79
+#: actions/showfavorites.php:211
 #, php-format
-msgid "%s favorite notices, page %d"
-msgstr "Statuts favoris de %s - page %d"
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+"%s n’a pas ajouté d’avis à ses favoris pour le moment. Vous pourriez [créer "
+"un compte](%%%%action.register%%%%), puis publier quelque chose "
+"d’intéressant, qui serait ajouté à ses favoris :)"
+
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr "C’est un moyen de partager ce que vous aimez."
 
-#: actions/showgroup.php:77
-#: lib/groupnav.php:85
+#: actions/showgroup.php:82 lib/groupnav.php:86
 #, php-format
 msgid "%s group"
 msgstr "Groupe %s"
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr "Groupe %s - page %d"
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:218
 msgid "Group profile"
 msgstr "Profil du groupe"
 
-#: actions/showgroup.php:251
-#: actions/showstream.php:278
-#: actions/tagother.php:119
-#: lib/grouplist.php:134
-#: lib/profilelist.php:133
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
 msgid "URL"
 msgstr "URL"
 
-#: actions/showgroup.php:262
-#: actions/showstream.php:289
-#: actions/tagother.php:129
-#: lib/grouplist.php:145
-#: lib/profilelist.php:144
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
 msgid "Note"
 msgstr "Note"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr "Alias"
+
+#: actions/showgroup.php:293
 msgid "Group actions"
 msgstr "Actions du groupe"
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:328
 #, php-format
-msgid "Notice feed for %s group"
-msgstr "Fil des statuts du groupe %s"
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Fil des avis du groupe %s (RSS 1.0)"
 
-#: actions/showgroup.php:357
-#: lib/groupnav.php:90
+#: actions/showgroup.php:334
+#, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Fil des avis du groupe %s (RSS 2.0)"
+
+#: actions/showgroup.php:340
+#, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Fil des avis du groupe %s (Atom)"
+
+#: actions/showgroup.php:345
+#, php-format
+msgid "FOAF for %s group"
+msgstr "ami d’un ami pour le groupe %s"
+
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
 msgid "Members"
 msgstr "Membres"
 
-#: actions/showgroup.php:363
-#: actions/showstream.php:413
-#: actions/showstream.php:442
-#: actions/showstream.php:524
-#: lib/section.php:95
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
 #: lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(aucun)"
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:392
 msgid "All members"
 msgstr "Tous les membres"
 
-#: actions/showgroup.php:378
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "Statistiques"
+
+#: actions/showgroup.php:432
+msgid "Created"
+msgstr "Créé"
+
+#: actions/showgroup.php:448
 #, php-format
-msgid "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service "
-msgstr "**%s** est un groupe d'utilisateurs du service de [micro-blogging](http://fr.wikipedia.org/wiki/Microblog)  %%%%site.name%%%%"
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+
+#: actions/showgroup.php:454
+#, fuzzy, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
+msgstr ""
+"**%s** est un groupe d’utilisateurs du service de [micro-blogging](http://fr."
+"wikipedia.org/wiki/Microblog)  %%%%site.name%%%%"
+
+#: actions/showgroup.php:482
+msgid "Admins"
+msgstr "Administrateurs"
+
+#: actions/showmessage.php:81
+msgid "No such message."
+msgstr "Message introuvable."
 
-# is there another part to this sentence?
 #: actions/showmessage.php:98
-#, fuzzy
-msgid "Only the sender and recipient "
-msgstr "Expéditeur et destinataire seulement "
+msgid "Only the sender and recipient may read this message."
+msgstr ""
+"Ce message personnel ne peut être lu que par son expéditeur et son "
+"destinataire."
+
+#: actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr "Message adressé à %1$s le %2$s"
+
+#: actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr "Message reçu de %1$s le %2$s"
+
+#: actions/shownotice.php:90
+msgid "Notice deleted."
+msgstr "Avis supprimé."
 
 #: actions/showstream.php:73
 #, php-format
+msgid " tagged %s"
+msgstr "   marqué %s"
+
+#: actions/showstream.php:79
+#, php-format
 msgid "%s, page %d"
 msgstr "%s - page %d"
 
-# missing context
+#: actions/showstream.php:122
+#, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Fil des statuts pour %s marqués %s (RSS 1.0)"
+
+#: actions/showstream.php:129
+#, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Flux des statuts de %s (RSS 1.0)"
+
+#: actions/showstream.php:136
+#, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Flux des statuts de %s (RSS 2.0)"
+
 #: actions/showstream.php:143
-#, fuzzy
-msgid "'s profile"
-msgstr " - Profil"
+#, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Flux des statuts de %s (Atom)"
 
-#: actions/showstream.php:236
-#: actions/tagother.php:77
-msgid "User profile"
-msgstr "Profil de l'utilisateur"
+#: actions/showstream.php:148
+#, php-format
+msgid "FOAF for %s"
+msgstr "ami d’un ami pour %s"
 
-#: actions/showstream.php:240
-#: actions/tagother.php:81
-msgid "Photo"
-msgstr "Photo"
+#: actions/showstream.php:191
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr "C’est le flux de %s mais %s n’a rien publié pour le moment."
 
-#: actions/showstream.php:317
-msgid "User actions"
-msgstr "Actions de l'utilisateur"
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+"Avez-vous vu quelque chose d’intéressant récemment ? Vous n’avez pas publié "
+"d’avis pour le moment, vous pourriez commencer maintenant :)"
 
-#: actions/showstream.php:342
-msgid "Send a direct message to this user"
-msgstr "Envoyer un message à cet utilisateur"
+#: actions/showstream.php:198
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+"Vous pouvez essayer de faire un clin d’œil à %s ou de [publier quelque chose "
+"à son attention](%%%%action.newnotice%%%%?status_textarea=%s)."
 
-#: actions/showstream.php:343
-msgid "Message"
-msgstr "Message "
+#: actions/showstream.php:234
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
 
-#: actions/showstream.php:451
-msgid "All subscribers"
-msgstr "Tous les abonnés"
+#: actions/showstream.php:239
+#, fuzzy, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
+msgstr ""
+"**%s** est inscrit au service de [micro-blogging](http://fr.wikipedia.org/"
+"wiki/Microblog)  %%%%site.name%%%%"
 
-#: actions/showstream.php:533
-msgid "All groups"
-msgstr "Tous les groupes"
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "Paramètres SMS"
 
-#: actions/showstream.php:542
+#: actions/smssettings.php:69
 #, php-format
-msgid "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service "
-msgstr "**%s** est inscrit au service de [micro-blogging](http://fr.wikipedia.org/wiki/Microblog)  %%%%site.name%%%%"
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+"Vous pouvez recevoir des messages SMS par courriel en provenance de %%site."
+"name%%."
 
-# missing context
-#: actions/smssettings.php:128
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, "
-msgstr "Numéro de téléphone, sans ponctuation ni espace, "
+#: actions/smssettings.php:91
+msgid "SMS is not available."
+msgstr "Les SMS ne sont pas disponibles."
 
-# missing context
-#: actions/smssettings.php:162
-#, fuzzy
-msgid "Send me notices through SMS; "
-msgstr "M'envoyer les statuts par SMS ; "
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Numéro de téléphone actuellement confirmé pour recevoir les SMS."
+
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
+msgstr "Numéro de téléphone en attente de confirmation."
+
+#: actions/smssettings.php:130
+msgid "Confirmation code"
+msgstr "Code de confirmation"
+
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
+msgstr "Entrez le code que vous avez reçu sur votre téléphone."
+
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
+msgstr "Numéro SMS"
+
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+"Numéro de téléphone, sans ponctuation ni espaces, incluant le code régional"
 
-#: actions/smssettings.php:335
-msgid "A confirmation code was sent to the phone number you added. "
-msgstr "Un code de confirmation vient d'être envoyé au numéro de téléphone indiqué. "
+#: actions/smssettings.php:174
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+"Envoyez-moi les statuts par SMS ; je comprends que cela pourrait affecter ma "
+"facture de téléphonie mobile."
+
+#: actions/smssettings.php:306
+msgid "No phone number."
+msgstr "Aucun numéro de téléphone."
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:311
+msgid "No carrier selected."
+msgstr "Aucun fournisseur sélectionné."
+
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
+msgstr "Vous utilisez déjà ce numéro de téléphone."
+
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
+msgstr "Ce numéro de téléphone est déjà utilisé."
+
+#: actions/smssettings.php:347
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"Un code de confirmation a été envoyé au numéro de téléphone indiqué. "
+"Vérifiez votre boîte de réception pour récupérer le code et les instructions "
+"pour son utilisation."
+
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
+msgstr "Ce code de confirmation est incorrect."
+
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
+msgstr "Ceci n’est pas votre numéro de téléphone."
+
+#: actions/smssettings.php:465
 msgid "Mobile carrier"
 msgstr "Fournisseur de téléphonie mobile"
 
+#: actions/smssettings.php:469
+msgid "Select a carrier"
+msgstr "Sélectionnez un fournisseur de téléphone mobile"
+
+#: actions/smssettings.php:476
+#, 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 ""
+"Votre fournisseur de téléphonie mobile. Si vous connaissez un fournisseur "
+"qui accepte la réception de SMS par courriel mais qui n’est pas listé ici, "
+"écrivez-nous à %s."
+
+#: actions/smssettings.php:498
+msgid "No code entered"
+msgstr "Aucun code entré"
+
 #: actions/subedit.php:70
 msgid "You are not subscribed to that profile."
 msgstr "Vous n'êtes pas abonné(e) à ce profil."
 
 #: actions/subedit.php:83
 msgid "Could not save subscription."
-msgstr "Impossible d'enregistrer l'abonnement."
+msgstr "Impossible d’enregistrer l’abonnement."
 
 #: actions/subscribe.php:55
 msgid "Not a local user."
-msgstr ""
-"Ceci n'est pas un utilisateur local."
+msgstr "Ceci n’est pas un utilisateur local."
 
-# missing context?
 #: actions/subscribe.php:69
-#, fuzzy
 msgid "Subscribed"
-msgstr "Abonné"
+msgstr "Souscrit"
 
 #: actions/subscribers.php:50
 #, php-format
@@ -5277,18 +3034,36 @@ msgstr "Abonnés à %s"
 msgid "%s subscribers, page %d"
 msgstr "Abonnés à %s - page &d"
 
-# missing context
 #: actions/subscribers.php:63
-#, fuzzy
-msgid "These are the people who listen to "
-msgstr "Ces personnes suivent "
+msgid "These are the people who listen to your notices."
+msgstr "Ces personnes suivent vos statuts."
 
-# missing context
 #: actions/subscribers.php:67
-#, fuzzy
 #, php-format
-msgid "These are the people who "
-msgstr "Ces personnes sont ceux qui "
+msgid "These are the people who listen to %s's notices."
+msgstr "Ces personnes suivent les statuts de %s."
+
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
+msgstr ""
+"Vous n’avez pas d’abonnés. Essayez de vous abonner à des gens que vous "
+"connaissez et ils pourraient vous retourner la faveur."
+
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr "%s n’a pas d’abonnés. Voulez-vous être le premier ?"
+
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+"%s n’a pas d’abonnés. Vous pourriez [créer un compte](%%%%action.register%%%"
+"%) et être le premier ?"
 
 #: actions/subscriptions.php:52
 #, php-format
@@ -5300,33 +3075,43 @@ msgstr "Abonnements de %s"
 msgid "%s subscriptions, page %d"
 msgstr "Abonnements de %s - page %d"
 
-# missing context
 #: actions/subscriptions.php:65
-#, fuzzy
-msgid "These are the people whose notices "
-msgstr "Voici les personnes dont les messages "
+msgid "These are the people whose notices you listen to."
+msgstr "Vous suivez les statuts de ces personnes. "
 
-# missing context
 #: actions/subscriptions.php:69
-#, fuzzy
 #, php-format
-msgid "These are the people whose "
-msgstr "Voici les personnes dont "
-
-#: actions/subscriptions.php:122
-msgid "Jabber"
-msgstr "Jabber"
+msgid "These are the people whose notices %s listens to."
+msgstr "Les statuts de ces personnes sont suivis par %s."
 
-#: actions/tag.php:43
+#: actions/subscriptions.php:121
 #, php-format
-msgid "Notices tagged with %s, page %d"
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
 msgstr ""
-"Statuts marqués %s - page %d"
+"Vous ne suivez les avis de personne pour le moment, essayez de vous abonnez "
+"à des gens que vous connaissez. Essayez la [recherche de personnes](%%action."
+"peoplesearch%%), cherchez les membres de groupes auquels vous vous "
+"intéressez et nos [utilisateurs en vedette](%%action.featured%%). Si vous "
+"êtes un [utilisateur de Twitter](%%action.twittersettings%%), vous pouvez "
+"vous abonner automatiquement aux gens auquels vous êtes déjà abonné là-bas."
 
-#: actions/tag.php:66
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
 #, php-format
-msgid "Messages tagged \"%s\", most recent first"
-msgstr "Messages marqués \"%s\", à partir du plus récent"
+msgid "%s is not listening to anyone."
+msgstr "%s ne suit actuellement personne."
+
+#: actions/subscriptions.php:194
+msgid "Jabber"
+msgstr "Jabber"
+
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
+msgstr "SMS"
 
 #: actions/tagother.php:33
 msgid "Not logged in"
@@ -5334,322 +3119,1037 @@ msgstr "Aucune session ouverte"
 
 #: actions/tagother.php:39
 msgid "No id argument."
-msgstr "Aucun argument d'identification."
+msgstr "Aucun argument d’identification."
 
 #: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr "Marquage %s"
 
+#: actions/tagother.php:77 lib/userprofile.php:75
+msgid "User profile"
+msgstr "Profil de l’utilisateur"
+
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
+msgstr "Photo"
+
 #: actions/tagother.php:141
 msgid "Tag user"
-msgstr "Marquer l'utilisateur"
+msgstr "Marquer l’utilisateur"
 
-#: actions/tagother.php:149
-msgid "Tags for this user (letters, numbers, -, ., and _), comma- or space- separated"
+#: actions/tagother.php:151
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
 msgstr "Marquer cet utilisateur (séparer par des espaces ou des virgules)"
 
-#: actions/tagother.php:164
-msgid "There was a problem with your session token."
-msgstr "Un problème est survenu avec votre jeton de session."
-
-#: actions/tagother.php:191
-msgid "You can only tag people you are subscribed to or who are subscribed to you."
-msgstr "Vous pouvez seulement marquer les personnes auxquelles vous êtes abonné(e) ou qui sont abonnées à vous."
+#: actions/tagother.php:193
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+"Vous pouvez seulement marquer les personnes auxquelles vous êtes abonné(e) "
+"ou qui sont abonnées à vous."
 
-#: actions/tagother.php:198
+#: actions/tagother.php:200
 msgid "Could not save tags."
-msgstr ""
-"Impossible d'enregistrer les marquages."
+msgstr "Impossible d’enregistrer les marquages."
 
-#: actions/tagother.php:233
+#: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
-msgstr "Remplissez les champs suivants pour marquer vos abonnés ou vos abonnements."
+msgstr ""
+"Remplissez les champs suivants pour marquer vos abonnés ou vos abonnements."
+
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Statuts marqués %s - page %d"
+
+#: actions/tag.php:86
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Flux des statuts pour le marquage %s (RSS 1.0)"
+
+#: actions/tag.php:92
+#, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Flux des statuts pour le marquage %s (RSS 2.0)"
+
+#: actions/tag.php:98
+#, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Flux des statuts pour le marquage %s (Atom)"
 
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Aucun marquage trouvé."
 
-#: actions/tagrss.php:66
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
+msgstr "Méthode API en construction."
+
+#: actions/unsubscribe.php:77
+msgid "No profile id in request."
+msgstr "Aucune identité de profil dans la requête."
+
+#: actions/unsubscribe.php:84
+msgid "No profile with that id."
+msgstr "Aucun profil avec cet identifiant."
+
+#: actions/unsubscribe.php:98
+msgid "Unsubscribed"
+msgstr "Désabonné"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
 #, php-format
-msgid "Microblog tagged with %s"
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
-"Microblog marqué avec %s"
+"La licence du flux auquel vous avez souscrit ‘%s’ n’est pas compatible avec "
+"la licence du site ‘%s’."
 
-#: actions/twitapiblocks.php:47
-msgid "Block user failed."
-msgstr "Le blocage de l'utilisateur a échoué."
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "Autoriser l’abonnement"
 
-#: actions/twitapiblocks.php:69
-msgid "Unblock user failed."
-msgstr "Le déblocage de l'utilisateur a échoué."
+#: actions/userauthorization.php:110
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
+msgstr ""
+"Veuillez vérifier ces détails pour vous assurer que vous souhaitez vous "
+"abonner aux statuts de cet utilisateur. Si vous n’avez pas demandé à vous "
+"abonner aux statuts de quelqu’un, cliquez « Rejeter »."
 
-#: actions/twitapiusers.php:48
-msgid "Not found."
-msgstr "Non trouvé."
+#: actions/userauthorization.php:188
+msgid "License"
+msgstr "Licence"
 
-#: actions/twittersettings.php:71
-msgid "Add your Twitter account to automatically send "
-msgstr "Ajoutez votre compte Twitter pour envoyer automatiquement "
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "Accepter"
+
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "S’abonner à cet utilisateur"
 
-#: actions/twittersettings.php:119
-msgid "Twitter user name"
-msgstr "Nom d'utilisateur Twitter"
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "Refuser"
 
-#: actions/twittersettings.php:126
-msgid "Twitter password"
-msgstr "Mot de passe Twitter"
+#: actions/userauthorization.php:212
+msgid "Reject this subscription"
+msgstr "Rejeter cette souscription"
 
-#: actions/twittersettings.php:228
-msgid "Twitter Friends"
-msgstr "Amis de Twitter"
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
+msgstr "Pas de requête d’autorisation !"
 
-#: actions/twittersettings.php:327
-msgid "Username must have only numbers, "
-msgstr "L'identifiant doit contenit seulement des chiffres, "
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+msgstr "Abonnement autorisé"
 
-#: actions/twittersettings.php:341
+#: actions/userauthorization.php:249
+#, fuzzy
+msgid ""
+"The subscription has been authorized, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to authorize the "
+"subscription. Your subscription token is:"
+msgstr ""
+"L’abonnement a été autorisé, mais l’URL de rappel n’a pas été validé. "
+"Vérifiez les instructions du site pour savoir comment compléter "
+"l’autorisation de l’abonnement. Votre jeton d’abonnement est :"
+
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
+msgstr "Abonnement refusé"
+
+#: actions/userauthorization.php:261
+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’abonnement a été refusé, mais aucune URL de rappel n’a pas été passée. "
+"Vérifiez les instructions du site pour savoir comment refuser pleinement "
+"l’abonnement."
+
+#: actions/userauthorization.php:296
 #, php-format
-msgid "Unable to retrieve account information "
-msgstr "Impossible de récupérer les informations du compte "
+msgid "Listener URI ‘%s’ not found here"
+msgstr "L’URI de l’auditeur ‘%s’ n’a pas été trouvée"
 
-#: actions/unblock.php:108
-msgid "Error removing the block."
-msgstr "Erreur lors de l'annulation du blocage."
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr "L’URI à laquelle vous avez souscrit ‘%s’ est trop longue."
 
-#: actions/unsubscribe.php:50
-msgid "No profile id in request."
-msgstr "Aucune identité de profil dans la requête."
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr "L’URI à laquelle vous avez souscrit ‘%s’ est un utilisateur local."
 
-#: actions/unsubscribe.php:57
-msgid "No profile with that id."
-msgstr "Aucun profil avec cet identifiant."
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr "L’URL du profil ‘%s’ est pour un utilisateur local."
 
-#: actions/unsubscribe.php:71
-msgid "Unsubscribed"
-msgstr "Désabonné"
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr "L’URL de l’avatar ‘%s’ n’est pas valide."
 
-#: actions/usergroups.php:63
+#: actions/userauthorization.php:343
 #, php-format
-msgid "%s groups"
-msgstr "Groupes de %s"
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Impossible de lire l’URL de l’avatar « %s »."
 
-#: actions/usergroups.php:65
+#: actions/userauthorization.php:348
+#, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Format d’image invalide pour l’URL de l’avatar « %s »."
+
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr "Aucun identifiant."
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+msgid "Profile design"
+msgstr "Conception de profil"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+"Personnalisez l’apparence de votre profil avec une image d’arrière plan et "
+"une palette de couleurs de votre choix."
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr "Bon appétit !"
+
+#: actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "Groupes de %s - page %d"
 
-#: classes/Notice.php:104
+#: actions/usergroups.php:130
+msgid "Search for more groups"
+msgstr "Rechercher pour plus de groupes"
+
+#: actions/usergroups.php:153
+#, php-format
+msgid "%s is not a member of any group."
+msgstr "%s n’est pas membre d’un groupe."
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+"Essayez de [rechercher un groupe](%%action.groupsearch%%) et de vous y "
+"inscrire."
+
+#: classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+"Un fichier ne peut pas être plus gros que %d octets et le fichier que vous "
+"avez envoyé pesait %d octets. Essayez d’importer une version moins grosse."
+
+#: classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr "Un fichier aussi gros dépasserai votre quota utilisateur de %d octets."
+
+#: classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr "Un fichier aussi gros dépasserai votre quota mensuel de %d octets."
+
+#: classes/Message.php:55
+msgid "Could not insert message."
+msgstr "Impossible d’insérer le message."
+
+#: classes/Message.php:65
+msgid "Could not update message with new URI."
+msgstr "Impossible de mettre à jour le message avec un nouvel URI."
+
+#: classes/Notice.php:164
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "Erreur de base de donnée en insérant le hashtag : %s"
+
+#: classes/Notice.php:179
+msgid "Problem saving notice. Too long."
+msgstr "Problème lors de l’enregistrement de l’avis ; trop long."
+
+#: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
-msgstr "Erreur lors de l'enregistrement du statut. Utilisateur inconnu."
+msgstr "Erreur lors de l’enregistrement du statut. Utilisateur inconnu."
 
-#: classes/Notice.php:109
-msgid "Too many notices too fast; take a breather and post again in a few minutes."
-msgstr "Trop de statuts, trop vite ! Prenez une pause et publiez à nouveau dans quelques minutes."
+#: classes/Notice.php:188
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+"Trop de statuts, trop vite ! Prenez une pause et publiez à nouveau dans "
+"quelques minutes."
+
+#: classes/Notice.php:194
+#, fuzzy
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+"Trop de statuts, trop vite ! Prenez une pause et publiez à nouveau dans "
+"quelques minutes."
 
-#: classes/Notice.php:116
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr "Il vous est interdit de publier des statuts dans ce site."
 
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
+msgstr "Problème lors de l’enregistrement du statut."
+
+#: classes/Notice.php:1120
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "Erreur de base de donnée en insérant la réponse :%s"
+
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Bienvenu à %1$s, %2$s !"
+
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Profil"
+
 #: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
+msgstr "Modifier vos paramètres de profil"
+
+#: lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "Ajouter un avatar"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr "Modifier votre mot de passe"
+
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
+msgstr "Modifier le traitement des courriels"
+
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
+msgstr "Conception"
+
+#: lib/accountsettingsaction.php:124
+msgid "Design your profile"
+msgstr "Concevez votre profil"
+
+#: lib/accountsettingsaction.php:128
 msgid "Other"
 msgstr "Autres "
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:128
 msgid "Other options"
 msgstr "Autres options "
 
-#: lib/action.php:130
+#: lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: lib/action.php:145
+#: lib/action.php:159
 msgid "Untitled page"
 msgstr "Page sans nom"
 
-#: lib/action.php:316
+#: lib/action.php:424
 msgid "Primary site navigation"
 msgstr "Navigation primaire du site"
 
-#: lib/action.php:322
+#: lib/action.php:430
+msgid "Home"
+msgstr "Accueil"
+
+#: lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr "Profil personnel et flux des amis"
 
-#: lib/action.php:325
-msgid "Search for people or text"
-msgstr "Rechercher des personnes ou du texte"
-
-#: lib/action.php:328
+#: lib/action.php:432
 msgid "Account"
 msgstr "Compte"
 
-# missing context
-#: lib/action.php:328
-#, fuzzy
+#: lib/action.php:432
 msgid "Change your email, avatar, password, profile"
-msgstr "Modifier votre courriel, avatar, mot de passe, profil "
+msgstr "Modifier votre courriel, avatar, mot de passe, profil"
+
+#: lib/action.php:435
+msgid "Connect"
+msgstr "Connecter"
+
+#: lib/action.php:435
+msgid "Connect to services"
+msgstr "Se connecter aux services"
+
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
+msgstr "Inviter"
+
+#: lib/action.php:440 lib/subgroupnav.php:106
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr "Inviter des amis et collègues à vous rejoindre dans %s"
 
-#: lib/action.php:330
-msgid "Connect to IM, SMS, Twitter"
-msgstr "Connexion à la messagerie instantanée, SMS ou Twitter"
+#: lib/action.php:445
+msgid "Logout"
+msgstr "Fermeture de session"
 
-#: lib/action.php:332
+#: lib/action.php:445
 msgid "Logout from the site"
 msgstr "Fermer la session"
 
-#: lib/action.php:335
-msgid "Login to the site"
-msgstr "Ouvrir une session"
-
-#: lib/action.php:338
+#: lib/action.php:450
 msgid "Create an account"
 msgstr "Créer un compte"
 
-#: lib/action.php:341
-msgid "Login with OpenID"
-msgstr "Connexion OpenID"
+#: lib/action.php:453
+msgid "Login to the site"
+msgstr "Ouvrir une session"
+
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
+msgstr "Aide"
 
-#: lib/action.php:344
+#: lib/action.php:456
 msgid "Help me!"
-msgstr "À l'aide !"
+msgstr "À l’aide !"
 
-#: lib/action.php:362
+#: lib/action.php:459
+msgid "Search"
+msgstr "Rechercher"
+
+#: lib/action.php:459
+msgid "Search for people or text"
+msgstr "Rechercher des personnes ou du texte"
+
+#: lib/action.php:480
 msgid "Site notice"
 msgstr "Notice du site"
 
-#: lib/action.php:417
+#: lib/action.php:546
 msgid "Local views"
 msgstr "Vues locales"
 
-# missing context?
-#: lib/action.php:472
-#, fuzzy
+#: lib/action.php:612
 msgid "Page notice"
-msgstr "Notice de la page"
+msgstr "Avis de la page"
 
-#: lib/action.php:562
+#: lib/action.php:714
 msgid "Secondary site navigation"
 msgstr "Navigation secondaire du site"
 
-#: lib/action.php:602
-#: lib/action.php:623
+#: lib/action.php:721
+msgid "About"
+msgstr "À propos"
+
+#: lib/action.php:723
+msgid "FAQ"
+msgstr "FAQ"
+
+#: lib/action.php:727
+msgid "TOS"
+msgstr "CGU"
+
+#: lib/action.php:730
+msgid "Privacy"
+msgstr "Confidentialité"
+
+#: lib/action.php:732
+msgid "Source"
+msgstr "Source"
+
+#: lib/action.php:734
+msgid "Contact"
+msgstr "Contact"
+
+#: lib/action.php:736
+#, fuzzy
+msgid "Badge"
+msgstr "Clin d’œil"
+
+#: lib/action.php:764
 msgid "StatusNet software license"
 msgstr "Licence du logiciel StatusNet"
 
-#: lib/action.php:630
+#: lib/action.php:767
+#, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
+msgstr ""
+"**%%site.name%%** est un service de microblogging qui vous est proposé par  "
+"[%%site.broughtby%%](%%site.broughtbyurl%%)."
+
+#: lib/action.php:769
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** est un service de micro-blogging."
+
+#: lib/action.php:771
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+"Il utilise le logiciel de micro-blogging [StatusNet](http://status.net/), "
+"version %s, disponible sous la licence [GNU Affero General Public License] "
+"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+
+#: lib/action.php:785
+msgid "Site content license"
+msgstr "Licence du contenu du site"
+
+#: lib/action.php:794
 msgid "All "
-msgstr "Tous"
+msgstr "Tous "
 
-#: lib/action.php:635
+#: lib/action.php:799
 msgid "license."
 msgstr "licence."
 
-#: lib/blockform.php:123
-#: lib/blockform.php:153
-msgid "Block this user"
-msgstr "Bloquer cet utilisateur "
+#: lib/action.php:1052
+msgid "Pagination"
+msgstr "Pagination"
 
-#: lib/blockform.php:153
-msgid "Block"
-msgstr "Bloquer"
+#: lib/action.php:1061
+msgid "After"
+msgstr "Après"
 
-#: lib/disfavorform.php:114
-#: lib/disfavorform.php:140
-msgid "Disfavor this notice"
-msgstr "Retirer des favoris"
+#: lib/action.php:1069
+msgid "Before"
+msgstr "Avant"
+
+#: lib/action.php:1117
+msgid "There was a problem with your session token."
+msgstr "Un problème est survenu avec votre jeton de session."
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr "Pièces jointes"
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr "Auteur"
+
+#: lib/attachmentlist.php:278
+msgid "Provider"
+msgstr "Fournisseur"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr "Statuts sur lesquels cette pièce jointe apparait."
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr "Marques de cette pièce jointe"
+
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
+msgstr "Résultats de la commande"
+
+#: lib/channel.php:210
+msgid "Command complete"
+msgstr "Commande complétée"
+
+#: lib/channel.php:221
+msgid "Command failed"
+msgstr "Échec de la commande"
+
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr "Désolé, cette commande n’a pas encore été implémentée."
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr ""
+"Impossible de mettre l’utilisateur à jour avec l’adresse courriel confirmée."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr "Ça n’a pas de sens de se faire un clin d’œil à soi-même !"
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "Clin d’œil envoyé"
+
+#: lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+"Abonnements : %1$s\n"
+"Abonnés : %2$s\n"
+"Messages : %3$s"
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr "Aucun statut avec cet identifiant n’existe"
+
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
+msgstr "Aucun statut récent pour cet utilisateur"
+
+#: lib/command.php:190
+msgid "Notice marked as fave."
+msgstr "Statut ajouté aux favoris."
+
+#: lib/command.php:315
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#: lib/command.php:318
+#, php-format
+msgid "Fullname: %s"
+msgstr "Nom complet : %s"
+
+#: lib/command.php:321
+#, php-format
+msgid "Location: %s"
+msgstr "Emplacement : %s"
+
+#: lib/command.php:324
+#, php-format
+msgid "Homepage: %s"
+msgstr "Site Web : %s"
+
+#: lib/command.php:327
+#, php-format
+msgid "About: %s"
+msgstr "À propos : %s"
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr ""
+"Message trop long ! La taille maximale est de %d caractères ; vous en avez "
+"entré %d."
+
+#: lib/command.php:377
+msgid "Error sending direct message."
+msgstr "Une erreur est survenue pendant l’envoi de votre message."
+
+#: lib/command.php:431
+#, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr ""
+"Avis trop long ! La taille maximale est de %d caractères ; vous en avez "
+"entré %d."
+
+#: lib/command.php:439
+#, php-format
+msgid "Reply to %s sent"
+msgstr "Réponse à %s envoyée"
+
+#: lib/command.php:441
+msgid "Error saving notice."
+msgstr "Problème lors de l’enregistrement de l’avis."
+
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
+msgstr "Indiquez le nom de l’utilisateur auquel vous souhaitez vous abonner"
+
+#: lib/command.php:502
+#, php-format
+msgid "Subscribed to %s"
+msgstr "Abonné à %s"
+
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
+msgstr "Indiquez le nom de l’utilisateur duquel vous souhaitez vous désabonner"
+
+#: lib/command.php:530
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr "Désabonné de %s"
 
-#: lib/facebookaction.php:268
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
+msgstr "Cette commande n’a pas encore été implémentée."
+
+#: lib/command.php:551
+msgid "Notification off."
+msgstr "Avertissements désactivés."
+
+#: lib/command.php:553
+msgid "Can't turn off notification."
+msgstr "Impossible de désactiver les avertissements."
+
+#: lib/command.php:574
+msgid "Notification on."
+msgstr "Avertissements activés."
+
+#: lib/command.php:576
+msgid "Can't turn on notification."
+msgstr "Impossible d’activer les avertissements."
+
+#: lib/command.php:597
+#, php-format
+msgid "Could not create login token for %s"
+msgstr "Impossible de créer le jeton de connexion pour %s"
+
+#: lib/command.php:602
 #, php-format
-msgid "To use the %s Facebook Application you need to login "
-msgstr "Vous devez ouvrir une session pour utiliser l'application Facebook %s"
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+"Ce lien n’est utilisable qu’une seule fois, et est valable uniquement "
+"pendant 2 minutes : %s"
+
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Vous n'êtes pas abonné(e) à ce profil."
 
-# missing context?
-#: lib/facebookaction.php:271
+#: lib/command.php:620
 #, fuzzy
-msgid " a new account."
-msgstr " un nouveau compte."
+msgid "You are subscribed to these people: "
+msgstr "Vous n'êtes pas abonné(e) à ce profil."
 
-#: lib/facebookaction.php:557
-#: lib/mailbox.php:214
-#: lib/noticelist.php:354
-msgid "Published"
-msgstr "Publié"
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Impossible d’abonner une autre personne à votre profil."
 
-#: lib/favorform.php:114
-#: lib/favorform.php:140
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Abonnés de %s"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Vous n'êtes pas membre de ce groupe."
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "Vous n'êtes pas membre de ce groupe."
+
+#: lib/command.php:670
+#, fuzzy
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+"Commandes :\n"
+"on - activer les notifications\n"
+"off - désactiver les notifications\n"
+"help - montrer l’aide\n"
+"follow <nickname> - s’abonner à l’utilisateur\n"
+"leave <nickname> - se désabonner de l’utilisateur\n"
+"d <nickname> <text> - message direct à l’utilisateur\n"
+"get <nickname> - obtenir le dernier avis de l’utilisateur\n"
+"whois <nickname> - obtenir le profil de cet utilisateur\n"
+"fav <nickname> - ajouter de dernier avis de l’utilisateur comme favori\n"
+"fav #<notice_id> - ajouter l’avis correspondant à l’id comme favori\n"
+"reply #<notice_id> - répondre à l’avis correspondant à l’id\n"
+"reply <nickname> - répondre au dernier avis de l’utilisateur\n"
+"join <group> - s’inscrire au groupe\n"
+"login - Obtenir un lien pour s’identifier sur l’interface web\n"
+"drop <group> - quitter le groupe\n"
+"stats - obtenir vos statistiques\n"
+"stop - même effet que 'off'\n"
+"quit - même effet que 'off'\n"
+"sub <nickname> - même effet que 'follow'\n"
+"unsub <nickname> - même effet que 'leave'\n"
+"last <nickname> - même effet que 'get'\n"
+"on <nickname> - pas encore implémenté.\n"
+"off <nickname> - pas encore implémenté.\n"
+"nudge <nickname> - rappeler à un utilisateur de publier.\n"
+"invite <phone number> - pas encore implémenté.\n"
+"track <word> - pas encore implémenté.\n"
+"untrack <word> - pas encore implémenté.\n"
+"track off - pas encore implémenté.\n"
+"untrack all - pas encore implémenté.\n"
+"tracks - pas encore implémenté.\n"
+"tracking - pas encore implémenté.\n"
+
+#: lib/common.php:192
+msgid "No configuration file found. "
+msgstr "Aucun fichier de configuration n'a été trouvé. "
+
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+"J’ai cherché des fichiers de configuration dans les emplacements suivants : "
+
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
+msgstr "Vous pouvez essayer de lancer l’installeur pour régler ce problème."
+
+#: lib/common.php:195
+msgid "Go to the installer."
+msgstr "Aller au programme d’installation"
+
+#: lib/connectsettingsaction.php:110
+msgid "IM"
+msgstr "IM"
+
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Suivi des statuts par messagerie instantanée"
+
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
+msgstr "Suivi des statuts par SMS"
+
+#: lib/dberroraction.php:60
+msgid "Database error"
+msgstr "Erreur de la base de données"
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr "Changer l’image d’arrière plan"
+
+#: lib/designsettings.php:105
+msgid "Upload file"
+msgstr "Importer un fichier"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+"Vous pouvez importer une image d’arrière plan personnelle. La taille "
+"maximale du fichier est de 2 Mo."
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr "Activé"
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr "Désactivé"
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr "Activer ou désactiver l’image d’arrière plan."
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr "Répéter l’image d’arrière plan"
+
+#: lib/designsettings.php:170
+msgid "Change colours"
+msgstr "Modifier les couleurs"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr "Arrière plan"
+
+#: lib/designsettings.php:191
+msgid "Content"
+msgstr "Contenu"
+
+#: lib/designsettings.php:204
+msgid "Sidebar"
+msgstr "Barre latérale"
+
+#: lib/designsettings.php:217
+msgid "Text"
+msgstr "Texte"
+
+#: lib/designsettings.php:230
+msgid "Links"
+msgstr "Liens"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr "Utiliser les valeurs par défaut"
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr "Restaurer les conceptions par défaut"
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr "Revenir aux valeurs par défaut"
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr "Sauvegarder la conception"
+
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
+msgstr "Les paramètre par défaut de la conception ont été restaurés."
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
+msgstr "Retirer des favoris"
+
+#: lib/favorform.php:114 lib/favorform.php:140
 msgid "Favor this notice"
 msgstr "Ajouter aux favoris"
 
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr "Ajouter à mes favoris"
+
 #: lib/feedlist.php:64
 msgid "Export data"
 msgstr "Exporter les données"
 
-# étiquettes ou marquages?
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr "RSS 1.0"
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr "RSS 2.0"
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr "Atom"
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr "Ami d’un ami"
+
 #: lib/galleryaction.php:121
-#, fuzzy
 msgid "Filter tags"
-msgstr "Filtrer les étiquettes"
+msgstr "Filtrer les balises"
 
 #: lib/galleryaction.php:131
 msgid "All"
 msgstr "Tous"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
+msgstr "Sélectionner une marque à filtrer"
+
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Marquer"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "Choissez un marquage pour réduire la liste"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "Aller"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "URL du site Web ou blogue du groupe ou sujet "
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:168
+msgid "Describe the group or topic"
+msgstr "Description du groupe ou du sujet"
+
+#: lib/groupeditform.php:170
+#, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "Description du groupe ou du sujet en %d caractères"
+
+#: lib/groupeditform.php:172
 msgid "Description"
 msgstr "Description"
 
-#: lib/groupeditform.php:153
-msgid "Describe the group or topic in 140 chars"
-msgstr "Description du groupe ou du sujet (140 caractères maximum)"
+#: lib/groupeditform.php:179
+msgid ""
+"Location for the group, if any, like \"City, State (or Region), Country\""
+msgstr ""
+"Emplacement du groupe, s’il y a lieu, de la forme « Ville, État ou région, "
+"Pays »"
 
-#: lib/groupeditform.php:158
-msgid "Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr "Emplacement du groupe, s'il y a lieu \"Ville, État ou région, Pays\""
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+"Pseudos supplémentaires pour le groupe, séparés par des virgules ou des "
+"espaces, %d au maximum"
 
-#: lib/groupnav.php:84
-#: lib/searchgroupnav.php:84
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
 msgid "Group"
 msgstr "Groupe"
 
-#: lib/groupnav.php:100
-msgid "Admin"
-msgstr "Administrer"
-
 #: lib/groupnav.php:101
+msgid "Blocked"
+msgstr "Bloqué"
+
+#: lib/groupnav.php:102
+#, php-format
+msgid "%s blocked users"
+msgstr "%s utilisateurs bloqués"
+
+#: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
 msgstr "Modifier les propriétés du groupe %s"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:113
 msgid "Logo"
 msgstr "Logo"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:114
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "Ajouter ou modifier le logo de %s"
 
+#: lib/groupnav.php:120
+#, php-format
+msgid "Add or edit %s design"
+msgstr "Ajouter ou modifier la conception de %s"
+
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Groupes avec le plus de membres"
@@ -5663,11 +4163,44 @@ msgstr "Groupes avec le plus d'éléments publiés"
 msgid "Tags in %s group's notices"
 msgstr "Marquages des statuts du groupe %s"
 
-# missing context
 #: lib/htmloutputter.php:104
-#, fuzzy
-msgid "This page is not available in a "
-msgstr "Cette page n'est pas disponible dans "
+msgid "This page is not available in a media type you accept"
+msgstr ""
+"Cette page n’est pas disponible dans un des formats que vous avez autorisés."
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Ce fichier est trop lourd. La taille maximale est %d."
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr "Transfert partiel."
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr "Erreur système lors du transfert du fichier."
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr "Ceci n’est pas une image, ou c’est un fichier corrompu."
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr "Format de fichier d’image non supporté."
+
+#: lib/imagefile.php:118
+msgid "Lost our file."
+msgstr "Fichier perdu."
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr "Type de fichier inconnu"
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr "[%s]"
 
 #: lib/joinform.php:114
 msgid "Join"
@@ -5677,164 +4210,527 @@ msgstr "Rejoindre"
 msgid "Leave"
 msgstr "Quitter"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr "Ouvrez une session avec un identifiant et un mot de passe"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr "Créer un nouveau compte"
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
-msgstr "Ouvrir une session ou s'enregistrer avec OpenID"
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "L’accès à cette boîte de réception est réservé à son utilisateur."
 
-#: lib/mail.php:175
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+"Vous n’avez pas de messages privés. Vous pouvez envoyer des messages privés "
+"pour démarrer des conversations avec d’autres utilisateurs. Ceux-ci peuvent "
+"vous envoyer des messages destinés à vous seul(e)."
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+msgid "from"
+msgstr "de"
+
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "Confirmation de l’adresse courriel"
+
+#: lib/mail.php:174
 #, php-format
 msgid ""
 "Hey, %s.\n"
 "\n"
-msgstr "Bonjour, %s.\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%s\n"
+"\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
+msgstr ""
+"Bonjour %s.\n"
+"\n"
+"Quelqu’un vient d’utiliser cette adresse électronique sur %s.\n"
+"\n"
+"S’il s’agit bien de vous, et que vous souhaitez confirmer cette adresse, "
+"utilisez le lien qui suit :\n"
+"\n"
+"%s\n"
 "\n"
+"Dans le cas contraire, il vous suffit d’ignorer ce message.\n"
+"\n"
+"Merci de votre attention,\n"
+"%s\n"
 
-# missing context
-#: lib/mail.php:236
-#, fuzzy
+#: lib/mail.php:235
+#, php-format
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr "%1$s suit maintenant vos statuts dans %2$s."
+
+#: lib/mail.php:240
 #, php-format
-msgid "%1$s is now listening to "
-msgstr "%1$s suit actuellement "
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
+"%1$s suit maintenant vos statuts sur %2$s.\n"
+"\n"
+"%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Cordialement,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Changez votre adresse de courriel ou vos options de notification sur %8$s\n"
 
-#: lib/mail.php:254
+#: lib/mail.php:253
 #, php-format
 msgid "Location: %s\n"
 msgstr "Emplacement : %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:255
 #, php-format
 msgid "Homepage: %s\n"
 msgstr "Site Web : %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
 "\n"
-msgstr "Bio : %s\n"
+msgstr ""
+"Bio : %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:285
+#, php-format
+msgid "New email address for posting to %s"
+msgstr "Nouvelle adresse courriel pour poster dans %s"
+
+#: lib/mail.php:288
+#, 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 ""
+"Une nouvelle adresse vous a été attribuée pour publier vos statuts dans %1"
+"$s.\n"
+"\n"
+"Écrivez à %2$s pour mettre à jour votre statut.\n"
+"\n"
+"Plus d’info : %3$s.\n"
+"\n"
+"Amicalement vôtre,\n"
+"%4$s"
+
+#: lib/mail.php:412
+#, php-format
+msgid "%s status"
+msgstr "Statut de %s"
+
+#: lib/mail.php:438
+msgid "SMS confirmation"
+msgstr "Confirmation SMS"
+
+#: lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
-msgstr "Vous avez reçu un clin d'œil de %s"
+msgstr "Vous avez reçu un clin d’œil de %s"
+
+#: lib/mail.php:466
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
+msgstr ""
+"%1$s (%2$s) se demande ce que vous devenez ces temps-ci et vous invite à "
+"publier des nouvelles.\n"
+"\n"
+"Donc on vous écoute :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Ne répondez pas à ce courriel ; il ne sera pas envoyé.\n"
+"\n"
+"Bien à vous,\n"
+"%4$s\n"
+
+#: lib/mail.php:509
+#, php-format
+msgid "New private message from %s"
+msgstr "Nouveau message personnel de %s"
+
+#: lib/mail.php:513
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%5$s\n"
+msgstr ""
+"%1$s (%2$s) vous a envoyé un message privé:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"Vous pouvez répondre à ce message ici:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Ne répondez pas à ce courriel ; il ne sera pas envoyé.\n"
+"\n"
+"Bien à vous,\n"
+"%5$s\n"
+
+#: lib/mail.php:554
+#, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s (@%s) a ajouté un de vos statut à ses favoris"
+
+#: lib/mail.php:556
+#, fuzzy, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
+"%1$s vient de marquer votre message de %2$s comme un de ses favoris.\n"
+"\n"
+"Dans le cas où vous l’auriez oublié, vous pouvez lire le texte de votre "
+"message ici :\n"
+"\n"
+"%3$s\n"
+"\n"
+"Vous pouvez consulter la liste des favoris de %1$s ici :\n"
+"\n"
+"%4$s\n"
+"\n"
+"Cordialement,\n"
+"%5$s\n"
 
-#: lib/mail.php:465
+#: lib/mail.php:611
 #, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
-msgstr "%1$s (%2$s) se demande ce que vous devenez  "
+msgid "%s (@%s) sent a notice to your attention"
+msgstr "%s (@%s) vous a envoyé un avis"
 
-#: lib/mail.php:555
+#: lib/mail.php:613
 #, php-format
-msgid "%1$s just added your notice from %2$s"
-msgstr "%1$s a ajouté votre statut depuis %2$s"
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+msgstr ""
+"%1$s (@%9$s) vient de vous envoyer un avis (une réponse « @ ») sur %2$s.\n"
+"\n"
+"L’avis est là :\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Il dit :\n"
+"\n"
+"\t%4$s\n"
+"\n"
+
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+"Une erreur de base de données s’est produite pendant la sauvegarde de votre "
+"fichier. Veuillez réessayer."
+
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr "Le fichier importé dépasse le réglage upload_max_filesize de php.ini."
 
-#: lib/mailbox.php:229
-#: lib/noticelist.php:380
-msgid "From"
-msgstr "De"
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+"Le fichier importé dépasse le réglage MAX_FILE_SIZE qui a été précisé dans "
+"le formulaire HTML."
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr "Le fichier n’a été que partiellement importé."
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr "Un dossier temporaire est manquant."
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr "Impossible d'écrire sur le disque."
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr "Import de fichier stoppé par une extension."
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr "Le fichier dépasse le quota de l’utilisateur."
+
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr "Le fichier n’a pas pu être déplacé dans le dossier de destination."
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+msgid "Could not determine file's mime-type!"
+msgstr "Impossible de déterminer le mime-type du fichier !"
+
+#: lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr " Essayez d’utiliser un autre %s format."
 
-# De #-#-#-#-#  statusnet-no-duplicates.po (0.43)  #-#-#-#-#\n
-# Nouveau message\n
-# #-#-#-#-#  statusnet.new.pot (PACKAGE VERSION)  #-#-#-#-#\n
-# à "Supprimer l'avis"
-#: lib/messageform.php:110
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr "%s n’est pas un type de fichier supporté sur ce serveur."
+
+#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Envoyer un message direct"
 
-#: lib/noticeform.php:125
-msgid "Send a notice"
-msgstr "Envoyer un statut"
+#: lib/messageform.php:146
+msgid "To"
+msgstr "À"
 
-#: lib/noticeform.php:152
+#: lib/messageform.php:162 lib/noticeform.php:173
 msgid "Available characters"
 msgstr "Caractères restants"
 
-#: lib/noticelist.php:426
-msgid "in reply to"
-msgstr "en réponse à"
+#: lib/noticeform.php:145
+msgid "Send a notice"
+msgstr "Envoyer un statut"
+
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
+msgstr "Quoi de neuf, %s ?"
+
+#: lib/noticeform.php:180
+msgid "Attach"
+msgstr "Attacher"
 
-#: lib/noticelist.php:447
-#: lib/noticelist.php:450
+#: lib/noticeform.php:184
+msgid "Attach a file"
+msgstr "Attacher un fichier"
+
+#: lib/noticelist.php:478
+msgid "in context"
+msgstr "dans le contexte"
+
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr "Répondre à ce statut"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "Répondre"
 
-# De #-#-#-#-#  statusnet-no-duplicates.po (0.43)  #-#-#-#-#\n
-# Nouveau message\n
-# #-#-#-#-#  statusnet.new.pot (PACKAGE VERSION)  #-#-#-#-#\n
-# à "Supprimer l'avis"
-#: lib/noticelist.php:471
-#: lib/noticelist.php:474
-msgid "Delete this notice"
-msgstr "Supprimer ce statut"
-
-# De #-#-#-#-#  statusnet-no-duplicates.po (0.43)  #-#-#-#-#\n
-# Nouveau message\n
-# #-#-#-#-#  statusnet.new.pot (PACKAGE VERSION)  #-#-#-#-#\n
-# à "Supprimer l'avis"
-#: lib/noticelist.php:474
-msgid "Delete"
-msgstr "Supprimer"
-
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
-msgstr "Envoyer un clin d'œil à cet utilisateur"
+msgstr "Envoyer un clin d’œil à cet utilisateur"
 
 #: lib/nudgeform.php:128
 msgid "Nudge"
-msgstr "Clin d'œil"
+msgstr "Clin d’œil"
 
 #: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
-msgstr "Envoyer un clin d'œil à cet utilisateur"
+msgstr "Envoyer un clin d’œil à cet utilisateur"
+
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "Erreur lors de l’insertion du nouveau profil"
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "Erreur lors de l’insertion de l’avatar"
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "Erreur lors de l’insertion du profil distant"
+
+#: lib/oauthstore.php:345
+msgid "Duplicate notice"
+msgstr "Dupliquer l’avis"
+
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
+msgstr "Impossible d’insérer un nouvel abonnement."
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "Personnel"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "Réponses"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr "Favoris"
+
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr "Utilisateur"
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr "Boîte de réception"
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr "Vos messages reçus"
+
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr "Boîte d’envoi"
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr "Vos messages envoyés"
 
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Marquages des statuts de %s"
 
-#: lib/profilelist.php:182
-msgid "(none)"
-msgstr "(aucun)"
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "Abonnements"
+
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "Tous les abonnements"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "Abonnés"
+
+#: lib/profileaction.php:157
+msgid "All subscribers"
+msgstr "Tous les abonnés"
+
+#: lib/profileaction.php:177
+msgid "User ID"
+msgstr "ID de l’utilisateur"
 
-#: lib/publicgroupnav.php:76
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "Membre depuis"
+
+#: lib/profileaction.php:235
+msgid "All groups"
+msgstr "Tous les groupes"
+
+#: lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Public"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:82
 msgid "User groups"
-msgstr "Groupes d'utilisateurs"
+msgstr "Groupes d’utilisateurs"
 
-#: lib/publicgroupnav.php:82
-#: lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Marquages récents"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "En vedette"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:92
 msgid "Popular"
-msgstr ""
-"Populaires"
+msgstr "Populaires"
+
+#: lib/searchaction.php:120
+msgid "Search site"
+msgstr "Rechercher sur le site"
+
+#: lib/searchaction.php:162
+msgid "Search help"
+msgstr "Aide sur la recherche"
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "Personnes"
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr "Chercher des personnes sur ce site"
 
 #: lib/searchgroupnav.php:82
 msgid "Notice"
 msgstr "Statut"
 
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr "Chercher dans le contenu des statuts"
+
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Rechercher des groupes sur ce site"
@@ -5843,34 +4739,62 @@ msgstr "Rechercher des groupes sur ce site"
 msgid "Untitled section"
 msgstr "Section sans titre"
 
-#: lib/subgroupnav.php:81
+#: lib/section.php:106
+msgid "More..."
+msgstr "Plus..."
+
+#: lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Abonnements de %s"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:91
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Abonnés de %s"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Groupes de %s"
 
-#: lib/subgroupnav.php:104
-#, php-format
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Inviter des amis et collègues à vous rejoindre dans %s"
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(aucun)"
+
+#: lib/subs.php:48
+msgid "Already subscribed!"
+msgstr "Déjà souscrit !"
 
-#: lib/subs.php:53
+#: lib/subs.php:52
 msgid "User has blocked you."
 msgstr "Cet utilisateur vous a bloqué."
 
-#: lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "S'abonner à cet utilisateur"
+#: lib/subs.php:56
+msgid "Could not subscribe."
+msgstr "Impossible de s’abonner."
+
+#: lib/subs.php:75
+msgid "Could not subscribe other to you."
+msgstr "Impossible d’abonner une autre personne à votre profil."
+
+#: lib/subs.php:124
+msgid "Not subscribed!"
+msgstr "Pas abonné !"
+
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
+msgstr "Impossible de cesser l’abonnement"
 
 #: lib/tagcloudsection.php:56
 msgid "None"
@@ -5880,32 +4804,105 @@ msgstr "Aucun"
 msgid "Top posters"
 msgstr "Utilisateurs les plus actifs"
 
-#: lib/unblockform.php:120
-#: lib/unblockform.php:150
-msgid "Unblock this user"
-msgstr "Débloquer cet utilisateur"
-
-#: lib/unblockform.php:150
-msgid "Unblock"
-msgstr "Débloquer"
-
-#: lib/unsubscribeform.php:113
-#: lib/unsubscribeform.php:137
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Ne plus suivre cet utilisateur"
 
-#~ msgid ""
-#~ "It runs the [StatusNet](http://status.net/) microblogging software, version "
-#~ "%s, available under the [GNU Affero General Public License] (http://www."
-#~ "fsf.org/licensing/licenses/agpl-3.0.html)."
-#~ msgstr ""
-#~ "Il utilise le logiciel de micro-blogging [StatusNet](http://status.net/), "
-#~ "version %s, disponible sous la licence [GNU Affero General Public "
-#~ "License] (http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "Désabonnement"
+
+#: lib/userprofile.php:116
+msgid "Edit Avatar"
+msgstr "Modifier l’avatar"
 
-#~ msgid "Unsupported type"
-#~ msgstr "Type non supporté"
+#: lib/userprofile.php:236
+msgid "User actions"
+msgstr "Actions de l’utilisateur"
 
-#, fuzzy
-#~ msgid "not a supported data format"
-#~ msgstr "pas un format de données supporté"
+#: lib/userprofile.php:248
+msgid "Edit profile settings"
+msgstr "Modifier les paramètres du profil"
+
+#: lib/userprofile.php:249
+msgid "Edit"
+msgstr "Modifier"
+
+#: lib/userprofile.php:272
+msgid "Send a direct message to this user"
+msgstr "Envoyer un message à cet utilisateur"
+
+#: lib/userprofile.php:273
+msgid "Message"
+msgstr "Message"
+
+#: lib/util.php:821
+msgid "a few seconds ago"
+msgstr "il y a quelques secondes"
+
+#: lib/util.php:823
+msgid "about a minute ago"
+msgstr "il y a 1 minute"
+
+#: lib/util.php:825
+#, php-format
+msgid "about %d minutes ago"
+msgstr "il y a %d minutes"
+
+#: lib/util.php:827
+msgid "about an hour ago"
+msgstr "il y a 1 heure"
+
+#: lib/util.php:829
+#, php-format
+msgid "about %d hours ago"
+msgstr "il y a %d heures"
+
+#: lib/util.php:831
+msgid "about a day ago"
+msgstr "il y a 1 jour"
+
+#: lib/util.php:833
+#, php-format
+msgid "about %d days ago"
+msgstr "il y a %d jours"
+
+#: lib/util.php:835
+msgid "about a month ago"
+msgstr "il y a 1 mois"
+
+#: lib/util.php:837
+#, php-format
+msgid "about %d months ago"
+msgstr "il y a %d mois"
+
+#: lib/util.php:839
+msgid "about a year ago"
+msgstr "il y a environ 1 an"
+
+#: lib/webcolor.php:82
+#, php-format
+msgid "%s is not a valid color!"
+msgstr "&s n’est pas une couleur valide !"
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+"%s n’est pas une couleur valide ! Utilisez 3 ou 6 caractères hexadécimaux."
+
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr "Impossible de déchiffrer ce message."
+
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr "Ceci n’est pas un utilisateur inscrit."
+
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr "Désolé, ceci n’est pas votre adresse de courriel entrant."
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr "Désolé, la réception de courriels n’est pas permise."
diff --git a/locale/ga/LC_MESSAGES/statusnet.mo b/locale/ga/LC_MESSAGES/statusnet.mo
index c13acd1a8..78a0e7ba0 100644
--- a/locale/ga/LC_MESSAGES/statusnet.mo
+++ b/locale/ga/LC_MESSAGES/statusnet.mo
diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po
index 3815e4853..bce6ff40a 100644
--- a/locale/ga/LC_MESSAGES/statusnet.po
+++ b/locale/ga/LC_MESSAGES/statusnet.po
@@ -1,4421 +1,3920 @@
-# translation of statusnet.po to Galician
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Translation of StatusNet to Irish
 #
-# Francisco Diéguez <fran.dieguez@glug.es>, 2008.
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: laconica-new\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-17 20:08+0100\n"
-"PO-Revision-Date: 2008-12-17 20:10+0100\n"
-"Last-Translator: Martín Vázquez Cabanas <eu@martinvazquez.net>\n"
-"Language-Team: Galician <en@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:30+0000\n"
+"Language-Team: Irish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ga\n"
+"X-Message-Group: out-statusnet\n"
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "Non existe a etiqueta."
 
-#: ../actions/noticesearchrss.php:64
-#: actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:61
-#, php-format
-msgid " Search Stream for \"%s\""
-msgstr "Buscar \"%s\" na Liña de tempo"
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
+msgstr "Ningún usuario."
 
-#: ../actions/finishopenidlogin.php:82
-#: ../actions/register.php:191
-#: actions/finishopenidlogin.php:88
-#: actions/register.php:205
-#: actions/register.php:232
-msgid " except this private data: password, email address, IM address, phone number."
-msgstr " agás esta informción privada: contrasinal, dirección de correo electrónico, dirección IM, número de teléfono."
-
-#: ../actions/showstream.php:400
-#: ../lib/stream.php:109
-#: actions/showstream.php:418
-#: lib/mailbox.php:164
-#: lib/stream.php:76
-#: lib/facebookaction.php:195
-#: lib/noticelist.php:160
-msgid " from "
-msgstr " dende "
+#: actions/all.php:84
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s e amigos"
 
-#: ../actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:341
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr "%1$s / Chíos que respostan a %2$s"
+msgid "%s and friends"
+msgstr "%s e amigos"
 
-#: ../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 invitoute a unirse a él en %2$s."
+#: actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Fonte para os amigos de %s"
+
+#: actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Fonte para os amigos de %s"
+
+#: actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Fonte para os amigos de %s"
 
-#: ../actions/invite.php:170
-#: actions/invite.php:178
+#: actions/all.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"
+"This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
-"%1$s invitoute a unirte a el en %2$s (%3$s).\n"
-"\n"
-"%2$s é un servizo de microbloguexo que che permite manterte actualizado coa xente que coñeces e xente na que tes interese.\n"
-"\n"
-"Tamén podes compartir novas contigo mesmo, ou pensamentos, ou vivir en liña con xente que te coñece. Tamén está moi ben para coñecer xente que comparte os mesmos intereses..\n"
-"\n"
-"%1$s dixo:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Podes ollar a súa páxina de perfil %1$s's en %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"Se queres probar, fai clic na ligazón de abaixo para aceptar a invitación..\n"
-"\n"
-"%6$s\n"
-"\n"
-"Se non, pois ignora esta mensaxe. Pero aló ti, aquí se pasa moi ben.\n"
-"\n"
-"Saudiños, %2$s\n"
 
-#: ../lib/mail.php:124
-#: lib/mail.php:124
-#: lib/mail.php:126
-#: lib/mail.php:115
+#: actions/all.php:132
 #, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s está a escoitar os teus chíos %2$s."
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
 
-#: ../lib/mail.php:126
-#: lib/mail.php:117
+#: actions/all.php:134
 #, 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"
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
-"%1$s está a escoitar os teus chíos en %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Atentamente todo seu,\n"
-"%4$s.\n"
 
-#: ../actions/twitapistatuses.php:482
-#: actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:344
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
 #, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "Hai %1$s chíos en resposta a chíos dende %2$s / %3$s."
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
 
-#: ../actions/shownotice.php:45
-#: actions/shownotice.php:45
-#: actions/shownotice.php:73
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr "Estado de %1$s en  %2$s"
+#: actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s e amigos"
 
-#: ../actions/invite.php:84
-#: ../actions/invite.php:92
-#: actions/invite.php:91
-#: actions/invite.php:99
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
 #, php-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr "Actualizacións dende %1$s e amigos en %2$s!"
 
-#: ../actions/publicrss.php:62
-#: actions/publicrss.php:48
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
+msgstr "Método da API non atopado"
+
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
+msgstr "Este método require un POST."
+
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Non se puido actualizar o usuario."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
 #, php-format
-msgid "%s Public Stream"
-msgstr "%s Fio Público"
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "Non se puideron gardar os teus axustes de Twitter!"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Non se puido actualizar o usuario."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "O usuario non ten perfil."
+
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Non se puido gardar o perfil."
+
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
+msgstr "Bloqueo de usuario fallido."
+
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
+msgstr "Desbloqueo de usuario fallido."
+
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "Non hai mensaxes de texto!"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr ""
+"Iso é demasiado longo. O tamaño máximo para unha mensaxe é de 140 caracteres."
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "Usuario destinatario non atopado."
 
-#: ../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
-#: actions/twitapistatuses.php:123
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+"Non se pode enviar a mensaxe directa a usuarios dos que non eres amigo."
+
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "Mensaxes directas para %s"
+
+#: actions/apidirectmessage.php:93
 #, php-format
-msgid "%s and friends"
-msgstr "%s e amigos"
+msgid "All the direct messages sent from %s"
+msgstr "Tódalas mensaxes directas enviadas dende %s"
 
-#: ../actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:31
+#: actions/apidirectmessage.php:101
 #, php-format
-msgid "%s public timeline"
-msgstr "Liña de tempo pública de %s"
+msgid "Direct messages to %s"
+msgstr "Mensaxes directas para %s"
 
-#: ../lib/mail.php:206
-#: lib/mail.php:212
-#: lib/mail.php:207
+#: actions/apidirectmessage.php:105
 #, php-format
-msgid "%s status"
-msgstr "Estado de %s"
+msgid "All the direct messages sent to %s"
+msgstr "Tódalas mensaxes directas enviadas a %s"
+
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "Método da API non atopado"
+
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
+msgstr "Non se atopou un estado con ese ID."
 
-#: ../actions/twitapistatuses.php:338
-#: actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:195
+#: actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+msgstr "Este chío xa é un favorito!"
+
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+msgstr "Non se puido crear o favorito."
+
+#: actions/apifavoritedestroy.php:122
+#, fuzzy
+msgid "That status is not a favorite!"
+msgstr "Este chío non é un favorito!"
+
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr "Non se puido eliminar o favorito."
+
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
+msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
+
+#: actions/apifriendshipscreate.php:118
 #, php-format
-msgid "%s timeline"
-msgstr "Liña de tempo de %s"
+msgid "Could not follow user: %s is already on your list."
+msgstr "Non podes seguir a este usuario: %s xa está na túa lista."
+
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
+msgstr ""
+"Dous identificadores de usuario ou nomes_en_pantalla deben ser "
+"proporcionados."
+
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Non se pudo recuperar a liña de tempo publica."
+
+#: actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Non se puido atopar ningún estado"
+
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
+#, fuzzy
+msgid "Could not create group."
+msgstr "Non se puido crear o favorito."
+
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Non se puido crear o favorito."
+
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Non se pode gardar a subscrición."
+
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "O alcume debe ter só letras minúsculas e números, e sen espazos."
+
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro."
+
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "Non é un alcume válido."
 
-#: ../actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:34
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "A páxina persoal semella que non é unha URL válida."
+
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "O nome completo é demasiado longo (max 255 car)."
+
+#: actions/apigroupcreate.php:261
 #, php-format
-msgid "%s updates from everyone!"
-msgstr "%s chíos de calquera!"
+msgid "Description is too long (max %d chars)."
+msgstr "O teu Bio é demasiado longo (max 140 car.)."
 
-#: ../actions/register.php:213
-#: actions/register.php:254
-msgid "(You should receive a message by email momentarily, with instructions on how to confirm your email address.)"
-msgstr "(Deberías recibir unha mensaxe no teu email nun intre, coas instrucións de como confirmar a túa dirección de correo.)"
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "A localización é demasiado longa (max 255 car.)."
 
-#: ../lib/util.php:257
-#: lib/util.php:273
-#: lib/util.php:290
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
 #, php-format
-msgid "**%%site.name%%** is a microblogging service brought to you by [%%site.broughtby%%](%%site.broughtbyurl%%). "
-msgstr "**%%site.name%%** é un servizo de microbloguexo que che proporciona [%%site.broughtby%%](%%site.broughtbyurl%%). "
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Etiqueta inválida: '%s'"
+
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro."
+
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/apigroupjoin.php:110
+msgid "You are already a member of that group."
+msgstr "Xa estas suscrito a estes usuarios:"
+
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
 
-#: ../lib/util.php:259
-#: lib/util.php:275
-#: lib/util.php:292
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
+
+#: actions/apigroupleave.php:114
+msgid "You are not a member of this group."
+msgstr "Non estás suscrito a ese perfil"
+
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
+
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
 #, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** é un servizo de microbloguexo."
+msgid "%s groups"
+msgstr ""
 
-#: ../lib/util.php:274
-#: lib/util.php:290
-#: lib/util.php:307
-msgid ". Contributors should be attributed by full name or nickname."
-msgstr ". Os contribuíntes deben atribuiselles polo nome completo ou apodo."
-
-#: ../actions/finishopenidlogin.php:73
-#: ../actions/profilesettings.php:43
-#: actions/finishopenidlogin.php:79
-#: actions/profilesettings.php:76
-#: actions/profilesettings.php:78
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "De 1 a 64 letras minúsculas ou númeors, nin espazos nin signos de puntuación"
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Outras opcions"
 
-#: ../actions/register.php:152
-#: actions/register.php:166
-#: actions/register.php:193
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "De 1 a 64 letras minúsculas ou números, nin espazos nin signos de puntuación. Requerido."
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "Usuarios"
 
-#: ../actions/password.php:42
-#: actions/profilesettings.php:181
-#: actions/profilesettings.php:198
-msgid "6 or more characters"
-msgstr "6 ou máis caracteres"
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "%1s non é unha orixe fiable."
 
-#: ../actions/recoverpassword.php:180
-#: actions/recoverpassword.php:186
-msgid "6 or more characters, and don't forget it!"
-msgstr "6 ou máis caracteres, non o esquenzas!"
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
+msgstr "Este método require un POST ou DELETE."
 
-#: ../actions/register.php:154
-#: actions/register.php:168
-#: actions/register.php:195
-msgid "6 or more characters. Required."
-msgstr "6 ou máis caracteres. Requerido."
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
+msgstr "Non deberías eliminar o estado de outro usuario"
 
-#: ../actions/imsettings.php:197
-#: actions/imsettings.php:205
-#: actions/imsettings.php:210
-#, php-format
-msgid "A confirmation code was sent to the IM address you added. You must approve %s for sending messages to you."
-msgstr "O código de confirmación foi embiado á dirección IM que engadiches. Deberías engadir a %s como contacto para que che poida enviar mensaxes."
-
-#: ../actions/emailsettings.php:213
-#: actions/emailsettings.php:231
-#: actions/emailsettings.php:235
-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 "Enviouseche un código de confirmación á dirección de correo que engadiches. Comproba a túa bandexa de entrada (ou spam!) polo código e instrucións que debes seguir."
-
-#: ../actions/smssettings.php:216
-#: actions/smssettings.php:224
-#: actions/smssettings.php:226
-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 "Enviouseche o código de confirmación ó número de teléfono que engadiches. Comproba a túa bandexa de entrada (ou spam!) polo código e instrucións que debes seguir."
-
-#: ../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
-#: actions/twitapiaccount.php:35
-#: actions/twitapidirect_messages.php:107
-#: actions/twitapifavorites.php:83
-#: actions/twitapifavorites.php:99
-#: actions/twitapifriendships.php:117
-#: actions/twitapihelp.php:42
-#: actions/twitapistatuses.php:77
-#: actions/twitapistatuses.php:144
-#: actions/twitapistatuses.php:224
-#: actions/twitapistatuses.php:234
-#: actions/twitapistatuses.php:386
-#: actions/twitapistatuses.php:395
-#: actions/twitapistatuses.php:421
-#: actions/twitapiusers.php:30
-msgid "API method not found!"
-msgstr "Método da API non atopado"
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "Avatar actualizado."
 
-#: ../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
-#: actions/twitapiaccount.php:42
-#: actions/twitapiaccount.php:92
-#: actions/twitapiaccount.php:97
-#: actions/twitapidirect_messages.php:178
-#: actions/twitapifavorites.php:139
-#: actions/twitapihelp.php:49
-#: actions/twitapistatuses.php:549
-msgid "API method under construction."
-msgstr "Método da API en contrución."
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
+msgstr "Non existe ningún estado con esa ID atopada."
 
-#: ../lib/util.php:324
-#: lib/util.php:340
-#: lib/util.php:369
-msgid "About"
-msgstr "Sobre"
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr ""
+"Iso é demasiado longo. O tamaño máximo para un chío é de 140 caracteres."
 
-#: ../actions/userauthorization.php:119
-#: actions/userauthorization.php:126
-msgid "Accept"
-msgstr "Aceptar"
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
+msgstr "Non atopado"
 
-#: ../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
-#: actions/smspostsettings.php:50
-#: actions/twittersettings.php:84
-#: actions/smspostsettings.php:51
-msgid "Add"
-msgstr "Engadir"
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
 
-#: ../actions/openidsettings.php:43
-#: actions/openidsettings.php:44
-msgid "Add OpenID"
-msgstr "Engadir dirección OpenID"
-
-#: ../lib/settingsaction.php:97
-#: lib/settingsaction.php:91
-#: actions/deleteprofile.php:248
-msgid "Add or remove OpenIDs"
-msgstr "Engadir ou eliminar 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 "Enderezo"
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Formato de ficheiro de imaxe non soportado."
 
-#: ../actions/invite.php:131
-#: actions/invite.php:139
-msgid "Addresses of friends to invite (one per line)"
-msgstr "Direccións dos amigos que queres invitar (unha por liña)"
+#: actions/apitimelinefavorites.php:107
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr "%s / Favoritos dende %s"
 
-#: ../actions/showstream.php:273
-#: actions/showstream.php:288
-#: actions/showstream.php:336
-msgid "All subscriptions"
-msgstr "Tódalas subscricións"
+#: actions/apitimelinefavorites.php:119
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr "%s updates favorited by %s / %s."
 
-#: ../actions/publicrss.php:64
-#: actions/publicrss.php:50
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
-msgid "All updates for %s"
-msgstr "Tódalas actualizacións de %s"
+msgid "%s timeline"
+msgstr "Liña de tempo de %s"
 
-#: ../actions/noticesearchrss.php:66
-#: actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:63
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
-msgid "All updates matching search term \"%s\""
-msgstr "Tódalas actualizacións que coinciden co termo de procura \"%s\""
+msgid "Updates from %1$s on %2$s!"
+msgstr "Actualizacións dende %1$s en %2$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 "Sesión xa iniciada"
+#: actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Chíos que respostan a %2$s"
 
-#: ../lib/subs.php:42
-#: lib/subs.php:42
-#: lib/subs.php:47
-msgid "Already subscribed!."
-msgstr "¡Xa está subscrito!."
+#: actions/apitimelinementions.php:126
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr "Hai %1$s chíos en resposta a chíos dende %2$s / %3$s."
 
-#: ../actions/deletenotice.php:54
-#: actions/deletenotice.php:55
-msgid "Are you sure you want to delete this notice?"
-msgstr "Estas seguro que queres eliminar este chío?"
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#, php-format
+msgid "%s public timeline"
+msgstr "Liña de tempo pública de %s"
 
-#: ../actions/userauthorization.php:77
-#: actions/userauthorization.php:83
-msgid "Authorize subscription"
-msgstr "Subscrición de autorización."
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#, php-format
+msgid "%s updates from everyone!"
+msgstr "%s chíos de calquera!"
 
-#: ../actions/login.php:104
-#: ../actions/register.php:178
-#: actions/register.php:192
-#: actions/login.php:111
-#: actions/openidlogin.php:86
-#: actions/register.php:219
-msgid "Automatically login in the future; not for shared computers!"
-msgstr "Endiante acceder automáticamente, coidado en equipos compartidos!"
+#: actions/apitimelinetag.php:101 actions/tag.php:66
+#, php-format
+msgid "Notices tagged with %s"
+msgstr "Chíos tagueados con %s"
 
-#: ../actions/profilesettings.php:65
-#: actions/profilesettings.php:98
-#: actions/profilesettings.php:112
-msgid "Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr "Suscribirse automáticamente a calquera que se suscriba a min (o mellor para non humáns)"
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Actualizacións dende %1$s en %2$s!"
+
+#: actions/apiusershow.php:96
+msgid "Not found."
+msgstr "Non atopado"
+
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "Ningún documento."
+
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+msgstr "Sen alcume."
+
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "Sen tamaño."
 
-#: ../actions/avatar.php:32
-#: ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "Tamaño inválido."
+
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
 msgid "Avatar"
 msgstr "Avatar"
 
-#: ../actions/avatar.php:113
-#: actions/profilesettings.php:350
-#: actions/profilesettings.php:396
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "Podes actualizar a túa información do perfil persoal aquí"
+
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
+msgstr "Usuario sen un perfil que coincida."
+
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+#, fuzzy
+msgid "Avatar settings"
+msgstr "Configuracións de Twitter"
+
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr ""
+
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr ""
+
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#, fuzzy
+msgid "Delete"
+msgstr "eliminar"
+
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+msgstr "Subir"
+
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
+msgstr ""
+
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
+
+#: actions/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Envio de formulario non esperada."
+
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
+msgstr ""
+
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
+msgstr ""
+
+#: actions/avatarsettings.php:360
 msgid "Avatar updated."
 msgstr "Avatar actualizado."
 
-#: ../actions/imsettings.php:55
-#: actions/imsettings.php:56
+#: actions/avatarsettings.php:363
+msgid "Failed updating avatar."
+msgstr "Acounteceu un fallo ó actualizar o avatar."
+
+#: actions/avatarsettings.php:387
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Avatar actualizado."
+
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+#, fuzzy
+msgid "No nickname"
+msgstr "Sen alcume."
+
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+#, fuzzy
+msgid "No such group"
+msgstr "Non é o usuario"
+
+#: actions/blockedfromgroup.php:90
 #, 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 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a message with further instructions. (Did you add %s to your buddy list?)"
+msgid "%s blocked profiles"
+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 "Agardando confirmación para esta dirección. Comproba a túa conta de Jabber/GTalk que ten que haber unha mensaxe coas seguintes instrucións. (Engadiches a %s á túa lista de contactos?)"
+#: actions/blockedfromgroup.php:93
+#, php-format
+msgid "%s blocked profiles, page %d"
+msgstr ""
 
-#: ../actions/smssettings.php:58
-#: actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr "Agardando a confirmación neste número de teléfono."
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr ""
 
-#: ../lib/util.php:1318
-#: lib/util.php:1452
-#: lib/facebookaction.php:259
-#: lib/util.php:1851
-msgid "Before »"
-msgstr "Antes »"
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Desbloqueo de usuario fallido."
 
-#: ../actions/profilesettings.php:49
-#: ../actions/register.php:170
-#: actions/profilesettings.php:82
-#: actions/register.php:184
-#: actions/profilesettings.php:84
-#: actions/register.php:211
-msgid "Bio"
-msgstr "Bio"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
+msgstr "Desbloquear"
 
-#: ../actions/profilesettings.php:101
-#: ../actions/register.php:82
-#: ../actions/updateprofile.php:103
-#: actions/profilesettings.php:216
-#: actions/register.php:89
-#: actions/updateprofile.php:104
-#: actions/profilesettings.php:235
-#: actions/register.php:98
-msgid "Bio is too long (max 140 chars)."
-msgstr "O teu Bio é demasiado longo (max 140 car.)."
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+#, fuzzy
+msgid "Unblock this user"
+msgstr "Bloquear usuario"
 
-#: ../lib/deleteaction.php:41
-#: lib/deleteaction.php:41
-msgid "Can't delete this notice."
-msgstr "Non se pode eliminar este chíos."
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Non está logueado."
 
-#: ../actions/updateprofile.php:119
-#: actions/updateprofile.php:120
-#, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr "Non se pode ler a URL do avatar de '%s'"
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
+msgstr "Non se especificou ningún perfil."
 
-#: ../actions/password.php:85
-#: ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404
-#: actions/recoverpassword.php:313
-#: actions/profilesettings.php:450
-msgid "Can't save new password."
-msgstr "Non se pode gardar a contrasinal."
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
+msgstr "Non se atopou un perfil con ese ID."
 
-#: ../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 "Cancelar"
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Bloquear usuario"
 
-#: ../lib/openid.php:121
-#: lib/openid.php:121
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Non se pode instanciar o obxecto consumidor de OpenID."
+#: actions/block.php:136
+msgid ""
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
+msgstr ""
+"Seguro que queres bloquear a este usuario? Despois diso, vai ser de-suscrito "
+"do teur perfil, non será capaz de suscribirse a ti nun futuro, e non vas a "
+"ser notificado de ningunha resposta-@ del."
 
-#: ../actions/imsettings.php:163
-#: actions/imsettings.php:171
-#: actions/imsettings.php:176
-msgid "Cannot normalize that Jabber ID"
-msgstr "Non se pode normalizar ese identificador de Jabber"
+#: actions/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
+msgid "No"
+msgstr "No"
 
-#: ../actions/emailsettings.php:181
-#: actions/emailsettings.php:199
-#: actions/emailsettings.php:205
-msgid "Cannot normalize that email address"
-msgstr "Esa dirección de correo non se pode normalizar "
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Bloquear usuario"
 
-#: ../actions/password.php:45
-#: actions/profilesettings.php:184
-#: actions/profilesettings.php:201
-msgid "Change"
-msgstr "Modificado"
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
+msgstr "Si"
 
-#: ../lib/settingsaction.php:88
-#: lib/settingsaction.php:88
-#: actions/deleteprofile.php:245
-msgid "Change email handling"
-msgstr "Cambiar a xestión de email"
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "Bloquear usuario"
 
-#: ../actions/password.php:32
-#: actions/profilesettings.php:36
-msgid "Change password"
-msgstr "Cambiar contrasinal"
+#: actions/block.php:165
+msgid "You have already blocked this user."
+msgstr "Xa bloqueaches a este usuario."
 
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr "Cambiar contrasinal"
+#: actions/block.php:170
+msgid "Failed to save block information."
+msgstr "Erro ao gardar información de bloqueo."
 
-#: ../lib/settingsaction.php:85
-#: lib/settingsaction.php:85
-#: actions/deleteprofile.php:242
-msgid "Change your profile settings"
-msgstr "Configuración de perfil"
+#: actions/bookmarklet.php:50
+#, fuzzy
+msgid "Post to "
+msgstr "Chíos dende SMS"
 
-#: ../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
-#: actions/profilesettings.php:199
-#: actions/register.php:196
-msgid "Confirm"
-msgstr "Confirmar"
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+msgstr "Sen código de confirmación."
+
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "Confirmation code not found."
+
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "¡Ese código de confirmación non é para ti!"
 
-#: ../actions/confirmaddress.php:90
 #: actions/confirmaddress.php:90
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr "Tipo de enderezo %s non recoñecido"
+
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr "Esa dirección xa foi confirmada."
+
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "Non se puido actualizar o usuario."
+
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr "Non se pode eliminar a confirmación de email."
+
+#: actions/confirmaddress.php:144
 msgid "Confirm Address"
 msgstr "Confirmar enderezo"
 
-#: ../actions/emailsettings.php:238
-#: ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245
-#: actions/emailsettings.php:256
-#: actions/imsettings.php:230
-#: actions/smssettings.php:253
-#: actions/emailsettings.php:260
-#: actions/imsettings.php:235
-#: actions/smssettings.php:255
-msgid "Confirmation cancelled."
-msgstr "Confirmación cancealada."
+#: actions/confirmaddress.php:159
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "A dirección \"%s\" xa foi confirmada para a túa conta."
 
-#: ../actions/smssettings.php:63
-#: actions/smssettings.php:63
-msgid "Confirmation code"
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
 msgstr "Código de confirmación."
 
-#: ../actions/confirmaddress.php:38
-#: actions/confirmaddress.php:38
-msgid "Confirmation code not found."
-msgstr "Confirmation code not found."
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
+msgstr "Chíos"
 
-#: ../actions/register.php:202
-#: actions/register.php:243
-#, php-format
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
+msgstr "Ningún chío."
+
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "Non se pode eliminar este chíos."
+
+#: actions/deletenotice.php:103
+#, fuzzy
 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."
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
 msgstr ""
-"Noraboa, %s! e benvido a %%%%site.name%%%%. Dende aquí, podes...\n"
-"\n"
-"* Ír ó [teu perfil](%s) e enviar o teu primeiro chío.\n"
-"* Engadir unha [conta de Jabber/Gtalk](%%%%action.imsettings%%%%) para enviar os teus chíos a través de mensaxería instantánea.\n"
-"* [Buscar xente ](%%%%action.peoplesearch%%%%) que poidas coñecer ou que comparta os teus intereses. \n"
-"* Actualizar as túas [preferencias no perfil](%%%%action.profilesettings%%%%) para decirlle a outros máis sobre ti. \n"
-"* Ler os [manuais en liña](%%%%doc.help%%%%) para ollar máis cousas que podes facer aquí. \n"
-"\n"
-"Grazas por rexistrarte e esperamos que laretexes moito."
+"Vas a eliminar permanentemente este chío. Unha vez feito, xa non hai volta "
+"atrás... Quedas avisado!"
 
-#: ../actions/finishopenidlogin.php:91
-#: actions/finishopenidlogin.php:97
-msgid "Connect"
-msgstr "Conectar"
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr "Eliminar chío"
 
-#: ../actions/finishopenidlogin.php:86
-#: actions/finishopenidlogin.php:92
-msgid "Connect existing account"
-msgstr "Conectar con unha conta existente"
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr "Estas seguro que queres eliminar este chío?"
 
-#: ../lib/util.php:332
-#: lib/util.php:348
-#: lib/util.php:377
-msgid "Contact"
-msgstr "Contacto"
+#: actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "Non se pode eliminar este chíos."
 
-#: ../lib/openid.php:178
-#: lib/openid.php:178
-#, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "Non se pode crear o formulario OpenID: %s"
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+#, fuzzy
+msgid "Delete this notice"
+msgstr "Eliminar chío"
 
-#: ../actions/twitapifriendships.php:60
-#: ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60
-#: actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:46
-#: actions/twitapifriendships.php:62
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr "Non podes seguir a este usuario: %s xa está na túa lista."
+#: actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
+msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
 
-#: ../actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:39
-msgid "Could not follow user: User not found."
-msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr "Este chío non é un favorito!"
 
-#: ../lib/openid.php:160
-#: lib/openid.php:160
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Non se pode redireccionar ao servidor: %s"
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "Engadir a favoritos"
 
-#: ../actions/updateprofile.php:162
-#: actions/updateprofile.php:163
-msgid "Could not save avatar info"
-msgstr "Non se pode gardar a información do avatar"
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "Ningún documento."
 
-#: ../actions/updateprofile.php:155
-#: actions/updateprofile.php:156
-msgid "Could not save new profile info"
-msgstr "Non se pode gardar a nova información do perfil"
+#: actions/editgroup.php:56
+#, php-format
+msgid "Edit %s group"
+msgstr ""
 
-#: ../lib/subs.php:54
-#: lib/subs.php:61
-#: lib/subs.php:70
-msgid "Could not subscribe other to you."
-msgstr "Outro usuario non se puido suscribir a ti."
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+#, fuzzy
+msgid "You must be logged in to create a group."
+msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
 
-#: ../lib/subs.php:46
-#: lib/subs.php:46
-#: lib/subs.php:55
-msgid "Could not subscribe."
-msgstr "No se pode suscribir."
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+#, fuzzy
+msgid "You must be an admin to edit the group"
+msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
 
-#: ../actions/recoverpassword.php:102
-#: actions/recoverpassword.php:105
-msgid "Could not update user with confirmed email address."
-msgstr "Non se puido actualizar o usuario coa dirección de correo electrónico."
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101
-#: actions/finishremotesubscribe.php:112
-msgid "Couldn't convert request tokens to access tokens."
-msgstr "Non se pode convertir o token da petición a tokens de acceso."
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, php-format
+msgid "description is too long (max %d chars)."
+msgstr "O teu Bio é demasiado longo (max 140 car.)."
 
-#: ../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
-#: actions/emailsettings.php:256
-#: actions/imsettings.php:231
-#: actions/smssettings.php:251
-msgid "Couldn't delete email confirmation."
-msgstr "Non se pode eliminar a confirmación de email."
+#: actions/editgroup.php:253
+#, fuzzy
+msgid "Could not update group."
+msgstr "Non se puido actualizar o usuario."
 
-#: ../lib/subs.php:103
-#: lib/subs.php:116
-#: lib/subs.php:129
-msgid "Couldn't delete subscription."
-msgstr "Non se pode eliminar a subscrición."
+#: actions/editgroup.php:269
+#, fuzzy
+msgid "Options saved."
+msgstr "Configuracións gardadas."
 
-#: ../actions/twitapistatuses.php:93
-#: actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:82
-msgid "Couldn't find any statuses."
-msgstr "Non se puido atopar ningún estado"
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "Configuración de Correo"
 
-#: ../actions/remotesubscribe.php:127
-#: actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:148
-msgid "Couldn't get a request token."
-msgstr "Non se puido recoller o token de petición."
+#: actions/emailsettings.php:71
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr "Xestina como recibir correo dende %%site.name%%."
 
-#: ../actions/emailsettings.php:205
-#: ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206
-#: actions/emailsettings.php:223
-#: actions/imsettings.php:195
-#: actions/smssettings.php:214
-#: actions/emailsettings.php:229
-#: actions/imsettings.php:200
-#: actions/smssettings.php:216
-msgid "Couldn't insert confirmation code."
-msgstr "Non se puido inserir o código de confirmación."
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "Enderezo"
 
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182
-#: actions/finishremotesubscribe.php:198
-#: actions/finishremotesubscribe.php:216
-msgid "Couldn't insert new subscription."
-msgstr "Non se puido inserir a nova subscrición."
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr "Direccións de correo confirmadas actualmente."
 
-#: ../actions/profilesettings.php:184
-#: ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299
-#: actions/twitapiaccount.php:94
-#: actions/profilesettings.php:336
-#: actions/twitapiaccount.php:77
-msgid "Couldn't save profile."
-msgstr "Non se puido gardar o perfil."
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "Eliminar"
 
-#: ../actions/profilesettings.php:161
-#: actions/profilesettings.php:276
-#: actions/profilesettings.php:313
-msgid "Couldn't update user for autosubscribe."
-msgstr "Non se puido actualizar o usuario para autosuscrición."
+#: actions/emailsettings.php:113
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
+"Agardando confirmación para esta dirección. Comproba a túa conta de Jabber/"
+"GTalk que ten que haber unha mensaxe coas seguintes instrucións. (Engadiches "
+"a %s á túa lista de contactos?)"
 
-#: ../actions/emailsettings.php:280
-#: ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298
-#: actions/emailsettings.php:312
-#: actions/emailsettings.php:302
-#: actions/emailsettings.php:316
-msgid "Couldn't update user record."
-msgstr "Non se puido actualizar o rexistro de usuario."
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: ../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
-#: actions/emailsettings.php:180
-#: actions/emailsettings.php:281
-#: actions/imsettings.php:151
-#: actions/imsettings.php:256
-#: actions/othersettings.php:173
-#: actions/profilesettings.php:293
-#: actions/smspostsettings.php:96
-#: actions/smspostsettings.php:123
-#: actions/smssettings.php:167
-#: actions/smssettings.php:279
-#: actions/smspostsettings.php:101
-#: actions/smspostsettings.php:128
-msgid "Couldn't update user."
-msgstr "Non se puido actualizar o usuario."
+#: actions/emailsettings.php:121
+msgid "Email Address"
+msgstr "Enderezo de correo"
 
-#: ../actions/finishopenidlogin.php:84
-#: actions/finishopenidlogin.php:90
-msgid "Create"
-msgstr "Crear"
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr "Dirección de correo, coma \"Nomede Usuario@exemplo.org\""
 
-#: ../actions/finishopenidlogin.php:70
-#: actions/finishopenidlogin.php:76
-msgid "Create a new user with this nickname."
-msgstr "Crear un novo usuario con este alcume."
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "Engadir"
 
-#: ../actions/finishopenidlogin.php:68
-#: actions/finishopenidlogin.php:74
-msgid "Create new account"
-msgstr "Crear nova conta"
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+msgstr "Correo Entrante"
 
-#: ../actions/finishopenidlogin.php:191
-#: actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:208
-msgid "Creating new account for OpenID that already has a user."
-msgstr "Creando nova conta para OpenID que xa ten un usuario."
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
+msgstr "Enviar un correo a esta dirección para enviar novos chíos."
 
-#: ../actions/imsettings.php:45
-#: actions/imsettings.php:46
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "Direccións Jabber/GTalk confirmadas."
+#: actions/emailsettings.php:145 actions/smssettings.php:162
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr "Crear unha nova dirección de correo para enviar, elimina a antiga."
 
-#: ../actions/smssettings.php:46
-#: actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "Número de teléfono actual confirmado mediante SMS."
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
+msgstr "Novo"
 
-#: ../actions/emailsettings.php:44
-#: actions/emailsettings.php:45
-msgid "Current confirmed email address."
-msgstr "Direccións de correo confirmadas actualmente."
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
+msgstr "Preferencias"
 
-#: ../actions/showstream.php:356
-#: actions/showstream.php:367
-#: actions/showstream.php:418
-msgid "Currently"
-msgstr "Actual"
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
+msgstr "Envíame chios de novas suscricións por email."
 
-#: ../classes/Notice.php:72
-#: classes/Notice.php:86
-#: classes/Notice.php:87
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "Erro ó inserir o hashtag na BD: %s"
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr "Enviar un correo cando alguen enganda un chío meu coma favorito."
 
-#: ../lib/util.php:1061
-#: lib/util.php:1110
-#: lib/util.php:1479
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Erro ó inserir a contestación na BD: %s"
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
+msgstr "Enviarme un email cando alguén me envíe unha mensaxe privada."
 
-#: ../actions/deletenotice.php:41
-#: actions/deletenotice.php:41
-msgid "Delete notice"
-msgstr "Eliminar chío"
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "Enviarme un email cando alguén me envíe unha mensaxe privada."
 
-#: ../actions/profilesettings.php:51
-#: ../actions/register.php:172
-#: actions/profilesettings.php:84
-#: actions/register.php:186
-#: actions/profilesettings.php:86
-#: actions/register.php:213
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
+msgstr "Permitir aos amigos darme toques e enviarme correos electrónicos."
 
-#: ../actions/register.php:158
-#: ../actions/register.php:161
-#: ../lib/settingsaction.php:87
-#: actions/register.php:172
-#: actions/register.php:175
-#: lib/settingsaction.php:87
-#: actions/deleteprofile.php:244
-#: actions/register.php:199
-#: actions/register.php:202
-msgid "Email"
-msgstr "Correo Electrónico"
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
+msgstr "Quero enviar chíos dende o mail."
 
-#: ../actions/emailsettings.php:59
-#: actions/emailsettings.php:60
-msgid "Email Address"
-msgstr "Enderezo de correo"
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
+msgstr "Publicar unha MicroID dende a miña dirección de correo."
 
-#: ../actions/emailsettings.php:32
-#: actions/emailsettings.php:32
-msgid "Email Settings"
-msgstr "Configuración de Correo"
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Gardar"
 
-#: ../actions/register.php:73
-#: actions/register.php:80
-#: actions/register.php:89
-msgid "Email address already exists."
-msgstr "O enderezo de correo xa existe."
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+msgstr "Preferencias gardadas."
 
-#: ../lib/mail.php:90
-#: lib/mail.php:90
-msgid "Email address confirmation"
-msgstr "Confirmar correo electrónico"
+#: actions/emailsettings.php:319
+msgid "No email address."
+msgstr "Non se inseriu unha dirección de correo"
 
-#: ../actions/emailsettings.php:61
-#: actions/emailsettings.php:62
-msgid "Email address, like \"UserName@example.org\""
-msgstr "Dirección de correo, coma \"Nomede Usuario@exemplo.org\""
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
+msgstr "Esa dirección de correo non se pode normalizar "
 
-#: ../actions/invite.php:129
-#: actions/invite.php:137
-msgid "Email addresses"
-msgstr "Enderezos de correo"
+#: actions/emailsettings.php:330
+msgid "Not a valid email address"
+msgstr "Non é unha dirección de correo válida"
 
-#: ../actions/recoverpassword.php:191
-#: actions/recoverpassword.php:197
-msgid "Enter a nickname or email address."
-msgstr "Insire o teu alcume ou enderezo de correo."
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
+msgstr "Xa é o teu enderezo de correo."
 
-#: ../actions/smssettings.php:64
-#: actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr "Insire o código que recibiches no teu teléfono."
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another user."
+msgstr "Este enderezo de correo xa pertence a outro usuario."
 
-#: ../actions/userauthorization.php:137
-#: actions/userauthorization.php:144
-msgid "Error authorizing token"
-msgstr "Erro no token de autorización."
-
-#: ../actions/finishopenidlogin.php:253
-#: actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:274
-msgid "Error connecting user to OpenID."
-msgstr "Acounteceu un erro conectando o usuario ó OpenID."
-
-#: ../actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:78
-msgid "Error connecting user."
-msgstr "Acounteceu un erro ó conectar co usuario"
-
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153
-#: actions/finishremotesubscribe.php:164
-msgid "Error inserting avatar"
-msgstr "Acounteceu un erro ó inserir o avatar"
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+msgstr "Non se puido inserir o código de confirmación."
 
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145
-#: actions/finishremotesubscribe.php:156
-msgid "Error inserting new profile"
-msgstr "Acounteceu un erro ó inserir o novo perfil"
+#: actions/emailsettings.php:358
+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 ""
+"Enviouseche un código de confirmación á dirección de correo que engadiches. "
+"Comproba a túa bandexa de entrada (ou spam!) polo código e instrucións que "
+"debes seguir."
 
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169
-#: actions/finishremotesubscribe.php:180
-msgid "Error inserting remote profile"
-msgstr "Aconteceu un erro ó inserir o perfil remoto"
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
+msgstr "Non hai ningunha confirmación pendente para cancelar."
 
-#: ../actions/recoverpassword.php:240
-#: actions/recoverpassword.php:246
-msgid "Error saving address confirmation."
-msgstr "Acounteceu un erro gardando a confirmación de enderezo."
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "Esa é unha enderezo IM incorrecto."
 
-#: ../actions/userauthorization.php:140
-#: actions/userauthorization.php:147
-msgid "Error saving remote profile"
-msgstr "Acounteceu un erro gardando o perfil remoto."
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "Confirmación cancealada."
 
-#: ../lib/openid.php:226
-#: lib/openid.php:226
-msgid "Error saving the profile."
-msgstr "Acounteceu un erro ó gardar o perfil."
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
+msgstr "Esa non é a túa dirección de correo."
 
-#: ../lib/openid.php:237
-#: lib/openid.php:237
-msgid "Error saving the user."
-msgstr "Acounteceu un erro gardando o usuario."
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "Enderezo eliminado."
 
-#: ../actions/password.php:80
-#: actions/profilesettings.php:399
-#: actions/profilesettings.php:445
-msgid "Error saving user; invalid."
-msgstr "Acounteceu un erro gardando o usuario: é inválido."
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
+msgstr "Non hai direccións de correo entrante"
 
-#: ../actions/login.php:47
-#: ../actions/login.php:73
-#: ../actions/recoverpassword.php:307
-#: ../actions/register.php:98
-#: actions/login.php:47
-#: actions/login.php:73
-#: actions/recoverpassword.php:320
-#: actions/register.php:108
-#: actions/login.php:54
-#: actions/login.php:80
-#: actions/register.php:117
-msgid "Error setting user."
-msgstr "Acounteceu un erro configurando o usuario."
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
+msgstr "Non se puido actualizar o rexistro de usuario."
 
-#: ../actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:83
-msgid "Error updating profile"
-msgstr "Acounteceu un erro actualizando o usuario"
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
+msgstr "Dirección de correo entrante eliminada."
 
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163
-#: actions/finishremotesubscribe.php:174
-msgid "Error updating remote profile"
-msgstr "Acounteceu un erro actualizando o perfil remoto"
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
+msgstr "Engadida nova dirección de correo entrante."
 
-#: ../actions/recoverpassword.php:80
-#: actions/recoverpassword.php:80
-msgid "Error with confirmation code."
-msgstr "Acounteceu un erro co código de confirmación."
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+msgid "Popular notices"
+msgstr "Chíos populares"
 
-#: ../actions/finishopenidlogin.php:89
-#: actions/finishopenidlogin.php:95
-msgid "Existing nickname"
-msgstr "Alcume existente"
+#: actions/favorited.php:67
+#, fuzzy, php-format
+msgid "Popular notices, page %d"
+msgstr "Chíos populares"
 
-#: ../lib/util.php:326
-#: lib/util.php:342
-#: lib/util.php:371
-msgid "FAQ"
-msgstr "Preguntas frecuentes"
+#: actions/favorited.php:79
+#, fuzzy
+msgid "The most popular notices on the site right now."
+msgstr "Amoa os tags máis populares dende a semana pasada"
 
-#: ../actions/avatar.php:115
-#: actions/profilesettings.php:352
-#: actions/profilesettings.php:398
-msgid "Failed updating avatar."
-msgstr "Acounteceu un fallo ó actualizar o avatar."
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+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 "Fonte para os amigos de %s"
+#: actions/favorited.php:153
+msgid ""
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
+msgstr ""
 
-#: ../actions/replies.php:65
-#: ../actions/repliesrss.php:80
-#: actions/replies.php:65
-#: actions/repliesrss.php:66
+#: actions/favorited.php:156
 #, php-format
-msgid "Feed for replies to %s"
-msgstr "Fonte para as contestacións de %s"
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
+msgstr ""
 
-#: ../actions/tag.php:55
-#: actions/tag.php:55
-#: actions/tag.php:61
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
 #, php-format
-msgid "Feed for tag %s"
-msgstr "Fonte para a etiqueta %s"
+msgid "%s's favorite notices"
+msgstr "Chíos favoritos de %s"
 
-#: ../lib/searchaction.php:105
-#: lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr "Atopar no contido dos chíos"
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Actualizacións dende %1$s en %2$s!"
 
-#: ../lib/searchaction.php:101
-#: lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr "Atopar xente neste sitio"
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Este chío xa é un favorito!"
 
-#: ../actions/login.php:122
-#: actions/login.php:142
-msgid "For security reasons, please re-enter your user name and password before changing your settings."
-msgstr "Por razóns de seguranza, por favor re-insire o teu nome de usuario e contrasinal antes de cambiar as túas preferenzas."
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Desactivar favorito"
 
-#: ../actions/profilesettings.php:44
-#: ../actions/register.php:164
-#: actions/profilesettings.php:77
-#: actions/register.php:178
-#: actions/profilesettings.php:79
-#: actions/register.php:205
-msgid "Full name"
-msgstr "Nome completo"
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr "Usuarios destacados"
 
-#: ../actions/profilesettings.php:98
-#: ../actions/register.php:79
-#: ../actions/updateprofile.php:93
-#: actions/profilesettings.php:213
-#: actions/register.php:86
-#: actions/updateprofile.php:94
-#: actions/profilesettings.php:232
-#: actions/register.php:95
-msgid "Full name is too long (max 255 chars)."
-msgstr "O nome completo é demasiado longo (max 255 car)."
+#: actions/featured.php:71
+#, fuzzy, php-format
+msgid "Featured users, page %d"
+msgstr "Usuarios destacados"
 
-#: ../lib/util.php:322
-#: lib/util.php:338
-#: lib/util.php:359
-#: lib/util.php:367
-msgid "Help"
-msgstr "Axuda"
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
+msgstr ""
 
-#: ../lib/util.php:298
-#: lib/util.php:314
-#: lib/util.php:343
-msgid "Home"
-msgstr "Persoal"
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "Novo chío"
 
-#: ../actions/profilesettings.php:46
-#: ../actions/register.php:167
-#: actions/profilesettings.php:79
-#: actions/register.php:181
-#: actions/profilesettings.php:81
-#: actions/register.php:208
-msgid "Homepage"
-msgstr "Páxina persoal"
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Novo chío"
 
-#: ../actions/profilesettings.php:95
-#: ../actions/register.php:76
-#: actions/profilesettings.php:210
-#: actions/register.php:83
-#: actions/profilesettings.php:229
-#: actions/register.php:92
-msgid "Homepage is not a valid URL."
-msgstr "A páxina persoal semella que non é unha URL válida."
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
 
-#: ../actions/emailsettings.php:91
-#: actions/emailsettings.php:98
-msgid "I want to post notices by email."
-msgstr "Quero enviar chíos dende o mail."
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
 
-#: ../lib/settingsaction.php:102
-#: lib/settingsaction.php:96
-#: actions/deleteprofile.php:253
-#: lib/settingsaction.php:100
-#: lib/settingsaction.php:102
-msgid "IM"
-msgstr "IM"
+#: actions/finishremotesubscribe.php:69
+msgid "Not expecting this response!"
+msgstr "¡Non esperaba esa resposta!"
 
-#: ../actions/imsettings.php:60
-#: actions/imsettings.php:61
-msgid "IM Address"
-msgstr "Enderezo de IM"
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "O usuario  que está sendo escoitado non existe."
 
-#: ../actions/imsettings.php:33
-#: actions/imsettings.php:33
-msgid "IM Settings"
-msgstr "Configuracións de IM"
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+msgstr "¡Podes empregar a túa subscrición local!"
 
-#: ../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 "Se xa tes unha conta, accede co teu usuario e contrasinal para conectar co teu OpenID."
-
-#: ../actions/openidsettings.php:45
-#: actions/openidsettings.php:46
-msgid "If you want to add an OpenID to your account, enter it in the box below and click \"Add\"."
-msgstr "Se queres engadir un enderezo OpenID á tua conta, insirea na caixa de embaixo e fai clic en \"Engadir\"."
-
-#: ../actions/recoverpassword.php:137
-#: actions/recoverpassword.php:141
-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 esquenceches ou perdeches a túa contrasinal, podes obter unha nova no enderezo de correo que configuraches na túa conta."
-
-#: ../actions/emailsettings.php:67
-#: ../actions/smssettings.php:76
-#: actions/emailsettings.php:68
-#: actions/smssettings.php:76
-msgid "Incoming email"
-msgstr "Correo Entrante"
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
+msgstr "Este usuario non che permite suscribirte a el."
 
-#: ../actions/emailsettings.php:283
-#: actions/emailsettings.php:301
-#: actions/emailsettings.php:305
-msgid "Incoming email address removed."
-msgstr "Dirección de correo entrante eliminada."
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "Non está autorizado."
 
-#: ../actions/password.php:69
-#: actions/profilesettings.php:388
-#: actions/profilesettings.php:434
-msgid "Incorrect old password"
-msgstr "Contrasinal actual incorrecta"
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "Non se pode convertir o token da petición a tokens de acceso."
 
-#: ../actions/login.php:67
-#: actions/login.php:67
-#: actions/login.php:74
-msgid "Incorrect username or password."
-msgstr "Usuario ou contrasinal incorrectos."
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Versión de protocolo OMB descoñecida."
 
-#: ../actions/recoverpassword.php:265
-#: actions/recoverpassword.php:271
-msgid "Instructions for recovering your password have been sent to the email address registered to your account."
-msgstr "As instruccións para recuperar a túa contrasinal foron enviadas ó enderezo de correo da túa conta."
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "Acounteceu un erro actualizando o perfil remoto"
 
-#: ../actions/updateprofile.php:114
-#: actions/updateprofile.php:115
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "URL do avatar '%s' inválido"
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+#, fuzzy
+msgid "No such group."
+msgstr "Non existe a etiqueta."
 
-#: ../actions/invite.php:55
-#: actions/invite.php:62
-#, php-format
-msgid "Invalid email address: %s"
-msgstr "Dirección de correo Inválida: %s"
+#: actions/getfile.php:75
+msgid "No such file."
+msgstr "Ningún chío."
 
-#: ../actions/updateprofile.php:98
-#: actions/updateprofile.php:99
-#, php-format
-msgid "Invalid homepage '%s'"
-msgstr "Páxina persoal '%s' inválida"
+#: actions/getfile.php:79
+msgid "Cannot read file."
+msgstr "Bloqueo de usuario fallido."
 
-#: ../actions/updateprofile.php:82
-#: actions/updateprofile.php:83
-#, php-format
-msgid "Invalid license URL '%s'"
-msgstr "URL de licenza '%s' inválida"
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "Non se especificou ningún perfil."
 
-#: ../actions/postnotice.php:61
-#: actions/postnotice.php:62
-#: actions/postnotice.php:63
-msgid "Invalid notice content"
-msgstr "Contido do chío inválido"
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
 
-#: ../actions/postnotice.php:67
-#: actions/postnotice.php:68
-#: actions/postnotice.php:69
-msgid "Invalid notice uri"
-msgstr "Enderezo de chío inválido"
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "O usuario bloqueoute."
 
-#: ../actions/postnotice.php:72
-#: actions/postnotice.php:73
-#: actions/postnotice.php:74
-msgid "Invalid notice url"
-msgstr "Enderezo de chío inválido"
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "%1s non é unha orixe fiable."
 
-#: ../actions/updateprofile.php:87
-#: actions/updateprofile.php:88
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "Enderezo de perfil inválido '%s'."
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "Bloquear usuario"
 
-#: ../actions/remotesubscribe.php:96
-#: actions/remotesubscribe.php:105
-msgid "Invalid profile URL (bad format)"
-msgstr "Enderezo de perfil inválido (formato incorrecto)"
+#: actions/groupblock.php:162
+#, fuzzy, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+"Seguro que queres bloquear a este usuario? Despois diso, vai ser de-suscrito "
+"do teur perfil, non será capaz de suscribirse a ti nun futuro, e non vas a "
+"ser notificado de ningunha resposta-@ del."
 
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79
-#: actions/finishremotesubscribe.php:78
-msgid "Invalid profile URL returned by server."
-msgstr "Enderezo de perfil inválido devolto polo servidor."
+#: actions/groupblock.php:178
+msgid "Do not block this user from this group"
+msgstr ""
 
-#: ../actions/avatarbynickname.php:37
-#: actions/avatarbynickname.php:37
-msgid "Invalid size."
-msgstr "Tamaño inválido."
+#: actions/groupblock.php:179
+msgid "Block this user from this group"
+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
-#: actions/finishopenidlogin.php:256
-#: actions/register.php:112
-#: actions/register.php:130
-msgid "Invalid username or password."
-msgstr "Usuario ou contrasinal inválidos."
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
+msgstr ""
 
-#: ../actions/invite.php:79
-#: actions/invite.php:86
-msgid "Invitation(s) sent"
-msgstr "Invitación(s) enviada(s)."
+#: actions/groupbyid.php:74
+msgid "No ID"
+msgstr ""
 
-#: ../actions/invite.php:97
-#: actions/invite.php:104
-msgid "Invitation(s) sent to the following people:"
-msgstr "Invitación(s) enviada(s) á seguinte xente:"
+#: actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
 
-#: ../lib/util.php:306
-#: lib/util.php:322
-#: lib/util.php:382
-msgid "Invite"
-msgstr "Invitar"
+#: actions/groupdesignsettings.php:141
+msgid "Group design"
+msgstr ""
 
-#: ../actions/invite.php:123
-#: actions/invite.php:130
-msgid "Invite new users"
-msgstr "Invitar a novos usuarios"
+#: actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
 
-#: ../lib/util.php:261
-#: lib/util.php:277
-#: lib/util.php:294
-#, php-format
-msgid "It runs the [StatusNet](http://status.net/) microblogging software, version %s, available under the [GNU Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-msgstr "Correndo o software de microblogaxe [StatusNet](http://status.net/), versión %s, dispoñible baixo licenza [GNU Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Non se puido actualizar o usuario."
 
-#: ../actions/imsettings.php:173
-#: actions/imsettings.php:181
-#: actions/imsettings.php:186
-msgid "Jabber ID already belongs to another user."
-msgstr "O identificador de Jabber xa pertence a outro usuario."
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "Non se puideron gardar os teus axustes de Twitter!"
 
-#: ../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 "Enderezo Jabber ou GTalk, coma \"NomeUsuario@Exemplo.org\". Primeiro, asegurate de engadir %s á tua lista de contactos no teu cliente de IM ou no GTalk."
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Preferencias gardadas."
 
-#: ../actions/profilesettings.php:57
-#: actions/profilesettings.php:90
-#: actions/profilesettings.php:98
-msgid "Language"
-msgstr "Linguaxe"
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
+msgstr ""
 
-#: ../actions/profilesettings.php:113
-#: actions/profilesettings.php:228
-#: actions/profilesettings.php:247
-msgid "Language is too long (max 50 chars)."
-msgstr "A Linguaxe é demasiado longa (max 50 car.)."
+#: actions/grouplogo.php:150
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
 
-#: ../actions/profilesettings.php:52
-#: ../actions/register.php:173
-#: actions/profilesettings.php:85
-#: actions/register.php:187
-#: actions/profilesettings.php:87
-#: actions/register.php:214
-msgid "Location"
-msgstr "Localización"
+#: actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
+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
-#: actions/profilesettings.php:238
-#: actions/register.php:101
-msgid "Location is too long (max 255 chars)."
-msgstr "A localización é demasiado longa (max 255 car.)."
+#: actions/grouplogo.php:396
+#, fuzzy
+msgid "Logo updated."
+msgstr "Avatar actualizado."
 
-#: ../actions/login.php:97
-#: ../actions/login.php:106
-#: ../actions/openidlogin.php:68
-#: ../lib/util.php:310
-#: actions/login.php:97
-#: actions/login.php:106
-#: actions/openidlogin.php:77
-#: lib/util.php:326
-#: actions/login.php:104
-#: actions/login.php:113
-#: actions/login.php:129
-#: actions/openidlogin.php:88
-#: lib/util.php:352
-msgid "Login"
-msgstr "Inicio de sesión"
+#: actions/grouplogo.php:398
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "Acounteceu un fallo ó actualizar o avatar."
 
-#: ../actions/openidlogin.php:44
-#: actions/openidlogin.php:52
-#: actions/openidlogin.php:60
+#: actions/groupmembers.php:93 lib/groupnav.php:92
 #, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Acceder con unha conta [OpenID](%%doc.openid%%)."
+msgid "%s group members"
+msgstr ""
 
-#: ../actions/login.php:126
-#: actions/login.php:146
+#: actions/groupmembers.php:96
 #, 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 "Accede co teu nome de usuario e contrasinal. ¿Non tes un todavía?? [Rexistra](%%action.register%%) unha nova conta, ou accede co teu enderezo [OpenID](%%action.openidlogin%%). "
+msgid "%s group members, page %d"
+msgstr ""
 
-#: ../lib/util.php:308
-#: lib/util.php:324
-#: lib/util.php:350
-msgid "Logout"
-msgstr "Sair"
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr ""
 
-#: ../actions/register.php:166
-#: actions/register.php:180
-#: actions/register.php:207
-msgid "Longer name, preferably your \"real\" name"
-msgstr "Nome máis longo, preferiblemente o teu nome \"real\""
+#: actions/groupmembers.php:175 lib/groupnav.php:107
+msgid "Admin"
+msgstr ""
 
-#: ../actions/login.php:110
-#: actions/login.php:110
-#: actions/login.php:118
-msgid "Lost or forgotten password?"
-msgstr "¿Perdeches a contrasinal?"
+#: actions/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
+msgstr "Bloquear"
 
-#: ../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 "Crear unha nova dirección de correo para enviar, elimina a antiga."
+#: actions/groupmembers.php:441
+msgid "Make user an admin of the group"
+msgstr ""
 
-#: ../actions/emailsettings.php:27
-#: actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr "Xestina como recibir correo dende %%site.name%%."
+#: actions/groupmembers.php:473
+msgid "Make Admin"
+msgstr ""
 
-#: ../actions/showstream.php:300
-#: actions/showstream.php:315
-#: actions/showstream.php:363
-msgid "Member since"
-msgstr "Membro dende"
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
+
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Actualizacións dende %1$s en %2$s!"
+
+#: actions/groupsearch.php:52
+#, fuzzy, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"Procurar xente en %%site.name%% pola seu nome, localización, ou intereses. "
+"Separa os termos por espazos; deben ter 3 caracteres ou máis."
+
+#: actions/groupsearch.php:58
+#, fuzzy
+msgid "Group search"
+msgstr "Procurar xente."
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "Non se atoparon resultados"
 
-#: ../actions/userrss.php:70
-#: actions/userrss.php:67
+#: actions/groupsearch.php:82
 #, php-format
-msgid "Microblog by %s"
-msgstr "Microblogue por %s"
+msgid ""
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
+msgstr ""
 
-#: ../actions/smssettings.php:304
-#: actions/smssettings.php:314
+#: actions/groupsearch.php:85
 #, 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 "Operadora móbil do teu teléfono. Se sabes se a operadora acepta SMS sobre email e non está listada aquí, envianos unha mensaxe para incluilo en %s."
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:79
-#: ../actions/register.php:188
-#: actions/finishopenidlogin.php:85
-#: actions/register.php:202
-#: actions/register.php:229
-msgid "My text and files are available under "
-msgstr "O meu texto e arquivos están dispoñibles baixo licenza "
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
+msgstr ""
 
-#: ../actions/emailsettings.php:82
-#: ../actions/smssettings.php:91
-#: actions/emailsettings.php:83
-#: actions/smssettings.php:91
-msgid "New"
-msgstr "Novo"
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr ""
 
-#: ../lib/mail.php:144
-#: lib/mail.php:144
-#: lib/mail.php:138
+#: actions/groups.php:90
 #, php-format
-msgid "New email address for posting to %s"
-msgstr "Nova dirección de email para posterar en %s"
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
 
-#: ../actions/emailsettings.php:297
-#: actions/emailsettings.php:315
-#: actions/emailsettings.php:319
-msgid "New incoming email address added."
-msgstr "Engadida nova dirección de correo entrante."
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+#, fuzzy
+msgid "Create a new group"
+msgstr "Crear nova conta"
 
-#: ../actions/finishopenidlogin.php:71
-#: actions/finishopenidlogin.php:77
-msgid "New nickname"
-msgstr "Novo alcume"
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
 
-#: ../actions/newnotice.php:87
-#: actions/newnotice.php:96
-#: actions/newnotice.php:141
-msgid "New notice"
-msgstr "Novo chío"
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "O usuario bloqueoute."
 
-#: ../actions/password.php:41
-#: ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180
-#: actions/recoverpassword.php:185
-#: actions/profilesettings.php:197
-msgid "New password"
-msgstr "Nova contrasinal"
+#: actions/groupunblock.php:128 actions/unblock.php:108
+msgid "Error removing the block."
+msgstr "Acounteceu un erro borrando o bloqueo."
 
-#: ../actions/recoverpassword.php:314
-#: actions/recoverpassword.php:327
-msgid "New password successfully saved. You are now logged in."
-msgstr "A nova contrasinal gardouse correctamente. Xa estas logueado."
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "Configuracións de IM"
 
-#: ../actions/login.php:101
-#: ../actions/profilesettings.php:41
-#: ../actions/register.php:151
-#: actions/login.php:101
-#: actions/profilesettings.php:74
-#: actions/register.php:165
-#: actions/login.php:108
-#: actions/profilesettings.php:76
-#: actions/register.php:192
-msgid "Nickname"
-msgstr "Alcume"
+#: actions/imsettings.php:70
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+"Podes enviar e recibir chíos a través de Jabber/GTalk [mensaxes instantáneos]"
+"(%%doc.im%%). Configura a túa conta e configuracións abaixo."
 
-#: ../actions/finishopenidlogin.php:175
-#: ../actions/profilesettings.php:110
-#: ../actions/register.php:69
-#: actions/finishopenidlogin.php:181
-#: actions/profilesettings.php:225
-#: actions/register.php:76
-#: actions/finishopenidlogin.php:192
-#: actions/profilesettings.php:244
-#: actions/register.php:85
-msgid "Nickname already in use. Try another one."
-msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro."
+#: actions/imsettings.php:89
+msgid "IM is not available."
+msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
 
-#: ../actions/finishopenidlogin.php:165
-#: ../actions/profilesettings.php:88
-#: ../actions/register.php:67
-#: ../actions/updateprofile.php:77
-#: actions/finishopenidlogin.php:171
-#: actions/profilesettings.php:203
-#: actions/register.php:74
-#: actions/updateprofile.php:78
-#: actions/finishopenidlogin.php:182
-#: actions/profilesettings.php:222
-#: actions/register.php:83
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "O alcume debe ter só letras minúsculas e números, e sen espazos."
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Direccións Jabber/GTalk confirmadas."
 
-#: ../actions/finishopenidlogin.php:170
-#: actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:187
-msgid "Nickname not allowed."
-msgstr "Alcume non permitido."
+#: actions/imsettings.php:114
+#, 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 ""
+"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
+"message with further instructions. (Did you add %s to your buddy list?)"
 
-#: ../actions/remotesubscribe.php:72
-#: actions/remotesubscribe.php:81
-msgid "Nickname of the user you want to follow"
-msgstr "Alcume de usuario que queres"
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "Enderezo de IM"
 
-#: ../actions/recoverpassword.php:162
-#: actions/recoverpassword.php:167
-msgid "Nickname or email"
-msgstr "Alcume ou email"
+#: actions/imsettings.php:126
+#, 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 ""
+"Enderezo Jabber ou GTalk, coma \"NomeUsuario@Exemplo.org\". Primeiro, "
+"asegurate de engadir %s á tua lista de contactos no teu cliente de IM ou no "
+"GTalk."
 
-#: ../actions/deletenotice.php:59
-#: actions/deletenotice.php:60
-#: actions/block.php:104
-msgid "No"
-msgstr "No"
+#: actions/imsettings.php:143
+msgid "Send me notices through Jabber/GTalk."
+msgstr "Enviarme advertencias a través de Jabber/GTalk."
+
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr "Post a notice when my Jabber/GTalk status changes."
+
+#: actions/imsettings.php:153
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+"Envíame respostas a través de Jabber/GTalk da xente á que non estou suscrito."
+
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Publicar unha MicroID dende a miña dirección de Jabber/GTalk."
 
-#: ../actions/imsettings.php:156
-#: actions/imsettings.php:164
-#: actions/imsettings.php:169
+#: actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr "Sen Identificador de Jabber."
 
-#: ../actions/userauthorization.php:129
-#: actions/userauthorization.php:136
-msgid "No authorization request!"
-msgstr "Sen petición de autorización!"
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr "Non se pode normalizar ese identificador de Jabber"
 
-#: ../actions/smssettings.php:181
-#: actions/smssettings.php:189
-#: actions/smssettings.php:191
-msgid "No carrier selected."
-msgstr "Non se seleccionou unha operadora."
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "Non é un Identificador de Jabber válido"
 
-#: ../actions/smssettings.php:316
-#: actions/smssettings.php:324
-#: actions/smssettings.php:326
-msgid "No code entered"
-msgstr "Non se inseriu ningún código"
+#: actions/imsettings.php:299
+msgid "That is already your Jabber ID."
+msgstr "Xa é a túa conta de Jabber."
 
-#: ../actions/confirmaddress.php:33
-#: actions/confirmaddress.php:33
-msgid "No confirmation code."
-msgstr "Sen código de confirmación."
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr "O identificador de Jabber xa pertence a outro usuario."
 
-#: ../actions/newnotice.php:44
-#: actions/newmessage.php:53
-#: actions/newnotice.php:44
-#: classes/Command.php:197
-#: actions/newmessage.php:52
-#: actions/newnotice.php:53
-msgid "No content!"
-msgstr "Sen contido!"
+#: actions/imsettings.php:327
+#, php-format
+msgid ""
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr ""
+"O código de confirmación foi embiado á dirección IM que engadiches. Deberías "
+"engadir a %s como contacto para que che poida enviar mensaxes."
 
-#: ../actions/emailsettings.php:174
-#: actions/emailsettings.php:192
-#: actions/emailsettings.php:198
-msgid "No email address."
-msgstr "Non se inseriu unha dirección de correo"
+#: actions/imsettings.php:387
+msgid "That is not your Jabber ID."
+msgstr "Esa non é a túa conta Jabber."
 
-#: ../actions/userbyid.php:32
-#: actions/userbyid.php:32
-msgid "No id."
-msgstr "Sen id."
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr "Band. Entrada para %s - páxina %d"
 
-#: ../actions/emailsettings.php:271
-#: actions/emailsettings.php:289
-#: actions/emailsettings.php:293
-msgid "No incoming email address."
-msgstr "Non hai direccións de correo entrante"
+#: actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr "Band. Entrada para %s"
 
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67
-#: actions/finishremotesubscribe.php:66
-msgid "No nickname provided by remote server."
-msgstr "O servidor remoto non proporcionou un alcume."
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+"Esta é a túa bandexa de entrada, aquí móstranse as túas mensaxes privadas."
 
-#: ../actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:27
-msgid "No nickname."
-msgstr "Sen alcume."
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+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
-#: actions/emailsettings.php:244
-#: actions/imsettings.php:219
-#: actions/smssettings.php:239
-msgid "No pending confirmation to cancel."
-msgstr "Non hai ningunha confirmación pendente para cancelar."
+#: actions/invite.php:41
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
 
-#: ../actions/smssettings.php:176
-#: actions/smssettings.php:184
-#: actions/smspostsettings.php:76
-#: actions/smssettings.php:186
-#: actions/smspostsettings.php:81
-msgid "No phone number."
-msgstr "Non hai ningún número de teléfono."
+#: actions/invite.php:72
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "Dirección de correo Inválida: %s"
 
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74
-#: actions/finishremotesubscribe.php:73
-msgid "No profile URL returned by server."
-msgstr "O servidor non voltou ningún enderezo de perfil."
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
+msgstr "Invitación(s) enviada(s)."
 
-#: ../actions/recoverpassword.php:226
-#: actions/recoverpassword.php:232
-msgid "No registered email address for that user."
-msgstr "Non hai un enderezo de correo rexistrado para ese usuario."
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr "Invitar a novos usuarios"
 
-#: ../actions/userauthorization.php:49
-#: actions/userauthorization.php:55
-msgid "No request found!"
-msgstr "¡Non se atoparon peticións!"
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr "Xa estas suscrito a estes usuarios:"
 
-#: ../actions/noticesearch.php:64
-#: ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69
-#: actions/peoplesearch.php:69
-#: actions/noticesearch.php:68
-#: actions/peoplesearch.php:59
-msgid "No results"
-msgstr "Non se atoparon resultados"
+#: actions/invite.php:131 actions/invite.php:139
+#, php-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:32
-msgid "No size."
-msgstr "Sen tamaño."
+#: actions/invite.php:136
+msgid ""
+"These people are already users and you were automatically subscribed to them:"
+msgstr "Esta xente xa é usuario e ti foches suscrito automaticamente a eles:"
 
-#: ../actions/twitapistatuses.php:595
-#: actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
-#: actions/twitapifavorites.php:109
-#: actions/twitapistatuses.php:438
-msgid "No status found with that ID."
-msgstr "Non se atopou un estado con ese ID."
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
+msgstr "Invitación(s) enviada(s) á seguinte xente:"
 
-#: ../actions/twitapistatuses.php:555
-#: actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:411
-msgid "No status with that ID found."
-msgstr "Non existe ningún estado con esa ID atopada."
+#: actions/invite.php:150
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr ""
+"Notificaráseche cando os teus invitados acepten unha invitación e se "
+"rexistren neste sitio. Grazas por facer crecer o gremio lareteiro!"
 
-#: ../actions/openidsettings.php:135
-#: actions/openidsettings.php:144
-msgid "No such OpenID."
-msgstr "Ningún OpenID."
+#: actions/invite.php:162
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
+msgstr ""
+"Emprega este formulario para invitar ós teus amigos e colegas a empregar "
+"este servizo."
 
-#: ../actions/doc.php:29
-#: actions/doc.php:29
-msgid "No such document."
-msgstr "Ningún documento."
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "Enderezos de correo"
 
-#: ../actions/shownotice.php:32
-#: ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30
-#: actions/shownotice.php:32
-#: actions/shownotice.php:83
-#: lib/deleteaction.php:30
-#: actions/shownotice.php:38
-#: actions/shownotice.php:114
-msgid "No such notice."
-msgstr "Ningún chío."
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr "Direccións dos amigos que queres invitar (unha por liña)"
 
-#: ../actions/recoverpassword.php:56
-#: actions/recoverpassword.php:56
-msgid "No such recovery code."
-msgstr "Ningún código de recuperación."
+#: actions/invite.php:192
+msgid "Personal message"
+msgstr "Mensaxe persoal"
 
-#: ../actions/postnotice.php:56
-#: actions/postnotice.php:57
-msgid "No such subscription"
-msgstr "Ningunha subscripció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/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
-#: actions/showstream.php:157
-#: classes/Command.php:208
-#: classes/Command.php:242
-#: lib/gallery.php:85
-#: lib/subs.php:105
-msgid "No such user."
-msgstr "Ningún usuario."
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
+msgstr "Opcionalmente engadir unha mensaxe persoal á invitación."
 
-#: ../actions/recoverpassword.php:211
-#: actions/recoverpassword.php:217
-msgid "No user with that email address or username."
-msgstr "Non hai ningún usuario con isa dirección de correo ou nome de usuario."
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
+msgstr "Enviar"
 
-#: ../lib/gallery.php:80
-#: lib/gallery.php:85
-#: actions/users.php:59
-msgid "Nobody to show!"
-msgstr "Ninguén para amosar"
+#: actions/invite.php:226
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s invitoute a unirse a él en %2$s."
 
-#: ../actions/recoverpassword.php:60
-#: actions/recoverpassword.php:60
-msgid "Not a recovery code."
-msgstr "Non é un código de recuperación."
+#: actions/invite.php:228
+#, 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 invitoute a unirte a el en %2$s (%3$s).\n"
+"\n"
+"%2$s é un servizo de microbloguexo que che permite manterte actualizado coa "
+"xente que coñeces e xente na que tes interese.\n"
+"\n"
+"Tamén podes compartir novas contigo mesmo, ou pensamentos, ou vivir en liña "
+"con xente que te coñece. Tamén está moi ben para coñecer xente que comparte "
+"os mesmos intereses..\n"
+"\n"
+"%1$s dixo:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Podes ollar a súa páxina de perfil %1$s's en %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Se queres probar, fai clic na ligazón de abaixo para aceptar a invitación..\n"
+"\n"
+"%6$s\n"
+"\n"
+"Se non, pois ignora esta mensaxe. Pero aló ti, aquí se pasa moi ben.\n"
+"\n"
+"Saudiños, %2$s\n"
 
-#: ../scripts/maildaemon.php:50
-#: scripts/maildaemon.php:50
-msgid "Not a registered user."
-msgstr "Non é un usuario rexistrado."
+#: actions/joingroup.php:60
+#, fuzzy
+msgid "You must be logged in to join a group."
+msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
 
-#: ../lib/twitterapi.php:226
-#: ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332
-#: lib/twitterapi.php:391
-#: lib/twitterapi.php:418
-#: lib/twitterapi.php:502
-#: lib/twitterapi.php:423
-#: lib/twitterapi.php:450
-#: lib/twitterapi.php:534
-msgid "Not a supported data format."
-msgstr "Non é un formato de datos soportado."
+#: actions/joingroup.php:90 lib/command.php:217
+#, fuzzy
+msgid "You are already a member of that group"
+msgstr "Xa estas suscrito a estes usuarios:"
 
-#: ../actions/imsettings.php:167
-#: actions/imsettings.php:175
-#: actions/imsettings.php:180
-msgid "Not a valid Jabber ID"
-msgstr "Non é un Identificador de Jabber válido"
+#: actions/joingroup.php:128 lib/command.php:234
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s"
+msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
 
-#: ../lib/openid.php:131
-#: lib/openid.php:131
-msgid "Not a valid OpenID."
-msgstr "Non é un enderezo OpenID válido."
+#: actions/joingroup.php:135 lib/command.php:239
+#, fuzzy, php-format
+msgid "%s joined group %s"
+msgstr "%s / Favoritos dende %s"
 
-#: ../actions/emailsettings.php:185
-#: actions/emailsettings.php:203
-#: actions/emailsettings.php:209
-msgid "Not a valid email address"
-msgstr "Non é unha dirección de correo válida"
+#: actions/leavegroup.php:60
+#, fuzzy
+msgid "You must be logged in to leave a group."
+msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
 
-#: ../actions/register.php:63
-#: actions/register.php:70
-#: actions/register.php:79
-msgid "Not a valid email address."
-msgstr "Non é un enderezo de correo válido."
+#: actions/leavegroup.php:90 lib/command.php:268
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "Non estás suscrito a ese perfil"
 
-#: ../actions/profilesettings.php:91
-#: ../actions/register.php:71
-#: actions/profilesettings.php:206
-#: actions/register.php:78
-#: actions/profilesettings.php:225
-#: actions/register.php:87
-msgid "Not a valid nickname."
-msgstr "Non é un alcume válido."
+#: actions/leavegroup.php:119 lib/command.php:278
+#, fuzzy
+msgid "Could not find membership record."
+msgstr "Non se puido actualizar o rexistro de usuario."
 
-#: ../actions/remotesubscribe.php:120
-#: actions/remotesubscribe.php:129
-msgid "Not a valid profile URL (incorrect services)."
-msgstr "Non é un enderezo de perfil válido (servizos incorrectos)."
+#: actions/leavegroup.php:127 lib/command.php:284
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
 
-#: ../actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:122
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr "Non é un enderezo de perfil válido (non está definido ningún XRDS)."
+#: actions/leavegroup.php:134 lib/command.php:289
+#, php-format
+msgid "%s left group %s"
+msgstr ""
 
-#: ../actions/remotesubscribe.php:104
-#: actions/remotesubscribe.php:113
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr "Non é un enderezo de perfil válido (non ten documento YADIS)."
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "Sesión xa iniciada"
 
-#: ../actions/avatar.php:95
-#: actions/profilesettings.php:332
-#: actions/profilesettings.php:378
-msgid "Not an image or corrupt file."
-msgstr "Non é unha imaxe ou está corrupta."
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Contido do chío inválido"
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53
-#: actions/finishremotesubscribe.php:52
-msgid "Not authorized."
-msgstr "Non está autorizado."
+#: actions/login.php:143
+msgid "Incorrect username or password."
+msgstr "Usuario ou contrasinal incorrectos."
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38
-msgid "Not expecting this response!"
-msgstr "¡Non esperaba esa resposta!"
+#: actions/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
+msgstr "Acounteceu un erro configurando o usuario."
 
-#: ../actions/twitapistatuses.php:422
-#: actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:304
-msgid "Not found"
-msgstr "Non atopado"
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "Inicio de sesión"
 
-#: ../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
-#: actions/block.php:31
-#: actions/misc.php:27
-#: actions/newnotice.php:30
-#: actions/nudge.php:30
-#: actions/subedit.php:31
-#: actions/unblock.php:31
-msgid "Not logged in."
-msgstr "Non está logueado."
+#: actions/login.php:243
+msgid "Login to site"
+msgstr ""
 
-#: ../lib/subs.php:91
-#: lib/subs.php:104
-#: lib/subs.php:117
-msgid "Not subscribed!."
-msgstr "Non está suscrito!"
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Alcume"
 
-#: ../actions/opensearch.php:35
-#: actions/opensearch.php:35
-msgid "Notice Search"
-msgstr "Procura de Chíos"
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Contrasinal"
 
-#: ../actions/showstream.php:82
-#: actions/showstream.php:82
-#: actions/showstream.php:111
-#: actions/showstream.php:118
-#: actions/showstream.php:123
-#, php-format
-msgid "Notice feed for %s"
-msgstr "Fonte de chíos para %s"
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "Lembrarme"
 
-#: ../actions/shownotice.php:39
-#: actions/shownotice.php:39
-#: actions/shownotice.php:45
-msgid "Notice has no profile"
-msgstr "O chío non ten perfil"
+#: actions/login.php:253 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
+msgstr "Endiante acceder automáticamente, coidado en equipos compartidos!"
 
-#: ../actions/showstream.php:316
-#: actions/showstream.php:331
-#: actions/showstream.php:379
-msgid "Notices"
-msgstr "Chíos"
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "¿Perdeches a contrasinal?"
+
+#: actions/login.php:282
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr ""
+"Por razóns de seguranza, por favor re-insire o teu nome de usuario e "
+"contrasinal antes de cambiar as túas preferenzas."
+
+#: actions/login.php:286
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"Accede co teu nome de usuario e contrasinal. ¿Non tes un todavía?? [Rexistra]"
+"(%%action.register%%) unha nova conta, ou accede co teu enderezo [OpenID](%%"
+"action.openidlogin%%). "
 
-#: ../actions/tag.php:35
-#: ../actions/tag.php:81
-#: actions/tag.php:35
-#: actions/tag.php:81
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:95
 #, php-format
-msgid "Notices tagged with %s"
-msgstr "Chíos tagueados con %s"
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
 
-#: ../actions/password.php:39
-#: actions/profilesettings.php:178
-#: actions/profilesettings.php:195
-msgid "Old password"
-msgstr "Contrasinal antiga"
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
 
-#: ../lib/settingsaction.php:96
-#: ../lib/util.php:314
-#: lib/settingsaction.php:90
-#: lib/util.php:330
-#: actions/deleteprofile.php:247
-msgid "OpenID"
-msgstr "OpenID"
-
-#: ../actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:66
-msgid "OpenID Account Setup"
-msgstr "Configuración de conta OpenID"
-
-#: ../lib/openid.php:180
-#: lib/openid.php:180
-msgid "OpenID Auto-Submit"
-msgstr "Auto-Envío de OpenID"
-
-#: ../actions/finishaddopenid.php:99
-#: ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60
-#: actions/finishaddopenid.php:99
-#: actions/finishopenidlogin.php:146
-#: actions/openidlogin.php:68
-#: actions/finishopenidlogin.php:150
-#: actions/openidlogin.php:76
-msgid "OpenID Login"
-msgstr "Acceso OpenID"
-
-#: ../actions/openidlogin.php:65
-#: ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74
-#: actions/openidsettings.php:50
-#: actions/login.php:125
-#: actions/openidlogin.php:82
-msgid "OpenID URL"
-msgstr "Enderezo OpenID"
-
-#: ../actions/finishaddopenid.php:42
-#: ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42
-#: actions/finishopenidlogin.php:109
-msgid "OpenID authentication cancelled."
-msgstr "Autenticación OpenID cancelada."
-
-#: ../actions/finishaddopenid.php:46
-#: ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46
-#: actions/finishopenidlogin.php:113
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr "A autenticación OpenID fallou: %s"
-
-#: ../lib/openid.php:133
-#: lib/openid.php:133
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "Fallou o OpenID: %s"
-
-#: ../actions/openidsettings.php:144
-#: actions/openidsettings.php:153
-msgid "OpenID removed."
-msgstr "OpenID eliminado."
-
-#: ../actions/openidsettings.php:37
-#: actions/openidsettings.php:37
-msgid "OpenID settings"
-msgstr "Configuracións de OpenID"
-
-#: ../actions/invite.php:135
-#: actions/invite.php:143
-msgid "Optionally add a personal message to the invitation."
-msgstr "Opcionalmente engadir unha mensaxe persoal á invitación."
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
 
-#: ../actions/avatar.php:84
-#: actions/profilesettings.php:321
-#: actions/profilesettings.php:367
-msgid "Partial upload."
-msgstr "Carga parcial."
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr "Sen estado actual"
 
-#: ../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
-#: actions/login.php:109
-#: actions/register.php:194
-msgid "Password"
-msgstr "Contrasinal"
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr ""
 
-#: ../actions/recoverpassword.php:288
-#: actions/recoverpassword.php:301
-msgid "Password and confirmation do not match."
-msgstr "A contrasinal e a súa confirmación non coinciden."
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
+msgstr ""
 
-#: ../actions/recoverpassword.php:284
-#: actions/recoverpassword.php:297
-msgid "Password must be 6 chars or more."
-msgstr "A contrasinal debe ter 6 caracteres ou máis."
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr "Nova mensaxe"
 
-#: ../actions/recoverpassword.php:261
-#: ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267
-#: actions/recoverpassword.php:269
-msgid "Password recovery requested"
-msgstr "Petición de recuperación de contrasinal"
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
+msgstr "Non podes enviar mensaxes a este usurio."
 
-#: ../actions/password.php:89
-#: ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408
-#: actions/recoverpassword.php:326
-#: actions/profilesettings.php:454
-msgid "Password saved."
-msgstr "Contrasinal gardada."
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+msgstr "Sen contido!"
 
-#: ../actions/password.php:61
-#: ../actions/register.php:88
-#: actions/profilesettings.php:380
-#: actions/register.php:98
-#: actions/profilesettings.php:426
-#: actions/register.php:107
-msgid "Passwords don't match."
-msgstr "As contrasinais non coinciden"
+#: actions/newmessage.php:158
+msgid "No recipient specified."
+msgstr "Non se especificou ningún destinatario"
 
-#: ../lib/searchaction.php:100
-#: lib/searchaction.php:100
-msgid "People"
-msgstr "Xente"
+#: actions/newmessage.php:164 lib/command.php:370
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly instead."
+msgstr ""
+"Non te envies mensaxes a ti mesmo!! só fala contigo mesmo baixiño, senón "
+"vante tomar por tolo."
 
-#: ../actions/opensearch.php:33
-#: actions/opensearch.php:33
-msgid "People Search"
-msgstr "Procurar xente"
+#: actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "Non hai mensaxes de texto!"
 
-#: ../actions/peoplesearch.php:33
-#: actions/peoplesearch.php:33
-msgid "People search"
-msgstr "Procurar xente."
+#: actions/newmessage.php:185 lib/command.php:375
+#, php-format
+msgid "Direct message to %s sent"
+msgstr "Mensaxe directo a %s enviado"
 
-#: ../lib/stream.php:50
-#: lib/personal.php:50
-msgid "Personal"
-msgstr "Persoal"
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
+msgstr "Erro de Ajax"
 
-#: ../actions/invite.php:133
-#: actions/invite.php:141
-msgid "Personal message"
-msgstr "Mensaxe persoal"
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "Novo chío"
 
-#: ../actions/smssettings.php:69
-#: actions/smssettings.php:69
-#: actions/smspostsettings.php:49
-#: actions/smspostsettings.php:50
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "Número de teléfono, sen puntuacións ou espazos, co código de área"
+#: actions/newnotice.php:199
+msgid "Notice posted"
+msgstr "Chío publicado"
 
-#: ../actions/userauthorization.php:78
-#: actions/userauthorization.php:84
-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 "Please check these details to make sure that you want to subscribe to this user's notices. If you didn't just ask to subscribe to someone's notices, click \"Cancel\"."
+#: actions/noticesearch.php:68
+#, php-format
+msgid ""
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
+msgstr ""
+"Procurar chíos en %%site.name%% polos seus contidos. Separa os termos de "
+"procura por espazos, deben ter 3 caracteres ou máis."
 
-#: ../actions/imsettings.php:73
-#: actions/imsettings.php:74
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Post a notice when my Jabber/GTalk status changes."
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "Procura de texto"
 
-#: ../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 "Preferencias"
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "Buscar \"%s\" na Liña de tempo"
 
-#: ../actions/emailsettings.php:162
-#: ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163
-#: actions/emailsettings.php:180
-#: actions/imsettings.php:152
-#: actions/smssettings.php:171
-#: actions/emailsettings.php:186
-#: actions/imsettings.php:157
-#: actions/othersettings.php:179
-#: actions/smssettings.php:173
-msgid "Preferences saved."
-msgstr "Preferencias gardadas."
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
 
-#: ../actions/profilesettings.php:57
-#: actions/profilesettings.php:90
-#: actions/profilesettings.php:98
-msgid "Preferred language"
-msgstr "Linguaxe preferida"
+#: actions/noticesearch.php:124
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
+msgstr ""
 
-#: ../lib/util.php:328
-#: lib/util.php:344
-#: lib/util.php:373
-msgid "Privacy"
-msgstr "Privacidade"
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Actualizacións dende %1$s en %2$s!"
 
-#: ../classes/Notice.php:95
-#: ../classes/Notice.php:106
-#: classes/Notice.php:109
-#: classes/Notice.php:119
-#: classes/Notice.php:139
-#: classes/Notice.php:149
-msgid "Problem saving notice."
-msgstr "Aconteceu un erro ó gardar o chío."
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Tódalas actualizacións que coinciden co termo de procura \"%s\""
 
-#: ../lib/settingsaction.php:84
-#: ../lib/stream.php:60
-#: lib/personal.php:60
-#: lib/settingsaction.php:84
-#: actions/deleteprofile.php:241
-msgid "Profile"
-msgstr "Perfil"
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+"Este usuario non permite toques, ou non confirmou ainda o seu correo "
+"electrónico."
 
-#: ../actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:82
-msgid "Profile URL"
-msgstr "Enderezo de perfil"
+#: actions/nudge.php:94
+msgid "Nudge sent"
+msgstr "Toque enviado"
 
-#: ../actions/profilesettings.php:34
-#: actions/profilesettings.php:32
-msgid "Profile settings"
-msgstr "Configuración de perfil"
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr "Toque enviado!"
 
-#: ../actions/postnotice.php:51
-#: ../actions/updateprofile.php:52
-#: actions/postnotice.php:52
-#: actions/updateprofile.php:53
-msgid "Profile unknown"
-msgstr "Perfil descoñecido"
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+msgstr "O chío non ten perfil"
 
-#: ../actions/public.php:54
-#: actions/public.php:54
-#: actions/public.php:77
-msgid "Public Stream Feed"
-msgstr "Sindicación do Fio Público"
+#: actions/oembed.php:86 actions/shownotice.php:180
+#, php-format
+msgid "%1$s's status on %2$s"
+msgstr "Estado de %1$s en  %2$s"
 
-#: ../actions/public.php:33
-#: actions/public.php:33
-#: lib/stream.php:34
-msgid "Public timeline"
-msgstr "Liña de tempo pública"
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Conectar"
 
-#: ../actions/imsettings.php:79
-#: actions/imsettings.php:80
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Publicar unha MicroID dende a miña dirección de Jabber/GTalk."
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
 
-#: ../actions/emailsettings.php:94
-#: actions/emailsettings.php:101
-msgid "Publish a MicroID for my email address."
-msgstr "Publicar unha MicroID dende a miña dirección de correo."
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
+msgstr "Non é un formato de datos soportado."
 
-#: ../actions/tag.php:75
-#: ../actions/tag.php:76
-#: actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr "Tags Recentes"
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "Procurar xente"
 
-#: ../actions/recoverpassword.php:166
-#: actions/recoverpassword.php:171
-msgid "Recover"
-msgstr "Recuperar"
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "Procura de Chíos"
 
-#: ../actions/recoverpassword.php:156
-#: actions/recoverpassword.php:161
-msgid "Recover password"
-msgstr "Recuperar contrasinal"
+#: actions/othersettings.php:60
+msgid "Other Settings"
+msgstr "Outros axustes"
 
-#: ../actions/recoverpassword.php:67
-#: actions/recoverpassword.php:67
-msgid "Recovery code for unknown user."
-msgstr "Código de recuperación para usuario descoñecido."
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr "Xestionár axustes varios."
 
-#: ../actions/register.php:142
-#: ../actions/register.php:193
-#: ../lib/util.php:312
-#: actions/register.php:152
-#: actions/register.php:207
-#: lib/util.php:328
-#: actions/register.php:181
-#: actions/register.php:234
-#: lib/util.php:354
-msgid "Register"
-msgstr "Rexistrar"
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
 
-#: ../actions/register.php:28
-#: actions/register.php:28
-#: actions/finishopenidlogin.php:173
-msgid "Registration not allowed."
-msgstr "Non se permite o rexistro neste intre."
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
+msgstr ""
 
-#: ../actions/register.php:200
-#: actions/register.php:214
-#: actions/register.php:241
-msgid "Registration successful"
-msgstr "Xa estas rexistrado!!"
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
+msgstr "Servizo de acortado automático a usar."
 
-#: ../actions/userauthorization.php:120
-#: actions/userauthorization.php:127
-msgid "Reject"
-msgstr "Rexeitar"
+#: actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "Configuración de perfil"
 
-#: ../actions/login.php:103
-#: ../actions/register.php:176
-#: actions/login.php:103
-#: actions/register.php:190
-#: actions/login.php:110
-#: actions/openidlogin.php:85
-#: actions/register.php:217
-msgid "Remember me"
-msgstr "Lembrarme"
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
 
-#: ../actions/updateprofile.php:70
-#: actions/updateprofile.php:71
-msgid "Remote profile with no matching profile"
-msgstr "Non hai ningún perfil que coincida co perfil remoto"
+#: actions/othersettings.php:153
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Sistema de acortamento de URLs demasiado longo (max 50 car.)."
 
-#: ../actions/remotesubscribe.php:65
-#: actions/remotesubscribe.php:73
-msgid "Remote subscribe"
-msgstr "Suscrición remota"
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr "Band. Saída para %s - páxina %d"
 
-#: ../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
-#: actions/smspostsettings.php:45
-#: actions/twittersettings.php:61
-#: actions/smspostsettings.php:46
-msgid "Remove"
-msgstr "Eliminar"
+#: actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
+msgstr "Band. Saída para %s"
 
-#: ../actions/openidsettings.php:68
-#: actions/openidsettings.php:69
-msgid "Remove OpenID"
-msgstr "Eliminar OpenID"
+#: actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+"Esta é a túa band. saída, que mostra as mensaxes privadas que enviaches."
 
-#: ../actions/openidsettings.php:73
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! If you need to remove it, add another OpenID first."
-msgstr "Eliminando o teu enderezo OpenID vaiche ser imposible acceder! Se queres eliminalo, primeiro engade outro enderezo OpenID."
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "Cambiar contrasinal"
 
-#: ../lib/stream.php:55
-#: lib/personal.php:55
-msgid "Replies"
-msgstr "Respostas"
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "Cambiar contrasinal"
 
-#: ../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 "Replies to %s"
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#, fuzzy
+msgid "Password change"
+msgstr "Contrasinal gardada."
 
-#: ../actions/recoverpassword.php:183
-#: actions/recoverpassword.php:189
-msgid "Reset"
-msgstr "Restaurar"
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "Contrasinal antiga"
 
-#: ../actions/recoverpassword.php:173
-#: actions/recoverpassword.php:178
-msgid "Reset password"
-msgstr "Restaurar contrasinal"
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "Nova contrasinal"
 
-#: ../lib/settingsaction.php:99
-#: lib/settingsaction.php:93
-#: actions/deleteprofile.php:250
-#: actions/subscriptions.php:73
-msgid "SMS"
-msgstr "SMS"
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6 ou máis caracteres"
 
-#: ../actions/smssettings.php:67
-#: actions/smssettings.php:67
-#: actions/smspostsettings.php:38
-#: actions/smspostsettings.php:39
-msgid "SMS Phone number"
-msgstr "Número de Teléfono do SMS"
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "Confirmar"
 
-#: ../actions/smssettings.php:33
-#: actions/smssettings.php:33
-msgid "SMS Settings"
-msgstr "Configuracións de SMS"
+#: actions/passwordsettings.php:113
+msgid "same as password above"
+msgstr "igual á contrasinal de enriba"
 
-#: ../lib/mail.php:219
-#: lib/mail.php:225
-#: lib/mail.php:220
-msgid "SMS confirmation"
-msgstr "Confirmación de SMS"
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "Modificado"
 
-#: ../actions/recoverpassword.php:182
-#: actions/recoverpassword.php:188
-msgid "Same as password above"
-msgstr "Igual que a contrasinal de enriba"
+#: actions/passwordsettings.php:154 actions/register.php:230
+msgid "Password must be 6 or more characters."
+msgstr "A contrasinal debe ter 6 caracteres ou máis."
 
-#: ../actions/register.php:156
-#: actions/register.php:170
-#: actions/register.php:197
-msgid "Same as password above. Required."
-msgstr "A mesma contrasinal que arriba. Requerido."
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "As contrasinais non coinciden"
 
-#: ../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
-#: actions/emailsettings.php:108
-#: actions/imsettings.php:85
-#: actions/othersettings.php:56
-#: actions/profilesettings.php:118
-#: actions/subscriptions.php:74
-#: actions/tagother.php:100
-#: actions/twittersettings.php:82
-msgid "Save"
-msgstr "Gardar"
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "Contrasinal actual incorrecta"
 
-#: ../lib/searchaction.php:84
-#: ../lib/util.php:300
-#: lib/searchaction.php:84
-#: lib/util.php:316
-#: lib/util.php:345
-msgid "Search"
-msgstr "Buscar"
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "Acounteceu un erro gardando o usuario: é inválido."
 
-#: ../actions/noticesearch.php:80
-#: actions/noticesearch.php:85
-#: actions/noticesearch.php:84
-msgid "Search Stream Feed"
-msgstr "Procura no Fío"
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "Non se pode gardar a contrasinal."
+
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "Contrasinal gardada."
 
-#: ../actions/noticesearch.php:30
-#: actions/noticesearch.php:30
-#: actions/noticesearch.php:29
+#: actions/peoplesearch.php:52
 #, 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 "Procurar chíos en %%site.name%% polos seus contidos. Separa os termos de procura por espazos, deben ter 3 caracteres ou máis."
+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 ""
+"Procurar xente en %%site.name%% pola seu nome, localización, ou intereses. "
+"Separa os termos por espazos; deben ter 3 caracteres ou máis."
+
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "Procurar xente."
 
-#: ../actions/peoplesearch.php:28
-#: actions/peoplesearch.php:28
+#: actions/peopletag.php:70
 #, 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 "Procurar xente en %%site.name%% pola seu nome, localización, ou intereses. Separa os termos por espazos; deben ter 3 caracteres ou máis."
+msgid "Not a valid people tag: %s"
+msgstr "%s non é unha etiqueta de xente válida"
 
-#: ../actions/smssettings.php:296
-#: actions/smssettings.php:304
-#: actions/smssettings.php:306
-msgid "Select a carrier"
-msgstr "Selecciona unha operadora"
+#: actions/peopletag.php:144
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr "Usuarios auto-etiquetados como %s - páxina %d"
 
-#: ../actions/invite.php:137
-#: ../lib/util.php:1172
-#: actions/invite.php:145
-#: lib/util.php:1306
-#: lib/util.php:1731
-#: lib/util.php:1705
-#: lib/util.php:2217
-msgid "Send"
-msgstr "Enviar"
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "Contido do chío inválido"
 
-#: ../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 "Enviar un correo a esta dirección para enviar novos chíos."
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
 
-#: ../actions/emailsettings.php:88
-#: actions/emailsettings.php:89
-msgid "Send me notices of new subscriptions through email."
-msgstr "Envíame chios de novas suscricións por email."
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "Configuración de perfil"
 
-#: ../actions/imsettings.php:70
-#: actions/imsettings.php:71
-msgid "Send me notices through Jabber/GTalk."
-msgstr "Enviarme advertencias a través de Jabber/GTalk."
+#: actions/profilesettings.php:71
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+"Podes actualizar a túa información do perfil persoal aquí para que a xente "
+"che poida coñecer mellor."
 
-#: ../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 "Enviarme chíos mediante SMS, entendo que a miña operadora poida cobrarme grandes facturas."
+#: actions/profilesettings.php:99
+#, fuzzy
+msgid "Profile information"
+msgstr "Perfil descoñecido"
 
-#: ../actions/imsettings.php:76
-#: actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr "Envíame respostas a través de Jabber/GTalk da xente á que non estou suscrito."
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+"De 1 a 64 letras minúsculas ou númeors, nin espazos nin signos de puntuación"
 
-#: ../lib/util.php:304
-#: lib/util.php:320
-#: lib/util.php:348
-msgid "Settings"
-msgstr "Configuración"
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full name"
+msgstr "Nome completo"
 
-#: ../actions/profilesettings.php:192
-#: actions/profilesettings.php:307
-#: actions/profilesettings.php:353
-msgid "Settings saved."
-msgstr "Configuracións gardadas."
+#: actions/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "Páxina persoal"
 
-#: ../actions/tag.php:60
-#: actions/tag.php:60
-#: actions/tag.php:67
-msgid "Showing most popular tags from the last week"
-msgstr "Amoa os tags máis populares dende a semana pasada"
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "Enderezo da túa páxina persoal, blogue, ou perfil noutro sitio"
 
-#: ../actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:66
-msgid "Someone else already has this OpenID."
-msgstr "Alguen máis ten ese enderezo OpenID."
+#: actions/profilesettings.php:122 actions/register.php:460
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
 
-#: ../actions/finishopenidlogin.php:42
-#: ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47
-#: actions/openidsettings.php:135
-msgid "Something weird happened."
-msgstr "Algo gordo aconteceu."
+#: actions/profilesettings.php:125 actions/register.php:463
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
 
-#: ../scripts/maildaemon.php:58
-#: scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr "Aivá, non se permiten correos entrantes."
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "Bio"
 
-#: ../scripts/maildaemon.php:54
-#: scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr "Ise é un enderezo IM incorrecto."
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "Localización"
 
-#: ../lib/util.php:330
-#: lib/util.php:346
-#: lib/util.php:375
-msgid "Source"
-msgstr "Fonte"
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "¿Onde estas, coma \"Cidade, Provincia, País\""
 
-#: ../actions/showstream.php:296
-#: actions/showstream.php:311
-#: actions/showstream.php:359
-#: actions/misc.php:87
-msgid "Statistics"
-msgstr "Estatísticas"
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
+msgstr "Tags"
 
-#: ../actions/finishopenidlogin.php:182
-#: ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188
-#: actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:199
-#: actions/finishopenidlogin.php:267
-msgid "Stored OpenID not found."
-msgstr "OpenID almacenado non atopado"
-
-#: ../actions/remotesubscribe.php:75
-#: ../actions/showstream.php:188
-#: ../actions/showstream.php:197
-#: actions/remotesubscribe.php:84
-#: actions/showstream.php:197
-#: actions/showstream.php:206
-#: actions/showstream.php:254
-#: lib/util.php:2137
-msgid "Subscribe"
-msgstr "Subscribir"
+#: actions/profilesettings.php:140
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+"Etiquetas para o teu usuario (letras, números, -, ., e _), separados por "
+"coma ou espazo"
 
-#: ../actions/showstream.php:313
-#: ../actions/subscribers.php:27
-#: actions/showstream.php:328
-#: actions/subscribers.php:27
-#: actions/showstream.php:376
-#: lib/gallery.php:136
-#: lib/gallery.php:137
-msgid "Subscribers"
-msgstr "Subscritores"
+#: actions/profilesettings.php:144
+msgid "Language"
+msgstr "Linguaxe"
 
-#: ../actions/userauthorization.php:310
-#: actions/userauthorization.php:322
-msgid "Subscription authorized"
-msgstr "Subscrición autorizada"
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr "Linguaxe preferida"
 
-#: ../actions/userauthorization.php:320
-#: actions/userauthorization.php:332
-msgid "Subscription rejected"
-msgstr "Subscrición rexeitada"
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr "Fuso Horario"
 
-#: ../actions/showstream.php:230
-#: ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27
-#: actions/showstream.php:240
-#: actions/showstream.php:322
-#: actions/subscriptions.php:27
-#: actions/showstream.php:288
-#: actions/showstream.php:370
-#: lib/gallery.php:131
-#: lib/gallery.php:132
-msgid "Subscriptions"
-msgstr "Subscricións"
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
+msgstr "En que fuso horario estas normalmente?"
 
-#: ../actions/avatar.php:87
-#: actions/profilesettings.php:324
-#: actions/profilesettings.php:370
-msgid "System error uploading file."
-msgstr "Aconteceu un erro no sistema namentras se estaba cargando o ficheiro."
+#: actions/profilesettings.php:160
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+"Suscribirse automáticamente a calquera que se suscriba a min (o mellor para "
+"non humáns)"
 
-#: ../actions/tag.php:41
-#: ../lib/util.php:301
-#: actions/tag.php:41
-#: lib/util.php:317
-#: actions/profilesettings.php:90
-#: actions/showstream.php:382
-#: actions/tagother.php:96
-#: actions/tagother.php:162
-#: actions/tag.php:47
-#: lib/profilelist.php:126
-#: lib/profilelist.php:128
-msgid "Tags"
-msgstr "Tags"
+#: actions/profilesettings.php:221 actions/register.php:223
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "O teu Bio é demasiado longo (max 140 car.)."
 
-#: ../lib/searchaction.php:104
-#: lib/searchaction.php:104
-msgid "Text"
-msgstr "Texto"
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr "Fuso Horario non seleccionado"
 
-#: ../actions/noticesearch.php:34
-#: actions/noticesearch.php:34
-#: actions/noticesearch.php:33
-msgid "Text search"
-msgstr "Procura de texto"
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr "A Linguaxe é demasiado longa (max 50 car.)."
 
-#: ../actions/openidsettings.php:140
-#: actions/openidsettings.php:149
-msgid "That OpenID does not belong to you."
-msgstr "Ese OpenID non che pertence."
+#: actions/profilesettings.php:246 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Etiqueta inválida: '%s'"
 
-#: ../actions/confirmaddress.php:52
-#: actions/confirmaddress.php:52
-msgid "That address has already been confirmed."
-msgstr "Esa dirección xa foi confirmada."
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
+msgstr "Non se puido actualizar o usuario para autosuscrición."
 
-#: ../actions/confirmaddress.php:43
-#: actions/confirmaddress.php:43
-msgid "That confirmation code is not for you!"
-msgstr "¡Ese código de confirmación non é para ti!"
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+msgstr "Non se puido gardar o perfil."
 
-#: ../actions/emailsettings.php:191
-#: actions/emailsettings.php:209
-#: actions/emailsettings.php:215
-msgid "That email address already belongs to another user."
-msgstr "Este enderezo de correo xa pertence a outro usuario."
+#: actions/profilesettings.php:336
+msgid "Couldn't save tags."
+msgstr "Non se puideron gardar as etiquetas."
 
-#: ../actions/avatar.php:80
-#: actions/profilesettings.php:317
-#: actions/profilesettings.php:363
-msgid "That file is too big."
-msgstr "Ese arquivo é demasiado grande."
+#: actions/profilesettings.php:344
+msgid "Settings saved."
+msgstr "Configuracións gardadas."
 
-#: ../actions/imsettings.php:170
-#: actions/imsettings.php:178
-#: actions/imsettings.php:183
-msgid "That is already your Jabber ID."
-msgstr "Xa é a túa conta de Jabber."
+#: actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
 
-#: ../actions/emailsettings.php:188
-#: actions/emailsettings.php:206
-#: actions/emailsettings.php:212
-msgid "That is already your email address."
-msgstr "Xa é o teu enderezo de correo."
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
+msgstr "Non se pudo recuperar a liña de tempo publica."
 
-#: ../actions/smssettings.php:188
-#: actions/smssettings.php:196
-#: actions/smspostsettings.php:83
-#: actions/smssettings.php:198
-#: actions/smspostsettings.php:88
-msgid "That is already your phone number."
-msgstr "Xa é o teu número de teléfono."
+#: actions/public.php:129
+#, fuzzy, php-format
+msgid "Public timeline, page %d"
+msgstr "Liña de tempo pública"
 
-#: ../actions/imsettings.php:233
-#: actions/imsettings.php:241
-#: actions/imsettings.php:246
-msgid "That is not your Jabber ID."
-msgstr "Esa non é a túa conta Jabber."
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr "Liña de tempo pública"
 
-#: ../actions/emailsettings.php:249
-#: actions/emailsettings.php:267
-#: actions/emailsettings.php:271
-msgid "That is not your email address."
-msgstr "Esa non é a túa dirección de correo."
+#: actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Sindicación do Fio Público"
 
-#: ../actions/smssettings.php:257
-#: actions/smssettings.php:265
-#: actions/smspostsettings.php:113
-#: actions/smssettings.php:267
-#: actions/smspostsettings.php:118
-msgid "That is not your phone number."
-msgstr "Ese non é o teu número de teléfono."
+#: actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Sindicación do Fio Público"
 
-#: ../actions/emailsettings.php:226
-#: ../actions/imsettings.php:210
-#: actions/emailsettings.php:244
-#: actions/imsettings.php:218
-#: actions/emailsettings.php:248
-#: actions/imsettings.php:223
-msgid "That is the wrong IM address."
-msgstr "Esa é unha enderezo IM incorrecto."
+#: actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Sindicación do Fio Público"
 
-#: ../actions/smssettings.php:233
-#: actions/smssettings.php:241
-#: actions/smssettings.php:243
-msgid "That is the wrong confirmation number."
-msgstr "Ese é un número de confirmación incorrecto."
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
 
-#: ../actions/smssettings.php:191
-#: actions/smssettings.php:199
-#: actions/smspostsettings.php:86
-#: actions/smssettings.php:201
-#: actions/smspostsettings.php:91
-msgid "That phone number already belongs to another user."
-msgstr "O número de teléfono xa pertence a outro usuario."
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
 
-#: ../actions/newnotice.php:49
-#: ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49
-#: actions/twitapistatuses.php:330
-#: actions/newnotice.php:61
-#: actions/newsmsnotice.php:73
-#: actions/twitapistatuses.php:271
-#: actions/newsmsnotice.php:79
-msgid "That's too long. Max notice size is 140 chars."
-msgstr "Iso é demasiado longo. O tamaño máximo para un chío é de 140 caracteres."
-
-#: ../actions/twitapiaccount.php:74
-#: actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:58
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "Iso é demasiado longo. O tamaño máximo para un chío é de 255 caracteres."
-
-#: ../actions/confirmaddress.php:92
-#: actions/confirmaddress.php:92
+#: actions/public.php:186
 #, php-format
-msgid "The address \"%s\" has been confirmed for your account."
-msgstr "A dirección \"%s\" xa foi confirmada para a túa conta."
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+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
-#: actions/emailsettings.php:286
-#: actions/imsettings.php:263
-#: actions/smspostsettings.php:128
-#: actions/smssettings.php:284
-#: actions/smspostsettings.php:133
-msgid "The address was removed."
-msgstr "Enderezo eliminado."
+#: actions/public.php:233
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
+msgstr ""
+"Esto é %%site.name%%, un servizo de [micro-blogging](http://en.wikipedia.org/"
+"wiki/Micro-blogging) basado na ferramenta de código aberto [StatusNet]"
+"(http://status.net/). [Únete agora](%%action.register%%) para compartir "
+"chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
 
-#: ../actions/userauthorization.php:312
-#: actions/userauthorization.php:324
-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 "A subscrición foi autorizada, pero ningunha URL de retorno foi proporcionada. Comproba coas instruccións do sitio para máis detalles en como autorizar subscricións. O teu token de subscrición é:"
+#: actions/public.php:238
+#, fuzzy, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
+msgstr ""
+"Esto é %%site.name%%, un servizo de [micro-blogging](http://en.wikipedia.org/"
+"wiki/Micro-blogging) basado na ferramenta de código aberto [StatusNet]"
+"(http://status.net/). [Únete agora](%%action.register%%) para compartir "
+"chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
+
+#: actions/publictagcloud.php:57
+#, fuzzy
+msgid "Public tag cloud"
+msgstr "Sindicación do Fio Público"
 
-#: ../actions/userauthorization.php:322
-#: actions/userauthorization.php:334
-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 "The subscription has been rejected, but no callback URL was passed. Check with the site's instructions for details on how to fully reject the subscription."
+#: actions/publictagcloud.php:63
+#, php-format
+msgid "These are most popular recent tags on %s "
+msgstr ""
 
-#: ../actions/subscribers.php:35
-#: actions/subscribers.php:35
+#: actions/publictagcloud.php:69
 #, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr "Esa é a xente que escoita os chíos de %s."
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
+msgstr ""
 
-#: ../actions/subscribers.php:33
-#: actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr "Esa é a xente que escoita os teus chíos."
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
+msgstr ""
 
-#: ../actions/subscriptions.php:35
-#: actions/subscriptions.php:35
+#: actions/publictagcloud.php:75
 #, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr "Esta é a xente á que lle estas a escoitar os chíos %s."
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
 
-#: ../actions/subscriptions.php:33
-#: actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr "Esa é a xente á que lle estas a escoitar os seus chíos"
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
+msgstr ""
 
-#: ../actions/invite.php:89
-#: actions/invite.php:96
-msgid "These people are already users and you were automatically subscribed to them:"
-msgstr "Esta xente xa é usuario e ti foches suscrito automaticamente a eles:"
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "¡Xa estás logueado!"
+
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "Ningún código de recuperación."
+
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "Non é un código de recuperación."
+
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr "Código de recuperación para usuario descoñecido."
 
-#: ../actions/recoverpassword.php:88
-#: actions/recoverpassword.php:91
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "Acounteceu un erro co código de confirmación."
+
+#: actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr "Ese código de confirmación é demasiado antigo. Comeza de novo."
 
-#: ../lib/openid.php:195
-#: lib/openid.php:195
-msgid "This form should automatically submit itself. If not, click the submit button to go to your OpenID provider."
-msgstr "Este formulario debería enviarse automáticamente. Se non é así, fai clic no botón de enviar para ir ó teu proveedro 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 "Esta é a primeria vez que accedes a %s polo que debes conectar o teu enderezo OpenID á conta local. Podes ademáis crear unha nova conta, ou conectarte cunha existente, se xa tes unha."
-
-#: ../actions/twitapifriendships.php:108
-#: ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127
-#: actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
-#: actions/twitapifavorites.php:94
-#: actions/twitapifriendships.php:82
-#: actions/twitapistatuses.php:428
-msgid "This method requires a POST or DELETE."
-msgstr "Este método require un POST ou DELETE."
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
+msgstr "Non se puido actualizar o usuario coa dirección de correo electrónico."
 
-#: ../actions/twitapiaccount.php:65
-#: ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381
-#: actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114
-#: actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303
-#: actions/twitapiaccount.php:49
-#: actions/twitapidirect_messages.php:117
-#: actions/twitapifriendships.php:30
-#: actions/twitapistatuses.php:239
-msgid "This method requires a POST."
-msgstr "Este método require un POST."
+#: actions/recoverpassword.php:152
+msgid ""
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
+msgstr ""
 
-#: ../lib/util.php:164
-#: lib/util.php:246
-#: lib/util.php:263
-msgid "This page is not available in a media type you accept"
-msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
+msgstr ""
 
-#: ../actions/profilesettings.php:63
-#: actions/profilesettings.php:96
-#: actions/profilesettings.php:109
-msgid "Timezone"
-msgstr "Fuso Horario"
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
+msgstr ""
 
-#: ../actions/profilesettings.php:107
-#: actions/profilesettings.php:222
-#: actions/profilesettings.php:241
-msgid "Timezone not selected."
-msgstr "Fuso Horario non seleccionado"
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
+msgstr ""
 
-#: ../actions/remotesubscribe.php:43
-#: actions/remotesubscribe.php:51
-#, 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 "Para subscribirse, podes [acceder](%%action.login%%), ou [rexistrar](%%action.register%%) unha nova conta. Se xa tes unha conta nun  [sitio de microblogaxe compatíbel](%%doc.openmublog%%),  insire a dirección do perfil abaixo."
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
+msgstr "O teu alcume neste servidor, ou o teu enderezo rexistrado."
 
-#: ../actions/twitapifriendships.php:163
-#: actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:128
-msgid "Two user ids or screen_names must be supplied."
-msgstr "Dous identificadores de usuario ou nomes_en_pantalla deben ser proporcionados."
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
+msgstr "Recuperar"
 
-#: ../actions/profilesettings.php:48
-#: ../actions/register.php:169
-#: actions/profilesettings.php:81
-#: actions/register.php:183
-#: actions/profilesettings.php:83
-#: actions/register.php:210
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "Enderezo da túa páxina persoal, blogue, ou perfil noutro sitio"
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "Restaurar contrasinal"
 
-#: ../actions/remotesubscribe.php:74
-#: actions/remotesubscribe.php:83
-msgid "URL of your profile on another compatible microblogging service"
-msgstr "Enderezo do teu perfil en outro servizo de microblogaxe compatíbel"
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr "Recuperar contrasinal"
 
-#: ../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
-#: actions/emailsettings.php:148
-#: actions/imsettings.php:121
-#: actions/othersettings.php:146
-#: actions/smspostsettings.php:64
-#: actions/smssettings.php:145
-#: actions/twittersettings.php:199
-#: actions/smspostsettings.php:69
-msgid "Unexpected form submission."
-msgstr "Envio de formulario non esperada."
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
+msgstr "Petición de recuperación de contrasinal"
+
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
+msgstr "Acción descoñecida"
+
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 ou máis caracteres, non o esquenzas!"
 
-#: ../actions/recoverpassword.php:276
-#: actions/recoverpassword.php:289
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Igual que a contrasinal de enriba"
+
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "Restaurar"
+
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "Insire o teu alcume ou enderezo de correo."
+
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
+msgstr "Non hai ningún usuario con isa dirección de correo ou nome de usuario."
+
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr "Non hai un enderezo de correo rexistrado para ese usuario."
+
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "Acounteceu un erro gardando a confirmación de enderezo."
+
+#: actions/recoverpassword.php:325
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr ""
+"As instruccións para recuperar a túa contrasinal foron enviadas ó enderezo "
+"de correo da túa conta."
+
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
 msgstr "Restauración de contrasinal non esperada."
 
-#: ../index.php:57
-#: index.php:57
-msgid "Unknown action"
-msgstr "Acción descoñecida"
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "A contrasinal debe ter 6 caracteres ou máis."
 
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60
-#: actions/finishremotesubscribe.php:59
-msgid "Unknown version of OMB protocol."
-msgstr "Versión de protocolo OMB descoñecida."
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
+msgstr "A contrasinal e a súa confirmación non coinciden."
 
-#: ../lib/util.php:269
-#: lib/util.php:285
-#: lib/util.php:302
-msgid "Unless otherwise specified, contents of this site are copyright by the contributors and available under the "
-msgstr "Aínda que especifiques outro, os contidos de este sitio teñen copyright polos contribuidores e está dispoñible baixo "
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
+msgstr "A nova contrasinal gardouse correctamente. Xa estas logueado."
 
-#: ../actions/confirmaddress.php:48
-#: actions/confirmaddress.php:48
-#, php-format
-msgid "Unrecognized address type %s"
-msgstr "Tipo de enderezo %s non recoñecido"
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
+msgstr "Desculpa, só se pode rexistrar a xente con invitación."
 
-#: ../actions/showstream.php:209
-#: actions/showstream.php:219
-#: actions/showstream.php:267
-#: lib/util.php:2153
-msgid "Unsubscribe"
-msgstr "Eliminar subscrición"
+#: actions/register.php:92
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "Acounteceu un erro co código de confirmación."
 
-#: ../actions/postnotice.php:44
-#: ../actions/updateprofile.php:45
-#: actions/postnotice.php:45
-#: actions/updateprofile.php:46
-msgid "Unsupported OMB version"
-msgstr "Versión OMB non soportada"
+#: actions/register.php:112
+msgid "Registration successful"
+msgstr "Xa estas rexistrado!!"
 
-#: ../actions/avatar.php:105
-#: actions/profilesettings.php:342
-#: actions/profilesettings.php:388
-msgid "Unsupported image file format."
-msgstr "Formato de ficheiro de imaxe non soportado."
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "Rexistrar"
 
-#: ../lib/settingsaction.php:100
-#: lib/settingsaction.php:94
-#: actions/deleteprofile.php:251
-msgid "Updates by SMS"
-msgstr "Chíos dende SMS"
+#: actions/register.php:135
+msgid "Registration not allowed."
+msgstr "Non se permite o rexistro neste intre."
 
-#: ../lib/settingsaction.php:103
-#: lib/settingsaction.php:97
-#: actions/deleteprofile.php:254
-#: lib/settingsaction.php:101
-#: lib/settingsaction.php:103
-msgid "Updates by instant messenger (IM)"
-msgstr "Chíos dende mensaxería instantánea (IM)"
+#: actions/register.php:198
+msgid "You can't register if you don't agree to the license."
+msgstr "Non podes rexistrarte se non estas de acordo coa licenza."
 
-#: ../actions/twitapistatuses.php:241
-#: actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:126
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr "Actualizacións dende %1$s e amigos en %2$s!"
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "Non é un enderezo de correo válido."
 
-#: ../actions/twitapistatuses.php:341
-#: actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:198
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr "Actualizacións dende %1$s en %2$s!"
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "O enderezo de correo xa existe."
 
-#: ../actions/avatar.php:68
-#: actions/profilesettings.php:161
-#: actions/profilesettings.php:178
-msgid "Upload"
-msgstr "Subir"
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "Usuario ou contrasinal inválidos."
 
-#: ../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 "Sube un novo \"avatar\" (imaxe de usuario) dende aquí. Non podes editar a imaxe despois de subila, polo que asegurate de que é máis ou menos cadrado. Debe estar baixo a licenza do sistio. Emprega unha imaxe que che pertenza e que queiras compartir."
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr "Subir unha nova imaxe de usuario"
-
-#: ../actions/invite.php:114
-#: actions/invite.php:121
-msgid "Use this form to invite your friends and colleagues to use this service."
-msgstr "Emprega este formulario para invitar ós teus amigos e colegas a empregar este servizo."
-
-#: ../actions/register.php:159
-#: ../actions/register.php:162
-#: actions/register.php:173
-#: actions/register.php:176
-#: actions/register.php:200
-#: actions/register.php:203
-msgid "Used only for updates, announcements, and password recovery"
-msgstr "Empregado só para actualizacións, novidades, e recuperación de contrasinais"
+#: actions/register.php:342
+#, fuzzy
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+"Neste formulario podes crear unha conta de usuario. Logo poderás publicar "
+"chíos, e suscribirte a amigos. (Tes unha conta [OpenID](http://openid.net/)? "
+"Proba o noso [Rexistro OpenID](%%action.openidlogin%%)!)"
 
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88
-#: actions/finishremotesubscribe.php:92
-msgid "User being listened to doesn't exist."
-msgstr "O usuario  que está sendo escoitado non existe."
+#: actions/register.php:424
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+"De 1 a 64 letras minúsculas ou números, nin espazos nin signos de "
+"puntuación. Requerido."
 
-#: ../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
-#: actions/showstream.php:57
-#: actions/twitapiaccount.php:66
-#: actions/twitapifavorites.php:40
-#: actions/twitapistatuses.php:163
-#: actions/twitapistatuses.php:492
-#: actions/twitapiusers.php:53
-msgid "User has no profile."
-msgstr "O usuario non ten perfil."
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr "6 ou máis caracteres. Requerido."
 
-#: ../actions/remotesubscribe.php:71
-#: actions/remotesubscribe.php:80
-msgid "User nickname"
-msgstr "Alcume de usuario"
+#: actions/register.php:433
+msgid "Same as password above. Required."
+msgstr "A mesma contrasinal que arriba. Requerido."
 
-#: ../actions/twitapiusers.php:75
-#: actions/twitapiusers.php:80
-msgid "User not found."
-msgstr "Usuario non atopado."
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "Correo Electrónico"
 
-#: ../actions/profilesettings.php:63
-#: actions/profilesettings.php:96
-#: actions/profilesettings.php:109
-msgid "What timezone are you normally in?"
-msgstr "En que fuso horario estas normalmente?"
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
+msgstr ""
+"Empregado só para actualizacións, novidades, e recuperación de contrasinais"
 
-#: ../lib/util.php:1159
-#: lib/util.php:1293
-#: lib/util.php:1689
-#, php-format
-msgid "What's up, %s?"
-msgstr "¿Que pasa, %s?"
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
+msgstr "Nome máis longo, preferiblemente o teu nome \"real\""
 
-#: ../actions/profilesettings.php:54
-#: ../actions/register.php:175
-#: actions/profilesettings.php:87
-#: actions/register.php:189
-#: actions/profilesettings.php:89
-#: actions/register.php:216
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "¿Onde estas, coma \"Cidade, Provincia, País\""
+#: actions/register.php:493
+msgid "My text and files are available under "
+msgstr "O meu texto e arquivos están dispoñibles baixo licenza "
+
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
 
-#: ../actions/updateprofile.php:128
-#: actions/updateprofile.php:129
+#: actions/register.php:496
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+" agás esta informción privada: contrasinal, dirección de correo electrónico, "
+"dirección IM, número de teléfono."
+
+#: actions/register.php:537
 #, php-format
-msgid "Wrong image type for '%s'"
-msgstr "Tipo de imaxe incorrecto para '%s'"
+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 ""
+"Noraboa, %s! e benvido a %%%%site.name%%%%. Dende aquí, podes...\n"
+"\n"
+"* Ír ó [teu perfil](%s) e enviar o teu primeiro chío.\n"
+"* Engadir unha [conta de Jabber/Gtalk](%%%%action.imsettings%%%%) para "
+"enviar os teus chíos a través de mensaxería instantánea.\n"
+"* [Buscar xente ](%%%%action.peoplesearch%%%%) que poidas coñecer ou que "
+"comparta os teus intereses. \n"
+"* Actualizar as túas [preferencias no perfil](%%%%action.profilesettings%%%"
+"%) para decirlle a outros máis sobre ti. \n"
+"* Ler os [manuais en liña](%%%%doc.help%%%%) para ollar máis cousas que "
+"podes facer aquí. \n"
+"\n"
+"Grazas por rexistrarte e esperamos que laretexes moito."
 
-#: ../actions/updateprofile.php:123
-#: actions/updateprofile.php:124
+#: actions/register.php:561
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+"(Deberías recibir unha mensaxe no teu email nun intre, coas instrucións de "
+"como confirmar a túa dirección de correo.)"
+
+#: actions/remotesubscribe.php:98
 #, php-format
-msgid "Wrong size image at '%s'"
-msgstr "Tamaño de imaxe incorrecto en '%s'"
+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 ""
+"Para subscribirse, podes [acceder](%%action.login%%), ou [rexistrar](%%"
+"action.register%%) unha nova conta. Se xa tes unha conta nun  [sitio de "
+"microblogaxe compatíbel](%%doc.openmublog%%),  insire a dirección do perfil "
+"abaixo."
 
-#: ../actions/deletenotice.php:63
-#: ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64
-#: actions/deletenotice.php:79
-#: actions/block.php:105
-msgid "Yes"
-msgstr "Si"
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr "Suscrición remota"
 
-#: ../actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:64
-msgid "You already have this OpenID!"
-msgstr "¡Xa tes esa OpenID!"
+#: actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Suscrito a %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 "Vas a eliminar permanentemente este chío. Unha vez feito, xa non hai volta atrás... Quedas avisado!"
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "Alcume de usuario"
 
-#: ../actions/recoverpassword.php:31
-#: actions/recoverpassword.php:31
-msgid "You are already logged in!"
-msgstr "¡Xa estás logueado!"
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr "Alcume de usuario que queres"
 
-#: ../actions/invite.php:81
-#: actions/invite.php:88
-msgid "You are already subscribed to these users:"
-msgstr "Xa estas suscrito a estes usuarios:"
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "Enderezo de perfil"
 
-#: ../actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:102
-msgid "You are not friends with the specified user."
-msgstr "No tes amigos con un usuario específico."
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "Enderezo do teu perfil en outro servizo de microblogaxe compatíbel"
 
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr "Podes cambiar a túa contrasinal aquí. ¡Escolle unha boa!"
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
+msgstr "Subscribir"
 
-#: ../actions/register.php:135
-#: actions/register.php:145
-msgid "You can create a new account to start posting notices."
-msgstr "Podes crear unha nova conta para comezar a escribir chíos."
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr "Enderezo de perfil inválido (formato incorrecto)"
 
-#: ../actions/smssettings.php:28
-#: actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "Podes recibir mensaxes SMS a través do email dende %%site.name%%."
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "Non é un enderezo de perfil válido (non ten documento YADIS)."
 
-#: ../actions/openidsettings.php:86
-#: actions/openidsettings.php:87
-msgid "You can remove an OpenID from your account by clicking the button marked \"Remove\"."
-msgstr "Podes eliminar unha OpenID da túa conta facendo clic no botón marcado \"Eliminar\"."
+#: actions/remotesubscribe.php:176
+#, fuzzy
+msgid "That’s a local profile! Login to subscribe."
+msgstr "Este é un perfil local! Rexístrate para suscribirte."
+
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "Non se puido recoller o token de petición."
 
-#: ../actions/imsettings.php:28
-#: actions/imsettings.php:28
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
 #, php-format
-msgid "You can send and receive notices through Jabber/GTalk [instant messages](%%doc.im%%). Configure your address and settings below."
-msgstr "Podes enviar e recibir chíos a través de Jabber/GTalk [mensaxes instantáneos](%%doc.im%%). Configura a túa conta e configuracións abaixo."
+msgid "Replies to %s"
+msgstr "Replies to %s"
 
-#: ../actions/profilesettings.php:27
-#: actions/profilesettings.php:27
-msgid "You can update your personal profile info here so people know more about you."
-msgstr "Podes actualizar a túa información do perfil persoal aquí para que a xente che poida coñecer mellor."
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %s, page %d"
+msgstr "Replies to %s"
 
-#: ../actions/finishremotesubscribe.php:31
-#: ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31
-#: actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:83
-#: actions/finishremotesubscribe.php:99
-msgid "You can use the local subscription!"
-msgstr "¡Podes empregar a túa subscrición local!"
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Fonte de chíos para %s"
 
-#: ../actions/finishopenidlogin.php:33
-#: ../actions/register.php:61
-#: actions/finishopenidlogin.php:38
-#: actions/register.php:68
-#: actions/register.php:77
-msgid "You can't register if you don't agree to the license."
-msgstr "Non podes rexistrarte se non estas de acordo coa licenza."
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Fonte de chíos para %s"
 
-#: ../actions/updateprofile.php:63
-#: actions/updateprofile.php:64
-msgid "You did not send us that profile"
-msgstr "Non nos enviaches ese perfil"
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Fonte de chíos para %s"
 
-#: ../lib/mail.php:147
-#: lib/mail.php:141
+#: actions/replies.php:198
 #, 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"
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
 msgstr ""
-"Tes unha nova dirección de envio de mensaxes en %1$s.\n"
-"\n"
-"Envia unha mensaxe a %2$s para enviar novas mensaxes.\n"
-"\n"
-"Hai máis instruccións de envio en %3$s.\n"
-"\n"
-"Sempre teu...,\n"
-"%4$s"
 
-#: ../actions/twitapistatuses.php:612
-#: actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:455
-msgid "You may not delete another user's status."
-msgstr "Non deberías eliminar o estado de outro usuario"
+#: actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
 
-#: ../actions/invite.php:31
-#: actions/invite.php:31
+#: actions/replies.php:205
 #, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%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 "Notificaráseche cando os teus invitados acepten unha invitación e se rexistren neste sitio. Grazas por facer crecer o gremio lareteiro!"
-
-#: ../actions/recoverpassword.php:149
-#: actions/recoverpassword.php:154
-msgid "You've been identified. Enter a  new password below. "
-msgstr "Foiches identificado. Insire unha nova contrasinal abaixo."
-
-#: ../actions/openidlogin.php:67
-#: actions/openidlogin.php:76
-#: actions/login.php:127
-#: actions/openidlogin.php:84
-msgid "Your OpenID URL"
-msgstr "O teu enderezo OpenID"
-
-#: ../actions/recoverpassword.php:164
-#: actions/recoverpassword.php:169
-msgid "Your nickname on this server, or your registered email address."
-msgstr "O teu alcume neste servidor, ou o teu enderezo rexistrado."
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Mensaxe de %1$s en %2$s"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "Chíos favoritos de %s"
+
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
+msgstr "Non se pode "
 
-#: ../actions/openidsettings.php:28
-#: actions/openidsettings.php:28
+#: actions/showfavorites.php:170
 #, 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%%) permiteche acceder en moitos sitios coa mesma conta. Xestina os teus OpenIDs asociados dende aquí."
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Fonte para os amigos de %s"
 
-#: ../lib/util.php:943
-#: lib/util.php:992
-#: lib/util.php:1349
-msgid "a few seconds ago"
-msgstr "fai uns segundos"
+#: actions/showfavorites.php:177
+#, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Fonte para os amigos de %s"
 
-#: ../lib/util.php:955
-#: lib/util.php:1004
-#: lib/util.php:1361
+#: actions/showfavorites.php:184
 #, php-format
-msgid "about %d days ago"
-msgstr "fai %d días"
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Fonte para os amigos de %s"
+
+#: actions/showfavorites.php:205
+msgid ""
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
+msgstr ""
 
-#: ../lib/util.php:951
-#: lib/util.php:1000
-#: lib/util.php:1357
+#: actions/showfavorites.php:207
 #, php-format
-msgid "about %d hours ago"
-msgstr "fai %d horas"
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
 
-#: ../lib/util.php:947
-#: lib/util.php:996
-#: lib/util.php:1353
+#: actions/showfavorites.php:211
 #, php-format
-msgid "about %d minutes ago"
-msgstr "fai %d minutos"
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
 
-#: ../lib/util.php:959
-#: lib/util.php:1008
-#: lib/util.php:1365
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:82 lib/groupnav.php:86
 #, php-format
-msgid "about %d months ago"
-msgstr "fai %d meses"
+msgid "%s group"
+msgstr ""
 
-#: ../lib/util.php:953
-#: lib/util.php:1002
-#: lib/util.php:1359
-msgid "about a day ago"
-msgstr "fai un día"
+#: actions/showgroup.php:84
+#, php-format
+msgid "%s group, page %d"
+msgstr ""
 
-#: ../lib/util.php:945
-#: lib/util.php:994
-#: lib/util.php:1351
-msgid "about a minute ago"
-msgstr "fai un minuto"
+#: actions/showgroup.php:218
+#, fuzzy
+msgid "Group profile"
+msgstr "Non existe o perfil."
 
-#: ../lib/util.php:957
-#: lib/util.php:1006
-#: lib/util.php:1363
-msgid "about a month ago"
-msgstr "fai un mes"
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
+msgid "URL"
+msgstr ""
 
-#: ../lib/util.php:961
-#: lib/util.php:1010
-#: lib/util.php:1367
-msgid "about a year ago"
-msgstr "fai un ano"
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
+#, fuzzy
+msgid "Note"
+msgstr "Chíos"
 
-#: ../lib/util.php:949
-#: lib/util.php:998
-#: lib/util.php:1355
-msgid "about an hour ago"
-msgstr "fai unha hora"
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
 
-#: ../actions/showstream.php:423
-#: ../lib/stream.php:132
-#: actions/showstream.php:441
-#: lib/stream.php:99
-#: lib/noticelist.php:211
-msgid "delete"
-msgstr "eliminar"
+#: actions/showgroup.php:293
+#, fuzzy
+msgid "Group actions"
+msgstr "Outras opcions"
 
-#: ../actions/noticesearch.php:130
-#: ../actions/showstream.php:408
-#: ../lib/stream.php:117
-#: actions/noticesearch.php:136
-#: actions/showstream.php:426
-#: lib/stream.php:84
-#: actions/noticesearch.php:135
-#: lib/facebookaction.php:202
-#: lib/noticelist.php:189
-msgid "in reply to..."
-msgstr "en contestación a..."
-
-#: ../actions/noticesearch.php:137
-#: ../actions/showstream.php:415
-#: ../lib/stream.php:124
-#: actions/noticesearch.php:143
-#: actions/showstream.php:433
-#: lib/stream.php:91
-#: actions/noticesearch.php:142
-#: lib/noticelist.php:199
-msgid "reply"
-msgstr "contestar"
+#: actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Fonte de chíos para %s"
 
-#: ../actions/password.php:44
-#: actions/profilesettings.php:183
-#: actions/profilesettings.php:200
-msgid "same as password above"
-msgstr "igual á contrasinal de enriba"
+#: actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Fonte de chíos para %s"
 
-#: ../actions/twitapistatuses.php:755
-#: actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:543
-msgid "unsupported file type"
-msgstr "tipo de ficheiro non soportado"
+#: actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Fonte de chíos para %s"
 
-#: ../lib/util.php:1309
-#: lib/util.php:1443
-#: lib/facebookaction.php:251
-#: lib/util.php:1842
-msgid "« After"
-msgstr "« Despois"
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "Band. Saída para %s"
 
-#: 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
-#: actions/block.php:38
-#: actions/deleteprofile.php:127
-#: actions/disfavor.php:47
-#: actions/emailsettings.php:131
-#: actions/favor.php:49
-#: actions/imsettings.php:108
-#: actions/login.php:45
-#: actions/newmessage.php:44
-#: actions/newnotice.php:36
-#: actions/nudge.php:47
-#: actions/othersettings.php:139
-#: actions/profilesettings.php:49
-#: actions/smssettings.php:126
-#: actions/subedit.php:38
-#: actions/tagother.php:113
-#: actions/twittersettings.php:188
-#: actions/unblock.php:38
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
+#, fuzzy
+msgid "Members"
+msgstr "Membro dende"
 
-#: actions/disfavor.php:55
-msgid "This notice is not a favorite!"
-msgstr "Este chío non é un favorito!"
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/tagcloudsection.php:71
+#, fuzzy
+msgid "(None)"
+msgstr "(nada)"
 
-#: actions/disfavor.php:63
-msgid "Could not delete favorite."
-msgstr "Non se puido eliminar o favorito."
+#: actions/showgroup.php:392
+msgid "All members"
+msgstr ""
 
-#: actions/disfavor.php:72
-msgid "Favor"
-msgstr "Gostame"
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "Estatísticas"
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
-msgstr "Enviar un correo cando alguen enganda un chío meu coma favorito."
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Crear"
 
-#: actions/emailsettings.php:95
-msgid "Send me email when someone sends me a private message."
-msgstr "Enviarme un email cando alguén me envíe unha mensaxe privada."
+#: actions/showgroup.php:448
+#, fuzzy, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+"Esto é %%site.name%%, un servizo de [micro-blogging](http://en.wikipedia.org/"
+"wiki/Micro-blogging) basado na ferramenta de código aberto [StatusNet]"
+"(http://status.net/). [Únete agora](%%action.register%%) para compartir "
+"chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
 
-#: actions/favor.php:53
-#: actions/twitapifavorites.php:142
-#: actions/favor.php:54
-#: actions/twitapifavorites.php:115
-msgid "This notice is already a favorite!"
-msgstr "Este chío xa é un favorito!"
+#: actions/showgroup.php:454
+#, fuzzy, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
+msgstr ""
+"Esto é %%site.name%%, un servizo de [micro-blogging](http://en.wikipedia.org/"
+"wiki/Micro-blogging) basado na ferramenta de código aberto [StatusNet]"
+"(http://status.net/). [Únete agora](%%action.register%%) para compartir "
+"chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
 
-#: actions/favor.php:60
-#: actions/twitapifavorites.php:151
-#: classes/Command.php:132
-#: actions/favor.php:61
-#: actions/twitapifavorites.php:122
-msgid "Could not create favorite."
-msgstr "Non se puido crear o favorito."
+#: actions/showgroup.php:482
+msgid "Admins"
+msgstr ""
 
-#: actions/favor.php:70
-msgid "Disfavor"
-msgstr "Non me gosta"
+#: actions/showmessage.php:81
+msgid "No such message."
+msgstr "Non existe a mensaxe."
 
-#: actions/favoritesrss.php:60
-#: actions/showfavorites.php:47
-#: actions/favoritesrss.php:62
-#, php-format
-msgid "%s favorite notices"
-msgstr "%s chíos favoritos"
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient may read this message."
+msgstr "Só o emisor e destinatario poden ler esta mensaxe."
 
-#: actions/favoritesrss.php:64
-#: actions/favoritesrss.php:66
+#: actions/showmessage.php:108
 #, php-format
-msgid "Feed of favorite notices of %s"
-msgstr "Fonte para os chíos favoritos de %s"
+msgid "Message to %1$s on %2$s"
+msgstr "Mensaxe de %1$s en %2$s"
 
-#: actions/inbox.php:28
+#: actions/showmessage.php:113
 #, php-format
-msgid "Inbox for %s - page %d"
+msgid "Message from %1$s on %2$s"
+msgstr "Mensaxe dende %1$s en %2$s"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Chío publicado"
+
+#: actions/showstream.php:73
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "Chíos tagueados con %s"
+
+#: actions/showstream.php:79
+#, fuzzy, php-format
+msgid "%s, page %d"
 msgstr "Band. Entrada para %s - páxina %d"
 
-#: actions/inbox.php:30
+#: actions/showstream.php:122
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Fonte de chíos para %s"
+
+#: actions/showstream.php:129
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Fonte de chíos para %s"
+
+#: actions/showstream.php:136
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Fonte de chíos para %s"
+
+#: actions/showstream.php:143
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Fonte de chíos para %s"
+
+#: actions/showstream.php:148
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Band. Saída para %s"
+
+#: actions/showstream.php:191
 #, php-format
-msgid "Inbox for %s"
-msgstr "Band. Entrada para %s"
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
 
-#: actions/inbox.php:53
-msgid "This is your inbox, which lists your incoming private messages."
-msgstr "Esta é a túa bandexa de entrada, aquí móstranse as túas mensaxes privadas."
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
 
-#: actions/invite.php:178
+#: actions/showstream.php:198
 #, php-format
 msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-msgstr "Acabas de invitar a %1$s a unirse a %2$s (%3$s).\n"
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
 
-#: actions/login.php:104
-msgid "Automatically login in the future; "
-msgstr "Loguearse automáticamente no futuro:"
+#: actions/showstream.php:234
+#, fuzzy, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+"Esto é %%site.name%%, un servizo de [micro-blogging](http://en.wikipedia.org/"
+"wiki/Micro-blogging) basado na ferramenta de código aberto [StatusNet]"
+"(http://status.net/). [Únete agora](%%action.register%%) para compartir "
+"chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
 
-#: actions/login.php:122
-msgid "For security reasons, please re-enter your "
-msgstr "Por razóns de seguranza, por favor re-insire o teu "
+#: actions/showstream.php:239
+#, fuzzy, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
+msgstr ""
+"Esto é %%site.name%%, un servizo de [micro-blogging](http://en.wikipedia.org/"
+"wiki/Micro-blogging) basado na ferramenta de código aberto [StatusNet]"
+"(http://status.net/). [Únete agora](%%action.register%%) para compartir "
+"chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
 
-#: actions/login.php:126
-msgid "Login with your username and password. "
-msgstr "Accede co teu nome de usuario e contrasinal."
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "Configuracións de SMS"
 
-#: actions/newmessage.php:58
-#: actions/twitapidirect_messages.php:130
-#: actions/newmessage.php:60
-#: actions/twitapidirect_messages.php:136
-msgid "That's too long. Max message size is 140 chars."
-msgstr "Iso é demasiado longo. O tamaño máximo para unha mensaxe é de 140 caracteres."
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr "Podes recibir mensaxes SMS a través do email dende %%site.name%%."
 
-#: actions/newmessage.php:65
-#: actions/newmessage.php:68
-msgid "No recipient specified."
-msgstr "Non se especificou ningún destinatario"
+#: actions/smssettings.php:91
+msgid "SMS is not available."
+msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
 
-#: actions/newmessage.php:68
-#: actions/newmessage.php:113
-#: classes/Command.php:206
-#: actions/newmessage.php:71
-#: actions/newmessage.php:116
-#: classes/Command.php:211
-msgid "You can't send a message to this user."
-msgstr "Non podes enviar mensaxes a este usurio."
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Número de teléfono actual confirmado mediante SMS."
 
-#: actions/newmessage.php:71
-#: actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
-#: actions/newmessage.php:74
-#: actions/twitapidirect_messages.php:153
-#: classes/Command.php:214
-msgid "Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "Non te envies mensaxes a ti mesmo!! só fala contigo mesmo baixiño, senón vante tomar por tolo."
-
-#: actions/newmessage.php:108
-#: actions/microsummary.php:32
-#: actions/newmessage.php:111
-msgid "No such user"
-msgstr "Non é o usuario"
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
+msgstr "Agardando a confirmación neste número de teléfono."
 
-#: actions/newmessage.php:117
-#: actions/newmessage.php:120
-msgid "New message"
-msgstr "Nova mensaxe"
+#: actions/smssettings.php:130
+msgid "Confirmation code"
+msgstr "Código de confirmación."
 
-#: actions/noticesearch.php:95
-#: actions/noticesearch.php:94
-msgid "Notice without matching profile"
-msgstr "Chío sen perfil coincidente"
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
+msgstr "Insire o código que recibiches no teu teléfono."
 
-#: actions/openidsettings.php:28
-#, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr "[OpenID](%%doc.openid%%) permiteche acceder en moitos sitios"
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
+msgstr "Número de Teléfono do SMS"
 
-#: actions/openidsettings.php:46
-msgid "If you want to add an OpenID to your account, "
-msgstr "Se queres engadir un enderezo OpenID á tua conta, "
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "Número de teléfono, sen puntuacións ou espazos, co código de área"
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr "Eliminando o teu enderezo OpenID serache imposíbel acceder!"
+#: actions/smssettings.php:174
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+"Enviarme chíos mediante SMS, entendo que a miña operadora poida cobrarme "
+"grandes facturas."
 
-#: actions/openidsettings.php:87
-msgid "You can remove an OpenID from your account "
-msgstr "Podes eliminar un identificador OpenID da túa conta "
+#: actions/smssettings.php:306
+msgid "No phone number."
+msgstr "Non hai ningún número de teléfono."
 
-#: actions/outbox.php:28
-#, php-format
-msgid "Outbox for %s - page %d"
-msgstr "Band. Saída para %s - páxina %d"
+#: actions/smssettings.php:311
+msgid "No carrier selected."
+msgstr "Non se seleccionou unha operadora."
 
-#: actions/outbox.php:30
-#, php-format
-msgid "Outbox for %s"
-msgstr "Band. Saída para %s"
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
+msgstr "Xa é o teu número de teléfono."
 
-#: actions/outbox.php:53
-msgid "This is your outbox, which lists private messages you have sent."
-msgstr "Esta é a túa band. saída, que mostra as mensaxes privadas que enviaches."
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
+msgstr "O número de teléfono xa pertence a outro usuario."
 
-#: actions/peoplesearch.php:28
-#, php-format
-msgid "Search for people on %%site.name%% by their name, location, or interests. "
-msgstr "Procurar xente en %%site.name%% polo seu nome, localización, ou intereses. "
+#: actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"Enviouseche o código de confirmación ó número de teléfono que engadiches. "
+"Comproba a túa bandexa de entrada (ou spam!) polo código e instrucións que "
+"debes seguir."
 
-#: actions/profilesettings.php:27
-msgid "You can update your personal profile info here "
-msgstr "Podes actualizar a túa información do perfil persoal aquí"
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
+msgstr "Ese é un número de confirmación incorrecto."
 
-#: actions/profilesettings.php:115
-#: actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159
-#: actions/userrss.php:76
-#: actions/profilesettings.php:132
-#: actions/remotesubscribe.php:333
-msgid "User without matching profile"
-msgstr "Usuario sen un perfil que coincida."
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
+msgstr "Ese non é o teu número de teléfono."
+
+#: actions/smssettings.php:465
+#, fuzzy
+msgid "Mobile carrier"
+msgstr "Selecciona unha operadora"
+
+#: actions/smssettings.php:469
+msgid "Select a carrier"
+msgstr "Selecciona unha operadora"
 
-#: actions/recoverpassword.php:91
-msgid "This confirmation code is too old. "
-msgstr "Ese código de confirmación é demasiado antigo."
+#: actions/smssettings.php:476
+#, 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 ""
+"Operadora móbil do teu teléfono. Se sabes se a operadora acepta SMS sobre "
+"email e non está listada aquí, envianos unha mensaxe para incluilo en %s."
 
-#: actions/recoverpassword.php:141
-msgid "If you've forgotten or lost your"
-msgstr "Se esquenciches ou perdeches a túa"
+#: actions/smssettings.php:498
+msgid "No code entered"
+msgstr "Non se inseriu ningún código"
 
-#: actions/recoverpassword.php:154
-msgid "You've been identified. Enter a "
-msgstr "Foches identificado. Insire unha "
+#: actions/subedit.php:70
+msgid "You are not subscribed to that profile."
+msgstr "Non estás suscrito a ese perfil"
 
-#: actions/recoverpassword.php:169
-msgid "Your nickname on this server, "
-msgstr "O teu alcume neste servidor, "
+#: actions/subedit.php:83
+msgid "Could not save subscription."
+msgstr "Non se pode gardar a subscrición."
 
-#: actions/recoverpassword.php:271
-msgid "Instructions for recovering your password "
-msgstr "Instruccións para recuperar a túa contrasinal."
+#: actions/subscribe.php:55
+msgid "Not a local user."
+msgstr "Non é usuario local."
 
-#: actions/recoverpassword.php:327
-msgid "New password successfully saved. "
-msgstr "A nova contrasinal foi gardada correctamente."
+#: actions/subscribe.php:69
+msgid "Subscribed"
+msgstr "Suscrito"
 
-#: actions/register.php:95
-#: actions/register.php:104
-msgid "Password must be 6 or more characters."
-msgstr "A contrasinal debe ter 6 caracteres ou máis."
+#: actions/subscribers.php:50
+#, fuzzy, php-format
+msgid "%s subscribers"
+msgstr "Subscritores"
 
-#: actions/register.php:216
+#: actions/subscribers.php:52
 #, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may want to..."
-msgstr "Noraboa, %s! E benvido a %%%%site.name%%%%. Dende aquí, igual queres..."
+msgid "%s subscribers, page %d"
+msgstr ""
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
-msgstr "(Deberías recibir unha mensaxe no teu email nun intre, con"
+#: actions/subscribers.php:63
+msgid "These are the people who listen to your notices."
+msgstr "Esa é a xente que escoita os teus chíos."
+
+#: actions/subscribers.php:67
+#, php-format
+msgid "These are the people who listen to %s's notices."
+msgstr "Esa é a xente que escoita os chíos de %s."
+
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
+msgstr ""
 
-#: actions/remotesubscribe.php:51
+#: actions/subscribers.php:110
 #, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr "Para suscribirse, podes [loguearte](%%action.login%%),"
+msgid "%s has no subscribers. Want to be the first?"
+msgstr ""
 
-#: actions/showfavorites.php:61
+#: actions/subscribers.php:114
 #, php-format
-msgid "Feed for favorites of %s"
-msgstr "Fonte para os favoritos de %s"
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
 
-#: actions/showfavorites.php:84
-#: actions/twitapifavorites.php:85
-#: actions/showfavorites.php:88
-#: actions/twitapifavorites.php:57
-msgid "Could not retrieve favorite notices."
-msgstr "Non se pode "
+#: actions/subscriptions.php:52
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "Tódalas subscricións"
 
-#: actions/showmessage.php:33
-msgid "No such message."
-msgstr "Non existe a mensaxe."
+#: actions/subscriptions.php:54
+#, fuzzy, php-format
+msgid "%s subscriptions, page %d"
+msgstr "Tódalas subscricións"
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
-msgstr "Só o emisor e destinatario poden ler esta mensaxe."
+#: actions/subscriptions.php:65
+msgid "These are the people whose notices you listen to."
+msgstr "Esa é a xente á que lle estas a escoitar os seus chíos"
 
-#: actions/showmessage.php:61
+#: actions/subscriptions.php:69
 #, php-format
-msgid "Message to %1$s on %2$s"
-msgstr "Mensaxe de %1$s en %2$s"
+msgid "These are the people whose notices %s listens to."
+msgstr "Esta é a xente á que lle estas a escoitar os chíos %s."
 
-#: actions/showmessage.php:66
+#: actions/subscriptions.php:121
 #, php-format
-msgid "Message from %1$s on %2$s"
-msgstr "Mensaxe dende %1$s en %2$s"
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
+msgstr ""
 
-#: actions/showstream.php:154
-#: lib/util.php:2164
-msgid "Send a message"
-msgstr "Enviar unha mensaxe"
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s está a escoitar os teus chíos %2$s."
 
-#: actions/smssettings.php:312
-#, php-format
-msgid "Mobile carrier for your phone. "
-msgstr "Operadora móbil do teu teléfono."
+#: actions/subscriptions.php:194
+msgid "Jabber"
+msgstr "Jabber."
 
-#: actions/twitapidirect_messages.php:76
-#: actions/twitapidirect_messages.php:64
-#, php-format
-msgid "Direct messages to %s"
-msgstr "Mensaxes directas para %s"
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
+msgstr "SMS"
 
-#: actions/twitapidirect_messages.php:77
-#: actions/twitapidirect_messages.php:65
-#, php-format
-msgid "All the direct messages sent to %s"
-msgstr "Tódalas mensaxes directas enviadas a %s"
+#: actions/tagother.php:33
+msgid "Not logged in"
+msgstr "Non estás logueado."
 
-#: actions/twitapidirect_messages.php:81
-#: actions/twitapidirect_messages.php:69
-msgid "Direct Messages You've Sent"
-msgstr "Mensaxes Directas que Enviaches."
+#: actions/tagother.php:39
+msgid "No id argument."
+msgstr "Non hai argumento id."
 
-#: actions/twitapidirect_messages.php:82
-#: actions/twitapidirect_messages.php:70
-#, php-format
-msgid "All the direct messages sent from %s"
-msgstr "Tódalas mensaxes directas enviadas dende %s"
+#: actions/tagother.php:65
+#, fuzzy, php-format
+msgid "Tag %s"
+msgstr "Tags"
 
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:132
-msgid "No message text!"
-msgstr "Non hai mensaxes de texto!"
+#: actions/tagother.php:77 lib/userprofile.php:75
+#, fuzzy
+msgid "User profile"
+msgstr "O usuario non ten perfil."
 
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:145
-msgid "Recipient user not found."
-msgstr "Usuario destinatario non atopado."
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
+msgstr ""
 
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:148
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr "Non se pode enviar a mensaxe directa a usuarios dos que non eres amigo."
+#: actions/tagother.php:141
+#, fuzzy
+msgid "Tag user"
+msgstr "Tags"
 
-#: actions/twitapifavorites.php:92
-#: actions/twitapifavorites.php:64
-#, php-format
-msgid "%s / Favorites from %s"
-msgstr "%s / Favoritos dende %s"
+#: actions/tagother.php:151
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+"Etiquetas para este usuario (letras, numeros, -, ., e _), separados por coma "
+"ou espazo"
 
-#: actions/twitapifavorites.php:95
-#: actions/twitapifavorites.php:67
-#, php-format
-msgid "%s updates favorited by %s / %s."
-msgstr "%s updates favorited by %s / %s."
+#: actions/tagother.php:193
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+"Só podes etiquetar xente á que estás suscrito ou aos que están suscritos a "
+"ti."
 
-#: actions/twitapifavorites.php:187
-#: lib/mail.php:275
-#: actions/twitapifavorites.php:158
-#: lib/mail.php:293
-#, php-format
-msgid "%s added your notice as a favorite"
-msgstr "%s gustoulle o teu chío"
+#: actions/tagother.php:200
+msgid "Could not save tags."
+msgstr "Non se poden gardar as etiquetas."
+
+#: actions/tagother.php:236
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+"Usa este formulario para engadir etiquetas aos teus seguidores ou aos que "
+"sigues."
+
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Chíos tagueados con %s"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Fonte de chíos para %s"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Fonte de chíos para %s"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Fonte de chíos para %s"
+
+#: actions/tagrss.php:35
+msgid "No such tag."
+msgstr "Non existe a etiqueta."
+
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
+msgstr "Método da API en contrución."
+
+#: actions/unsubscribe.php:77
+msgid "No profile id in request."
+msgstr "Non hai identificador de perfil na peticion."
+
+#: actions/unsubscribe.php:84
+msgid "No profile with that id."
+msgstr "Non se atopou un perfil con ese ID."
+
+#: actions/unsubscribe.php:98
+msgid "Unsubscribed"
+msgstr "De-suscribido"
 
-#: actions/twitapifavorites.php:188
-#: lib/mail.php:276
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
 #, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "Subscrición de autorización."
+
+#: actions/userauthorization.php:110
+#, fuzzy
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
 msgstr ""
-"A %1$s gustoulle o teu chío %2$s e marcouno como favorito.\n"
-"\n"
+"Please check these details to make sure that you want to subscribe to this "
+"user's notices. If you didn't just ask to subscribe to someone's notices, "
+"click \"Cancel\"."
 
-#: actions/twittersettings.php:27
-msgid "Add your Twitter account to automatically send your notices to Twitter, "
-msgstr "Engade a túa conta de Twitter para enviar automáticamente os teus chíos a Twitter."
+#: actions/userauthorization.php:188
+msgid "License"
+msgstr ""
 
-#: actions/twittersettings.php:41
-#: actions/twittersettings.php:43
-msgid "Twitter settings"
-msgstr "Configuracións de Twitter"
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "Aceptar"
 
-#: actions/twittersettings.php:48
-#: actions/twittersettings.php:50
-msgid "Twitter Account"
-msgstr "Conta de Twitter"
-
-#: actions/twittersettings.php:56
-#: actions/twittersettings.php:58
-msgid "Current verified Twitter account."
-msgstr "Conta de twitter verificada actualmente."
-
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr "Nome de usuario en Twitter"
-
-#: actions/twittersettings.php:65
-msgid "No spaces, please."
-msgstr "Sen espazos, anda..."
-
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
-msgstr "Contrasinal de Twitter"
-
-#: actions/twittersettings.php:72
-msgid "Automatically send my notices to Twitter."
-msgstr "Enviar automáticamente os meus chíos a Twitter."
-
-#: actions/twittersettings.php:75
-msgid "Send local \"@\" replies to Twitter."
-msgstr "Enviar respostas \"@\" locais a Twitter."
-
-#: actions/twittersettings.php:78
-msgid "Subscribe to my Twitter friends here."
-msgstr "Suscribirse ós meus amigos de Twitter aquí."
-
-#: actions/twittersettings.php:122
-#: actions/twittersettings.php:216
-msgid "Username must have only numbers, upper- and lowercase letters, and underscore (_). 15 chars max."
-msgstr "O nome de usuario debe ter só letras, minúsculas e maiúsculas, e números, e sen espazos."
-
-#: actions/twittersettings.php:128
-#: actions/twittersettings.php:221
-msgid "Could not verify your Twitter credentials!"
-msgstr "Non se puideron verificar as túas credenciais en Twitter!"
-
-#: actions/twittersettings.php:137
-#: actions/twittersettings.php:228
-#, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr "Non se puido recoller información da túa conta  \"%s\" en Twitter."
-
-#: actions/twittersettings.php:151
-#: actions/twittersettings.php:170
-#: actions/twittersettings.php:234
-#: actions/twittersettings.php:253
-msgid "Unable to save your Twitter settings!"
-msgstr "Non se puideron gardar os teus axustes de Twitter!"
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+#, fuzzy
+msgid "Subscribe to this user"
+msgstr "Suscrito a %s"
 
-#: actions/twittersettings.php:174
-#: actions/twittersettings.php:261
-msgid "Twitter settings saved."
-msgstr "Configuracións de Twitter gardadas."
-
-#: actions/twittersettings.php:192
-#: actions/twittersettings.php:272
-msgid "That is not your Twitter account."
-msgstr "Esa non é a túa conta de Twitter."
-
-#: actions/twittersettings.php:200
-#: actions/twittersettings.php:208
-#: actions/twittersettings.php:280
-msgid "Couldn't remove Twitter user."
-msgstr "Non se puido eliminar o usuario."
-
-#: actions/twittersettings.php:212
-#: actions/twittersettings.php:284
-msgid "Twitter account removed."
-msgstr "Conta de Twitter "
-
-#: actions/twittersettings.php:225
-#: actions/twittersettings.php:239
-#: actions/twittersettings.php:299
-#: actions/twittersettings.php:310
-#: actions/twittersettings.php:322
-msgid "Couldn't save Twitter preferences."
-msgstr "Non se puideron gardar as preferenzas de Twitter."
-
-#: actions/twittersettings.php:245
-#: actions/twittersettings.php:330
-msgid "Twitter preferences saved."
-msgstr "Preferencias de Twitter gardadas."
-
-#: actions/userauthorization.php:84
-msgid "Please check these details to make sure "
-msgstr "Comproba estes datos para asegurarte"
-
-#: actions/userauthorization.php:324
-msgid "The subscription has been authorized, but no "
-msgstr "A suscrición foi autorizada, pero non"
-
-#: actions/userauthorization.php:334
-msgid "The subscription has been rejected, but no "
-msgstr "A suscrición foi rexeitada, pero non"
-
-#: classes/Channel.php:113
-#: classes/Channel.php:129
-msgid "Command results"
-msgstr "Resultados do comando"
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "Rexeitar"
 
-#: classes/Channel.php:148
-#: classes/Channel.php:175
-msgid "Command complete"
-msgstr "Comando completo"
+#: actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "Subscrición de autorización."
 
-#: classes/Channel.php:158
-#: classes/Channel.php:185
-msgid "Command failed"
-msgstr "Comando fallido"
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
+msgstr "Sen petición de autorización!"
 
-#: classes/Command.php:39
-msgid "Sorry, this command is not yet implemented."
-msgstr "Desculpa, este comando todavía non está implementado."
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+msgstr "Subscrición autorizada"
 
-#: classes/Command.php:96
-#, php-format
-msgid "Subscriptions: %1$s\n"
-msgstr "Subscricións: %1$s.\n"
+#: actions/userauthorization.php:249
+#, fuzzy
+msgid ""
+"The subscription has been authorized, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to authorize the "
+"subscription. Your subscription token is:"
+msgstr ""
+"A subscrición foi autorizada, pero ningunha URL de retorno foi "
+"proporcionada. Comproba coas instruccións do sitio para máis detalles en "
+"como autorizar subscricións. O teu token de subscrición é:"
 
-#: classes/Command.php:125
-#: classes/Command.php:242
-#: classes/Command.php:247
-msgid "User has no last notice"
-msgstr "O usuario non ten último chio."
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
+msgstr "Subscrición rexeitada"
 
-#: classes/Command.php:146
-msgid "Notice marked as fave."
-msgstr "Chío marcado coma favorito."
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"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."
 
-#: classes/Command.php:166
+#: actions/userauthorization.php:296
 #, php-format
-msgid "%1$s (%2$s)"
-msgstr "%1$s (%2$s)"
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
 
-#: classes/Command.php:169
+#: actions/userauthorization.php:301
 #, php-format
-msgid "Fullname: %s"
-msgstr "Nome completo: %s"
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
 
-#: classes/Command.php:172
+#: actions/userauthorization.php:307
 #, php-format
-msgid "Location: %s"
-msgstr "Ubicación: %s"
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
 
-#: classes/Command.php:175
+#: actions/userauthorization.php:322
 #, php-format
-msgid "Homepage: %s"
-msgstr "Páxina persoal: %s"
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
 
-#: classes/Command.php:178
+#: actions/userauthorization.php:338
 #, php-format
-msgid "About: %s"
-msgstr "Sobre: %s"
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
 
-#: classes/Command.php:200
-#: classes/Command.php:202
-#, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
-msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Non se pode ler a URL do avatar de '%s'"
 
-#: classes/Command.php:214
-#: classes/Command.php:219
-#, php-format
-msgid "Direct message to %s sent"
-msgstr "Mensaxe directo a %s enviado"
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Tipo de imaxe incorrecto para '%s'"
 
-#: classes/Command.php:216
-#: classes/Command.php:221
-msgid "Error sending direct message."
-msgstr "Erro ó enviar a mensaxe directa."
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr "Sen id."
 
-#: classes/Command.php:263
-#: classes/Command.php:268
-msgid "Specify the name of the user to subscribe to"
-msgstr "Especifica o nome do usuario ó que queres suscribirte"
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "Configuración de perfil"
 
-#: classes/Command.php:270
-#: classes/Command.php:275
-#, php-format
-msgid "Subscribed to %s"
-msgstr "Suscrito a %s"
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
 
-#: classes/Command.php:288
-#: classes/Command.php:293
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Especifica o nome de usuario ó que queres deixar de seguir"
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
 
-#: classes/Command.php:295
-#: classes/Command.php:300
+#: actions/usergroups.php:64
 #, php-format
-msgid "Unsubscribed from %s"
-msgstr "Desuscribir de %s"
+msgid "%s groups, page %d"
+msgstr ""
 
-#: classes/Command.php:310
-#: classes/Command.php:330
-#: classes/Command.php:315
-#: classes/Command.php:335
-msgid "Command not yet implemented."
-msgstr "Comando non implementado."
+#: actions/usergroups.php:130
+msgid "Search for more groups"
+msgstr ""
 
-#: classes/Command.php:313
-#: classes/Command.php:318
-msgid "Notification off."
-msgstr "Notificación desactivada."
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "%1s non é unha orixe fiable."
 
-#: classes/Command.php:315
-#: classes/Command.php:320
-msgid "Can't turn off notification."
-msgstr "No se pode desactivar a notificación."
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
 
-#: classes/Command.php:333
-#: classes/Command.php:338
-msgid "Notification on."
-msgstr "Notificación habilitada."
+#: classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
 
-#: classes/Command.php:335
-#: classes/Command.php:340
-msgid "Can't turn on notification."
-msgstr "Non se pode activar a notificación."
+#: classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
 
-#: classes/Command.php:344
-msgid "Commands:\n"
-msgstr "Comandos:\n"
+#: classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
 
-#: classes/Message.php:53
+#: classes/Message.php:55
 msgid "Could not insert message."
 msgstr "Non se pode inserir unha mensaxe."
 
-#: classes/Message.php:63
+#: classes/Message.php:65
 msgid "Could not update message with new URI."
 msgstr "Non se puido actualizar a mensaxe coa nova URI."
 
-#: lib/gallery.php:46
-#: lib/gallery.php:55
-msgid "User without matching profile in system."
-msgstr "Usuario sen perfil coincidente no sistema."
-
-#: lib/mail.php:147
+#: classes/Notice.php:164
 #, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-msgstr ""
-"Tes novas direccións de posteo en %1$s.\n"
-"\n"
+msgid "DB error inserting hashtag: %s"
+msgstr "Erro ó inserir o hashtag na BD: %s"
 
-#: lib/mail.php:249
-#: lib/mail.php:265
-#, php-format
-msgid "New private message from %s"
-msgstr "%s enviouche unha nova mensaxe privada"
+#: classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Aconteceu un erro ó gardar o chío."
 
-#: lib/mail.php:253
-#, php-format
+#: classes/Notice.php:183
+msgid "Problem saving notice. Unknown user."
+msgstr "Aconteceu un erro ó gardar o chío. Usuario descoñecido."
+
+#: classes/Notice.php:188
 msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+"Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
-"%1$s (%2$s) enviouche unha mensaxe privada:\n"
-"\n"
+"Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro "
+"duns minutos."
 
-#: lib/mailbox.php:43
-msgid "Only the user can read their own mailboxes."
-msgstr "Só o usuario pode ler os seus propios buzóns."
+#: classes/Notice.php:194
+#, fuzzy
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+"Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro "
+"duns minutos."
 
-#: lib/openid.php:195
-msgid "This form should automatically submit itself. "
-msgstr "Este formulario debería enviarse automáticamente él mesmo."
+#: classes/Notice.php:202
+msgid "You are banned from posting notices on this site."
+msgstr "Tes restrinxido o envio de chíos neste sitio."
 
-#: lib/personal.php:65
-msgid "Favorites"
-msgstr "Favoritos"
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
+msgstr "Aconteceu un erro ó gardar o chío."
 
-#: lib/personal.php:66
+#: classes/Notice.php:1120
 #, php-format
-msgid "%s's favorite notices"
-msgstr "Chíos favoritos de %s"
-
-#: lib/personal.php:66
-msgid "User"
-msgstr "Usuario"
-
-#: lib/personal.php:75
-msgid "Inbox"
-msgstr "Band. Entrada"
-
-#: lib/personal.php:76
-msgid "Your incoming messages"
-msgstr "As túas mensaxes entrantes"
+msgid "DB error inserting reply: %s"
+msgstr "Erro ó inserir a contestación na BD: %s"
 
-#: lib/personal.php:80
-msgid "Outbox"
-msgstr "Band. Saída"
+#: classes/User.php:347
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Mensaxe de %1$s en %2$s"
 
-#: lib/personal.php:81
-msgid "Your sent messages"
-msgstr "As túas mensaxes enviadas"
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Perfil"
 
-#: lib/settingsaction.php:99
-#: actions/deleteprofile.php:256
-#: lib/settingsaction.php:103
-#: lib/settingsaction.php:105
-msgid "Twitter"
-msgstr "Twitter"
-
-#: lib/settingsaction.php:100
-#: actions/deleteprofile.php:257
-#: lib/settingsaction.php:104
-#: lib/settingsaction.php:106
-msgid "Twitter integration options"
-msgstr "Opcións de integración de Twitter"
-
-#: lib/util.php:1718
-#: lib/util.php:2204
-msgid "To"
-msgstr "A"
+#: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
+msgstr "Configuración de perfil"
 
-#: scripts/maildaemon.php:45
-msgid "Could not parse message."
-msgstr "Non se puido analizaar a mensaxe."
+#: lib/accountsettingsaction.php:112
+#, fuzzy
+msgid "Upload an avatar"
+msgstr "Acounteceu un fallo ó actualizar o avatar."
 
-#: actions/block.php:45
-#: actions/subedit.php:45
-#: actions/unblock.php:45
-msgid "No profile specified."
-msgstr "Non se especificou ningún perfil."
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr "Cambiar contrasinal"
 
-#: actions/block.php:52
-#: actions/subedit.php:52
-#: actions/tagother.php:45
-#: actions/unblock.php:52
-msgid "No profile with that ID."
-msgstr "Non se atopou un perfil con ese ID."
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
+msgstr "Cambiar a xestión de email"
 
-#: actions/block.php:78
-msgid "Block user"
-msgstr "Bloquear usuario"
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
 
-#: actions/block.php:81
-msgid "Are you sure you want to block this user? Afterwards, they will be unsubscribed from you, unable to subscribe to you in the future, and you will not be notified of any @-replies from them."
-msgstr "Seguro que queres bloquear a este usuario? Despois diso, vai ser de-suscrito do teur perfil, non será capaz de suscribirse a ti nun futuro, e non vas a ser notificado de ningunha resposta-@ del."
+#: lib/accountsettingsaction.php:124
+#, fuzzy
+msgid "Design your profile"
+msgstr "O usuario non ten perfil."
 
-#: actions/block.php:117
-msgid "You have already blocked this user."
-msgstr "Xa bloqueaches a este usuario."
+#: lib/accountsettingsaction.php:128
+msgid "Other"
+msgstr "Outros"
 
-#: actions/block.php:124
-msgid "Failed to save block information."
-msgstr "Erro ao gardar información de bloqueo."
+#: lib/accountsettingsaction.php:128
+msgid "Other options"
+msgstr "Outras opcions"
 
-#: actions/deleteprofile.php:25
-msgid "Code not yet ready."
-msgstr "Código non implementado."
+#: lib/action.php:144
+#, fuzzy, php-format
+msgid "%s - %s"
+msgstr "%s (%s)"
 
-#: actions/deleteprofile.php:36
-msgid "Export and delete your user information."
-msgstr "Exportar e eliminar a túa información de usuario."
+#: lib/action.php:159
+msgid "Untitled page"
+msgstr ""
 
-#: actions/deleteprofile.php:88
-#: actions/deleteprofile.php:119
-msgid "Delete my account"
-msgstr "Borrar a miña conta"
+#: lib/action.php:424
+msgid "Primary site navigation"
+msgstr ""
 
-#: actions/deleteprofile.php:89
-msgid "Delete my account confirmation"
-msgstr "Confirmación de borrado da miña conta"
+#: lib/action.php:430
+msgid "Home"
+msgstr "Persoal"
 
-#: actions/deleteprofile.php:117
-msgid "Check if you are sure you want to delete your account."
-msgstr "Estas seguro que queres eliminar a tua conta?"
+#: lib/action.php:430
+msgid "Personal profile and friends timeline"
+msgstr ""
 
-#: actions/deleteprofile.php:259
-#: lib/settingsaction.php:106
-#: lib/util.php:384
-#: lib/settingsaction.php:108
-msgid "Other"
-msgstr "Outros"
+#: lib/action.php:432
+#, fuzzy
+msgid "Account"
+msgstr "Sobre"
 
-#: actions/deleteprofile.php:260
-#: lib/settingsaction.php:107
-#: lib/settingsaction.php:109
-msgid "Other options"
-msgstr "Outras opcions"
+#: lib/action.php:432
+#, fuzzy
+msgid "Change your email, avatar, password, profile"
+msgstr "Cambiar contrasinal"
 
-#: actions/disfavor.php:72
-msgid "Add to favorites"
-msgstr "Engadir a favoritos"
+#: lib/action.php:435
+msgid "Connect"
+msgstr "Conectar"
 
-#: actions/emailsettings.php:98
-msgid "Allow friends to nudge me and send me an email."
-msgstr "Permitir aos amigos darme toques e enviarme correos electrónicos."
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Non se pode redireccionar ao servidor: %s"
 
-#: actions/facebookremove.php:54
-msgid "Couldn't remove Facebook user."
-msgstr "Non se puido eliminar o usuario de Facebook."
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
+msgstr "Invitar"
 
-#: actions/favorited.php:31
-#: lib/stream.php:48
-msgid "Popular notices"
-msgstr "Chíos populares"
+#: lib/action.php:440 lib/subgroupnav.php:106
+#, fuzzy, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr ""
+"Emprega este formulario para invitar ós teus amigos e colegas a empregar "
+"este servizo."
 
-#: actions/favorited.php:54
-msgid "Showing recently popular notices"
-msgstr "Amosando chíos populares recentes"
+#: lib/action.php:445
+msgid "Logout"
+msgstr "Sair"
 
-#: actions/favor.php:71
-msgid "Disfavor favorite"
-msgstr "Desactivar favorito"
+#: lib/action.php:445
+msgid "Logout from the site"
+msgstr ""
 
-#: actions/featured.php:32
-#: actions/featured.php:54
-#: lib/stream.php:44
-msgid "Featured users"
-msgstr "Usuarios destacados"
+#: lib/action.php:450
+#, fuzzy
+msgid "Create an account"
+msgstr "Crear nova conta"
 
-#: actions/finishremotesubscribe.php:186
-msgid "That user has blocked you from subscribing."
-msgstr "Este usuario non che permite suscribirte a el."
+#: lib/action.php:453
+msgid "Login to the site"
+msgstr ""
 
-#: actions/imsettings.php:83
-msgid "Send me notices from public timeline through Jabber/GTalk."
-msgstr "Enviarme os chíos da liña de tempo pública a través de Jabber/GTalk."
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
+msgstr "Axuda"
 
-#: actions/login.php:120
-msgid "you can also login using OpenID"
-msgstr "tamén te podes rexistrar cunha conta OpenID"
+#: lib/action.php:456
+#, fuzzy
+msgid "Help me!"
+msgstr "Axuda"
 
-#: actions/microsummary.php:39
-msgid "No current status"
-msgstr "Sen estado actual"
+#: lib/action.php:459
+msgid "Search"
+msgstr "Buscar"
 
-#: actions/misc.php:81
-msgid "Embedded"
-msgstr "Embebida"
+#: lib/action.php:459
+msgid "Search for people or text"
+msgstr ""
 
-#: actions/misc.php:82
-#, php-format
-msgid "Embedded %1s"
-msgstr "%1s embebida"
+#: lib/action.php:480
+#, fuzzy
+msgid "Site notice"
+msgstr "Novo chío"
 
-#: actions/misc.php:84
-msgid "WP"
-msgstr "WP"
+#: lib/action.php:546
+msgid "Local views"
+msgstr ""
 
-#: actions/newnotice.php:93
-msgid "Notice posted"
-msgstr "Chío publicado"
+#: lib/action.php:612
+#, fuzzy
+msgid "Page notice"
+msgstr "Novo chío"
 
-#: actions/newnotice.php:116
-#: classes/Channel.php:140
-msgid "Ajax Error"
-msgstr "Erro de Ajax"
+#: lib/action.php:714
+#, fuzzy
+msgid "Secondary site navigation"
+msgstr "Navegación de subscricións"
 
-#: actions/nudge.php:52
-msgid "This user doesn't allow nudges or hasn't confirmed or set his email yet."
-msgstr "Este usuario non permite toques, ou non confirmou ainda o seu correo electrónico."
+#: lib/action.php:721
+msgid "About"
+msgstr "Sobre"
 
-#: actions/nudge.php:61
-msgid "Nudge sent"
-msgstr "Toque enviado"
+#: lib/action.php:723
+msgid "FAQ"
+msgstr "Preguntas frecuentes"
 
-#: actions/othersettings.php:27
-msgid "Manage various other options."
-msgstr "Xestionár axustes varios."
+#: lib/action.php:727
+msgid "TOS"
+msgstr ""
 
-#: actions/othersettings.php:33
-msgid "Other Settings"
-msgstr "Outros axustes"
+#: lib/action.php:730
+msgid "Privacy"
+msgstr "Privacidade"
 
-#: actions/othersettings.php:35
-msgid "URL Auto-shortening"
-msgstr "Auto-acortado de URL"
+#: lib/action.php:732
+msgid "Source"
+msgstr "Fonte"
 
-#: actions/othersettings.php:54
-msgid "Service"
-msgstr "Servizo"
+#: lib/action.php:734
+msgid "Contact"
+msgstr "Contacto"
 
-#: actions/othersettings.php:54
-msgid "Automatic shortening service to use."
-msgstr "Servizo de acortado automático a usar."
+#: lib/action.php:736
+msgid "Badge"
+msgstr ""
 
-#: actions/othersettings.php:155
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "Sistema de acortamento de URLs demasiado longo (max 50 car.)."
+#: lib/action.php:764
+msgid "StatusNet software license"
+msgstr ""
 
-#: actions/peopletag.php:33
+#: lib/action.php:767
 #, php-format
-msgid "Not a valid people tag: %s"
-msgstr "%s non é unha etiqueta de xente válida"
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
+msgstr ""
+"**%%site.name%%** é un servizo de microbloguexo que che proporciona [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
 
-#: actions/peopletag.php:45
+#: lib/action.php:769
 #, php-format
-msgid "Users self-tagged with %s - page %d"
-msgstr "Usuarios auto-etiquetados como %s - páxina %d"
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** é un servizo de microbloguexo."
 
-#: actions/peopletag.php:87
+#: lib/action.php:771
 #, php-format
-msgid "These are users who have tagged themselves \"%s\" to show a common interest, characteristic, hobby or job."
-msgstr "Estes son usuarios que se etiquetaron a sí mesmos como \"%s\" para mostrar intereses comuns, características, aficións ou traballos."
-
-#: actions/profilesettings.php:92
-msgid "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
-msgstr "Etiquetas para o teu usuario (letras, números, -, ., e _), separados por coma ou espazo"
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+"Correndo o software de microblogaxe [StatusNet](http://status.net/), versión "
+"%s, dispoñible baixo licenza [GNU Affero General Public License](http://www."
+"fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#: actions/profilesettings.php:116
-msgid "Theme"
-msgstr "Tema"
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "Atopar no contido dos chíos"
 
-#: actions/profilesettings.php:116
-msgid "Preferred theme"
-msgstr "Tema preferido"
+#: lib/action.php:794
+#, fuzzy
+msgid "All "
+msgstr "Todos"
 
-#: actions/profilesettings.php:259
-#: actions/tagother.php:131
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Etiqueta inválida: '%s'"
+#: lib/action.php:799
+msgid "license."
+msgstr ""
 
-#: actions/profilesettings.php:345
-msgid "Couldn't save tags."
-msgstr "Non se puideron gardar as etiquetas."
+#: lib/action.php:1052
+msgid "Pagination"
+msgstr ""
 
-#: actions/public.php:68
-#, php-format
-msgid "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service based on the Free Software [StatusNet](http://status.net/) tool. [Join now](%%action.register%%) to share notices about yourself with friends, family, and colleagues! ([Read more](%%doc.help%%))"
-msgstr "Esto é %%site.name%%, un servizo de [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) basado na ferramenta de código aberto [StatusNet](http://status.net/). [Únete agora](%%action.register%%) para compartir chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
+#: lib/action.php:1061
+#, fuzzy
+msgid "After"
+msgstr "« Despois"
 
-#: actions/public.php:90
-msgid "Could not retrieve public stream."
-msgstr "Non se pudo recuperar a liña de tempo publica."
+#: lib/action.php:1069
+#, fuzzy
+msgid "Before"
+msgstr "Antes »"
 
-#: actions/register.php:67
-#: actions/register.php:177
-msgid "Sorry, only invited people can register."
-msgstr "Desculpa, só se pode rexistrar a xente con invitación."
+#: lib/action.php:1117
+#, fuzzy
+msgid "There was a problem with your session token."
+msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
 
-#: actions/register.php:156
-#, php-format
-msgid "With this form you can create a new account. You can then post notices and link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? Try our [OpenID registration](%%action.openidlogin%%)!)"
-msgstr "Neste formulario podes crear unha conta de usuario. Logo poderás publicar chíos, e suscribirte a amigos. (Tes unha conta [OpenID](http://openid.net/)? Proba o noso [Rexistro OpenID](%%action.openidlogin%%)!)"
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
 
-#: actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:141
-msgid "That's a local profile! Login to subscribe."
-msgstr "Este é un perfil local! Rexístrate para suscribirte."
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
 
-#: actions/smspostsettings.php:27
-#, php-format
-msgid "You can post on %1s sending an sms to %2s in the followin format: '%3s'"
-msgstr "Podes publicar chíos en %1s enviando un SMS a %2s co seguinte formato: '%3s'"
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "Perfil"
 
-#: actions/smspostsettings.php:32
-#: actions/smspostsettings.php:33
-#: actions/smspostsettings.php:57
-msgid "SMS Post Settings"
-msgstr "Configuracións de envio por SMS"
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
 
-#: actions/smspostsettings.php:101
-#: actions/smspostsettings.php:106
-msgid "The address was added."
-msgstr "Enderezo engadido."
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
 
-#: actions/subedit.php:68
-msgid "You are not subscribed to that profile."
-msgstr "Non estás suscrito a ese perfil"
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
+msgstr "Resultados do comando"
 
-#: actions/subedit.php:81
-msgid "Could not save subscription."
-msgstr "Non se pode gardar a subscrición."
+#: lib/channel.php:210
+msgid "Command complete"
+msgstr "Comando completo"
 
-#: actions/subscribe.php:53
-msgid "Not a local user."
-msgstr "Non é usuario local."
+#: lib/channel.php:221
+msgid "Command failed"
+msgstr "Comando fallido"
 
-#: actions/subscribe.php:67
-msgid "Subscribed"
-msgstr "Suscrito"
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr "Desculpa, este comando todavía non está implementado."
 
-#: actions/subscriptions.php:72
-msgid "Jabber"
-msgstr "Jabber."
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Non se puido actualizar o usuario coa dirección de correo electrónico."
 
-#: actions/tagother.php:31
-msgid "Not logged in"
-msgstr "Non estás logueado."
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
 
-#: actions/tagother.php:40
-msgid "No id argument."
-msgstr "Non hai argumento id."
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "Toque enviado"
 
-#: actions/tagother.php:56
-msgid "Tag a person"
-msgstr "Etiquetar a unha persoa"
+#: lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+"Suscripcións: %1$s\n"
+"Suscriptores: %2$s\n"
+"Chíos: %3$s"
 
-#: actions/tagother.php:98
-msgid "Tags for this user (letters, numbers, -, ., and _), comma- or space- separated"
-msgstr "Etiquetas para este usuario (letras, numeros, -, ., e _), separados por coma ou espazo"
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
 
-#: actions/tagother.php:120
-msgid "No such profile."
-msgstr "Non existe o perfil."
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
+msgstr "O usuario non ten último chio."
 
-#: actions/tagother.php:146
-msgid "You can only tag people you are subscribed to or who are subscribed to you."
-msgstr "Só podes etiquetar xente á que estás suscrito ou aos que están suscritos a ti."
+#: lib/command.php:190
+msgid "Notice marked as fave."
+msgstr "Chío marcado coma favorito."
 
-#: actions/tagother.php:153
-msgid "Could not save tags."
-msgstr "Non se poden gardar as etiquetas."
+#: lib/command.php:315
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
 
-#: actions/tagother.php:188
-msgid "Use this form to add tags to your subscribers or subscriptions."
-msgstr "Usa este formulario para engadir etiquetas aos teus seguidores ou aos que sigues."
+#: lib/command.php:318
+#, php-format
+msgid "Fullname: %s"
+msgstr "Nome completo: %s"
 
-#: actions/tag.php:66
-msgid "Showing all tags"
-msgstr "Amosando tódalas etiquetas"
+#: lib/command.php:321
+#, php-format
+msgid "Location: %s"
+msgstr "Ubicación: %s"
 
-#: actions/tagrss.php:33
-msgid "No such tag."
-msgstr "Non existe a etiqueta."
+#: lib/command.php:324
+#, php-format
+msgid "Homepage: %s"
+msgstr "Páxina persoal: %s"
 
-#: actions/tagrss.php:62
+#: lib/command.php:327
 #, php-format
-msgid "Microblog tagged with %s"
-msgstr "Microblog etiquetado con %s"
+msgid "About: %s"
+msgstr "Sobre: %s"
 
-#: actions/twitapiblocks.php:45
-msgid "Block user failed."
-msgstr "Bloqueo de usuario fallido."
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
 
-#: actions/twitapiblocks.php:66
-msgid "Unblock user failed."
-msgstr "Desbloqueo de usuario fallido."
+#: lib/command.php:377
+msgid "Error sending direct message."
+msgstr "Erro ó enviar a mensaxe directa."
 
-#: actions/twitapifavorites.php:159
-#: lib/mail.php:294
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
+
+#: lib/command.php:439
 #, php-format
-msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
-"In case you forgot, you can see the text of your notice here:\n"
-"\n"
-"%3$s\n"
-"\n"
-"You can see the list of %1$s's favorites here:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Faithfully yours,\n"
-"%5$s\n"
-msgstr ""
-"%1$s acaba de engadir o teu chío en %2$s como un dos seus favoritos.\n"
-"\n"
-"Se o olvidaches, podes velo texto do teu chío aquí:\n"
-"\n"
-"%3$s\n"
-"\n"
-"Podes vela lista de cíos favoritos de %1$s aquí:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Fielmente teu,\n"
-"%5$s\n"
+msgid "Reply to %s sent"
+msgstr "Non se pode eliminar este chíos."
 
-#: actions/twitapiusers.php:46
-msgid "Not found."
-msgstr "Non atopado"
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Aconteceu un erro ó gardar o chío."
 
-#: actions/twittersettings.php:29
-msgid "Add your Twitter account to automatically send your notices to Twitter, and subscribe to Twitter friends already here."
-msgstr "Engade a túa conta de Twitter para enviar automáticamente os teus chíos a Twitter, e suscribirte aos usuarios de twiter que teñas como amigos aqui."
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
+msgstr "Especifica o nome do usuario ó que queres suscribirte"
 
-#: actions/twittersettings.php:63
-msgid "Twitter user name"
-msgstr "Nome de usuario en Twitter"
+#: lib/command.php:502
+#, php-format
+msgid "Subscribed to %s"
+msgstr "Suscrito a %s"
 
-#: actions/twittersettings.php:67
-msgid "Twitter password"
-msgstr "Contrasinal de Twitter"
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
+msgstr "Especifica o nome de usuario ó que queres deixar de seguir"
 
-#: actions/twittersettings.php:129
-msgid "Twitter Friends"
-msgstr "Amigos de Twitter"
+#: lib/command.php:530
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr "Desuscribir de %s"
 
-#: actions/unblock.php:73
-msgid "Error removing the block."
-msgstr "Acounteceu un erro borrando o bloqueo."
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
+msgstr "Comando non implementado."
 
-#: actions/unsubscribe.php:48
-msgid "No profile id in request."
-msgstr "Non hai identificador de perfil na peticion."
+#: lib/command.php:551
+msgid "Notification off."
+msgstr "Notificación desactivada."
 
-#: actions/unsubscribe.php:55
-msgid "No profile with that id."
-msgstr "Non se atopou un perfil con ese ID."
+#: lib/command.php:553
+msgid "Can't turn off notification."
+msgstr "No se pode desactivar a notificación."
 
-#: actions/unsubscribe.php:69
-msgid "Unsubscribed"
-msgstr "De-suscribido"
+#: lib/command.php:574
+msgid "Notification on."
+msgstr "Notificación habilitada."
 
-#: actions/users.php:38
-#: lib/util.php:378
-msgid "Users list"
-msgstr "Lista de usuarios"
+#: lib/command.php:576
+msgid "Can't turn on notification."
+msgstr "Non se pode activar a notificación."
 
-#: classes/Command.php:96
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Non se pode crear o formulario OpenID: %s"
+
+#: lib/command.php:602
 #, php-format
-msgid ""
-"Subscriptions: %1$s\n"
-"Subscribers: %2$s\n"
-"Notices: %3$s"
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
-"Suscripcións: %1$s\n"
-"Suscriptores: %2$s\n"
-"Chíos: %3$s"
 
-#: classes/Command.php:349
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Non estás suscrito a ese perfil"
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Non estás suscrito a ese perfil"
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Outro usuario non se puido suscribir a ti."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Suscrito a %s"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Non estás suscrito a ese perfil"
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "Non estás suscrito a ese perfil"
+
+#: lib/command.php:670
+#, fuzzy
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
 "whois <nickname> - get profile info on user\n"
 "fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
 "stats - get your stats\n"
 "stop - same as 'off'\n"
 "quit - same as 'off'\n"
@@ -4424,7 +3923,7 @@ msgid ""
 "last <nickname> - same as 'get'\n"
 "on <nickname> - not yet implemented.\n"
 "off <nickname> - not yet implemented.\n"
-"nudge <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
 "invite <phone number> - not yet implemented.\n"
 "track <word> - not yet implemented.\n"
 "untrack <word> - not yet implemented.\n"
@@ -4460,53 +3959,338 @@ msgstr ""
 "tracks - non implementado por agora.\n"
 "tracking - non implementado por agora.\n"
 
-#: classes/Notice.php:100
-msgid "Problem saving notice. Unknown user."
-msgstr "Aconteceu un erro ó gardar o chío. Usuario descoñecido."
+#: lib/common.php:192
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Sen código de confirmación."
 
-#: classes/Notice.php:105
-msgid "Too many notices too fast; take a breather and post again in a few minutes."
-msgstr "Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro duns minutos."
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
+msgstr ""
 
-#: classes/Notice.php:112
-msgid "You are banned from posting notices on this site."
-msgstr "Tes restrinxido o envio de chíos neste sitio."
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:195
+msgid "Go to the installer."
+msgstr ""
+
+#: lib/connectsettingsaction.php:110
+msgid "IM"
+msgstr "IM"
+
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Chíos dende mensaxería instantánea (IM)"
+
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
+msgstr "Chíos dende SMS"
+
+#: lib/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Subir"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Cambiar contrasinal"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Conectar"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Buscar"
+
+#: lib/designsettings.php:217
+msgid "Text"
+msgstr "Texto"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Lista"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+#, fuzzy
+msgid "Disfavor this notice"
+msgstr "%s chíos favoritos"
+
+#: lib/favorform.php:114 lib/favorform.php:140
+#, fuzzy
+msgid "Favor this notice"
+msgstr "%s chíos favoritos"
+
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr "Gostame"
+
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr ""
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr ""
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr ""
 
-#: lib/gallery.php:98
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr ""
+
+#: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Filtrar etiquetas"
 
-#: lib/gallery.php:104
+#: lib/galleryaction.php:131
 msgid "All"
 msgstr "Todos"
 
-#: lib/gallery.php:108
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Selecciona unha operadora"
+
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Etiqueta"
 
-#: lib/gallery.php:109
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "Elixe unha etiqueta para reducila lista"
 
-#: lib/gallery.php:110
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "Ir"
 
-#: lib/gallery.php:264
-msgid "Subscriptions navigation"
-msgstr "Navegación de subscricións"
+#: lib/groupeditform.php:163
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic"
+msgstr "Enderezo da túa páxina persoal, blogue, ou perfil noutro sitio"
 
-#: lib/gallery.php:270
-#: lib/gallery.php:292
-msgid "List"
-msgstr "Lista"
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
+
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
+
+#: lib/groupeditform.php:172
+#, fuzzy
+msgid "Description"
+msgstr "Subscricións"
+
+#: lib/groupeditform.php:179
+#, fuzzy
+msgid ""
+"Location for the group, if any, like \"City, State (or Region), Country\""
+msgstr "¿Onde estas, coma \"Cidade, Provincia, País\""
+
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+msgid "Group"
+msgstr ""
+
+#: lib/groupnav.php:101
+#, fuzzy
+msgid "Blocked"
+msgstr "Bloquear"
+
+#: lib/groupnav.php:102
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Bloquear usuario"
+
+#: lib/groupnav.php:108
+#, php-format
+msgid "Edit %s group properties"
+msgstr ""
+
+#: lib/groupnav.php:113
+#, fuzzy
+msgid "Logo"
+msgstr "Sair"
+
+#: lib/groupnav.php:114
+#, php-format
+msgid "Add or edit %s logo"
+msgstr ""
+
+#: lib/groupnav.php:120
+#, php-format
+msgid "Add or edit %s design"
+msgstr ""
+
+#: lib/groupsbymemberssection.php:71
+msgid "Groups with most members"
+msgstr ""
+
+#: lib/groupsbypostssection.php:71
+msgid "Groups with most posts"
+msgstr ""
+
+#: lib/grouptagcloudsection.php:56
+#, php-format
+msgid "Tags in %s group's notices"
+msgstr ""
+
+#: lib/htmloutputter.php:104
+msgid "This page is not available in a media type you accept"
+msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Podes actualizar a túa información do perfil persoal aquí"
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr "Carga parcial."
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr "Aconteceu un erro no sistema namentras se estaba cargando o ficheiro."
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr "Non é unha imaxe ou está corrupta."
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr "Formato de ficheiro de imaxe non soportado."
+
+#: lib/imagefile.php:118
+#, fuzzy
+msgid "Lost our file."
+msgstr "Bloqueo de usuario fallido."
 
-#: lib/gallery.php:280
-#: lib/gallery.php:294
-msgid "Icons"
-msgstr "Iconos"
+#: lib/imagefile.php:150 lib/imagefile.php:197
+#, fuzzy
+msgid "Unknown file type"
+msgstr "tipo de ficheiro non soportado"
 
-#: lib/mail.php:92
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr ""
+
+#: lib/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "Inicio de sesión"
+
+#: lib/leaveform.php:114
+#, fuzzy
+msgid "Leave"
+msgstr "Gardar"
+
+#: lib/logingroupnav.php:80
+#, fuzzy
+msgid "Login with a username and password"
+msgstr "Accede co teu nome de usuario e contrasinal."
+
+#: lib/logingroupnav.php:86
+#, fuzzy
+msgid "Sign up for a new account"
+msgstr "Crear nova conta"
+
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "Só o usuario pode ler os seus propios buzóns."
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr " dende "
+
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "Confirmar correo electrónico"
+
+#: lib/mail.php:174
 #, php-format
 msgid ""
 "Hey, %s.\n"
@@ -4535,15 +4319,94 @@ msgstr ""
 "Grazas polo teu tempo, \n"
 "%s\n"
 
-#: lib/mail.php:232
+#: lib/mail.php:235
+#, php-format
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr "%1$s está a escoitar os teus chíos %2$s."
+
+#: lib/mail.php:240
+#, fuzzy, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
+"%1$s está a escoitar os teus chíos en %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Atentamente todo seu,\n"
+"%4$s.\n"
+
+#: lib/mail.php:253
+#, fuzzy, php-format
+msgid "Location: %s\n"
+msgstr "Ubicación: %s"
+
+#: lib/mail.php:255
+#, fuzzy, php-format
+msgid "Homepage: %s\n"
+msgstr "Páxina persoal: %s"
+
+#: lib/mail.php:257
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:285
+#, php-format
+msgid "New email address for posting to %s"
+msgstr "Nova dirección de email para posterar en %s"
+
+#: lib/mail.php:288
+#, 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 ""
+"Tes unha nova dirección de envio de mensaxes en %1$s.\n"
+"\n"
+"Envia unha mensaxe a %2$s para enviar novas mensaxes.\n"
+"\n"
+"Hai máis instruccións de envio en %3$s.\n"
+"\n"
+"Sempre teu...,\n"
+"%4$s"
+
+#: lib/mail.php:412
+#, php-format
+msgid "%s status"
+msgstr "Estado de %s"
+
+#: lib/mail.php:438
+msgid "SMS confirmation"
+msgstr "Confirmación de SMS"
+
+#: lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "%s douche un toque"
 
-#: lib/mail.php:236
+#: lib/mail.php:466
 #, php-format
 msgid ""
-"%1$s (%2$s) is wondering what you are up to these days and is inviting you to post some news.\n"
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
 "\n"
 "So let's hear from you :)\n"
 "\n"
@@ -4565,7 +4428,12 @@ msgstr ""
 "With kind regards,\n"
 "%4$s\n"
 
-#: lib/mail.php:269
+#: lib/mail.php:509
+#, php-format
+msgid "New private message from %s"
+msgstr "%s enviouche unha nova mensaxe privada"
+
+#: lib/mail.php:513
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -4598,116 +4466,495 @@ msgstr ""
 "With kind regards,\n"
 "%5$s\n"
 
-#: lib/profilelist.php:146
-msgid "(none)"
-msgstr "(nada)"
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s gustoulle o teu chío"
 
-#: lib/settingsaction.php:97
-#: lib/settingsaction.php:98
-msgid "SMS Post"
-msgstr "Envío por SMS"
+#: lib/mail.php:556
+#, fuzzy, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
+"%1$s acaba de engadir o teu chío en %2$s como un dos seus favoritos.\n"
+"\n"
+"Se o olvidaches, podes velo texto do teu chío aquí:\n"
+"\n"
+"%3$s\n"
+"\n"
+"Podes vela lista de cíos favoritos de %1$s aquí:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Fielmente teu,\n"
+"%5$s\n"
 
-#: lib/settingsaction.php:98
-#: lib/settingsaction.php:99
-msgid "Posts by SMS"
-msgstr "Chíos dende SMS"
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, php-format
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+msgstr ""
+
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+msgid "Could not determine file's mime-type!"
+msgstr "Non se pudo recuperar a liña de tempo publica."
+
+#: lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: lib/messageform.php:120
+#, fuzzy
+msgid "Send a direct notice"
+msgstr "Eliminar chío"
+
+#: lib/messageform.php:146
+msgid "To"
+msgstr "A"
+
+#: lib/messageform.php:162 lib/noticeform.php:173
+#, fuzzy
+msgid "Available characters"
+msgstr "6 ou máis caracteres"
+
+#: lib/noticeform.php:145
+#, fuzzy
+msgid "Send a notice"
+msgstr "Dar un toque"
+
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
+msgstr "¿Que pasa, %s?"
+
+#: lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "Sen contido!"
+
+#: lib/noticelist.php:498
+#, fuzzy
+msgid "Reply to this notice"
+msgstr "Non se pode eliminar este chíos."
+
+#: lib/noticelist.php:499
+#, fuzzy
+msgid "Reply"
+msgstr "contestar"
+
+#: lib/nudgeform.php:116
+#, fuzzy
+msgid "Nudge this user"
+msgstr "Toque enviado"
+
+#: lib/nudgeform.php:128
+#, fuzzy
+msgid "Nudge"
+msgstr "Toque enviado"
+
+#: lib/nudgeform.php:128
+#, fuzzy
+msgid "Send a nudge to this user"
+msgstr "Non podes enviar mensaxes a este usurio."
+
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "Acounteceu un erro ó inserir o novo perfil"
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "Acounteceu un erro ó inserir o avatar"
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "Aconteceu un erro ó inserir o perfil remoto"
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Eliminar chío"
+
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
+msgstr "Non se puido inserir a nova subscrición."
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "Persoal"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "Respostas"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr "Favoritos"
+
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr "Usuario"
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr "Band. Entrada"
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr "As túas mensaxes entrantes"
 
-#: lib/stream.php:33
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr "Band. Saída"
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr "As túas mensaxes enviadas"
+
+#: lib/personaltagcloudsection.php:56
+#, fuzzy, php-format
+msgid "Tags in %s's notices"
+msgstr "O usuario non ten último chio."
+
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "Subscricións"
+
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "Tódalas subscricións"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "Subscritores"
+
+#: lib/profileaction.php:157
+#, fuzzy
+msgid "All subscribers"
+msgstr "Subscritores"
+
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "Usuario"
+
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "Membro dende"
+
+#: lib/profileaction.php:235
+#, fuzzy
+msgid "All groups"
+msgstr "Tódalas etiquetas"
+
+#: lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Público"
 
-#: lib/stream.php:36
-#: lib/stream.php:37
+#: lib/publicgroupnav.php:82
+#, fuzzy
+msgid "User groups"
+msgstr "Usuarios"
+
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Etiquetas recentes"
 
-#: lib/stream.php:39
-#: lib/stream.php:40
-msgid "All tags"
-msgstr "Tódalas etiquetas"
-
-#: lib/stream.php:43
+#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Destacado"
 
-#: lib/stream.php:47
+#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Popular"
 
-#: lib/subs.php:51
+#: lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Buscar"
+
+#: lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Buscar"
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "Xente"
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr "Atopar xente neste sitio"
+
+#: lib/searchgroupnav.php:82
+#, fuzzy
+msgid "Notice"
+msgstr "Chíos"
+
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr "Atopar no contido dos chíos"
+
+#: lib/searchgroupnav.php:85
+#, fuzzy
+msgid "Find groups on this site"
+msgstr "Atopar xente neste sitio"
+
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr ""
+
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: lib/subgroupnav.php:83
+#, fuzzy, php-format
+msgid "People %s subscribes to"
+msgstr "Suscrición remota"
+
+#: lib/subgroupnav.php:91
+#, fuzzy, php-format
+msgid "People subscribed to %s"
+msgstr "Suscrito a %s"
+
+#: lib/subgroupnav.php:99
+#, php-format
+msgid "Groups %s is a member of"
+msgstr ""
+
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(nada)"
+
+#: lib/subs.php:48
+msgid "Already subscribed!"
+msgstr ""
+
+#: lib/subs.php:52
 msgid "User has blocked you."
 msgstr "O usuario bloqueoute."
 
-#: lib/util.php:379
-msgid "Users"
-msgstr "Usuarios"
+#: lib/subs.php:56
+msgid "Could not subscribe."
+msgstr "No se pode suscribir."
 
-#: lib/util.php:2118
-msgid "Send a nudge"
-msgstr "Dar un toque"
+#: lib/subs.php:75
+msgid "Could not subscribe other to you."
+msgstr "Outro usuario non se puido suscribir a ti."
 
-#: lib/util.php:2122
-msgid "Nudge sent!"
-msgstr "Toque enviado!"
+#: lib/subs.php:124
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Non está suscrito!"
 
-#: lib/util.php:2253
-msgid "Block"
-msgstr "Bloquear"
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
+msgstr "Non se pode eliminar a subscrición."
 
-#: lib/util.php:2257
-msgid "Unblock"
-msgstr "Desbloquear"
+#: lib/tagcloudsection.php:56
+#, fuzzy
+msgid "None"
+msgstr "No"
 
-#: actions/newsmsnotice.php:29
-#: actions/smspostsettings.php:57
-msgid "SMS Post Disabled!"
-msgstr "Publicación de chíos por SMS desactivado!"
+#: lib/topposterssection.php:74
+msgid "Top posters"
+msgstr ""
 
-#: actions/badgemisc.php:31
-#, php-format
-msgid "%1s in your blog"
-msgstr "%1s no teu blogue"
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+#, fuzzy
+msgid "Unsubscribe from this user"
+msgstr "Desuscribir de %s"
 
-#: actions/misc.php:85
-msgid "WordPress Plugin"
-msgstr "Plugin WordPress"
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "Eliminar subscrición"
 
-#: actions/misc.php:88
+#: lib/userprofile.php:116
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "Avatar"
+
+#: lib/userprofile.php:236
+#, fuzzy
+msgid "User actions"
+msgstr "Outras opcions"
+
+#: lib/userprofile.php:248
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Configuración de perfil"
+
+#: lib/userprofile.php:249
+msgid "Edit"
+msgstr ""
+
+#: lib/userprofile.php:272
+#, fuzzy
+msgid "Send a direct message to this user"
+msgstr "Non podes enviar mensaxes a este usurio."
+
+#: lib/userprofile.php:273
+#, fuzzy
+msgid "Message"
+msgstr "Nova mensaxe"
+
+#: lib/util.php:821
+msgid "a few seconds ago"
+msgstr "fai uns segundos"
+
+#: lib/util.php:823
+msgid "about a minute ago"
+msgstr "fai un minuto"
+
+#: lib/util.php:825
 #, php-format
-msgid "Graphics and statistics about the state of %1s"
-msgstr "Gráficos e estatísticas sobre o estado de %1s"
+msgid "about %d minutes ago"
+msgstr "fai %d minutos"
+
+#: lib/util.php:827
+msgid "about an hour ago"
+msgstr "fai unha hora"
 
-#: actions/newsmsnotice.php:35
+#: lib/util.php:829
 #, php-format
-msgid "%1s is not a reliable source."
-msgstr "%1s non é unha orixe fiable."
+msgid "about %d hours ago"
+msgstr "fai %d horas"
+
+#: lib/util.php:831
+msgid "about a day ago"
+msgstr "fai un día"
 
-#: actions/newsmsnotice.php:60
-msgid "Unexpected error"
-msgstr "Erro inesperado"
+#: lib/util.php:833
+#, php-format
+msgid "about %d days ago"
+msgstr "fai %d días"
 
-#: actions/newsmsnotice.php:65
-msgid "No such phone"
-msgstr "Non existe o telefono"
+#: lib/util.php:835
+msgid "about a month ago"
+msgstr "fai un mes"
 
-#: actions/newsmsnotice.php:75
-msgid "Missing message"
-msgstr "Falta a mensaxe"
+#: lib/util.php:837
+#, php-format
+msgid "about %d months ago"
+msgstr "fai %d meses"
 
-#: actions/newsmsnotice.php:91
-msgid "Notice published correctly"
-msgstr "Chío publicado correctamente"
+#: lib/util.php:839
+msgid "about a year ago"
+msgstr "fai un ano"
 
-#: actions/wpmisc.php:27
-msgid "If you want to have your notices on your Wordpress, then follow the instructions"
-msgstr "Se queres ter os teus chios no teu Wordpress, sigue as instruccións"
+#: lib/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "%1s non é unha orixe fiable."
 
-#: actions/wpmisc.php:31
+#: lib/webcolor.php:123
 #, php-format
-msgid "%1s on your Wordpress"
-msgstr "%1s no teu Wordpress"
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr "Non se puido analizaar a mensaxe."
 
-#: actions/badgemisc.php:27
-msgid "If you want to have your notices on your blog/website, then follow the instructions"
-msgstr "Se queres ter os teus chios no teu blogue/sitio web, sigue as instruccións"
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr "Non é un usuario rexistrado."
 
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr "Ise é un enderezo IM incorrecto."
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr "Aivá, non se permiten correos entrantes."
diff --git a/locale/he/LC_MESSAGES/statusnet.mo b/locale/he/LC_MESSAGES/statusnet.mo
index 609918d92..57b3fb49f 100644
--- a/locale/he/LC_MESSAGES/statusnet.mo
+++ b/locale/he/LC_MESSAGES/statusnet.mo
diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po
index 97a44a030..3de5c0072 100644
--- a/locale/he/LC_MESSAGES/statusnet.po
+++ b/locale/he/LC_MESSAGES/statusnet.po
@@ -1,4529 +1,3949 @@
-# #-#-#-#-#  statusnet.pot (PACKAGE VERSION)  #-#-#-#-#
-# Hebrew translation for StatusNet
-# תרגום לעברית של לאקוניה
-# Copyright (C) 2008 COPYRIGHT HOLDER
-# כל הזכויות שמורות, 2008
-# This file is distributed under the same license as the StatusNet package.
-# קובץ זה מופץ תחת רשיון זהה לזה של החבילה לאקוניקה
-# Hezy Amiel חזי עמיאל <open@hezyamiel.com>, 2008.
-#
-# #-#-#-#-#  statusnet.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.
+# Translation of StatusNet to Hebrew
 #
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-01-30 12:07+0000\n"
-"Last-Translator: support team <jbrnra@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:33+0000\n"
+"Language-Team: Hebrew\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: he\n"
+"X-Message-Group: out-statusnet\n"
 
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
-#, php-format
-msgid " Search Stream for \"%s\""
-msgstr "חיפוש ברצף אחרי \"%s\""
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "אין הודעה כזו."
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-#: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
-msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr ""
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
+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/all.php:84
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s וחברים"
 
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
+msgid "%s and friends"
+msgstr "%s וחברים"
 
-#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
+#: actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "הזנות החברים של %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 ""
+#: actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "הזנות החברים של %s"
 
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s כעת מאזין להודעות שלך ב-%2$s"
+#: actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "הזנות החברים של %s"
 
-#: ../lib/mail.php:126
+#: actions/all.php:127
 #, 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"
+"This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
-"%1$s מאזין כעת להודעות שלך ב %2$s. \n"
-"\n"
-"\t%3$s\n"
-" שלך,\n"
-" %4$s.\n"
 
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/all.php:132
 #, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
 msgstr ""
 
-#: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/all.php:134
 #, 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 actions/invite.php:123 actions/invite.php:131
-#, php-format
-msgid "%s (%s)"
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
 #, php-format
-msgid "%s Public Stream"
-msgstr "רצף ציבורי ב-%s"
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+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
-#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
-#, php-format
-msgid "%s and friends"
+#: actions/all.php:165
+#, fuzzy
+msgid "You and friends"
 msgstr "%s וחברים"
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
 #, php-format
-msgid "%s public timeline"
-msgstr ""
-
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
-#, php-format
-msgid "%s status"
+msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
-#, php-format
-msgid "%s timeline"
-msgstr ""
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
+msgstr "קוד האישור לא נמצא."
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
-#, php-format
-msgid "%s updates from everyone!"
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
 msgstr ""
 
-#: ../actions/register.php:213
+#: actions/apiaccountupdatedeliverydevice.php:105
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
 msgstr ""
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "עידכון המשתמש נכשל."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
 msgstr ""
-"**%%site.name%%** הוא שרות ביקרובלוג הניתן על ידי [%%site.broughtby%%](%%"
-"site.broughtbyurl%%)."
-
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
-#, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** הוא שרות ביקרובלוג."
-
-#: ../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
-#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1 עד 64 אותיות אנגליות קטנות או מספרים, ללא סימני פיסוק או רווחים."
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
 msgstr ""
 
-#: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr "לפחות 6 אותיות"
-
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
-msgid "6 or more characters, and don't forget it!"
-msgstr "לפחות 6 אותיות, אל תשכח!"
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "עידכון המשתמש נכשל."
 
-#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
-msgid "6 or more characters. Required."
-msgstr " לפחות 6 אותיות. שדה חובה."
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+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 ""
-"קוד אישור נשלח אל כתובת המסרים המידיים שהוספת. עליך לאשר את %s לשליחת מסרים "
-"מידיים אליך."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+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."
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
 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 actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
-msgid "API method not found!"
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
 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 actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
-msgid "API method under construction."
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
 msgstr ""
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
-msgid "About"
-msgstr "אודות"
-
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
-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 actions/emailsettings.php:120
-#: actions/imsettings.php:127 actions/openidsettings.php:111
-#: actions/smssettings.php:133 actions/twittersettings.php:163
-msgid "Add"
-msgstr "הוסף"
-
-#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
-msgstr "הוסף OpenID"
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות."
 
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-msgid "Add or remove OpenIDs"
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
 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
-#: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
-msgstr "כתבות"
-
-#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-msgid "Addresses of friends to invite (one per line)"
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
-msgid "All subscriptions"
-msgstr "כל המנויים"
+#: actions/apidirectmessage.php:89
+#, php-format
+msgid "Direct messages from %s"
+msgstr ""
 
-#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/apidirectmessage.php:93
 #, php-format
-msgid "All updates for %s"
-msgstr "כל העדכונים עבור %s"
+msgid "All the direct messages sent from %s"
+msgstr ""
 
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/apidirectmessage.php:101
 #, php-format
-msgid "All updates matching search term \"%s\""
-msgstr "כל העידכונים התואמים את החיפוש אחרי \"%s\""
+msgid "Direct messages to %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
-#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
-msgid "Already logged in."
-msgstr "כבר מחובר."
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
-msgid "Already subscribed!."
-msgstr "כבר מנוי!"
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr ""
 
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
-msgid "Are you sure you want to delete this notice?"
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
 msgstr ""
 
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
-msgid "Authorize subscription"
-msgstr "אשר מנוי"
+#: actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
+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/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+msgstr ""
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+#: actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
 msgstr ""
 
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34 actions/avatarsettings.php:65
-#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
-msgid "Avatar"
-msgstr "תמונה"
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr ""
 
-#: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
-msgid "Avatar updated."
-msgstr "התמונה עודכנה."
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
+msgstr ""
 
-#: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/apifriendshipscreate.php:118
 #, 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?)"
+msgid "Could not follow user: %s is already on your 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."
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "נכשלה ההפניה לשרת: %s"
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
 msgstr ""
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
-msgid "Awaiting confirmation on this phone number."
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
-#: ../lib/util.php:1318 lib/util.php:1452
+#: actions/apifriendshipsshow.php:135
 #, fuzzy
-msgid "Before »"
-msgstr "לפני >>"
-
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
-#: actions/profilesettings.php:82 actions/register.php:184
-#: actions/profilesettings.php:112 actions/register.php:402
-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
-#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
-msgid "Bio is too long (max 140 chars)."
-msgstr "הביוגרפיה ארוכה מידי (לכל היותר 140 אותיות)"
+msgid "Could not determine source user."
+msgstr "עידכון המשתמש נכשל."
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
-msgid "Can't delete this notice."
-msgstr ""
+#: actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "עידכון המשתמש נכשל."
 
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
-#, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr "לא ניתן לקרוא את ה-URL '%s' של התמונה"
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
+#, fuzzy
+msgid "Could not create group."
+msgstr "שמירת מידע התמונה נכשל"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404 actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-msgid "Can't save new password."
-msgstr "לא ניתן לשמור את הסיסמה"
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+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
-#: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
-msgstr "בטל"
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "יצירת המנוי נכשלה."
 
-#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "לא ניתן להפעיל את אובייקט הלקוח של OpenID."
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "כינוי יכול להכיל רק אותיות אנגליות קטנות ומספרים, וללא רווחים."
 
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
-msgstr "לא ניתן לנרמל את זהות ה-Jabber הזה"
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr "כינוי זה כבר תפוס. נסה כינוי אחר."
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
-msgid "Cannot normalize that email address"
-msgstr ""
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "שם משתמש לא חוקי."
 
-#: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
-msgstr "שנה"
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "לאתר הבית יש כתובת לא חוקית."
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
-msgstr ""
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "השם המלא ארוך מידי (מותרות 255 אותיות בלבד)"
 
-#: ../actions/password.php:32 actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr "שנה סיסמה"
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "הביוגרפיה ארוכה מידי (לכל היותר 140 אותיות)"
 
-#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
-msgid "Change your password"
-msgstr ""
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "שם המיקום ארוך מידי (מותר עד 255 אותיות)."
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-msgid "Change your profile settings"
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
 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
-#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
-#: actions/register.php:376 actions/smssettings.php:122
-msgid "Confirm"
-msgstr "אשר"
-
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "אשר כתובת"
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "כתובת אתר הבית '%s' אינה חוקית"
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245 actions/emailsettings.php:256
-#: actions/imsettings.php:230 actions/smssettings.php:253
-#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
-msgid "Confirmation cancelled."
-msgstr "האישור בוטל."
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "כינוי זה כבר תפוס. נסה כינוי אחר."
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
-msgid "Confirmation code"
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
 msgstr ""
 
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-msgid "Confirmation code not found."
-msgstr "קוד האישור לא נמצא."
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+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."
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
-msgid "Connect"
-msgstr "התחבר"
-
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
-msgid "Connect existing account"
-msgstr "התחבר לחשבון קיים"
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "נכשלה ההפניה לשרת: %s"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
-msgid "Contact"
-msgstr "צור קשר"
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "לא שלחנו אלינו את הפרופיל הזה"
 
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
-#, php-format
-msgid "Could not create OpenID form: %s"
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
 msgstr "נכשלה יצירת OpenID מתוך: %s"
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
 #, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
-msgid "Could not follow user: User not found."
+msgid "%s groups"
 msgstr ""
 
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: actions/apigrouplistall.php:94
 #, php-format
-msgid "Could not redirect to server: %s"
-msgstr "נכשלה ההפניה לשרת: %s"
+msgid "groups on %s"
+msgstr ""
 
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
-msgid "Could not save avatar info"
-msgstr "שמירת מידע התמונה נכשל"
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "פרופיל"
 
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
-msgid "Could not save new profile info"
-msgstr "שמירת מידע הפרופיל החדש נכשלה"
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "לא שלחנו אלינו את הפרופיל הזה"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
-msgid "Could not subscribe other to you."
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
 msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
-msgid "Could not subscribe."
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
 msgstr ""
 
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "התמונה עודכנה."
+
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-msgid "Couldn't convert request tokens to access tokens."
-msgstr "המרת אסימון הבקשה לאסימון גישה לא הצליחה."
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות."
 
-#: ../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
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-msgid "Couldn't delete email confirmation."
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
+msgstr "לא נמצא"
+
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
-msgid "Couldn't delete subscription."
-msgstr "מחיקת המנוי לא הצליחה."
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "פורמט התמונה אינו נתמך."
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
-msgid "Couldn't find any statuses."
+#: actions/apitimelinefavorites.php:107
+#, php-format
+msgid "%s / Favorites from %s"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-msgid "Couldn't get a request token."
-msgstr "אסימון הבקשה לא התקבל."
+#: actions/apitimelinefavorites.php:119
+#, php-format
+msgid "%s updates favorited by %s / %s."
+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
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
-msgid "Couldn't insert confirmation code."
-msgstr "הכנסת קוד האישור נכשלה."
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
+#, php-format
+msgid "%s timeline"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
-msgstr "הכנסת מנוי חדש נכשלה."
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-msgid "Couldn't save profile."
-msgstr "שמירת הפרופיל נכשלה."
+#: actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "הסטטוס של %1$s ב-%2$s "
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
+#: actions/apitimelinementions.php:126
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
-msgid "Couldn't update user record."
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#, php-format
+msgid "%s public timeline"
 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
-#: actions/confirmaddress.php:114 actions/emailsettings.php:280
-#: actions/emailsettings.php:411 actions/imsettings.php:252
-#: actions/imsettings.php:395 actions/othersettings.php:162
-#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
-msgid "Couldn't update user."
-msgstr "עידכון המשתמש נכשל."
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
-msgid "Create"
-msgstr "צור"
+#: actions/apitimelinetag.php:101 actions/tag.php:66
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
-msgid "Create a new user with this nickname."
-msgstr "צור משתמש חדש עם הכינוי הזה."
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "מיקרובלוג מאת %s"
 
-#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
-msgid "Create new account"
-msgstr "צור חשבון חדש"
+#: actions/apiusershow.php:96
+#, fuzzy
+msgid "Not found."
+msgstr "לא נמצא"
 
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
-msgid "Creating new account for OpenID that already has a user."
-msgstr "יצירת חשבון חדש עבור OpenID שכבר משוייך למשתמש."
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "אין מסמך כזה."
 
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "כתובת מאושרת נוכחית של Jabber/GTalk."
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+msgstr "אין כינוי"
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "אין גודל."
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-msgid "Current confirmed email address."
-msgstr ""
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "גודל לא חוקי."
 
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
-msgstr "כרגע"
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "תמונה"
 
-#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: actions/avatarsettings.php:78
 #, php-format
-msgid "DB error inserting hashtag: %s"
+msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "שגיאת מסד נתונים בהכנסת התגובה: %s"
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
-msgid "Delete notice"
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
 msgstr ""
 
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "תאר את עצמך ואת נושאי העניין שלך ב-140 אותיות"
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+#, fuzzy
+msgid "Avatar settings"
+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 actions/register.php:381
-#: actions/register.php:385 lib/accountsettingsaction.php:113
-msgid "Email"
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
 msgstr ""
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-msgid "Email Address"
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
 msgstr ""
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
-msgstr ""
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#, fuzzy
+msgid "Delete"
+msgstr "מחק"
 
-#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-msgid "Email address already exists."
-msgstr ""
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+msgstr "ההעלה"
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
-msgid "Email address confirmation"
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
 msgstr ""
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-msgid "Email addresses"
-msgstr ""
+#: actions/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "הגשת טופס לא צפויה."
 
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
-msgid "Enter a nickname or email address."
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
 msgstr ""
 
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
-msgid "Error authorizing token"
-msgstr "שגיאה באישור האסימון"
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+msgstr "התמונה עודכנה."
 
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
-msgid "Error connecting user to OpenID."
-msgstr "שגיאה בקישור המשתמש ל-OpenID."
+#: actions/avatarsettings.php:363
+msgid "Failed updating avatar."
+msgstr "עדכון התמונה נכשל."
 
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
-msgstr "שגיאת חיבור משתמש."
+#: actions/avatarsettings.php:387
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "התמונה עודכנה."
 
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
-msgstr "שגיאה בהכנסת התמונה."
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+#, fuzzy
+msgid "No nickname"
+msgstr "אין כינוי"
 
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
-msgstr "שגיאה בהכנסת הפרופיל"
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+#, fuzzy
+msgid "No such group"
+msgstr "אין הודעה כזו."
 
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
-msgstr "שגיאה בהכנסת פרופיל מרוחק"
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "למשתמש אין פרופיל."
 
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
-msgid "Error saving address confirmation."
-msgstr "שגיאה בשמירת אישור הכתובת."
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s וחברים"
 
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
-msgid "Error saving remote profile"
-msgstr "שגיאה בשמירת פרופיל מרוחק"
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr ""
 
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-msgid "Error saving the profile."
-msgstr "שגיאה בשמירת הפרופיל."
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "אין משתמש כזה."
 
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-msgid "Error saving the user."
-msgstr "שגיאה בשמירת המשתמש."
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
+msgstr ""
 
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
-msgid "Error saving user; invalid."
-msgstr "שגיאה בשמירת שם המשתמש, לא עומד בכללים."
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+#, fuzzy
+msgid "Unblock this user"
+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 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-msgid "Error setting user."
-msgstr "שגיאה ביצירת שם המשתמש."
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "לא מחובר."
 
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr "שגיאה בעידכון הפרופיל"
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
-msgstr "שגיאה בעדכון פרופיל מרוחק"
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
+msgstr ""
 
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr "שגיאה באישור הקוד."
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#, fuzzy
+msgid "Block user"
+msgstr "אין משתמש כזה."
 
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
-msgid "Existing nickname"
-msgstr "כינוי זה כבר קיים"
+#: actions/block.php:136
+msgid ""
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
+msgstr ""
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
-msgid "FAQ"
-msgstr "רשימת שאלות נפוצות"
+#: actions/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
+msgid "No"
+msgstr "לא"
 
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
-msgid "Failed updating avatar."
-msgstr "עדכון התמונה נכשל."
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user"
+msgstr "אין משתמש כזה."
 
-#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
-#, php-format
-msgid "Feed for friends of %s"
-msgstr "הזנות החברים של %s"
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
+msgstr "כן"
 
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
-#, php-format
-msgid "Feed for replies to %s"
-msgstr "הזנת התגובות ל-%s"
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "אין משתמש כזה."
 
-#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
-#, php-format
-msgid "Feed for tag %s"
-msgstr ""
+#: actions/block.php:165
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "כבר נכנסת למערכת!"
 
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
+#: actions/block.php:170
+msgid "Failed to save block information."
 msgstr ""
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
+#: actions/bookmarklet.php:50
+msgid "Post to "
 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
-#: actions/profilesettings.php:103 actions/register.php:391
-#: actions/showgroup.php:235 actions/showstream.php:262
-#: actions/tagother.php:105 lib/groupeditform.php:142
-msgid "Full name"
-msgstr "שם מלא"
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+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
-#: actions/editgroup.php:195 actions/newgroup.php:146
-#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
-msgid "Full name is too long (max 255 chars)."
-msgstr "השם המלא ארוך מידי (מותרות 255 אותיות בלבד)"
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "קוד האישור לא נמצא."
 
-#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
-msgid "Help"
-msgstr "עזרה"
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "קוד האישור הזה אינו מיועד לך!"
 
-#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
-msgid "Home"
-msgstr "בית"
+#: actions/confirmaddress.php:90
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr "סוג לא מזוהה של כתובת %s"
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
-msgid "Homepage"
-msgstr "אתר בית"
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr "כתובת זו כבר אושרה."
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
-msgid "Homepage is not a valid URL."
-msgstr "לאתר הבית יש כתובת לא חוקית."
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "עידכון המשתמש נכשל."
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
-msgid "I want to post notices by email."
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
 msgstr ""
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
-msgstr ""
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "אשר כתובת"
 
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
-msgstr "כתובת מסרים מידיים"
+#: actions/confirmaddress.php:159
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "הכתובת \"%s\" אושרה עבור חשבונך."
 
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
-msgstr "הגדרות מסרים מידיים"
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "מיקום"
 
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
-msgstr ""
-"אם יש לך כבר חשבון, התחבר עם שם המשתמש והסיסמה שלך וקשר אותו אל ה-OpenID שלך."
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
+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\"."
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
+msgstr "אין הודעה כזו."
+
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
 msgstr ""
-"אם אתה רוצה להוסיף OpenID לחשבון שלך, הכנס אותו לתיבה שלמטה ולחץ \"הוסף\""
 
-#: ../actions/recoverpassword.php:137
+#: actions/deletenotice.php:103
 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."
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
 msgstr ""
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-#: actions/emailsettings.php:127 actions/smssettings.php:140
-msgid "Incoming email"
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
 msgstr ""
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
-msgid "Incoming email address removed."
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
 msgstr ""
 
-#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
-msgid "Incorrect old password"
-msgstr "הסיסמה הישנה לא נכונה"
-
-#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
-msgid "Incorrect username or password."
-msgstr "שם משתמש או סיסמה לא נכונים."
+#: actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "אין הודעה כזו."
 
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+msgid "Delete this notice"
 msgstr ""
 
-#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "כתובת התמונה '%s' אינה חוקית"
-
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
-#, php-format
-msgid "Invalid email address: %s"
+#: actions/deletenotice.php:157
+msgid "There was a problem with your session token.  Try again, please."
 msgstr ""
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
-#, php-format
-msgid "Invalid homepage '%s'"
-msgstr "כתובת אתר הבית '%s' אינה חוקית"
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr ""
 
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
-#, php-format
-msgid "Invalid license URL '%s'"
-msgstr "כתובת הרשיון '%s' איה חוקית"
+#: actions/disfavor.php:94
+#, fuzzy
+msgid "Add to favorites"
+msgstr "מועדפים"
 
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
-msgstr "תוכן ההודעה לא חוקי"
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "אין מסמך כזה."
 
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
-msgstr "כתובת לא חוקית"
+#: actions/editgroup.php:56
+#, php-format
+msgid "Edit %s group"
+msgstr ""
 
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
-msgstr "כתובת לא חוקית"
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
+msgstr ""
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "כתובת הפרופיל '%s' לא חוקית."
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+msgid "You must be an admin to edit the group"
+msgstr ""
 
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
-msgstr "כתובת פרופיל לא חוקית (פורמט לא תקין)"
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
-msgstr "השרת החזיר כתובת פרופיל לא חוקית"
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "הביוגרפיה ארוכה מידי (לכל היותר 140 אותיות)"
 
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
-#: actions/avatarbynickname.php:69
-msgid "Invalid size."
-msgstr "גודל לא חוקי."
+#: actions/editgroup.php:253
+#, fuzzy
+msgid "Could not update group."
+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
-#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
-msgid "Invalid username or password."
-msgstr "שם המשתמש או הסיסמה לא חוקיים"
+#: actions/editgroup.php:269
+#, fuzzy
+msgid "Options saved."
+msgstr "ההגדרות נשמרו."
 
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-msgid "Invitation(s) sent"
+#: actions/emailsettings.php:60
+msgid "Email Settings"
 msgstr ""
 
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-msgid "Invitation(s) sent to the following people:"
+#: actions/emailsettings.php:71
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
-msgid "Invite"
-msgstr ""
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "כתבות"
 
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-msgid "Invite new users"
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
 msgstr ""
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
-#, php-format
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "הסר"
+
+#: actions/emailsettings.php:113
 msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
 msgstr ""
-"הוא פועל על תוכנת המיקרובלוג [](http://status.netלאקוניקה/) לאקוניקה, גירסה %"
-"s, המופצת תחת רשיון [GNU Affero General Public License](http://www.fsf.org/"
-"licensing/licenses/agpl-3.0.html)"
 
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
-msgstr "זיהוי ה-Jabber כבר שייך למשתמש אחר."
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+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."
+#: actions/emailsettings.php:121
+msgid "Email Address"
 msgstr ""
-"כתובת Jabber או GTalk, כגון \"UserName@example.org\". הוסף את %s אל רשימת "
-"החברים בתוכנת ההמסרים המידיים או GTalk שלך."
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
-msgid "Language"
-msgstr "שפה"
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
-msgid "Language is too long (max 50 chars)."
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "הוסף"
+
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
 msgstr ""
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
-msgid "Location"
-msgstr "מיקום"
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
+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
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
-msgid "Location is too long (max 255 chars)."
-msgstr "שם המיקום ארוך מידי (מותר עד 255 אותיות)."
+#: actions/emailsettings.php:145 actions/smssettings.php:162
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr ""
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
-#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
-#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
-#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
-#, php-format
-msgid "Login"
-msgstr "היכנס"
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
+msgstr "חדש"
 
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "התחבר לחשבון [OpenID](%%doc.openid%%). "
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
+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%"
-"%). "
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
 msgstr ""
-"היכנס בעזרת שם המשתמש והסיסמה שלך. עדיין אין לך שם משתמש? [הרשם](%%action."
-"register%%) לחשבון "
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
-msgid "Logout"
-msgstr "צא"
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
 
-#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
-msgid "Longer name, preferably your \"real\" name"
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
-msgid "Lost or forgotten password?"
-msgstr "שכחת או איבדת את הסיסמה?"
+#: actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
+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."
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#: actions/emailsettings.php:71
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
 msgstr ""
 
-#: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
-msgid "Member since"
-msgstr "חבר מאז"
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
+msgstr ""
 
-#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
-#, php-format
-msgid "Microblog by %s"
-msgstr "מיקרובלוג מאת %s"
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+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."
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+msgstr "העדפות נשמרו."
+
+#: actions/emailsettings.php:319
+msgid "No email address."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-msgid "My text and files are available under "
-msgstr "הטקסטים והקבצים שלי מופצים תחת רשיון"
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
+msgstr ""
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#: actions/emailsettings.php:142 actions/smssettings.php:152
-msgid "New"
-msgstr "חדש"
+#: actions/emailsettings.php:330
+msgid "Not a valid email address"
+msgstr ""
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
-#, php-format
-msgid "New email address for posting to %s"
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
 msgstr ""
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
-msgid "New incoming email address added."
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another user."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
-msgid "New nickname"
-msgstr "כינוי חדש"
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+msgstr "הכנסת קוד האישור נכשלה."
 
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
-msgstr "הודעה חדשה"
+#: actions/emailsettings.php:358
+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/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-msgid "New password"
-msgstr "סיסמה חדשה"
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
+msgstr "אין אישור ממתין שניתן לבטל."
 
-#: ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
-msgstr "הסיסמה החדשה נשמרה בהצלחה. אתה מחובר למערכת."
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+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
-#: actions/login.php:228 actions/profilesettings.php:98
-#: actions/register.php:367 actions/showgroup.php:224
-#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
-msgid "Nickname"
-msgstr "כינוי"
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+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
-#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
-msgid "Nickname already in use. Try another one."
-msgstr "כינוי זה כבר תפוס. נסה כינוי אחר."
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
+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
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "כינוי יכול להכיל רק אותיות אנגליות קטנות ומספרים, וללא רווחים."
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "הכתובת הוסרה."
 
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
-msgid "Nickname not allowed."
-msgstr "כינוי זה אסור."
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
+msgstr ""
 
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
-msgstr "כינויו של המשתמש אחריו אתה רוצה לעקוב"
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
+msgstr ""
 
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
-msgid "Nickname or email"
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
 msgstr ""
 
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
-msgid "No"
-msgstr "לא"
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
+msgstr ""
 
-#: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
-msgstr "אין זיהוי Jabber כזה."
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+#, fuzzy
+msgid "Popular notices"
+msgstr "אין הודעה כזו."
 
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
-msgid "No authorization request!"
-msgstr "לא התבקש אישור!"
+#: actions/favorited.php:67
+#, fuzzy, php-format
+msgid "Popular notices, page %d"
+msgstr "אין הודעה כזו."
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
-msgid "No carrier selected."
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
 msgstr ""
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
-#: actions/confirmaddress.php:75
-msgid "No confirmation code."
-msgstr "אין קוד אישור."
+#: actions/favorited.php:153
+msgid ""
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
+msgstr ""
 
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
-#: actions/newnotice.php:126 classes/Command.php:223
-msgid "No content!"
-msgstr "אין תוכן!"
+#: actions/favorited.php:156
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
+msgstr ""
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
-msgid "No email address."
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
 msgstr ""
 
-#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
-msgid "No id."
-msgstr "אין זיהוי."
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "מיקרובלוג מאת %s"
 
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
-msgid "No incoming email address."
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr "השרת הרחוק לא מספק כינוי"
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr ""
 
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
-msgid "No nickname."
-msgstr "אין כינוי"
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+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
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
-msgid "No pending confirmation to cancel."
-msgstr "אין אישור ממתין שניתן לבטל."
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr ""
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
-msgstr "השרת לא החזיר כתובת פרופיל"
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "הודעה חדשה"
 
-#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
-msgid "No registered email address for that user."
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "הודעה חדשה"
+
+#: actions/file.php:42
+msgid "No attachments"
 msgstr ""
 
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr "לא נמצאה בקשה!"
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
 
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
-msgid "No results"
-msgstr "אין תוצאות"
+#: actions/finishremotesubscribe.php:69
+msgid "Not expecting this response!"
+msgstr "זו תגובה לא צפויה!"
 
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
-msgstr "אין גודל."
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "המשתמש אליו אתה מאזין אינו קיים."
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
-msgid "No status found with that ID."
-msgstr ""
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+msgstr "ניתן להשתמש במנוי המקומי!"
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
-msgid "No status with that ID found."
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
-msgstr "אין OpenID כזה."
-
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
-msgid "No such document."
-msgstr "אין מסמך כזה."
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+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 actions/shownotice.php:87
-#: lib/deleteaction.php:51
-msgid "No such notice."
-msgstr "אין הודעה כזו."
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "המרת אסימון הבקשה לאסימון גישה לא הצליחה."
 
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr "אין קוד שיחזור כזה."
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "גירסה לא מוכרת של פרוטוקול OMB"
 
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-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 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
-msgid "No such user."
-msgstr "אין משתמש כזה."
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "שגיאה בעדכון פרופיל מרוחק"
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-msgid "No user with that email address or username."
-msgstr ""
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+#, fuzzy
+msgid "No such group."
+msgstr "אין הודעה כזו."
 
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
-msgstr "אין את מי להציג!"
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "אין הודעה כזו."
 
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr "זהו לא קוד אישור."
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "אין הודעה כזו."
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
 msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
-msgid "Not a supported data format."
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
 msgstr ""
 
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
-msgstr "לא עומד בכללים לזיהוי Jabber"
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "למשתמש אין פרופיל."
 
-#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-msgid "Not a valid OpenID."
-msgstr "לא עומד בכללים ל-OpenID."
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "לא שלחנו אלינו את הפרופיל הזה"
 
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
-msgid "Not a valid email address"
-msgstr ""
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "אין משתמש כזה."
 
-#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-msgid "Not a valid email address."
+#: actions/groupblock.php:162
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
 msgstr ""
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-#: actions/editgroup.php:186 actions/newgroup.php:137
-#: actions/profilesettings.php:195 actions/register.php:161
-msgid "Not a valid nickname."
-msgstr "שם משתמש לא חוקי."
+#: actions/groupblock.php:178
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "נכשלה ההפניה לשרת: %s"
 
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
-msgstr "Not a valid profile URL (incorrect services)."
+#: actions/groupblock.php:179
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "אין משתמש כזה."
 
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr "Not a valid profile URL (no XRDS defined)."
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
+msgstr ""
 
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr "Not a valid profile URL (no YADIS document)."
+#: actions/groupbyid.php:74
+msgid "No ID"
+msgstr ""
 
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
-msgid "Not an image or corrupt file."
-msgstr "זהו לא קובץ תמונה, או שחל בו שיבוש."
+#: actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
-msgid "Not authorized."
-msgstr "לא מורשה."
+#: actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "קבוצות"
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
-msgid "Not expecting this response!"
-msgstr "זו תגובה לא צפויה!"
+#: actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
-msgid "Not found"
-msgstr "לא נמצא"
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+#, fuzzy
+msgid "Couldn't update your design."
+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 actions/block.php:59 actions/disfavor.php:61
-#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
-#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
-#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
-#: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "לא מחובר."
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+msgid "Unable to save your design settings!"
+msgstr ""
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
-msgid "Not subscribed!."
-msgstr "לא מנוי!"
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "העדפות נשמרו."
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
 msgstr ""
 
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
+#: actions/grouplogo.php:150
 #, php-format
-msgid "Notice feed for %s"
-msgstr "הזנת הודעות של %s"
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
 
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
-msgstr "להודעה אין פרופיל"
+#: actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
+msgstr ""
 
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
-msgid "Notices"
-msgstr "הודעות"
+#: actions/grouplogo.php:396
+#, fuzzy
+msgid "Logo updated."
+msgstr "התמונה עודכנה."
+
+#: actions/grouplogo.php:398
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "עדכון התמונה נכשל."
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/groupmembers.php:93 lib/groupnav.php:92
 #, php-format
-msgid "Notices tagged with %s"
+msgid "%s group members"
 msgstr ""
 
-#: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
-msgstr "סיסמה ישנה"
-
-#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
-msgid "OpenID"
-msgstr "OpenID"
-
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
-msgid "OpenID Account Setup"
-msgstr "הגדרת חשבון OpenID"
-
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-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
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-msgid "OpenID Login"
-msgstr "כניסת OpenId"
-
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-#: actions/openidlogin.php:102 actions/openidsettings.php:101
-msgid "OpenID URL"
-msgstr "כתובת ה-OpenID"
-
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
-msgid "OpenID authentication cancelled."
-msgstr "אישור ה-OpenID בוטל."
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr "אישור ה-OpenID נכשל: %s"
-
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "כשל OpenID: %s"
-
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr "OpenID הוסר."
-
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
-msgstr "הגדרות OpenID"
-
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-msgid "Optionally add a personal message to the invitation."
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
 msgstr ""
 
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
-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 actions/finishopenidlogin.php:118
-#: actions/login.php:231 actions/register.php:372
-#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-msgid "Password"
-msgstr "סיסמה"
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr ""
 
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
-msgid "Password and confirmation do not match."
-msgstr "הסיסמה ואישורה אינן תואמות."
+#: actions/groupmembers.php:175 lib/groupnav.php:107
+msgid "Admin"
+msgstr ""
 
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
-msgid "Password must be 6 chars or more."
-msgstr "הסיסמה חייבת להיות בת לפחות 6 אותיות."
+#: actions/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
+msgstr ""
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-msgid "Password recovery requested"
-msgstr "התבקש שיחזור סיסמה"
+#: actions/groupmembers.php:441
+msgid "Make user an admin of the group"
+msgstr ""
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-msgid "Password saved."
-msgstr "הסיסמה נשמרה."
+#: actions/groupmembers.php:473
+msgid "Make Admin"
+msgstr ""
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-msgid "Passwords don't match."
-msgstr "הסיסמאות לא תואמות."
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
-msgstr "אנשים"
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "מיקרובלוג מאת %s"
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
-msgstr "חיפוש אנשים"
+#: actions/groupsearch.php:52
+#, fuzzy, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"חפש אנשים ב-%%site.name%% לפי שם, מיקום, או תחומי עניין. הפרד בעזרת רווחים "
+"בין הביטויים; עליהם להיות בני לפחות 3 אותיות."
 
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
+#: actions/groupsearch.php:58
+#, fuzzy
+msgid "Group search"
 msgstr "חיפוש סיסמה"
 
-#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
-msgid "Personal"
-msgstr "אישי"
-
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-msgid "Personal message"
-msgstr ""
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "אין תוצאות"
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
+#: actions/groupsearch.php:82
+#, php-format
+msgid ""
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
 msgstr ""
 
-#: ../actions/userauthorization.php:78
+#: actions/groupsearch.php:85
+#, php-format
 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\"."
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
 msgstr ""
-"בדוק את הפרטים כדי לוודא שברצונך להירשם כמנוי להודעות משתמש זה. אם אינך רוצה "
-"להירשם, לחץ \"בטל\"."
 
-#: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "פרסם הודעה כששורת הסטטוס שלי ב-Jabber/GTalk מתעדכנת."
-
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94 actions/emailsettings.php:86
-#: actions/imsettings.php:68 actions/smssettings.php:94
-#: actions/twittersettings.php:70 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
-msgid "Preferences"
-msgstr "העדפות"
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
+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
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
-msgid "Preferences saved."
-msgstr "העדפות נשמרו."
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
-msgid "Preferred language"
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
 msgstr ""
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
-msgid "Privacy"
-msgstr "פרטיות"
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+#, fuzzy
+msgid "Create a new group"
+msgstr "צור חשבון חדש"
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-msgid "Problem saving notice."
-msgstr "בעיה בשמירת ההודעה."
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
-msgid "Profile"
-msgstr "פרופיל"
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "למשתמש אין פרופיל."
 
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
-msgstr "כתובת הפרופיל"
+#: actions/groupunblock.php:128 actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+msgstr "שגיאה בשמירת המשתמש."
 
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
-msgstr "הגדרות הפרופיל"
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "הגדרות מסרים מידיים"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-msgid "Profile unknown"
-msgstr "פרופיל לא מוכר"
+#: actions/imsettings.php:70
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+"אפשר לשלוח ולקבל בודעות דרך Jabber/GTalk [instant messages](%%doc.im%%) הגדר "
+"את כתובתך והעדפותיך למטה."
 
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
-msgid "Public Stream Feed"
-msgstr "הזנת זרם הציבורי"
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל"
 
-#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
-msgid "Public timeline"
-msgstr "קו זמן ציבורי"
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "כתובת מאושרת נוכחית של Jabber/GTalk."
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#: actions/imsettings.php:114
+#, 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:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
-msgid "Publish a MicroID for my email address."
-msgstr ""
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "כתובת מסרים מידיים"
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
+#: actions/imsettings.php:126
+#, 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 אל רשימת "
+"החברים בתוכנת ההמסרים המידיים או GTalk שלך."
 
-#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
-msgid "Recover"
-msgstr "שיחזור"
-
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
-msgid "Recover password"
-msgstr "סיסמת שיחזור"
-
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-msgid "Recovery code for unknown user."
-msgstr "קוד שיחזור למשתמש לא ידוע."
+#: actions/imsettings.php:143
+msgid "Send me notices through Jabber/GTalk."
+msgstr "שלח לי הודעות דרך Jabber/GTalk."
 
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
-#: actions/register.php:152 actions/register.php:207 lib/util.php:328
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-msgid "Register"
-msgstr "הירשם"
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr "פרסם הודעה כששורת הסטטוס שלי ב-Jabber/GTalk מתעדכנת."
 
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
-msgid "Registration not allowed."
+#: actions/imsettings.php:153
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
-msgid "Registration successful"
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
-msgid "Reject"
-msgstr "דחה"
-
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
-msgid "Remember me"
-msgstr "זכור אותי"
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "אין זיהוי Jabber כזה."
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
-msgid "Remote profile with no matching profile"
-msgstr "אין פרופיל תואם לפרופיל המרוחק "
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr "לא ניתן לנרמל את זהות ה-Jabber הזה"
 
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
-msgstr "הרשמה מרוחקת"
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "לא עומד בכללים לזיהוי Jabber"
 
-#: ../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 actions/emailsettings.php:101
-#: actions/emailsettings.php:134 actions/imsettings.php:102
-#: actions/openidsettings.php:166 actions/smssettings.php:103
-#: actions/smssettings.php:146 actions/twittersettings.php:115
-msgid "Remove"
-msgstr "הסר"
+#: actions/imsettings.php:299
+msgid "That is already your Jabber ID."
+msgstr "זהו כבר זיהוי ה-Jabber שלך."
 
-#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
-msgstr "הסר OpenID"
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr "זיהוי ה-Jabber כבר שייך למשתמש אחר."
 
-#: ../actions/openidsettings.php:73
+#: actions/imsettings.php:327
+#, php-format
 msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
 msgstr ""
-"הסרת ה-OpenID היחיד שלך תגרום לכך שלא תוכל להתחבר למערכת. אם אתה צריך להסיר "
-"אותו, לפני כן הוסף OpenID אחר."
+"קוד אישור נשלח אל כתובת המסרים המידיים שהוספת. עליך לאשר את %s לשליחת מסרים "
+"מידיים אליך."
 
-#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
-msgid "Replies"
-msgstr "תגובות"
+#: actions/imsettings.php:387
+msgid "That is not your Jabber ID."
+msgstr "זהו לא זיהוי ה-Jabber שלך."
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
-#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
-#: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: actions/inbox.php:59
 #, php-format
-msgid "Replies to %s"
-msgstr "תגובת עבור %s"
+msgid "Inbox for %s - page %d"
+msgstr ""
 
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
-msgid "Reset"
-msgstr "איפוס"
+#: actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
 
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
-msgid "Reset password"
-msgstr "איפוס סיסמה"
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-msgid "SMS"
-msgstr "סמס"
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
-msgid "SMS Phone number"
+#: actions/invite.php:41
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
 msgstr ""
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
+#: actions/invite.php:72
+#, php-format
+msgid "Invalid email address: %s"
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
-msgid "SMS confirmation"
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
 msgstr ""
 
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
-msgid "Same as password above"
-msgstr "זהה לסיסמה למעלה"
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr ""
 
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
-msgid "Same as password above. Required."
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
 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 actions/emailsettings.php:182
-#: actions/facebooksettings.php:114 actions/imsettings.php:157
-#: actions/othersettings.php:117 actions/profilesettings.php:150
-#: actions/smssettings.php:169 actions/subscriptions.php:124
-#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
-msgid "Save"
-msgstr "שמור"
+#: actions/invite.php:131 actions/invite.php:139
+#, php-format
+msgid "%s (%s)"
+msgstr ""
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
-msgid "Search"
-msgstr "חיפוש"
+#: actions/invite.php:136
+msgid ""
+"These people are already users and you were automatically subscribed to them:"
+msgstr ""
 
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
-msgstr "הזנת זרם החיפושים"
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
-#, php-format
+#: actions/invite.php:150
 msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 msgstr ""
-"חפש הודעות ב-%%site.name%% לפי תוכנן. הפרד בעזרת רווחים בין הביטויים; עליהם "
-"להיות בני לפחות 3 אותיות."
 
-#: ../actions/peoplesearch.php:28
-#, php-format
+#: actions/invite.php:162
 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."
+"Use this form to invite your friends and colleagues to use this service."
 msgstr ""
-"חפש אנשים ב-%%site.name%% לפי שם, מיקום, או תחומי עניין. הפרד בעזרת רווחים "
-"בין הביטויים; עליהם להיות בני לפחות 3 אותיות."
 
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
-msgid "Select a carrier"
+#: actions/invite.php:187
+msgid "Email addresses"
 msgstr ""
 
-#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
-#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
-msgid "Send"
-msgstr "שלח"
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
+#: actions/invite.php:192
+msgid "Personal message"
 msgstr ""
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
-msgid "Send me notices through Jabber/GTalk."
-msgstr "שלח לי הודעות דרך Jabber/GTalk."
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
+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."
+#: actions/invite.php:226
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#: actions/invite.php:228
+#, 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/util.php:304 lib/util.php:320 lib/facebookaction.php:215
-msgid "Settings"
-msgstr "הגדרות"
-
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
-msgid "Settings saved."
-msgstr "ההגדרות נשמרו."
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
 msgstr ""
 
-#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:114
-msgid "Someone else already has this OpenID."
-msgstr "למישהו כבר יש את ה-OpenID הזה."
+#: actions/joingroup.php:90 lib/command.php:217
+#, fuzzy
+msgid "You are already a member of that group"
+msgstr "כבר נכנסת למערכת!"
 
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
-msgstr "קרה משהו מוזר."
+#: actions/joingroup.php:128 lib/command.php:234
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s"
+msgstr "נכשלה ההפניה לשרת: %s"
 
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
+#: actions/joingroup.php:135 lib/command.php:239
+#, php-format
+msgid "%s joined group %s"
 msgstr ""
 
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
-msgid "Source"
-msgstr "מקור"
+#: actions/leavegroup.php:90 lib/command.php:268
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "לא שלחנו אלינו את הפרופיל הזה"
 
-#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
-msgid "Statistics"
-msgstr "סטטיסטיקה"
+#: actions/leavegroup.php:119 lib/command.php:278
+msgid "Could not find membership record."
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-msgid "Stored OpenID not found."
-msgstr "OpenID מאוכסן לא נמצא."
+#: actions/leavegroup.php:127 lib/command.php:284
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "נכשלה יצירת OpenID מתוך: %s"
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
-#: actions/showstream.php:197 actions/showstream.php:206
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
-msgid "Subscribe"
-msgstr "הירשם כמנוי"
+#: actions/leavegroup.php:134 lib/command.php:289
+#, php-format
+msgid "%s left group %s"
+msgstr ""
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
-msgid "Subscribers"
-msgstr "מנויים"
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "כבר מחובר."
 
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
-msgid "Subscription authorized"
-msgstr "ההרשמה אושרה"
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "תוכן ההודעה לא חוקי"
 
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
-msgid "Subscription rejected"
-msgstr "ההרשמה נדחתה"
+#: actions/login.php:143
+msgid "Incorrect username or password."
+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
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
-msgid "Subscriptions"
-msgstr "הרשמות"
+#: actions/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
+msgstr "שגיאה ביצירת שם המשתמש."
 
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
-msgid "System error uploading file."
-msgstr "שגיאת מערכת בהעלאת הקובץ."
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "היכנס"
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
-#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
-msgid "Tags"
+#: actions/login.php:243
+msgid "Login to site"
 msgstr ""
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "טקסט"
-
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
-msgid "Text search"
-msgstr "חיפוש טקסט"
-
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
-msgstr "ה-OpenID הזה אינו שייך לך."
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "כינוי"
 
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
-msgstr "כתובת זו כבר אושרה."
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "סיסמה"
 
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
-msgstr "קוד האישור הזה אינו מיועד לך!"
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "זכור אותי"
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr ""
+#: actions/login.php:253 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
+msgstr "בעתיד התחבר אוטומטית; לא לשימוש במחשבים ציבוריים!"
 
-#: ../actions/avatar.php:80 actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
-msgstr "קובץ זה גדול מידי."
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "שכחת או איבדת את הסיסמה?"
 
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
-msgid "That is already your Jabber ID."
-msgstr "זהו כבר זיהוי ה-Jabber שלך."
+#: actions/login.php:282
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr "לצרכי אבטחה, הכנס מחדש את שם המשתמש והסיסמה לפני שתשנה את ההגדרות."
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
-msgid "That is already your email address."
+#: actions/login.php:286
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
 msgstr ""
+"היכנס בעזרת שם המשתמש והסיסמה שלך. עדיין אין לך שם משתמש? [הרשם](%%action."
+"register%%) לחשבון "
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
-msgid "That is already your phone number."
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
 msgstr ""
 
-#: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
-msgid "That is not your Jabber ID."
-msgstr "זהו לא זיהוי ה-Jabber שלך."
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
-msgid "That is not your email address."
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
 msgstr ""
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
 msgstr ""
 
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-#: actions/emailsettings.php:367 actions/imsettings.php:349
-msgid "That is the wrong IM address."
-msgstr "זוהי כתובת מסרים מידיים שגויה."
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr ""
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
+#: actions/newgroup.php:53
+msgid "New group"
 msgstr ""
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-msgid "That phone number already belongs to another user."
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
 msgstr ""
 
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49 actions/twitapistatuses.php:330
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-msgid "That's too long. Max notice size is 140 chars."
-msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות."
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr "הודעה חדשה"
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
-msgid "That's too long. Max notice size is 255 chars."
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
 msgstr ""
 
-#: ../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
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
-msgid "The address was removed."
-msgstr "הכתובת הוסרה."
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+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:"
+#: actions/newmessage.php:158
+msgid "No recipient specified."
 msgstr ""
-"המנוי אושר, אבל לא התקבלה כתובת אליה ניתן לחזור. בדוק את הוראות האתר וחפש "
-"כיצד לאשר מנוי. אסימון המנוי שלך הוא:"
 
-#: ../actions/userauthorization.php:322
+#: actions/newmessage.php:164 lib/command.php:370
 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."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
-"המנוי נדחה, אבל לא התקבלה כתובת לחזרה. בדוק את הוראות האתר וחפש כיצד להשלים "
-"דחיית מנוי."
 
-#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "הודעה חדשה"
+
+#: actions/newmessage.php:185 lib/command.php:375
 #, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr "אלה האנשים במאזינים להודעות של %s."
+msgid "Direct message to %s sent"
+msgstr ""
 
-#: ../actions/subscribers.php:33 actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr "אלה האנשים המאזינים להודעות שלך."
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
+msgstr ""
 
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
-#, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr "אלה האנשים ש%s מאזין להודעות שלהם."
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "הודעה חדשה"
 
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr "אלה האנשים שלהודעות שלהם אתה מאזין."
+#: actions/newnotice.php:199
+#, fuzzy
+msgid "Notice posted"
+msgstr "הודעות"
 
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/noticesearch.php:68
+#, php-format
 msgid ""
-"These people are already users and you were automatically subscribed to them:"
+"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/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
-msgstr "קוד אישור זה ישן מידי. אנא התחל מחדש."
+#: actions/noticesearch.php:78
+msgid "Text search"
+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/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "חיפוש ברצף אחרי \"%s\""
 
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/noticesearch.php:121
 #, 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 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-msgid "This method requires a POST or DELETE."
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 msgstr ""
 
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
-msgid "This method requires a POST."
+#: actions/noticesearch.php:124
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#: ../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
-#: actions/profilesettings.php:138
-msgid "Timezone"
-msgstr ""
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "מיקרובלוג מאת %s"
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
-msgid "Timezone not selected."
-msgstr ""
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "כל העידכונים התואמים את החיפוש אחרי \"%s\""
 
-#: ../actions/remotesubscribe.php:43
-#, php-format
+#: actions/nudge.php:85
 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."
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
-"כדי לעשות מנוי, עליך [להיכנס למערכת](%%action.login%%), או [להירשם](%%action."
-"register%%) לחשבון חדשה. אם יש לך כבר חשבון [במערכת מיקרובלוג תואמת](%%doc."
-"openmublog%%), הכנס את כתובת הפרופיל שלך למטה. "
 
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
-msgid "Two user ids or screen_names must be supplied."
+#: actions/nudge.php:94
+msgid "Nudge sent"
 msgstr ""
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "הכתובת של אתר הבית שלך, בלוג, או פרופיל באתר אחר "
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr ""
 
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-msgid "URL of your profile on another compatible microblogging service"
-msgstr "כתובת הפרופיל שלך בשרות ביקרובלוג תואם אחר"
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+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 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-msgid "Unexpected form submission."
-msgstr "הגשת טופס לא צפויה."
+#: actions/oembed.php:86 actions/shownotice.php:180
+#, php-format
+msgid "%1$s's status on %2$s"
+msgstr "הסטטוס של %1$s ב-%2$s "
 
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
-msgid "Unexpected password reset."
-msgstr "איפוס סיסמה לא צפוי."
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "התחבר"
 
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-msgid "Unknown action"
+#: actions/oembed.php:160
+msgid "Only "
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-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/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
+msgstr ""
 
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
-#, php-format
-msgid "Unrecognized address type %s"
-msgstr "סוג לא מזוהה של כתובת %s"
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "חיפוש אנשים"
 
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
-msgstr "בטל מנוי"
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr ""
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-msgid "Unsupported OMB version"
-msgstr "גירסה לא נתמכת של OMB"
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "הגדרות"
 
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
-msgid "Unsupported image file format."
-msgstr "פורמט התמונה אינו נתמך."
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr ""
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
+#: actions/othersettings.php:108
+msgid " (free service)"
 msgstr ""
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
-#, php-format
-msgid "Updates from %1$s on %2$s!"
+#: actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "הגדרות הפרופיל"
+
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
 msgstr ""
 
-#: ../actions/avatar.php:68 actions/profilesettings.php:161
-#: actions/avatarsettings.php:162 actions/grouplogo.php:232
-msgid "Upload"
-msgstr "ההעלה"
+#: actions/othersettings.php:153
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "שם המיקום ארוך מידי (מותר עד 255 אותיות)."
 
-#: ../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."
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %s - page %d"
 msgstr ""
-"העלה תמונת משתמש כאן. לאחר העלאת התמונה לא תוכל לערוך אותה, לכן וודא שהיא "
-"ריבועית (פחות או יותר). כמו כן, התמונה תפורסם תחת רשיון השימוש של האתר. "
-"השתמש בתמונה ששייכת לך ושאתה מוכן לשתף. "
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
+#: actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
 msgstr ""
 
-#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
+#: actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
 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/passwordsettings.php:58
+msgid "Change password"
+msgstr "שנה סיסמה"
 
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
-msgid "User being listened to doesn't exist."
-msgstr "המשתמש אליו אתה מאזין אינו קיים."
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+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
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-msgid "User has no profile."
-msgstr "למשתמש אין פרופיל."
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#, fuzzy
+msgid "Password change"
+msgstr "הסיסמה נשמרה."
 
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
-msgstr "כינוי משתמש"
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "סיסמה ישנה"
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr ""
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "סיסמה חדשה"
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
-msgid "What timezone are you normally in?"
-msgstr ""
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "לפחות 6 אותיות"
 
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
-#, php-format
-msgid "What's up, %s?"
-msgstr "מה המצב %s?"
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "אשר"
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-#: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "מיקומך, למשל \"עיר, מדינה או מחוז, ארץ\""
+#: actions/passwordsettings.php:113
+msgid "same as password above"
+msgstr "זהה לסיסמה למעלה"
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
-#, php-format
-msgid "Wrong image type for '%s'"
-msgstr "סוג התמונה של '%s' אינו מתאים"
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "שנה"
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
-#, php-format
-msgid "Wrong size image at '%s'"
-msgstr "גודל התמונה של: '%s' לא מתאים."
+#: actions/passwordsettings.php:154 actions/register.php:230
+msgid "Password must be 6 or more characters."
+msgstr ""
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
-msgid "Yes"
-msgstr "כן"
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "הסיסמאות לא תואמות."
 
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-msgid "You already have this OpenID!"
-msgstr "כבר יש לך את ה-OpenID הזה!"
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+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/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "שגיאה בשמירת שם המשתמש, לא עומד בכללים."
 
-#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
-msgstr "כבר נכנסת למערכת!"
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "לא ניתן לשמור את הסיסמה"
 
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-msgid "You are already subscribed to these users:"
-msgstr ""
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "הסיסמה נשמרה."
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
-msgid "You are not friends with the specified user."
+#: actions/peoplesearch.php:52
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+"Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
+"חפש אנשים ב-%%site.name%% לפי שם, מיקום, או תחומי עניין. הפרד בעזרת רווחים "
+"בין הביטויים; עליהם להיות בני לפחות 3 אותיות."
 
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr "אפשר לשנות את הסיסמה כאן. בחר סיסמה טובה!"
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "חיפוש סיסמה"
 
-#: ../actions/register.php:135 actions/register.php:145
-msgid "You can create a new account to start posting notices."
-msgstr "ניתן ליצור חשבון חדש ולהתחיל לפרסם הודעות."
+#: actions/peopletag.php:70
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "לא עומד בכללים ל-OpenID."
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
+#: actions/peopletag.php:144
 #, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
+msgid "Users self-tagged with %s - page %d"
 msgstr ""
 
-#: ../actions/openidsettings.php:86
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr "הסיר OpenID מחשבונך על ידי לחיצה על הכפתור המסומן \"הסר\"."
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "תוכן ההודעה לא חוקי"
 
-#: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/postnotice.php:90
 #, php-format
-msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
-"אפשר לשלוח ולקבל בודעות דרך Jabber/GTalk [instant messages](%%doc.im%%) הגדר "
-"את כתובתך והעדפותיך למטה."
 
-#: ../actions/profilesettings.php:27
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "הגדרות הפרופיל"
+
+#: actions/profilesettings.php:71
 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
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
-msgstr "ניתן להשתמש במנוי המקומי!"
+#: actions/profilesettings.php:99
+#, fuzzy
+msgid "Profile information"
+msgstr "פרופיל לא מוכר"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
-msgid "You can't register if you don't agree to the license."
-msgstr "לא ניתן להירשם ללא הסכמה לרשיון"
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1 עד 64 אותיות אנגליות קטנות או מספרים, ללא סימני פיסוק או רווחים."
 
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
-msgid "You did not send us that profile"
-msgstr "לא שלחנו אלינו את הפרופיל הזה"
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full 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/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "אתר בית"
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
-msgid "You may not delete another user's status."
-msgstr ""
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "הכתובת של אתר הבית שלך, בלוג, או פרופיל באתר אחר "
 
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr ""
+#: actions/profilesettings.php:122 actions/register.php:460
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "תאר את עצמך ואת נושאי העניין שלך ב-140 אותיות"
 
-#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
+#: actions/profilesettings.php:125 actions/register.php:463
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "תאר את עצמך ואת נושאי העניין שלך ב-140 אותיות"
 
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr "זוהית. הכנס סיסמה חדשה למטה."
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "ביוגרפיה"
 
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
-msgid "Your OpenID URL"
-msgstr "כתובת ה-OpenID שלך"
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "מיקום"
 
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "מיקומך, למשל \"עיר, מדינה או מחוז, ארץ\""
+
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
 msgstr ""
 
-#: ../actions/openidsettings.php:28
-#, php-format
+#: actions/profilesettings.php:140
 msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
-"account.  Manage your associated OpenIDs from here."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
-"מאפשר לך להיכנס להרבה אתרים בעזרת חשבון משתמש אחד. נהל את שיוך ה-OpenID "
-"מכאן. [OpenID](%%doc.openid%%)"
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
-msgid "a few seconds ago"
-msgstr "לפני מספר שניות"
-
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
-#, php-format
-msgid "about %d days ago"
-msgstr "לפני כ-%d ימים"
+#: actions/profilesettings.php:144
+msgid "Language"
+msgstr "שפה"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
-#, php-format
-msgid "about %d hours ago"
-msgstr "לפני כ-%d שעות"
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr ""
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
-#, php-format
-msgid "about %d minutes ago"
-msgstr "לפני כ-%d דקות"
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr ""
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
-#, php-format
-msgid "about %d months ago"
-msgstr "לפני כ-%d חודשים"
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
+msgstr ""
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
-msgid "about a day ago"
-msgstr "לפני כיום"
+#: actions/profilesettings.php:160
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
-msgid "about a minute ago"
-msgstr "לפני כדקה"
+#: actions/profilesettings.php:221 actions/register.php:223
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "הביוגרפיה ארוכה מידי (לכל היותר 140 אותיות)"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
-msgid "about a month ago"
-msgstr "לפני כחודש"
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr ""
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
-msgid "about a year ago"
-msgstr "לפני כשנה"
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr ""
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
-msgid "about an hour ago"
-msgstr "לפני כשעה"
+#: actions/profilesettings.php:246 actions/tagother.php:178
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "כתובת אתר הבית '%s' אינה חוקית"
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
-msgstr "מחק"
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
 
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117 actions/noticesearch.php:136
-#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
-msgid "in reply to..."
-msgstr "בתגובה ל..."
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+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 actions/noticesearch.php:194
-msgid "reply"
-msgstr "הגב"
+#: actions/profilesettings.php:336
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "שמירת הפרופיל נכשלה."
 
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-msgid "same as password above"
-msgstr "זהה לסיסמה למעלה"
+#: actions/profilesettings.php:344
+msgid "Settings saved."
+msgstr "ההגדרות נשמרו."
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
-msgid "unsupported file type"
+#: actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
 msgstr ""
 
-#: ../lib/util.php:1309 lib/util.php:1443
-#, fuzzy
-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
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-msgid "There was a problem with your session token. Try again, please."
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
 msgstr ""
 
-#: actions/disfavor.php:55 actions/disfavor.php:81
-msgid "This notice is not a favorite!"
-msgstr ""
+#: actions/public.php:129
+#, fuzzy, php-format
+msgid "Public timeline, page %d"
+msgstr "קו זמן ציבורי"
 
-#: actions/disfavor.php:63 actions/disfavor.php:87
-msgid "Could not delete favorite."
-msgstr ""
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr "קו זמן ציבורי"
 
-#: actions/disfavor.php:72 lib/favorform.php:140
-msgid "Favor"
-msgstr ""
+#: actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "הזנת זרם הציבורי"
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
-msgstr ""
+#: actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "הזנת זרם הציבורי"
 
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-msgid "Send me email when someone sends me a private message."
-msgstr ""
+#: actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "הזנת זרם הציבורי"
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
-msgid "This notice is already a favorite!"
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
 msgstr ""
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132 actions/favor.php:86
-#: actions/twitapifavorites.php:125 classes/Command.php:152
-msgid "Could not create favorite."
+#: actions/public.php:182
+msgid "Be the first to post!"
 msgstr ""
 
-#: actions/favor.php:70
-msgid "Disfavor"
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/public.php:233
 #, php-format
-msgid "%s favorite notices"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/public.php:238
 #, php-format
-msgid "Feed of favorite notices of %s"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
 msgstr ""
 
-#: actions/inbox.php:28 actions/inbox.php:59
+#: actions/publictagcloud.php:57
+#, fuzzy
+msgid "Public tag cloud"
+msgstr "הזנת זרם הציבורי"
+
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "Inbox for %s - page %d"
+msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/inbox.php:30 actions/inbox.php:62
+#: actions/publictagcloud.php:69
 #, php-format
-msgid "Inbox for %s"
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
 
-#: actions/inbox.php:53 actions/inbox.php:115
-msgid "This is your inbox, which lists your incoming private messages."
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
 msgstr ""
 
-#: actions/invite.php:178 actions/invite.php:213
+#: actions/publictagcloud.php:75
 #, php-format
 msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
 msgstr ""
 
-#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-msgid "Automatically login in the future; "
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
 msgstr ""
 
-#: actions/login.php:122 actions/login.php:264
-msgid "For security reasons, please re-enter your "
-msgstr ""
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "כבר נכנסת למערכת!"
 
-#: actions/login.php:126 actions/login.php:268
-msgid "Login with your username and password. "
-msgstr ""
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "אין קוד שיחזור כזה."
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
-msgid "That's too long. Max message size is 140 chars."
-msgstr ""
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "זהו לא קוד אישור."
 
-#: actions/newmessage.php:65 actions/newmessage.php:128
-msgid "No recipient specified."
-msgstr ""
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr "קוד שיחזור למשתמש לא ידוע."
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206 actions/newmessage.php:131
-#: actions/newmessage.php:168 classes/Command.php:237
-msgid "You can't send a message to this user."
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "שגיאה באישור הקוד."
+
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
+msgstr "קוד אישור זה ישן מידי. אנא התחל מחדש."
+
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
 msgstr ""
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: actions/recoverpassword.php:152
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
 msgstr ""
 
-#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
-msgid "No such user"
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
-#: actions/newmessage.php:117 actions/newmessage.php:67
-msgid "New message"
-msgstr "הודעה חדשה"
-
-#: actions/noticesearch.php:95 actions/noticesearch.php:146
-msgid "Notice without matching profile"
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
 msgstr ""
 
-#: actions/openidsettings.php:28 actions/openidsettings.php:70
-#, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
 msgstr ""
 
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr ""
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
+msgstr "שיחזור"
 
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-msgid "You can remove an OpenID from your account "
-msgstr ""
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "איפוס סיסמה"
 
-#: actions/outbox.php:28 actions/outbox.php:58
-#, php-format
-msgid "Outbox for %s - page %d"
-msgstr ""
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr "סיסמת שיחזור"
 
-#: actions/outbox.php:30 actions/outbox.php:61
-#, php-format
-msgid "Outbox for %s"
-msgstr ""
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
+msgstr "התבקש שיחזור סיסמה"
 
-#: actions/outbox.php:53 actions/outbox.php:116
-msgid "This is your outbox, which lists private messages you have sent."
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
 msgstr ""
 
-#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
-#, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
-msgstr ""
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "לפחות 6 אותיות, אל תשכח!"
 
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
-msgid "You can update your personal profile info here "
-msgstr ""
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "זהה לסיסמה למעלה"
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
-msgid "User without matching profile"
-msgstr ""
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "איפוס"
 
-#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
 msgstr ""
 
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
 msgstr ""
 
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a "
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
 msgstr ""
 
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-msgid "Your nickname on this server, "
-msgstr ""
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "שגיאה בשמירת אישור הכתובת."
 
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-msgid "Instructions for recovering your password "
+#: actions/recoverpassword.php:325
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
 msgstr ""
 
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
-msgid "New password successfully saved. "
-msgstr ""
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
+msgstr "איפוס סיסמה לא צפוי."
 
-#: actions/register.php:95 actions/register.php:180
-msgid "Password must be 6 or more characters."
-msgstr ""
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "הסיסמה חייבת להיות בת לפחות 6 אותיות."
 
-#: actions/register.php:216
-#, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
-msgstr ""
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
+msgstr "הסיסמה ואישורה אינן תואמות."
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
-msgstr ""
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
+msgstr "הסיסמה החדשה נשמרה בהצלחה. אתה מחובר למערכת."
 
-#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
-#, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/showfavorites.php:61 actions/showfavorites.php:145
-#, php-format
-msgid "Feed for favorites of %s"
-msgstr ""
+#: actions/register.php:92
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "שגיאה באישור הקוד."
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-msgid "Could not retrieve favorite notices."
+#: actions/register.php:112
+msgid "Registration successful"
 msgstr ""
 
-#: actions/showmessage.php:33 actions/showmessage.php:81
-msgid "No such message."
-msgstr ""
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "הירשם"
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
+#: actions/register.php:135
+msgid "Registration not allowed."
 msgstr ""
 
-#: actions/showmessage.php:61 actions/showmessage.php:108
-#, php-format
-msgid "Message to %1$s on %2$s"
-msgstr ""
+#: actions/register.php:198
+msgid "You can't register if you don't agree to the license."
+msgstr "לא ניתן להירשם ללא הסכמה לרשיון"
 
-#: actions/showmessage.php:66 actions/showmessage.php:113
-#, php-format
-msgid "Message from %1$s on %2$s"
+#: actions/register.php:201
+msgid "Not a valid email address."
 msgstr ""
 
-#: actions/showstream.php:154
-msgid "Send a message"
+#: actions/register.php:212
+msgid "Email address already exists."
 msgstr ""
 
-#: actions/smssettings.php:312 actions/smssettings.php:464
-#, php-format
-msgid "Mobile carrier for your phone. "
-msgstr ""
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "שם המשתמש או הסיסמה לא חוקיים"
 
-#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
-#, php-format
-msgid "Direct messages to %s"
+#: actions/register.php:342
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
-#, php-format
-msgid "All the direct messages sent to %s"
+#: actions/register.php:424
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-msgid "Direct Messages You've Sent"
-msgstr ""
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr " לפחות 6 אותיות. שדה חובה."
 
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
-#, php-format
-msgid "All the direct messages sent from %s"
+#: actions/register.php:433
+msgid "Same as password above. Required."
 msgstr ""
 
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-msgid "No message text!"
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-msgid "Recipient user not found."
-msgstr ""
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
+msgstr "לשימוש רק במקרים של עידכונים, הודעות מערכת, ושיחזורי סיסמאות"
 
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-msgid "Can't send direct messages to users who aren't your friend."
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
-#, php-format
-msgid "%s / Favorites from %s"
-msgstr ""
+#: actions/register.php:493
+msgid "My text and files are available under "
+msgstr "הטקסטים והקבצים שלי מופצים תחת רשיון"
 
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
-#, php-format
-msgid "%s updates favorited by %s / %s."
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
-#, php-format
-msgid "%s added your notice as a favorite"
+#: actions/register.php:496
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
 msgstr ""
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
+#: actions/register.php:537
 #, php-format
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
+"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/twittersettings.php:27
+#: actions/register.php:561
 msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
 msgstr ""
 
-#: actions/twittersettings.php:41 actions/twittersettings.php:60
-msgid "Twitter settings"
+#: actions/remotesubscribe.php:98
+#, php-format
+msgid ""
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
+"כדי לעשות מנוי, עליך [להיכנס למערכת](%%action.login%%), או [להירשם](%%action."
+"register%%) לחשבון חדשה. אם יש לך כבר חשבון [במערכת מיקרובלוג תואמת](%%doc."
+"openmublog%%), הכנס את כתובת הפרופיל שלך למטה. "
 
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-msgid "Twitter Account"
-msgstr ""
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr "הרשמה מרוחקת"
 
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-msgid "Current verified Twitter account."
-msgstr ""
+#: actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "ההרשמה אושרה"
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr ""
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "כינוי משתמש"
 
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-msgid "No spaces, please."
-msgstr ""
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr "כינויו של המשתמש אחריו אתה רוצה לעקוב"
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
-msgstr ""
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "כתובת הפרופיל"
 
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-msgid "Automatically send my notices to Twitter."
-msgstr ""
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "כתובת הפרופיל שלך בשרות ביקרובלוג תואם אחר"
 
-#: actions/twittersettings.php:75 actions/twittersettings.php:146
-msgid "Send local \"@\" replies to Twitter."
-msgstr ""
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
+msgstr "הירשם כמנוי"
 
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-msgid "Subscribe to my Twitter friends here."
-msgstr ""
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr "כתובת פרופיל לא חוקית (פורמט לא תקין)"
 
-#: actions/twittersettings.php:122
+#: actions/remotesubscribe.php:168
+#, fuzzy
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
-msgstr ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "Not a valid profile URL (no YADIS document)."
 
-#: actions/twittersettings.php:128 actions/twittersettings.php:334
-msgid "Could not verify your Twitter credentials!"
+#: actions/remotesubscribe.php:176
+msgid "That’s a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "אסימון הבקשה לא התקבל."
+
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
 #, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr ""
+msgid "Replies to %s"
+msgstr "תגובת עבור %s"
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-msgid "Unable to save your Twitter settings!"
-msgstr ""
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %s, page %d"
+msgstr "תגובת עבור %s"
 
-#: actions/twittersettings.php:174 actions/twittersettings.php:376
-msgid "Twitter settings saved."
-msgstr ""
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "הזנת הודעות של %s"
 
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-msgid "That is not your Twitter account."
-msgstr ""
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "הזנת הודעות של %s"
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
-msgid "Couldn't remove Twitter user."
-msgstr ""
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "הזנת הודעות של %s"
 
-#: actions/twittersettings.php:212 actions/twittersettings.php:407
-msgid "Twitter account removed."
+#: actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
 msgstr ""
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
-msgid "Couldn't save Twitter preferences."
+#: actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
 msgstr ""
 
-#: actions/twittersettings.php:245 actions/twittersettings.php:461
-msgid "Twitter preferences saved."
+#: actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: actions/userauthorization.php:84 actions/userauthorization.php:86
-msgid "Please check these details to make sure "
-msgstr ""
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "תגובת עבור %s"
 
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
-msgid "The subscription has been authorized, but no "
-msgstr ""
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "אין הודעה כזו."
 
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-msgid "The subscription has been rejected, but no "
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
 msgstr ""
 
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-msgid "Command results"
-msgstr ""
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "הזנות החברים של %s"
 
-#: classes/Channel.php:148 classes/Channel.php:204
-msgid "Command complete"
-msgstr ""
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "הזנות החברים של %s"
 
-#: classes/Channel.php:158 classes/Channel.php:215
-msgid "Command failed"
-msgstr ""
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "הזנות החברים של %s"
 
-#: classes/Command.php:39 classes/Command.php:44
-msgid "Sorry, this command is not yet implemented."
+#: actions/showfavorites.php:205
+msgid ""
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""
 
-#: classes/Command.php:96 classes/Command.php:113
+#: actions/showfavorites.php:207
 #, php-format
-msgid "Subscriptions: %1$s\n"
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
-msgid "User has no last notice"
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
 msgstr ""
 
-#: classes/Command.php:146 classes/Command.php:166
-msgid "Notice marked as fave."
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
 msgstr ""
 
-#: classes/Command.php:166 classes/Command.php:189
+#: actions/showgroup.php:82 lib/groupnav.php:86
 #, php-format
-msgid "%1$s (%2$s)"
+msgid "%s group"
 msgstr ""
 
-#: classes/Command.php:169 classes/Command.php:192
+#: actions/showgroup.php:84
 #, php-format
-msgid "Fullname: %s"
+msgid "%s group, page %d"
 msgstr ""
 
-#: classes/Command.php:172 classes/Command.php:195
-#, php-format
-msgid "Location: %s"
-msgstr ""
+#: actions/showgroup.php:218
+#, fuzzy
+msgid "Group profile"
+msgstr "אין הודעה כזו."
 
-#: classes/Command.php:175 classes/Command.php:198
-#, php-format
-msgid "Homepage: %s"
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
+msgid "URL"
 msgstr ""
 
-#: classes/Command.php:178 classes/Command.php:201
-#, php-format
-msgid "About: %s"
-msgstr "אודות: %s"
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
+#, fuzzy
+msgid "Note"
+msgstr "הודעות"
 
-#: classes/Command.php:200 classes/Command.php:228
-#, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
 msgstr ""
 
-#: classes/Command.php:214 classes/Command.php:245
-#, php-format
-msgid "Direct message to %s sent"
+#: actions/showgroup.php:293
+msgid "Group actions"
 msgstr ""
 
-#: classes/Command.php:216 classes/Command.php:247
-msgid "Error sending direct message."
+#: actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "הזנת הודעות של %s"
+
+#: actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "הזנת הודעות של %s"
+
+#: actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "הזנת הודעות של %s"
+
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "הזנת הודעות של %s"
+
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
+#, fuzzy
+msgid "Members"
+msgstr "חבר מאז"
+
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/tagcloudsection.php:71
+msgid "(None)"
 msgstr ""
 
-#: classes/Command.php:263 classes/Command.php:300
-msgid "Specify the name of the user to subscribe to"
+#: actions/showgroup.php:392
+msgid "All members"
 msgstr ""
 
-#: classes/Command.php:270 classes/Command.php:307
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "סטטיסטיקה"
+
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "צור"
+
+#: actions/showgroup.php:448
 #, php-format
-msgid "Subscribed to %s"
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: classes/Command.php:288 classes/Command.php:328
-msgid "Specify the name of the user to unsubscribe from"
+#: actions/showgroup.php:454
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
 msgstr ""
 
-#: classes/Command.php:295 classes/Command.php:335
-#, php-format
-msgid "Unsubscribed from %s"
+#: actions/showgroup.php:482
+msgid "Admins"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
-msgid "Command not yet implemented."
+#: actions/showmessage.php:81
+msgid "No such message."
 msgstr ""
 
-#: classes/Command.php:313 classes/Command.php:356
-msgid "Notification off."
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: classes/Command.php:315 classes/Command.php:358
-msgid "Can't turn off notification."
+#: actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: classes/Command.php:333 classes/Command.php:379
-msgid "Notification on."
+#: actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: classes/Command.php:335 classes/Command.php:381
-msgid "Can't turn on notification."
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "הודעות"
+
+#: actions/showstream.php:73
+#, php-format
+msgid " tagged %s"
 msgstr ""
 
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
+#: actions/showstream.php:79
+#, php-format
+msgid "%s, page %d"
 msgstr ""
 
-#: classes/Message.php:53 classes/Message.php:56
-msgid "Could not insert message."
+#: actions/showstream.php:122
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "הזנת הודעות של %s"
+
+#: actions/showstream.php:129
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "הזנת הודעות של %s"
+
+#: actions/showstream.php:136
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "הזנת הודעות של %s"
+
+#: actions/showstream.php:143
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "הזנת הודעות של %s"
+
+#: actions/showstream.php:148
+#, php-format
+msgid "FOAF for %s"
 msgstr ""
 
-#: classes/Message.php:63 classes/Message.php:66
-msgid "Could not update message with new URI."
+#: actions/showstream.php:191
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
 msgstr ""
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
 msgstr ""
 
-#: lib/mail.php:147 lib/mail.php:289
+#: actions/showstream.php:198
 #, php-format
 msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: lib/mail.php:249 lib/mail.php:508
+#: actions/showstream.php:234
 #, php-format
-msgid "New private message from %s"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: lib/mail.php:253 lib/mail.php:512
+#: actions/showstream.php:239
 #, php-format
 msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
 msgstr ""
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
+#: actions/smssettings.php:58
+msgid "SMS Settings"
 msgstr ""
 
-#: lib/openid.php:195 lib/openid.php:203
-msgid "This form should automatically submit itself. "
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-msgid "Favorites"
-msgstr "מועדפים"
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל"
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-#, php-format
-msgid "%s's favorite notices"
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-msgid "User"
-msgstr "מתשמש"
-
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-msgid "Inbox"
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-msgid "Your incoming messages"
+#: actions/smssettings.php:130
+msgid "Confirmation code"
 msgstr ""
 
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-msgid "Outbox"
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
 msgstr ""
 
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-msgid "Your sent messages"
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
 msgstr ""
 
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-msgid "Twitter"
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
+#: actions/smssettings.php:174
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
 msgstr ""
 
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-msgid "To"
-msgstr "אל"
+#: actions/smssettings.php:306
+msgid "No phone number."
+msgstr ""
 
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-msgid "Could not parse message."
+#: actions/smssettings.php:311
+msgid "No carrier selected."
 msgstr ""
 
-#: actions/all.php:63 actions/facebookhome.php:162
-#, fuzzy, php-format
-msgid "%s and friends, page %d"
-msgstr "%s וחברים"
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
+msgstr ""
 
-#: actions/avatarsettings.php:76
-msgid "You can upload your personal avatar."
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
 msgstr ""
 
-#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/smssettings.php:347
 #, fuzzy
-msgid "Avatar settings"
-msgstr "הגדרות"
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr "קוד האישור הזה אינו מיועד לך!"
 
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-msgid "Original"
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
 msgstr ""
 
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-msgid "Preview"
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
 msgstr ""
 
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
-msgid "Crop"
+#: actions/smssettings.php:465
+msgid "Mobile carrier"
 msgstr ""
 
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-msgid "There was a problem with your session token. "
+#: actions/smssettings.php:469
+msgid "Select a carrier"
 msgstr ""
 
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-msgid "Pick a square area of the image to be your avatar"
+#: actions/smssettings.php:476
+#, 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/avatarsettings.php:327 actions/grouplogo.php:384
-msgid "Lost our file data."
+#: actions/smssettings.php:498
+msgid "No code entered"
 msgstr ""
 
-#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: actions/subedit.php:70
 #, fuzzy
-msgid "Lost our file."
-msgstr "אין הודעה כזו."
-
-#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
-#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
-msgid "Unknown file type"
-msgstr ""
-
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr ""
+msgid "You are not subscribed to that profile."
+msgstr "לא שלחנו אלינו את הפרופיל הזה"
 
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr ""
+#: actions/subedit.php:83
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "יצירת המנוי נכשלה."
 
-#: actions/block.php:111
+#: actions/subscribe.php:55
 #, fuzzy
-msgid "Block user"
+msgid "Not a local user."
 msgstr "אין משתמש כזה."
 
-#: actions/block.php:129
-msgid "Are you sure you want to block this user? "
-msgstr ""
-
-#: actions/block.php:162
+#: actions/subscribe.php:69
 #, fuzzy
-msgid "You have already blocked this user."
-msgstr "כבר נכנסת למערכת!"
-
-#: actions/block.php:167
-msgid "Failed to save block information."
-msgstr ""
+msgid "Subscribed"
+msgstr "הירשם כמנוי"
 
-#: actions/confirmaddress.php:159
+#: actions/subscribers.php:50
 #, fuzzy, php-format
-msgid "The address \"%s\" has been "
-msgstr "הכתובת הוסרה."
+msgid "%s subscribers"
+msgstr "מנויים"
 
-#: actions/deletenotice.php:73
-msgid "You are about to permanently delete a notice. "
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %d"
 msgstr ""
 
-#: actions/disfavor.php:94
-#, fuzzy
-msgid "Add to favorites"
-msgstr "מועדפים"
+#: actions/subscribers.php:63
+msgid "These are the people who listen to your notices."
+msgstr "אלה האנשים המאזינים להודעות שלך."
 
-#: actions/editgroup.php:54
+#: actions/subscribers.php:67
 #, php-format
-msgid "Edit %s group"
+msgid "These are the people who listen to %s's notices."
+msgstr "אלה האנשים במאזינים להודעות של %s."
+
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
 msgstr ""
 
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-msgid "Inboxes must be enabled for groups to work"
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
 
-#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-msgid "You must be logged in to create a group."
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
 msgstr ""
 
-#: actions/editgroup.php:87 actions/grouplogo.php:87
-#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
-#, fuzzy
-msgid "No nickname"
-msgstr "אין כינוי"
+#: actions/subscriptions.php:52
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "כל המנויים"
 
-#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
-#: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
-#, fuzzy
-msgid "No such group"
-msgstr "אין הודעה כזו."
+#: actions/subscriptions.php:54
+#, fuzzy, php-format
+msgid "%s subscriptions, page %d"
+msgstr "כל המנויים"
 
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
-msgid "You must be an admin to edit the group"
-msgstr ""
+#: actions/subscriptions.php:65
+msgid "These are the people whose notices you listen to."
+msgstr "אלה האנשים שלהודעות שלהם אתה מאזין."
 
-#: actions/editgroup.php:157
-msgid "Use this form to edit the group."
+#: actions/subscriptions.php:69
+#, php-format
+msgid "These are the people whose notices %s listens to."
+msgstr "אלה האנשים ש%s מאזין להודעות שלהם."
+
+#: actions/subscriptions.php:121
+#, php-format
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
 msgstr ""
 
-#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s כעת מאזין להודעות שלך ב-%2$s"
+
+#: actions/subscriptions.php:194
 #, fuzzy
-msgid "Nickname must have only lowercase letters "
-msgstr "כינוי יכול להכיל רק אותיות אנגליות קטנות ומספרים, וללא רווחים."
+msgid "Jabber"
+msgstr "אין זיהוי Jabber כזה."
+
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
+msgstr "סמס"
 
-#: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/tagother.php:33
 #, fuzzy
-msgid "description is too long (max 140 chars)."
-msgstr "הביוגרפיה ארוכה מידי (לכל היותר 140 אותיות)"
+msgid "Not logged in"
+msgstr "לא מחובר."
 
-#: actions/editgroup.php:218
+#: actions/tagother.php:39
 #, fuzzy
-msgid "Could not update group."
-msgstr "עידכון המשתמש נכשל."
+msgid "No id argument."
+msgstr "אין מסמך כזה."
+
+#: actions/tagother.php:65
+#, php-format
+msgid "Tag %s"
+msgstr ""
 
-#: actions/editgroup.php:226
+#: actions/tagother.php:77 lib/userprofile.php:75
 #, fuzzy
-msgid "Options saved."
-msgstr "ההגדרות נשמרו."
+msgid "User profile"
+msgstr "למשתמש אין פרופיל."
 
-#: actions/emailsettings.php:107 actions/imsettings.php:108
-#, fuzzy, php-format
-msgid "Awaiting confirmation on this address. "
-msgstr "שגיאה באישור הקוד."
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
+msgstr ""
 
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-msgid "Make a new email address for posting to; "
+#: actions/tagother.php:141
+msgid "Tag user"
 msgstr ""
 
-#: actions/emailsettings.php:157
-msgid "Send me email when someone "
+#: actions/tagother.php:151
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
 msgstr ""
 
-#: actions/emailsettings.php:168
-msgid "Allow friends to nudge me and send me an email."
+#: actions/tagother.php:193
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/emailsettings.php:321
+#: actions/tagother.php:200
 #, fuzzy
-msgid "That email address already belongs "
-msgstr "כתובת זו כבר אושרה."
+msgid "Could not save tags."
+msgstr "שמירת מידע התמונה נכשל"
 
-#: actions/emailsettings.php:343
-#, fuzzy
-msgid "A confirmation code was sent to the email address you added. "
+#: actions/tagother.php:236
+msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
-"קוד אישור נשלח אל כתובת המסרים המידיים שהוספת. עליך לאשר את %s לשליחת מסרים "
-"מידיים אליך."
 
-#: actions/facebookhome.php:110
-msgid "Server error - couldn't get user!"
-msgstr ""
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "מיקרובלוג מאת %s"
 
-#: actions/facebookhome.php:196
-#, php-format
-msgid "If you would like the %s app to automatically update "
-msgstr ""
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "הזנת הודעות של %s"
 
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr ""
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "הזנת הודעות של %s"
 
-#: actions/facebookhome.php:218
-msgid "Skip"
-msgstr ""
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "הזנת הודעות של %s"
 
-#: actions/facebookhome.php:235
+#: actions/tagrss.php:35
 #, fuzzy
-msgid "No notice content!"
-msgstr "אין תוכן!"
+msgid "No such tag."
+msgstr "אין הודעה כזו."
 
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-msgid "Pagination"
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
 msgstr ""
 
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/unsubscribe.php:77
 #, fuzzy
-msgid "After"
-msgstr "<< אחרי"
+msgid "No profile id in request."
+msgstr "השרת לא החזיר כתובת פרופיל"
 
-#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/unsubscribe.php:84
 #, fuzzy
-msgid "Before"
-msgstr "לפני >>"
-
-#: actions/facebookinvite.php:70
-#, php-format
-msgid "Thanks for inviting your friends to use %s"
-msgstr ""
+msgid "No profile with that id."
+msgstr "אין פרופיל תואם לפרופיל המרוחק "
 
-#: actions/facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr ""
+#: actions/unsubscribe.php:98
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "בטל מנוי"
 
-#: actions/facebookinvite.php:96
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
 #, php-format
-msgid "You have been invited to %s"
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
-#: actions/facebookinvite.php:105
-#, fuzzy, php-format
-msgid "Invite your friends to use %s"
-msgstr "הזנות החברים של %s"
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "אשר מנוי"
 
-#: actions/facebookinvite.php:113
-#, php-format
-msgid "Friends already using %s:"
+#: actions/userauthorization.php:110
+#, fuzzy
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
 msgstr ""
+"בדוק את הפרטים כדי לוודא שברצונך להירשם כמנוי להודעות משתמש זה. אם אינך רוצה "
+"להירשם, לחץ \"בטל\"."
 
-#: actions/facebookinvite.php:130
-#, php-format
-msgid "Send invitations"
+#: actions/userauthorization.php:188
+msgid "License"
 msgstr ""
 
-#: actions/facebookremove.php:56
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "קבל"
+
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
 #, fuzzy
-msgid "Couldn't remove Facebook user."
-msgstr "עידכון המשתמש נכשל."
+msgid "Subscribe to this user"
+msgstr "ההרשמה אושרה"
 
-#: actions/facebooksettings.php:65
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "דחה"
 
-#: actions/facebooksettings.php:67
+#: actions/userauthorization.php:212
 #, fuzzy
-msgid "Sync preferences saved."
-msgstr "העדפות נשמרו."
+msgid "Reject this subscription"
+msgstr "כל המנויים"
 
-#: actions/facebooksettings.php:90
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
+msgstr "לא התבקש אישור!"
 
-#: actions/facebooksettings.php:97
-msgid "Send \"@\" replies to Facebook."
-msgstr ""
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+msgstr "ההרשמה אושרה"
 
-#: actions/facebooksettings.php:106
+#: actions/userauthorization.php:249
 #, fuzzy
-msgid "Prefix"
-msgstr "פרופיל"
-
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
+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/facebooksettings.php:124
-#, php-format
-msgid "If you would like %s to automatically update "
-msgstr ""
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
+msgstr "ההרשמה נדחתה"
 
-#: actions/facebooksettings.php:147
+#: actions/userauthorization.php:261
 #, fuzzy
-msgid "Sync preferences"
-msgstr "העדפות"
-
-#: actions/favor.php:94 lib/disfavorform.php:140
-msgid "Disfavor favorite"
+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/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
-#, fuzzy
-msgid "Popular notices"
-msgstr "אין הודעה כזו."
-
-#: actions/favorited.php:67
-#, fuzzy, php-format
-msgid "Popular notices, page %d"
-msgstr "אין הודעה כזו."
-
-#: actions/favorited.php:79
-msgid "The most popular notices on the site right now."
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
 msgstr ""
 
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
-msgid "Featured users"
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
 msgstr ""
 
-#: actions/featured.php:71
+#: actions/userauthorization.php:307
 #, php-format
-msgid "Featured users, page %d"
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr ""
 
-#: actions/featured.php:99
+#: actions/userauthorization.php:322
 #, php-format
-msgid "A selection of some of the great users on %s"
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr ""
 
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr ""
 
-#: actions/groupbyid.php:79
-msgid "No ID"
-msgstr ""
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "לא ניתן לקרוא את ה-URL '%s' של התמונה"
 
-#: actions/grouplogo.php:138 actions/grouplogo.php:191
-msgid "Group logo"
-msgstr ""
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "סוג התמונה של '%s' אינו מתאים"
 
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
-msgstr ""
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr "אין זיהוי."
 
-#: actions/grouplogo.php:448
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
 #, fuzzy
-msgid "Logo updated."
-msgstr "התמונה עודכנה."
+msgid "Profile design"
+msgstr "הגדרות הפרופיל"
 
-#: actions/grouplogo.php:450
-#, fuzzy
-msgid "Failed updating logo."
-msgstr "עדכון התמונה נכשל."
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
 
-#: actions/groupmembers.php:93 lib/groupnav.php:91
-#, php-format
-msgid "%s group members"
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
 msgstr ""
 
-#: actions/groupmembers.php:96
+#: actions/usergroups.php:64
 #, php-format
-msgid "%s group members, page %d"
+msgid "%s groups, page %d"
 msgstr ""
 
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
+#: actions/usergroups.php:130
+msgid "Search for more groups"
 msgstr ""
 
-#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
-msgid "Groups"
-msgstr "קבוצות"
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "לא שלחנו אלינו את הפרופיל הזה"
 
-#: actions/groups.php:64
+#: actions/usergroups.php:158
 #, php-format
-msgid "Groups, page %d"
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
 
-#: actions/groups.php:90
+#: classes/File.php:137
 #, php-format
-msgid "%%%%site.name%%%% groups let you find and talk with "
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
 msgstr ""
 
-#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-#, fuzzy
-msgid "Create a new group"
-msgstr "צור חשבון חדש"
+#: classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
 
-#: actions/groupsearch.php:57
-#, fuzzy, php-format
-msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
+#: classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
-"חפש אנשים ב-%%site.name%% לפי שם, מיקום, או תחומי עניין. הפרד בעזרת רווחים "
-"בין הביטויים; עליהם להיות בני לפחות 3 אותיות."
 
-#: actions/groupsearch.php:63
-#, fuzzy
-msgid "Group search"
-msgstr "חיפוש סיסמה"
+#: classes/Message.php:55
+msgid "Could not insert message."
+msgstr ""
 
-#: actions/imsettings.php:70
-msgid "You can send and receive notices through "
+#: classes/Message.php:65
+msgid "Could not update message with new URI."
 msgstr ""
 
-#: actions/imsettings.php:120
+#: classes/Notice.php:164
 #, php-format
-msgid "Jabber or GTalk address, "
+msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: actions/imsettings.php:147
+#: classes/Notice.php:179
 #, fuzzy
-msgid "Send me replies through Jabber/GTalk "
-msgstr "שלח לי הודעות דרך Jabber/GTalk."
+msgid "Problem saving notice. Too long."
+msgstr "בעיה בשמירת ההודעה."
 
-#: actions/imsettings.php:321
-#, fuzzy, php-format
-msgid "A confirmation code was sent "
-msgstr "אין קוד אישור."
+#: classes/Notice.php:183
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "בעיה בשמירת ההודעה."
 
-#: actions/joingroup.php:65
-msgid "You must be logged in to join a group."
+#: classes/Notice.php:188
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: actions/joingroup.php:95
-#, fuzzy
-msgid "You are already a member of that group"
-msgstr "כבר נכנסת למערכת!"
+#: classes/Notice.php:194
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
 
-#: actions/joingroup.php:128
-#, fuzzy, php-format
-msgid "Could not join user %s to group %s"
-msgstr "נכשלה ההפניה לשרת: %s"
+#: classes/Notice.php:202
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
+msgstr "בעיה בשמירת ההודעה."
 
-#: actions/joingroup.php:135
+#: classes/Notice.php:1120
 #, php-format
-msgid "%s joined group %s"
-msgstr ""
+msgid "DB error inserting reply: %s"
+msgstr "שגיאת מסד נתונים בהכנסת התגובה: %s"
 
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 
-#: actions/leavegroup.php:65
-msgid "You must be logged in to leave a group."
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "פרופיל"
+
+#: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
 msgstr ""
 
-#: actions/leavegroup.php:88
+#: lib/accountsettingsaction.php:112
 #, fuzzy
-msgid "No such group."
-msgstr "אין הודעה כזו."
+msgid "Upload an avatar"
+msgstr "עדכון התמונה נכשל."
 
-#: actions/leavegroup.php:95
-#, fuzzy
-msgid "You are not a member of that group."
-msgstr "לא שלחנו אלינו את הפרופיל הזה"
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr ""
 
-#: actions/leavegroup.php:100
-msgid "You may not leave a group while you are its administrator."
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
 msgstr ""
 
-#: actions/leavegroup.php:130
-msgid "Could not find membership record."
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
 msgstr ""
 
-#: actions/leavegroup.php:138
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "נכשלה יצירת OpenID מתוך: %s"
+#: lib/accountsettingsaction.php:124
+#, fuzzy
+msgid "Design your profile"
+msgstr "למשתמש אין פרופיל."
 
-#: actions/leavegroup.php:145
-#, php-format
-msgid "%s left group %s"
+#: lib/accountsettingsaction.php:128
+msgid "Other"
 msgstr ""
 
-#: actions/login.php:225 lib/facebookaction.php:304
-msgid "Login to site"
+#: lib/accountsettingsaction.php:128
+msgid "Other options"
 msgstr ""
 
-#: actions/microsummary.php:69
-msgid "No current status"
+#: lib/action.php:144
+#, php-format
+msgid "%s - %s"
 msgstr ""
 
-#: actions/newgroup.php:53
-msgid "New group"
+#: lib/action.php:159
+msgid "Untitled page"
 msgstr ""
 
-#: actions/newgroup.php:115
-msgid "Use this form to create a new group."
+#: lib/action.php:424
+msgid "Primary site navigation"
 msgstr ""
 
-#: actions/newgroup.php:177
-#, fuzzy
-msgid "Could not create group."
-msgstr "שמירת מידע התמונה נכשל"
+#: lib/action.php:430
+msgid "Home"
+msgstr "בית"
 
-#: actions/newgroup.php:191
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "יצירת המנוי נכשלה."
+#: lib/action.php:430
+msgid "Personal profile and friends timeline"
+msgstr ""
 
-#: actions/newmessage.php:119 actions/newnotice.php:132
+#: lib/action.php:432
 #, fuzzy
-msgid "That's too long. "
-msgstr "קובץ זה גדול מידי."
+msgid "Account"
+msgstr "אודות"
 
-#: actions/newmessage.php:134
-msgid "Don't send a message to yourself; "
+#: lib/action.php:432
+msgid "Change your email, avatar, password, profile"
 msgstr ""
 
-#: actions/newnotice.php:166
+#: lib/action.php:435
+msgid "Connect"
+msgstr "התחבר"
+
+#: lib/action.php:435
 #, fuzzy
-msgid "Notice posted"
-msgstr "הודעות"
+msgid "Connect to services"
+msgstr "נכשלה ההפניה לשרת: %s"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
-msgid "Ajax Error"
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
 msgstr ""
 
-#: actions/nudge.php:85
-msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+#: lib/action.php:440 lib/subgroupnav.php:106
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: actions/nudge.php:94
-msgid "Nudge sent"
-msgstr ""
+#: lib/action.php:445
+msgid "Logout"
+msgstr "צא"
 
-#: actions/nudge.php:97
-msgid "Nudge sent!"
+#: lib/action.php:445
+msgid "Logout from the site"
 msgstr ""
 
-#: actions/openidlogin.php:97
+#: lib/action.php:450
 #, fuzzy
-msgid "OpenID login"
-msgstr "כניסת OpenId"
+msgid "Create an account"
+msgstr "צור חשבון חדש"
 
-#: actions/openidsettings.php:128
-#, fuzzy
-msgid "Removing your only OpenID "
-msgstr "הסר OpenID"
+#: lib/action.php:453
+msgid "Login to the site"
+msgstr ""
 
-#: actions/othersettings.php:60
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
+msgstr "עזרה"
+
+#: lib/action.php:456
 #, fuzzy
-msgid "Other Settings"
-msgstr "הגדרות"
+msgid "Help me!"
+msgstr "עזרה"
 
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr ""
+#: lib/action.php:459
+msgid "Search"
+msgstr "חיפוש"
 
-#: actions/othersettings.php:93
-msgid "URL Auto-shortening"
+#: lib/action.php:459
+msgid "Search for people or text"
 msgstr ""
 
-#: actions/othersettings.php:112
+#: lib/action.php:480
 #, fuzzy
-msgid "Service"
-msgstr "חיפוש"
+msgid "Site notice"
+msgstr "הודעה חדשה"
 
-#: actions/othersettings.php:113
-msgid "Automatic shortening service to use."
+#: lib/action.php:546
+msgid "Local views"
 msgstr ""
 
-#: actions/othersettings.php:144
+#: lib/action.php:612
 #, fuzzy
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "שם המיקום ארוך מידי (מותר עד 255 אותיות)."
+msgid "Page notice"
+msgstr "הודעה חדשה"
 
-#: actions/passwordsettings.php:69
+#: lib/action.php:714
 #, fuzzy
-msgid "Change your password."
-msgstr "שנה סיסמה"
+msgid "Secondary site navigation"
+msgstr "הרשמות"
 
-#: actions/passwordsettings.php:89
-#, fuzzy
-msgid "Password change"
-msgstr "הסיסמה נשמרה."
+#: lib/action.php:721
+msgid "About"
+msgstr "אודות"
 
-#: actions/peopletag.php:35
-#, fuzzy, php-format
-msgid "Not a valid people tag: %s"
-msgstr "לא עומד בכללים ל-OpenID."
+#: lib/action.php:723
+msgid "FAQ"
+msgstr "רשימת שאלות נפוצות"
 
-#: actions/peopletag.php:47
-#, php-format
-msgid "Users self-tagged with %s - page %d"
+#: lib/action.php:727
+msgid "TOS"
 msgstr ""
 
-#: actions/peopletag.php:91
-#, php-format
-msgid "These are users who have tagged themselves \"%s\" "
-msgstr ""
+#: lib/action.php:730
+msgid "Privacy"
+msgstr "פרטיות"
 
-#: actions/profilesettings.php:91
-#, fuzzy
-msgid "Profile information"
-msgstr "פרופיל לא מוכר"
+#: lib/action.php:732
+msgid "Source"
+msgstr "מקור"
 
-#: actions/profilesettings.php:124
-msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
-msgstr ""
+#: lib/action.php:734
+msgid "Contact"
+msgstr "צור קשר"
 
-#: actions/profilesettings.php:144
-msgid "Automatically subscribe to whoever "
+#: lib/action.php:736
+msgid "Badge"
 msgstr ""
 
-#: actions/profilesettings.php:229 actions/tagother.php:176
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "כתובת אתר הבית '%s' אינה חוקית"
-
-#: actions/profilesettings.php:311
-#, fuzzy
-msgid "Couldn't save tags."
-msgstr "שמירת הפרופיל נכשלה."
-
-#: actions/public.php:107
-#, fuzzy, php-format
-msgid "Public timeline, page %d"
-msgstr "קו זמן ציבורי"
-
-#: actions/public.php:173
-msgid "Could not retrieve public stream."
+#: lib/action.php:764
+msgid "StatusNet software license"
 msgstr ""
 
-#: actions/public.php:220
+#: lib/action.php:767
 #, php-format
 msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
+"**%%site.name%%** הוא שרות ביקרובלוג הניתן על ידי [%%site.broughtby%%](%%"
+"site.broughtbyurl%%)."
 
-#: actions/publictagcloud.php:57
-#, fuzzy
-msgid "Public tag cloud"
-msgstr "הזנת זרם הציבורי"
-
-#: actions/publictagcloud.php:63
+#: lib/action.php:769
 #, php-format
-msgid "These are most popular recent tags on %s "
-msgstr ""
-
-#: actions/publictagcloud.php:119
-msgid "Tag cloud"
-msgstr ""
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** הוא שרות ביקרובלוג."
 
-#: actions/register.php:139 actions/register.php:349
-msgid "Sorry, only invited people can register."
+#: lib/action.php:771
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
+"הוא פועל על תוכנת המיקרובלוג [](http://status.netלאקוניקה/) לאקוניקה, גירסה %"
+"s, המופצת תחת רשיון [GNU Affero General Public License](http://www.fsf.org/"
+"licensing/licenses/agpl-3.0.html)"
 
-#: actions/register.php:149
+#: lib/action.php:785
 #, fuzzy
-msgid "You can't register if you don't "
-msgstr "לא ניתן להירשם ללא הסכמה לרשיון"
+msgid "Site content license"
+msgstr "הודעה חדשה"
 
-#: actions/register.php:286
-msgid "With this form you can create "
+#: lib/action.php:794
+msgid "All "
 msgstr ""
 
-#: actions/register.php:368
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, "
-msgstr "1 עד 64 אותיות אנגליות קטנות או מספרים, ללא סימני פיסוק או רווחים."
-
-#: actions/register.php:382 actions/register.php:386
-#, fuzzy
-msgid "Used only for updates, announcements, "
-msgstr "לשימוש רק במקרים של עידכונים, הודעות מערכת, ושיחזורי סיסמאות"
+#: lib/action.php:799
+msgid "license."
+msgstr ""
 
-#: actions/register.php:398
-#, fuzzy
-msgid "URL of your homepage, blog, "
-msgstr "הכתובת של אתר הבית שלך, בלוג, או פרופיל באתר אחר "
+#: lib/action.php:1052
+msgid "Pagination"
+msgstr ""
 
-#: actions/register.php:404
+#: lib/action.php:1061
 #, fuzzy
-msgid "Describe yourself and your "
-msgstr "תאר את עצמך ואת נושאי העניין שלך ב-140 אותיות"
+msgid "After"
+msgstr "<< אחרי"
 
-#: actions/register.php:410
+#: lib/action.php:1069
 #, fuzzy
-msgid "Where you are, like \"City, "
-msgstr "מיקומך, למשל \"עיר, מדינה או מחוז, ארץ\""
+msgid "Before"
+msgstr "לפני >>"
 
-#: actions/register.php:432
-msgid " except this private data: password, "
+#: lib/action.php:1117
+msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/register.php:471
-#, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
+#: lib/attachmentlist.php:87
+msgid "Attachments"
 msgstr ""
 
-#: actions/register.php:495
-msgid "(You should receive a message by email "
+#: lib/attachmentlist.php:265
+msgid "Author"
 msgstr ""
 
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
-msgstr ""
-
-#: actions/replies.php:118
-#, fuzzy, php-format
-msgid "Replies to %s, page %d"
-msgstr "תגובת עבור %s"
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "פרופיל"
 
-#: actions/showfavorites.php:79
-#, php-format
-msgid "%s favorite notices, page %d"
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
 msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
-#, php-format
-msgid "%s group"
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
 msgstr ""
 
-#: actions/showgroup.php:79
-#, php-format
-msgid "%s group, page %d"
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
 msgstr ""
 
-#: actions/showgroup.php:206
-#, fuzzy
-msgid "Group profile"
-msgstr "אין הודעה כזו."
-
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
-msgid "URL"
+#: lib/channel.php:210
+msgid "Command complete"
 msgstr ""
 
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
-#, fuzzy
-msgid "Note"
-msgstr "הודעות"
-
-#: actions/showgroup.php:270
-msgid "Group actions"
+#: lib/channel.php:221
+msgid "Command failed"
 msgstr ""
 
-#: actions/showgroup.php:323
-#, fuzzy, php-format
-msgid "Notice feed for %s group"
-msgstr "הזנת הודעות של %s"
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
-#, fuzzy
-msgid "Members"
-msgstr "חבר מאז"
+#: lib/command.php:88
+#, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "עידכון המשתמש נכשל."
 
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
-msgid "(None)"
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: actions/showgroup.php:370
-msgid "All members"
+#: lib/command.php:99
+#, php-format
+msgid "Nudge sent to %s"
 msgstr ""
 
-#: actions/showgroup.php:378
+#: lib/command.php:126
 #, php-format
 msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
 msgstr ""
 
-#: actions/showmessage.php:98
-msgid "Only the sender and recipient "
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
 msgstr ""
 
-#: actions/showstream.php:73
-#, php-format
-msgid "%s, page %d"
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
 msgstr ""
 
-#: actions/showstream.php:143
-#, fuzzy
-msgid "'s profile"
-msgstr "פרופיל"
-
-#: actions/showstream.php:236 actions/tagother.php:77
-#, fuzzy
-msgid "User profile"
-msgstr "למשתמש אין פרופיל."
-
-#: actions/showstream.php:240 actions/tagother.php:81
-msgid "Photo"
+#: lib/command.php:190
+msgid "Notice marked as fave."
 msgstr ""
 
-#: actions/showstream.php:317
-msgid "User actions"
+#: lib/command.php:315
+#, php-format
+msgid "%1$s (%2$s)"
 msgstr ""
 
-#: actions/showstream.php:342
-msgid "Send a direct message to this user"
+#: lib/command.php:318
+#, php-format
+msgid "Fullname: %s"
 msgstr ""
 
-#: actions/showstream.php:343
-#, fuzzy
-msgid "Message"
-msgstr "הודעה חדשה"
-
-#: actions/showstream.php:451
-#, fuzzy
-msgid "All subscribers"
-msgstr "מנויים"
-
-#: actions/showstream.php:533
-msgid "All groups"
+#: lib/command.php:321
+#, php-format
+msgid "Location: %s"
 msgstr ""
 
-#: actions/showstream.php:542
+#: lib/command.php:324
 #, php-format
-msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+msgid "Homepage: %s"
 msgstr ""
 
-#: actions/smssettings.php:128
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, "
-msgstr "1 עד 64 אותיות אנגליות קטנות או מספרים, ללא סימני פיסוק או רווחים."
-
-#: actions/smssettings.php:162
-#, fuzzy
-msgid "Send me notices through SMS; "
-msgstr "שלח לי הודעות דרך Jabber/GTalk."
-
-#: actions/smssettings.php:335
-#, fuzzy
-msgid "A confirmation code was sent to the phone number you added. "
-msgstr "קוד האישור הזה אינו מיועד לך!"
+#: lib/command.php:327
+#, php-format
+msgid "About: %s"
+msgstr "אודות: %s"
 
-#: actions/smssettings.php:453
-msgid "Mobile carrier"
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: actions/subedit.php:70
-#, fuzzy
-msgid "You are not subscribed to that profile."
-msgstr "לא שלחנו אלינו את הפרופיל הזה"
-
-#: actions/subedit.php:83
-#, fuzzy
-msgid "Could not save subscription."
-msgstr "יצירת המנוי נכשלה."
-
-#: actions/subscribe.php:55
-#, fuzzy
-msgid "Not a local user."
-msgstr "אין משתמש כזה."
-
-#: actions/subscribe.php:69
-#, fuzzy
-msgid "Subscribed"
-msgstr "הירשם כמנוי"
-
-#: actions/subscribers.php:50
-#, fuzzy, php-format
-msgid "%s subscribers"
-msgstr "מנויים"
+#: lib/command.php:377
+msgid "Error sending direct message."
+msgstr ""
 
-#: actions/subscribers.php:52
+#: lib/command.php:431
 #, php-format
-msgid "%s subscribers, page %d"
+msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: actions/subscribers.php:63
-#, fuzzy
-msgid "These are the people who listen to "
-msgstr "אלה האנשים במאזינים להודעות של %s."
-
-#: actions/subscribers.php:67
+#: lib/command.php:439
 #, fuzzy, php-format
-msgid "These are the people who "
-msgstr "אלה האנשים במאזינים להודעות של %s."
-
-#: actions/subscriptions.php:52
-#, fuzzy, php-format
-msgid "%s subscriptions"
-msgstr "כל המנויים"
-
-#: actions/subscriptions.php:54
-#, fuzzy, php-format
-msgid "%s subscriptions, page %d"
-msgstr "כל המנויים"
-
-#: actions/subscriptions.php:65
-#, fuzzy
-msgid "These are the people whose notices "
-msgstr "אלה האנשים ש%s מאזין להודעות שלהם."
-
-#: actions/subscriptions.php:69
-#, fuzzy, php-format
-msgid "These are the people whose "
-msgstr "אלה האנשים במאזינים להודעות של %s."
+msgid "Reply to %s sent"
+msgstr "תגובת עבור %s"
 
-#: actions/subscriptions.php:122
+#: lib/command.php:441
 #, fuzzy
-msgid "Jabber"
-msgstr "אין זיהוי Jabber כזה."
-
-#: actions/tag.php:43
-#, fuzzy, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "מיקרובלוג מאת %s"
+msgid "Error saving notice."
+msgstr "בעיה בשמירת ההודעה."
 
-#: actions/tag.php:66
-#, php-format
-msgid "Messages tagged \"%s\", most recent first"
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: actions/tagother.php:33
-#, fuzzy
-msgid "Not logged in"
-msgstr "לא מחובר."
-
-#: actions/tagother.php:39
-#, fuzzy
-msgid "No id argument."
-msgstr "אין מסמך כזה."
-
-#: actions/tagother.php:65
+#: lib/command.php:502
 #, php-format
-msgid "Tag %s"
-msgstr ""
-
-#: actions/tagother.php:141
-msgid "Tag user"
-msgstr ""
-
-#: actions/tagother.php:149
-msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
-msgstr ""
-
-#: actions/tagother.php:164
-msgid "There was a problem with your session token."
+msgid "Subscribed to %s"
 msgstr ""
 
-#: actions/tagother.php:191
-msgid ""
-"You can only tag people you are subscribed to or who are subscribed to you."
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: actions/tagother.php:198
-#, fuzzy
-msgid "Could not save tags."
-msgstr "שמירת מידע התמונה נכשל"
-
-#: actions/tagother.php:233
-msgid "Use this form to add tags to your subscribers or subscriptions."
+#: lib/command.php:530
+#, php-format
+msgid "Unsubscribed from %s"
 msgstr ""
 
-#: actions/tagrss.php:35
-#, fuzzy
-msgid "No such tag."
-msgstr "אין הודעה כזו."
-
-#: actions/tagrss.php:66
-#, fuzzy, php-format
-msgid "Microblog tagged with %s"
-msgstr "מיקרובלוג מאת %s"
-
-#: actions/twitapiblocks.php:47
-msgid "Block user failed."
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
 msgstr ""
 
-#: actions/twitapiblocks.php:69
-msgid "Unblock user failed."
+#: lib/command.php:551
+msgid "Notification off."
 msgstr ""
 
-#: actions/twitapiusers.php:48
-#, fuzzy
-msgid "Not found."
-msgstr "לא נמצא"
-
-#: actions/twittersettings.php:71
-msgid "Add your Twitter account to automatically send "
+#: lib/command.php:553
+msgid "Can't turn off notification."
 msgstr ""
 
-#: actions/twittersettings.php:119
-msgid "Twitter user name"
+#: lib/command.php:574
+msgid "Notification on."
 msgstr ""
 
-#: actions/twittersettings.php:126
-#, fuzzy
-msgid "Twitter password"
-msgstr "סיסמה חדשה"
-
-#: actions/twittersettings.php:228
-msgid "Twitter Friends"
+#: lib/command.php:576
+msgid "Can't turn on notification."
 msgstr ""
 
-#: actions/twittersettings.php:327
-msgid "Username must have only numbers, "
-msgstr ""
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "נכשלה יצירת OpenID מתוך: %s"
 
-#: actions/twittersettings.php:341
+#: lib/command.php:602
 #, php-format
-msgid "Unable to retrieve account information "
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: actions/unblock.php:108
+#: lib/command.php:618
 #, fuzzy
-msgid "Error removing the block."
-msgstr "שגיאה בשמירת המשתמש."
+msgid "You are not subscribed to anyone."
+msgstr "לא שלחנו אלינו את הפרופיל הזה"
 
-#: actions/unsubscribe.php:50
+#: lib/command.php:620
 #, fuzzy
-msgid "No profile id in request."
-msgstr "השרת לא החזיר כתובת פרופיל"
+msgid "You are subscribed to these people: "
+msgstr "לא שלחנו אלינו את הפרופיל הזה"
 
-#: actions/unsubscribe.php:57
+#: lib/command.php:637
 #, fuzzy
-msgid "No profile with that id."
-msgstr "אין פרופיל תואם לפרופיל המרוחק "
+msgid "No one is subscribed to you."
+msgstr "הרשמה מרוחקת"
 
-#: actions/unsubscribe.php:71
+#: lib/command.php:639
 #, fuzzy
-msgid "Unsubscribed"
-msgstr "בטל מנוי"
-
-#: actions/usergroups.php:63
-#, php-format
-msgid "%s groups"
-msgstr ""
+msgid "These people are subscribed to you: "
+msgstr "הרשמה מרוחקת"
 
-#: actions/usergroups.php:65
-#, php-format
-msgid "%s groups, page %d"
-msgstr ""
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "לא שלחנו אלינו את הפרופיל הזה"
 
-#: classes/Notice.php:104
+#: lib/command.php:658
 #, fuzzy
-msgid "Problem saving notice. Unknown user."
-msgstr "בעיה בשמירת ההודעה."
+msgid "You are a member of these groups: "
+msgstr "לא שלחנו אלינו את הפרופיל הזה"
 
-#: classes/Notice.php:109
+#: lib/command.php:670
 msgid ""
-"Too many notices too fast; take a breather and post again in a few minutes."
-msgstr ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+
+#: lib/common.php:192
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "אין קוד אישור."
 
-#: classes/Notice.php:116
-msgid "You are banned from posting notices on this site."
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/accountsettingsaction.php:108
-#, fuzzy
-msgid "Upload an avatar"
-msgstr "עדכון התמונה נכשל."
-
-#: lib/accountsettingsaction.php:119
-msgid "Other"
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/accountsettingsaction.php:120
-msgid "Other options"
+#: lib/common.php:195
+msgid "Go to the installer."
 msgstr ""
 
-#: lib/action.php:130
-#, php-format
-msgid "%s - %s"
+#: lib/connectsettingsaction.php:110
+msgid "IM"
 msgstr ""
 
-#: lib/action.php:145
-msgid "Untitled page"
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
 msgstr ""
 
-#: lib/action.php:316
-msgid "Primary site navigation"
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
 msgstr ""
 
-#: lib/action.php:322
-msgid "Personal profile and friends timeline"
+#: lib/dberroraction.php:60
+msgid "Database error"
 msgstr ""
 
-#: lib/action.php:325
-msgid "Search for people or text"
+#: lib/designsettings.php:101
+msgid "Change background image"
 msgstr ""
 
-#: lib/action.php:328
+#: lib/designsettings.php:105
 #, fuzzy
-msgid "Account"
-msgstr "אודות"
+msgid "Upload file"
+msgstr "ההעלה"
 
-#: lib/action.php:328
-msgid "Change your email, avatar, password, profile"
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 
-#: lib/action.php:330
-msgid "Connect to IM, SMS, Twitter"
+#: lib/designsettings.php:139
+msgid "On"
 msgstr ""
 
-#: lib/action.php:332
-msgid "Logout from the site"
+#: lib/designsettings.php:155
+msgid "Off"
 msgstr ""
 
-#: lib/action.php:335
-msgid "Login to the site"
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
 msgstr ""
 
-#: lib/action.php:338
-#, fuzzy
-msgid "Create an account"
-msgstr "צור חשבון חדש"
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
 
-#: lib/action.php:341
+#: lib/designsettings.php:170
 #, fuzzy
-msgid "Login with OpenID"
-msgstr "אין OpenID כזה."
+msgid "Change colours"
+msgstr "שנה סיסמה"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
 
-#: lib/action.php:344
+#: lib/designsettings.php:191
 #, fuzzy
-msgid "Help me!"
-msgstr "עזרה"
+msgid "Content"
+msgstr "התחבר"
 
-#: lib/action.php:362
+#: lib/designsettings.php:204
 #, fuzzy
-msgid "Site notice"
-msgstr "הודעה חדשה"
+msgid "Sidebar"
+msgstr "חיפוש"
 
-#: lib/action.php:417
-msgid "Local views"
-msgstr ""
+#: lib/designsettings.php:217
+msgid "Text"
+msgstr "טקסט"
 
-#: lib/action.php:472
+#: lib/designsettings.php:230
 #, fuzzy
-msgid "Page notice"
-msgstr "הודעה חדשה"
+msgid "Links"
+msgstr "היכנס"
 
-#: lib/action.php:562
-#, fuzzy
-msgid "Secondary site navigation"
-msgstr "הרשמות"
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
 
-#: lib/action.php:602 lib/action.php:623
-msgid "StatusNet software license"
+#: lib/designsettings.php:248
+msgid "Restore default designs"
 msgstr ""
 
-#: lib/action.php:630
-msgid "All "
+#: lib/designsettings.php:254
+msgid "Reset back to default"
 msgstr ""
 
-#: lib/action.php:635
-msgid "license."
+#: lib/designsettings.php:257
+msgid "Save design"
 msgstr ""
 
-#: lib/blockform.php:123 lib/blockform.php:153
-#, fuzzy
-msgid "Block this user"
-msgstr "אין משתמש כזה."
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
+msgstr ""
 
-#: lib/blockform.php:153
-msgid "Block"
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
 msgstr ""
 
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr ""
 
-#: lib/facebookaction.php:268
-#, php-format
-msgid "To use the %s Facebook Application you need to login "
-msgstr ""
-
-#: lib/facebookaction.php:271
-#, fuzzy
-msgid " a new account."
-msgstr "צור חשבון חדש"
-
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-#, fuzzy
-msgid "Published"
-msgstr "ציבורי"
-
 #: lib/favorform.php:114 lib/favorform.php:140
 #, fuzzy
 msgid "Favor this notice"
 msgstr "אין הודעה כזו."
 
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr ""
+
 #: lib/feedlist.php:64
 msgid "Export data"
 msgstr ""
 
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr ""
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr ""
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr ""
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr ""
@@ -4532,62 +3952,87 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
+msgstr ""
+
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr ""
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr ""
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:163
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "הכתובת של אתר הבית שלך, בלוג, או פרופיל באתר אחר "
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:168
 #, fuzzy
-msgid "Description"
-msgstr "הרשמות"
+msgid "Describe the group or topic"
+msgstr "תאר את עצמך ואת נושאי העניין שלך ב-140 אותיות"
 
-#: lib/groupeditform.php:153
-#, fuzzy
-msgid "Describe the group or topic in 140 chars"
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
 msgstr "תאר את עצמך ואת נושאי העניין שלך ב-140 אותיות"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:172
+#, fuzzy
+msgid "Description"
+msgstr "הרשמות"
+
+#: lib/groupeditform.php:179
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr "מיקומך, למשל \"עיר, מדינה או מחוז, ארץ\""
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
-msgid "Group"
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:100
-msgid "Admin"
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+msgid "Group"
 msgstr ""
 
 #: lib/groupnav.php:101
+#, fuzzy
+msgid "Blocked"
+msgstr "אין משתמש כזה."
+
+#: lib/groupnav.php:102
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "אין משתמש כזה."
+
+#: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
 msgstr ""
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:113
 #, fuzzy
 msgid "Logo"
 msgstr "צא"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:114
 #, php-format
 msgid "Add or edit %s logo"
 msgstr ""
 
+#: lib/groupnav.php:120
+#, php-format
+msgid "Add or edit %s design"
+msgstr ""
+
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr ""
@@ -4602,10 +4047,44 @@ msgid "Tags in %s group's notices"
 msgstr ""
 
 #: lib/htmloutputter.php:104
-#, fuzzy
-msgid "This page is not available in a "
+msgid "This page is not available in a media type you accept"
 msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל"
 
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות."
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr "העלאה חלקית."
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr "שגיאת מערכת בהעלאת הקובץ."
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr "זהו לא קובץ תמונה, או שחל בו שיבוש."
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr "פורמט התמונה אינו נתמך."
+
+#: lib/imagefile.php:118
+#, fuzzy
+msgid "Lost our file."
+msgstr "אין הודעה כזו."
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr ""
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr ""
+
 #: lib/joinform.php:114
 #, fuzzy
 msgid "Join"
@@ -4616,104 +4095,308 @@ msgstr "היכנס"
 msgid "Leave"
 msgstr "שמור"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:80
 #, fuzzy
 msgid "Login with a username and password"
 msgstr "שם המשתמש או הסיסמה לא חוקיים"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:86
 #, fuzzy
 msgid "Sign up for a new account"
 msgstr "צור חשבון חדש"
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+msgid "from"
 msgstr ""
 
-#: lib/mail.php:175
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr ""
+
+#: lib/mail.php:174
 #, php-format
 msgid ""
 "Hey, %s.\n"
 "\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%s\n"
+"\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
 msgstr ""
 
-#: lib/mail.php:236
-#, fuzzy, php-format
-msgid "%1$s is now listening to "
+#: lib/mail.php:235
+#, php-format
+msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s כעת מאזין להודעות שלך ב-%2$s"
 
-#: lib/mail.php:254
+#: lib/mail.php:240
 #, fuzzy, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
+"%1$s מאזין כעת להודעות שלך ב %2$s. \n"
+"\n"
+"\t%3$s\n"
+" שלך,\n"
+" %4$s.\n"
+
+#: lib/mail.php:253
+#, php-format
 msgid "Location: %s\n"
 msgstr ""
 
-#: lib/mail.php:256
-#, fuzzy, php-format
+#: lib/mail.php:255
+#, php-format
 msgid "Homepage: %s\n"
 msgstr ""
 
-#: lib/mail.php:258
+#: lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:461
+#: lib/mail.php:285
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: lib/mail.php:288
+#, 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 ""
+
+#: lib/mail.php:412
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: lib/mail.php:438
+msgid "SMS confirmation"
+msgstr ""
+
+#: lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr ""
 
-#: lib/mail.php:465
+#: lib/mail.php:466
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
+msgstr ""
+
+#: lib/mail.php:509
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:513
 #, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
+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 ""
 
-#: lib/mail.php:555
+#: lib/mail.php:554
 #, fuzzy, php-format
-msgid "%1$s just added your notice from %2$s"
+msgid "%s (@%s) added your notice as a favorite"
 msgstr "%1$s כעת מאזין להודעות שלך ב-%2$s"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
-msgid "From"
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
 msgstr ""
 
-#: lib/messageform.php:110
-msgid "Send a direct notice"
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, php-format
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+msgstr ""
+
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
 msgstr ""
 
-#: lib/noticeform.php:125
+#: lib/mediafile.php:201 lib/mediafile.php:237
 #, fuzzy
-msgid "Send a notice"
-msgstr "הודעה חדשה"
+msgid "Could not determine file's mime-type!"
+msgstr "עידכון המשתמש נכשל."
+
+#: lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
 
-#: lib/noticeform.php:152
+#: lib/messageform.php:120
+msgid "Send a direct notice"
+msgstr ""
+
+#: lib/messageform.php:146
+msgid "To"
+msgstr "אל"
+
+#: lib/messageform.php:162 lib/noticeform.php:173
 #, fuzzy
 msgid "Available characters"
 msgstr "לפחות 6 אותיות"
 
-#: lib/noticelist.php:426
+#: lib/noticeform.php:145
 #, fuzzy
-msgid "in reply to"
-msgstr "בתגובה ל..."
+msgid "Send a notice"
+msgstr "הודעה חדשה"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
-msgid "Reply to this notice"
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
+msgstr "מה המצב %s?"
+
+#: lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:184
+msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:478
 #, fuzzy
-msgid "Reply"
-msgstr "הגב"
+msgid "in context"
+msgstr "אין תוכן!"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
-msgid "Delete this notice"
+#: lib/noticelist.php:498
+msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:474
+#: lib/noticelist.php:499
 #, fuzzy
-msgid "Delete"
-msgstr "מחק"
+msgid "Reply"
+msgstr "הגב"
 
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
@@ -4727,41 +4410,142 @@ msgstr ""
 msgid "Send a nudge to this user"
 msgstr ""
 
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "שגיאה בהכנסת הפרופיל"
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "שגיאה בהכנסת התמונה."
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "שגיאה בהכנסת פרופיל מרוחק"
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "הודעה חדשה"
+
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
+msgstr "הכנסת מנוי חדש נכשלה."
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "אישי"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "תגובות"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr "מועדפים"
+
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr "מתשמש"
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr ""
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr ""
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr ""
+
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/profilelist.php:182
-msgid "(none)"
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "הרשמות"
+
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "כל המנויים"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "מנויים"
+
+#: lib/profileaction.php:157
+#, fuzzy
+msgid "All subscribers"
+msgstr "מנויים"
+
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "מתשמש"
+
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "חבר מאז"
+
+#: lib/profileaction.php:235
+msgid "All groups"
 msgstr ""
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "ציבורי"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr ""
 
-#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr ""
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr ""
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:92
 #, fuzzy
 msgid "Popular"
 msgstr "אנשים"
 
+#: lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "חיפוש"
+
+#: lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "חיפוש"
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "אנשים"
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr ""
+
 #: lib/searchgroupnav.php:82
 #, fuzzy
 msgid "Notice"
 msgstr "הודעות"
 
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr ""
+
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr ""
@@ -4770,35 +4554,64 @@ msgstr ""
 msgid "Untitled section"
 msgstr ""
 
-#: lib/subgroupnav.php:81
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: lib/subgroupnav.php:83
 #, fuzzy, php-format
 msgid "People %s subscribes to"
 msgstr "הרשמה מרוחקת"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:91
 #, fuzzy, php-format
 msgid "People subscribed to %s"
 msgstr "הרשמה מרוחקת"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:104
-#, php-format
-msgid "Invite friends and colleagues to join you on %s"
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
 msgstr ""
 
-#: lib/subs.php:53
+#: lib/subs.php:48
+msgid "Already subscribed!"
+msgstr ""
+
+#: lib/subs.php:52
 #, fuzzy
 msgid "User has blocked you."
 msgstr "למשתמש אין פרופיל."
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: lib/subs.php:56
+msgid "Could not subscribe."
+msgstr ""
+
+#: lib/subs.php:75
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: lib/subs.php:124
 #, fuzzy
-msgid "Subscribe to this user"
-msgstr "ההרשמה אושרה"
+msgid "Not subscribed!"
+msgstr "לא מנוי!"
+
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
+msgstr "מחיקת המנוי לא הצליחה."
 
 #: lib/tagcloudsection.php:56
 #, fuzzy
@@ -4809,22 +4622,107 @@ msgstr "לא"
 msgid "Top posters"
 msgstr ""
 
-#: lib/unblockform.php:120 lib/unblockform.php:150
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+msgid "Unsubscribe from this user"
+msgstr ""
+
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "בטל מנוי"
+
+#: lib/userprofile.php:116
 #, fuzzy
-msgid "Unblock this user"
-msgstr "אין משתמש כזה."
+msgid "Edit Avatar"
+msgstr "תמונה"
 
-#: lib/unblockform.php:150
-msgid "Unblock"
+#: lib/userprofile.php:236
+msgid "User actions"
 msgstr ""
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
-msgid "Unsubscribe from this user"
+#: lib/userprofile.php:248
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "הגדרות הפרופיל"
+
+#: lib/userprofile.php:249
+msgid "Edit"
 msgstr ""
 
+#: lib/userprofile.php:272
+msgid "Send a direct message to this user"
+msgstr ""
+
+#: lib/userprofile.php:273
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "צור חשבון חדש"
+msgid "Message"
+msgstr "הודעה חדשה"
+
+#: lib/util.php:821
+msgid "a few seconds ago"
+msgstr "לפני מספר שניות"
+
+#: lib/util.php:823
+msgid "about a minute ago"
+msgstr "לפני כדקה"
+
+#: lib/util.php:825
+#, php-format
+msgid "about %d minutes ago"
+msgstr "לפני כ-%d דקות"
 
-#~ msgid "Error inserting notice"
-#~ msgstr "שגיאה בהכנסת ההודאה"
+#: lib/util.php:827
+msgid "about an hour ago"
+msgstr "לפני כשעה"
+
+#: lib/util.php:829
+#, php-format
+msgid "about %d hours ago"
+msgstr "לפני כ-%d שעות"
+
+#: lib/util.php:831
+msgid "about a day ago"
+msgstr "לפני כיום"
+
+#: lib/util.php:833
+#, php-format
+msgid "about %d days ago"
+msgstr "לפני כ-%d ימים"
+
+#: lib/util.php:835
+msgid "about a month ago"
+msgstr "לפני כחודש"
+
+#: lib/util.php:837
+#, php-format
+msgid "about %d months ago"
+msgstr "לפני כ-%d חודשים"
+
+#: lib/util.php:839
+msgid "about a year ago"
+msgstr "לפני כשנה"
+
+#: lib/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "לאתר הבית יש כתובת לא חוקית."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr ""
+
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr ""
+
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr ""
diff --git a/locale/is/LC_MESSAGES/statusnet.mo b/locale/is/LC_MESSAGES/statusnet.mo
index 36039f4aa..0d3848efd 100644
--- a/locale/is/LC_MESSAGES/statusnet.mo
+++ b/locale/is/LC_MESSAGES/statusnet.mo
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index 524b85a0d..e871d86a5 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -1,2651 +1,1372 @@
-# 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.
+# Translation of StatusNet to Icelandic
 #
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-04-24 13:32+0000\n"
-"Last-Translator: Tryggvi Björgvinsson <tryggvib@hi.is>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:36+0000\n"
+"Language-Team: Icelandic\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
-
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
-#, php-format
-msgid " Search Stream for \"%s\""
-msgstr "Leita í bablveitu að \"%s\""
-
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-#: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
-msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr ""
-"nema þessi persónulegu gögn: lykilorð, tölvupóstfang, snarskilaboðafang (IM "
-"netfang), símanúmer."
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr "frá"
-
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr "%1$s / Færslur sem svar til %2$s"
-
-#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s hefur boðið þér að slást í hópinn með þeim á %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 hefur boðið þér að slást í hópinn með þeim á %2$s (%3$s).\n"
-"\n"
-"%2$s er örbloggsþjónusta sem leyfir þér að fylgjast með með fólki sem þú "
-"þekkir eða öðru áhugaverðu fólki í rauntíma.\n"
-"\n"
-"Þú getur líka sent inn fréttir af þér og deilt hugleiðingum og netveru þinni "
-"með fólki sem þekkir til þín. Þetta er frábær leið til þess að kynnast "
-"fólki sem hefur sömu áhugamál og þú.\n"
-"\n"
-"%1$s sagði:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Þú getur séð persónulega síðu %1$s á %2$s hér:\n"
-"\n"
-"%5$s\n"
-"\n"
-"Ef þig langar til að prófa þjónustuna, smelltu þá á hlekkinn hér fyrir neðan "
-"til að taka þessu boði.\n"
-"\n"
-"%6$s\n"
-"\n"
-"Ef ekki, þá getur þú hunsað þessi skilaboð. Takk fyrir tímann og "
-"þolinmæðina.\n"
-"\n"
-"Með bestu kveðju, %2$s\n"
-
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s er að hlusta á bablið þitt á %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 er að hlusta á bablið þitt á %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Með kveðju,\n"
-"%4$s.\n"
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "%1$s færslur sem svara færslum frá %2$s / %3$s."
-
-#: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr "Staða %1$s á %2$s"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: is\n"
+"X-Message-Group: out-statusnet\n"
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "Ekkert þannig merki."
 
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
-#, php-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
+msgstr "Enginn svoleiðis notandi."
 
-#: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/all.php:84
 #, php-format
-msgid "%s Public Stream"
-msgstr "%s Opinber bablveita"
+msgid "%s and friends, page %d"
+msgstr "%s og vinirnir, síða %d"
 
-#: ../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
-#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s og vinirnir"
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/all.php:99
 #, php-format
-msgid "%s public timeline"
-msgstr "Almenningsrás %s"
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr ""
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: actions/all.php:107
 #, php-format
-msgid "%s status"
-msgstr "Staða %s"
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr ""
 
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/all.php:115
 #, php-format
-msgid "%s timeline"
-msgstr "Rás %s"
+msgid "Feed for friends of %s (Atom)"
+msgstr ""
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/all.php:127
 #, php-format
-msgid "%s updates from everyone!"
-msgstr "%s færslur frá öllum!"
-
-#: ../actions/register.php:213
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
-"(Þú ættir að fá tölvupóst eftir smá stund. Í tölvupóstinum eru leiðbeiningar "
-"um það hvernig þú staðfestir tölvupóstfangið þitt.)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: actions/all.php:132
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
 msgstr ""
-"**%%site.name%%** er örbloggsþjónusta í boði "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
-#, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** er örbloggsþjónusta."
-
-#: ../lib/util.php:274 lib/util.php:290
-msgid ". Contributors should be attributed by full name or nickname."
-msgstr "Fulls nafns eða stuttnefnis efnishöfunda skal vera getið."
-
-#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
-#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 lágstafir eða tölustafir, engin greinarmerki eða bil"
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 lágstafir eða tölustafir, engin greinarmerki eða bil. Nauðsynlegt."
-
-#: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr "6 eða fleiri tákn"
-
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
-msgid "6 or more characters, and don't forget it!"
-msgstr "6 eða fleiri tákn og ekki gleyma því!"
-
-#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
-msgid "6 or more characters. Required."
-msgstr "6 eða fleiri tákn. Nauðsynlegt"
-
-#: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/all.php:134
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
-"Staðfestingarlykill var sendur á snarskilaboðafangið sem þú varst að bæta "
-"við. Þú verður að leyfa %s að senda snarskilaboð til þín."
 
-#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#, php-format
 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."
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
 msgstr ""
-"Staðfestingarlykill var sendur á tölvupóstfangið sem þú varst að bæta við. "
-"Athugaðu innhólfið þitt (og ruslpóstinn þinn!). Þar ætti "
-"staðfestingarlykillinn að vera og leiðbeingar um hvernig eigi að nota hann. "
 
-#: ../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."
+#: actions/all.php:165
+msgid "You and friends"
 msgstr ""
-"Staðfestingarlykill var sendur á símanúmerið sem þú varst að bæta við. "
-"Athugaðu innhólfið þitt (og ruslpóstinn þinn!). Þar ætti "
-"staðfestingarlykillinn að vera og leiðbeingar um hvernig eigi að nota hann."
-
-#: ../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 actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82
-#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
-msgid "API method not found!"
-msgstr "Aðferð í forritsskilum fannst ekki!"
-
-#: ../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 actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172
-#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
-msgid "API method under construction."
-msgstr "Aðferð í forritsskilum er í þróun."
-
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
-msgid "About"
-msgstr "Um"
-
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
-msgid "Accept"
-msgstr "Samþykkja"
-
-#: ../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 actions/emailsettings.php:120
-#: actions/imsettings.php:127 actions/openidsettings.php:111
-#: actions/smssettings.php:133 actions/twittersettings.php:163
-msgid "Add"
-msgstr "Bæta við"
-
-#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
-msgstr "Bæta við OpenID"
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-msgid "Add or remove OpenIDs"
-msgstr "Bæta við eða fjarlægja 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
-#: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
-msgstr "Tölvupóstfang"
-
-#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-msgid "Addresses of friends to invite (one per line)"
-msgstr "Tölvupóstfang vina sem þú vilt bjóða (eitt póstfang í hverja línu)"
-
-#: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
-msgid "All subscriptions"
-msgstr "Allar áskriftir"
-
-#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
-#, php-format
-msgid "All updates for %s"
-msgstr "Allar færslur %s"
 
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
 #, php-format
-msgid "All updates matching search term \"%s\""
-msgstr "Allar færslur sem passa við \"%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
-#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
-msgid "Already logged in."
-msgstr "Þú hefur nú þegar skráð þig inn."
-
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
-msgid "Already subscribed!."
-msgstr "Þú ert nú þegar áskrifandi!"
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
-msgid "Are you sure you want to delete this notice?"
-msgstr "Ertu viss um að þú viljir eyða þessu babli?"
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr "Færslur frá %1$s og vinum á %2$s!"
 
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
-msgid "Authorize subscription"
-msgstr "Heimila áskriftir"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
+msgstr "Aðferð í forritsskilum fannst ekki!"
 
-#: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
-msgid "Automatically login in the future; not for shared computers!"
-msgstr ""
-"Sjálfvirk innskráning í framtíðinni. Ekki nota þetta á tölvu sem aðrir deila "
-"með þér!"
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
+msgstr "Þessi aðferð krefst POST."
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/apiaccountupdatedeliverydevice.php:105
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
 msgstr ""
-"Gerast sjálfkrafa áskrifandi að hverjum þeim sem gerist áskrifandi að þér "
-"(best fyrir ómannlega notendur)"
 
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34 actions/avatarsettings.php:65
-#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
-msgid "Avatar"
-msgstr "Mynd"
-
-#: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
-msgid "Avatar updated."
-msgstr "Mynd hefur verið uppfærð."
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Gat ekki uppfært notanda."
 
-#: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
 #, 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?)"
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
 msgstr ""
-"Býð eftir staðfestingu frá þessu netfangi. Athugaðu Jabber/GTalk aðganginn "
-"þinn. Þar ættu að vera skilaboð með ítarlegri leiðbeiningum. (Hefurðu bætt "
-"%s við í vinalistann þinn?)"
 
-#: ../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."
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
 msgstr ""
-"Býð eftir staðfestingu frá þessu netfangi. Athugaðu innhólfið þitt (og "
-"ruslpóstinn þinn!). Þar ættu að vera skilaboð með ítarlegri leiðbeiningum."
-
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
-msgid "Awaiting confirmation on this phone number."
-msgstr "Býð eftir staðfestingu varðandi þetta símanúmer."
-
-#: ../lib/util.php:1318 lib/util.php:1452
-msgid "Before »"
-msgstr "Eldri »"
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
-#: actions/profilesettings.php:82 actions/register.php:184
-#: actions/profilesettings.php:112 actions/register.php:402
-msgid "Bio"
-msgstr "Lýsing"
-
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
-#: actions/register.php:89 actions/updateprofile.php:104
-#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
-msgid "Bio is too long (max 140 chars)."
-msgstr "Lýsingin er of löng (í mesta lagi 140 tákn)."
-
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
-msgid "Can't delete this notice."
-msgstr "Get ekki eytt þessu babli."
-
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
-#, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr "Get ekki lesið slóðina fyrir myndina '%s'"
-
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404 actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-msgid "Can't save new password."
-msgstr "Get ekki vistað nýja lykilorðið."
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Gat ekki uppfært hóp."
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62 actions/emailsettings.php:58
-#: actions/imsettings.php:59 actions/smssettings.php:62
-#: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
-msgstr "Hætta við"
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Notandi hefur enga persónulega síðu."
 
-#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Get ekki útbúið OpenID notandahlut."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Gat ekki vistað persónulega síðu."
 
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
-msgstr "Get ekki staðlað þetta Jabber kenni"
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
+msgstr "Mistókst að loka á notanda."
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
-msgid "Cannot normalize that email address"
-msgstr "Get ekki staðlað þetta tölvupóstfang"
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
+msgstr "Mistókst að opna fyrir notanda."
 
-#: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
-msgstr "Breyta"
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "Enginn texti í skilaboðum!"
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
-msgstr "Breyta tölvupóstumsjón"
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Þetta er of langt. Hámarkslengd skilaboða er 140 tákn."
 
-#: ../actions/password.php:32 actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr "Breyta lykilorði"
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "Móttakandi fannst ekki."
 
-#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
-msgid "Change your password"
-msgstr "Breyta lykilorðinu þínu"
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr "Gat ekki sent bein skilaboð til notenda sem eru ekki vinir þínir."
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-msgid "Change your profile settings"
-msgstr "Breyta persónulegu stillingunum þínum"
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "Bein skilaboð til %s"
 
-#: ../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
-#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
-#: actions/register.php:376 actions/smssettings.php:122
-msgid "Confirm"
-msgstr "Staðfesta"
+#: actions/apidirectmessage.php:93
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr "Öll bein skilaboð send frá %s"
 
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "Staðfesta tölvupóstfang"
+#: actions/apidirectmessage.php:101
+#, php-format
+msgid "Direct messages to %s"
+msgstr "Bein skilaboð til %s"
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245 actions/emailsettings.php:256
-#: actions/imsettings.php:230 actions/smssettings.php:253
-#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
-msgid "Confirmation cancelled."
-msgstr "Hætt við staðfestingu."
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr "Öll bein skilaboð til %s"
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
-msgid "Confirmation code"
-msgstr "Staðfestingarlykill"
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "Aðferð í forritsskilum fannst ekki!"
 
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-msgid "Confirmation code not found."
-msgstr "Staðfestingarlykill fannst ekki."
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
+msgstr "Engin staða fundin með þessu kenni."
 
-#: ../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."
+#: actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
 msgstr ""
-"Til hamingju %s! Frábært að þú skulir hafa skráð þig á %%%%site.name%%%%. "
-"Héðan vilt þú kannski...\n"
-"\n"
-"* Fara á [persónulegu síðuna þína](%s) senda inn þitt fyrsta babl.\n"
-"* Bæta við [Jabber/GTalk snarskilaboðafangi](%%%%action.imsettings%%%%) svo "
-"þú getir sent inn babl í snarskilaboðum.\n"
-"* [Leita að fólki](%%%%action.peoplesearch%%%%) sem þú þekkir eða hefur sömu "
-"áhugamál og þú. \n"
-"* Uppfæra [persónulegu síðuna](%%%%action.profilesettings%%%%) þína til þess "
-"að leyfa öðrum að kynnast þér betur.\n"
-"* Lesa [vefleiðbeiningarnar](%%%%doc.help%%%%) til þess að læra að babla "
-"betur.\n"
-"\n"
-"Takk fyrir að skrá þig og við vonum að þú njótir þjónustunnar."
 
-#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
-msgid "Connect"
-msgstr "Tengjast"
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+msgstr "Gat ekki búið til uppáhald."
 
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
-msgid "Connect existing account"
-msgstr "Tengja aðgang sem nú þegar er til"
+#: actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
+msgstr ""
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
-msgid "Contact"
-msgstr "Tengiliður"
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr "Gat ekki eytt uppáhaldi."
 
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
-#, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "Gat ekki búið til OpenID eyðublað: %s"
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
+msgstr "Get ekki fylgst með notanda: Notandinn finnst ekki."
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr ""
 "Get ekki fylgst með notanda: %s. Þessi notandi er nú þegar í listanum þínum."
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
-msgid "Could not follow user: User not found."
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
 msgstr "Get ekki fylgst með notanda: Notandinn finnst ekki."
 
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Gat ekki framsent til vefþjóns: %s"
-
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
-msgid "Could not save avatar info"
-msgstr "Gat ekki vistað myndupplýsingar"
-
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
-msgid "Could not save new profile info"
-msgstr "Gat ekki vistað nýjar persónuupplýsingar"
-
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
-msgid "Could not subscribe other to you."
-msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér."
-
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
-msgid "Could not subscribe."
-msgstr "Gat ekki farið í áskrift."
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
-msgstr "Gat ekki uppfært notanda með staðfestu tölvupóstfangi."
-
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-msgid "Couldn't convert request tokens to access tokens."
-msgstr "Gat ekki breytt beiðnistókum í aðgangstóka."
-
-#: ../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
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-msgid "Couldn't delete email confirmation."
-msgstr "Gat ekki eytt tölvupóstsstaðfestingu."
-
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
-msgid "Couldn't delete subscription."
-msgstr "Gat ekki eytt áskrift."
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
-msgid "Couldn't find any statuses."
-msgstr "Gat ekki fundið neinar notendastöður."
-
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-msgid "Couldn't get a request token."
-msgstr "Gat ekki komist yfir beiðnistóka."
-
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206 actions/emailsettings.php:223
-#: actions/imsettings.php:195 actions/smssettings.php:214
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
-msgid "Couldn't insert confirmation code."
-msgstr "Gat ekki sett inn staðfestingarlykil."
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
-msgstr "Gat ekki sett inn nýja áskrift."
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
+msgstr "Tvo notendakenni eða skjáarnöfn verða að vera uppgefin."
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-msgid "Couldn't save profile."
-msgstr "Gat ekki vistað persónulega síðu."
+#: actions/apifriendshipsshow.php:135
+msgid "Could not determine source user."
+msgstr ""
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
-msgstr "Gat ekki uppfært notanda í sjálfvirka áskrift."
+#: actions/apifriendshipsshow.php:143
+msgid "Could not find target user."
+msgstr ""
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
-msgid "Couldn't update user record."
-msgstr "Gat ekki uppfært skráarfærslu notanda."
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
+msgid "Could not create group."
+msgstr "Gat ekki búið til hóp."
 
-#: ../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
-#: actions/confirmaddress.php:114 actions/emailsettings.php:280
-#: actions/emailsettings.php:411 actions/imsettings.php:252
-#: actions/imsettings.php:395 actions/othersettings.php:162
-#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
-msgid "Couldn't update user."
-msgstr "Gat ekki uppfært notanda."
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
+msgid "Could not create aliases."
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
-msgid "Create"
-msgstr "Búa til"
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+msgid "Could not set group membership."
+msgstr "Gat ekki skráð hópmeðlimi."
 
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
-msgid "Create a new user with this nickname."
-msgstr "Búa til nýjan notanda með þessu stuttnefni."
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "Stuttnefni geta bara verið lágstafir og tölustafir en engin bil."
 
-#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
-msgid "Create new account"
-msgstr "Búa til nýjan aðgang"
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað."
 
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
-msgid "Creating new account for OpenID that already has a user."
-msgstr "Búa til nýjan aðgang fyrir OpenID sem nú þegar hefur notanda."
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "Ekki tækt stuttnefni."
 
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "Núverandi staðfesta Jabber/GTalk snarskilaboðafangið."
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "Heimasíða er ekki gild vefslóð."
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "Núverandi staðfesta SMS símanúmerið."
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "Fullt nafn er of langt (í mesta lagi 255 stafir)."
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-msgid "Current confirmed email address."
-msgstr "Núverandi staðfesta tölvupóstfangið."
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "Lýsing er of löng (í mesta lagi 140 tákn)."
 
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
-msgstr "Í gangi núna"
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "Staðsetning er of löng (í mesta lagi 255 stafir)."
 
-#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
 #, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %s"
+msgid "Too many aliases! Maximum %d."
+msgstr ""
 
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
 #, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Gagnagrunnsvilla við innsetningu svars: %s"
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
-msgid "Delete notice"
-msgstr "Eyða babli"
-
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "Lýstu þér og áhugamálum þínum í 140 táknum"
-
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87 actions/register.php:172
-#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
-#: actions/register.php:385 lib/accountsettingsaction.php:113
-msgid "Email"
-msgstr "Tölvupóstur"
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-msgid "Email Address"
-msgstr "Tölvupóstfang"
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
-msgstr "Tölvupóstsstillingar"
-
-#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-msgid "Email address already exists."
-msgstr "Tölvupóstfang er nú þegar skráð."
-
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
-msgid "Email address confirmation"
-msgstr "Staðfesting tölvupóstfangs"
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
-msgstr "Tölvupóstfang eins og \"notandi@eitthvað.is\""
-
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-msgid "Email addresses"
-msgstr "Tölvupóstföng"
-
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
-msgid "Enter a nickname or email address."
-msgstr "Sláðu inn stuttnefni eða tölvupóstfang."
+msgid "Invalid alias: \"%s\""
+msgstr ""
 
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
-msgstr "Sláðu inn lykilinn sem þú fékkst í símann þinn."
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr ""
 
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
-msgid "Error authorizing token"
-msgstr "Villa kom upp í heimilun tóka"
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
-msgid "Error connecting user to OpenID."
-msgstr "Villa kom upp í tengingu notanda við OpenID."
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Þú ert nú þegar meðlimur í þessum hópi"
 
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
-msgstr "Villa kom upp við að tengja notanda."
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
-msgstr "Villa kom upp við að setja inn mynd"
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Gat ekki bætt notandanum %s í hópinn %s"
 
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
-msgstr "Villa kom upp við að setja inn nýja persónulega síðu"
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Þú ert ekki meðlimur í þessum hópi."
 
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
-msgstr "Villa kom upp við að setja inn persónulega fjarsíðu"
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s"
 
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
-msgid "Error saving address confirmation."
-msgstr "Villa kom upp í vistun netfangsstaðfestingar."
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "Hópar %s"
 
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
-msgid "Error saving remote profile"
-msgstr "Villa kom upp í vistun persónulegrar fjarsíðu"
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Hópsaðgerðir"
 
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-msgid "Error saving the profile."
-msgstr "Villa kom upp í vistun persónulegu síðunnar."
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "Hópar %s"
 
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-msgid "Error saving the user."
-msgstr "Villa kom upp í vistun notandans."
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Hópar sem %s er meðlimur í"
 
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
-msgid "Error saving user; invalid."
-msgstr "Villa kom upp í vistun notanda: ótækt."
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
+msgstr "Þessi aðferð krefst POST eða DELETE."
 
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
-#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
-#: actions/register.php:108 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-msgid "Error setting user."
-msgstr "Villa kom upp í stillingu notanda."
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
+msgstr "Þú getur ekki eytt stöðu annars notanda."
 
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr "Villa kom upp í uppfærslu persónulegu síðunnar"
+#: actions/apistatusesshow.php:138
+msgid "Status deleted."
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
-msgstr "Villa kom upp í uppfærslu persónulegrar fjarsíðu"
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
+msgstr "Engin staða með þessu kenni fannst."
 
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr "Villa kom upp varðandi staðfestingarlykilinn."
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
 
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
-msgid "Existing nickname"
-msgstr "Stuttnefni er nú þegar til"
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
+msgstr "Fannst ekki"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
-msgid "FAQ"
-msgstr "Spurt og svarað"
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
 
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
-msgid "Failed updating avatar."
-msgstr "Mistókst að uppfæra mynd"
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Skráarsnið myndar ekki stutt."
 
-#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/apitimelinefavorites.php:107
 #, php-format
-msgid "Feed for friends of %s"
-msgstr "Vinaveita %s"
+msgid "%s / Favorites from %s"
+msgstr "%s / Uppáhaldsbabl frá %s"
 
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/apitimelinefavorites.php:119
 #, php-format
-msgid "Feed for replies to %s"
-msgstr "Svaraveita %s"
+msgid "%s updates favorited by %s / %s."
+msgstr "%s færslur gerðar að uppáhaldsbabli af %s / %s."
 
-#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
-msgid "Feed for tag %s"
-msgstr "Merkjaveita %s"
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
-msgstr "Finna innihald babls"
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
-msgstr "Finna persónur á þessu vefsvæði"
-
-#: ../actions/login.php:122
-msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
-msgstr ""
-"Af öryggisástæðum, vinsamlegast sláðu aftur inn notendanafnið þitt og "
-"lykilorð áður en þú breytir stillingunum þínum."
-
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
-#: actions/profilesettings.php:77 actions/register.php:178
-#: actions/profilesettings.php:103 actions/register.php:391
-#: actions/showgroup.php:235 actions/showstream.php:262
-#: actions/tagother.php:105 lib/groupeditform.php:142
-msgid "Full name"
-msgstr "Fullt nafn"
-
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
-#: actions/register.php:86 actions/updateprofile.php:94
-#: actions/editgroup.php:195 actions/newgroup.php:146
-#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
-msgid "Full name is too long (max 255 chars)."
-msgstr "Fullt nafn er of langt (í mesta lagi 255 stafir)."
-
-#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
-msgid "Help"
-msgstr "Hjálp"
-
-#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
-msgid "Home"
-msgstr "Heim"
-
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
-msgid "Homepage"
-msgstr "Heimasíða"
-
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
-msgid "Homepage is not a valid URL."
-msgstr "Heimasíða er ekki gild vefslóð."
-
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
-msgid "I want to post notices by email."
-msgstr "Ég vil babla í gegnum tölvupóst."
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
-msgstr "Snarskilaboð"
-
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
-msgstr "Snarskilaboðafang"
-
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
-msgstr "Snarskilaboðastillingar"
-
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
-msgstr ""
-"Ef ert nú þegar með aðgang, skráðu þig inn með notendanafni og lykilorði til "
-"þess að tengjast OpenID aðganginum þínum."
-
-#: ../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 ""
-"Ef þig langar til það bæta við OpenID í aðganginn þinn, sláðu það þá inn í "
-"reitinn hér fyrir neðan og smelltu á \"Bæta við\"."
-
-#: ../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 ""
-"Ef þú hefur gleymt eða tapað lykilorðinu þínu getur þú fengið nýtt sent á "
-"tölvupóstfangið sem þú hefur vistað  í notendaaðganginum þínum."
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-#: actions/emailsettings.php:127 actions/smssettings.php:140
-msgid "Incoming email"
-msgstr "Móttökutölvupóstur"
-
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
-msgid "Incoming email address removed."
-msgstr "Móttökutölvupóstfang fjarlægt."
-
-#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
-msgid "Incorrect old password"
-msgstr "Rangt eldra lykilorð"
+msgid "%s timeline"
+msgstr "Rás %s"
 
-#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
-msgid "Incorrect username or password."
-msgstr "Rangt notendanafn eða lykilorð."
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "Færslur frá %1$s á %2$s!"
 
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
+#: actions/apitimelinementions.php:116
+#, php-format
+msgid "%1$s / Updates mentioning %2$s"
 msgstr ""
-"Leiðbeiningar um það hvernig þú getur endurheimt lykilorðið þitt hafa verið "
-"sendar á tölvupóstfangið sem er tengt notendaaðganginum þínum."
 
-#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/apitimelinementions.php:126
 #, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "Ótæk myndarslóð '%s'"
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr "%1$s færslur sem svara færslum frá %2$s / %3$s."
 
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
 #, php-format
-msgid "Invalid email address: %s"
-msgstr "Ótækt tölvupóstfang: %s"
+msgid "%s public timeline"
+msgstr "Almenningsrás %s"
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
 #, php-format
-msgid "Invalid homepage '%s'"
-msgstr "Ótæk heimasíða '%s'"
+msgid "%s updates from everyone!"
+msgstr "%s færslur frá öllum!"
 
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/apitimelinetag.php:101 actions/tag.php:66
 #, php-format
-msgid "Invalid license URL '%s'"
-msgstr "Ótæk leyfisslóð '%s'"
-
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
-msgstr "Ótækt bablinnihald"
+msgid "Notices tagged with %s"
+msgstr "Babl merkt með %s"
 
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
-msgstr "Ótækt veffang babls"
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr ""
 
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
-msgstr "Ótækt veffang babls"
+#: actions/apiusershow.php:96
+msgid "Not found."
+msgstr "Fannst ekki."
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "Ótækt veffang persónulegrar síðu '%s'."
+#: actions/attachment.php:73
+msgid "No such attachment."
+msgstr ""
 
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
-msgstr "Ótækt veffang persónulegrar síðu (vitlaust snið)"
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+msgstr "Ekkert stuttnefni."
 
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
-msgstr "Ótæku veffangi persónulegrar síðu skilað af vefþjóni."
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "Engin stærð."
 
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 #: actions/avatarbynickname.php:69
 msgid "Invalid size."
 msgstr "Ótæk stærð."
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111 actions/finishopenidlogin.php:241
-#: actions/register.php:103 actions/register.php:121
-#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
-msgid "Invalid username or password."
-msgstr "Ótækt notendanafn eða lykilorð."
-
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-msgid "Invitation(s) sent"
-msgstr "Boðskort hefur verið sent út"
-
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-msgid "Invitation(s) sent to the following people:"
-msgstr "Boðskort sent á eftirfarandi aðila:"
-
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
-msgid "Invite"
-msgstr "Bjóða"
-
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-msgid "Invite new users"
-msgstr "Bjóða nýjum notendum að vera með"
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "Mynd"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#: actions/avatarsettings.php:78
 #, php-format
-msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
+msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
-"Það keyrir [StatusNet](http://status.net/) örbloggshugbúnaðinn, útgáfu %s, sem "
-"er gefinn út undir [GNU Affero "
-"almenningsleyfinu](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
-msgstr "Jabber-kennið tilheyrir öðrum notanda."
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
+msgstr "Notandi með enga persónulega síðu sem passar við"
 
-#: ../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 eða GTalk netfang eins og \"notandi@eitthvað.is\". Fyrst skaltu vera "
-"viss um að bæta %s við í vinalistann þinn í snarskilaboðaforritinu þínu eða "
-"á GTalk."
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+msgid "Avatar settings"
+msgstr "Stillingar fyrir mynd"
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
-msgid "Language"
-msgstr "Tungumál"
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr "Upphafleg mynd"
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
-msgid "Language is too long (max 50 chars)."
-msgstr "Tungumál er of langt (í mesta lagi 50 stafir)."
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr "Forsýn"
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
-msgid "Location"
-msgstr "Staðsetning"
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+msgid "Delete"
+msgstr "Eyða"
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
-#: actions/register.php:92 actions/updateprofile.php:109
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
-msgid "Location is too long (max 255 chars)."
-msgstr "Staðsetning er of löng (í mesta lagi 255 stafir)."
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+msgstr "Hlaða upp"
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
-#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
-#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
-#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
-#, php-format
-msgid "Login"
-msgstr "Innskráning"
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
+msgstr "Skera af"
 
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Innskráning með [OpenID](%%doc.openid%%) aðgangi."
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Það kom upp vandamál með setutókann þinn. Vinsamlegast reyndu aftur."
 
-#: ../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 ""
-"Skráðu þig inn með notendanafninu þínu og lykilorði. Ertu ekki með "
-"notendanafn? [Nýskráðu þig](%%action.register%%) eða prófaðu "
-"[OpenID](%%action.openidlogin%%). "
+#: actions/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Bjóst ekki við innsendingu eyðublaðs."
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
-msgid "Logout"
-msgstr "Útskráning"
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
+msgstr ""
+"Veldu ferningslaga svæði á upphaflegu myndinni sem einkennismyndina þína"
 
-#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
-msgid "Longer name, preferably your \"real\" name"
-msgstr "Lengra nafn, ákjósalegast að það sé \"rétta\" nafnið þitt"
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
+msgstr "Týndum skráargögnunum okkar"
 
-#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
-msgid "Lost or forgotten password?"
-msgstr "Tapað eða gleymt lykilorð?"
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+msgstr "Mynd hefur verið uppfærð."
 
-#: ../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 "Búa til nýtt tölvupóstfang til að senda til. Skrifar yfir það gamla."
+#: actions/avatarsettings.php:363
+msgid "Failed updating avatar."
+msgstr "Mistókst að uppfæra mynd"
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#: actions/emailsettings.php:71
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr "Stilla það hvernig þú færð tölvupóst frá %%site.name%%."
+#: actions/avatarsettings.php:387
+msgid "Avatar deleted."
+msgstr ""
 
-#: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
-msgid "Member since"
-msgstr "Meðlimur síðan"
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+msgid "No nickname"
+msgstr "Ekkert stuttnefni"
 
-#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
-#, php-format
-msgid "Microblog by %s"
-msgstr "Örblogg frá %s"
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
+msgstr "Enginn þannig hópur"
 
-#: ../actions/smssettings.php:304
+#: actions/blockedfromgroup.php:90
 #, 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."
+msgid "%s blocked profiles"
 msgstr ""
-"Farsímafélagið þitt. Ef þú veist um farsímafélag sem tekur á móti SMS í "
-"gegnum tölvupóst sem er ekki í þessum lista, sendu okkur tölvupóst í %s og "
-"láttu okkur vita."
-
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-msgid "My text and files are available under "
-msgstr "Textinn og skrárnar mínar eru aðgengilegar undir "
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#: actions/emailsettings.php:142 actions/smssettings.php:152
-msgid "New"
-msgstr "Nýtt"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: actions/blockedfromgroup.php:93
 #, php-format
-msgid "New email address for posting to %s"
-msgstr "Nýtt tölvupóstfang til að senda á %s"
-
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
-msgid "New incoming email address added."
-msgstr "Nýju móttökutölvupóstfangi bætt við."
-
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
-msgid "New nickname"
-msgstr "Nýtt stuttnefni"
+msgid "%s blocked profiles, page %d"
+msgstr ""
 
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
-msgstr "Nýtt babl"
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr ""
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-msgid "New password"
-msgstr "Nýtt lykilorð"
+#: actions/blockedfromgroup.php:281
+msgid "Unblock user from group"
+msgstr ""
 
-#: ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
-msgstr "Tókst að vista nýtt lykilorð. Þú ert núna innskráð(ur)"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
+msgstr "Opna"
 
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151 actions/login.php:101
-#: actions/profilesettings.php:74 actions/register.php:165
-#: actions/login.php:228 actions/profilesettings.php:98
-#: actions/register.php:367 actions/showgroup.php:224
-#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
-msgid "Nickname"
-msgstr "Stuttnefni"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+msgid "Unblock this user"
+msgstr "Opna á þennan notanda"
 
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69 actions/finishopenidlogin.php:181
-#: actions/profilesettings.php:225 actions/register.php:76
-#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
-msgid "Nickname already in use. Try another one."
-msgstr "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað."
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Ekki innskráð(ur)."
 
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:67 ../actions/updateprofile.php:77
-#: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
-#: actions/register.php:74 actions/updateprofile.php:78
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "Stuttnefni geta bara verið lágstafir og tölustafir en engin bil."
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
+msgstr "Engin persónuleg síða tilgreind"
 
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
-msgid "Nickname not allowed."
-msgstr "Stuttnefni ekki leyfilegt."
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
+msgstr "Engin persónulega síða með þessu einkenni"
 
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
-msgstr "Stuttnefni notandans sem þú vilt fylgja"
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Loka á notanda"
 
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
-msgid "Nickname or email"
-msgstr "Stuttnefni eða tölvupóstur"
+#: actions/block.php:136
+msgid ""
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
+msgstr ""
 
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
+#: actions/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
 msgid "No"
 msgstr "Nei"
 
-#: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
-msgstr "Ekkert Jabber-kenni"
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Opna á þennan notanda"
 
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
-msgid "No authorization request!"
-msgstr "Engin heimildarbeiðni!"
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
+msgstr "Já"
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
-msgid "No carrier selected."
-msgstr "Ekkert farsímafélag valið."
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+msgid "Block this user"
+msgstr "Loka á þennan notanda"
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
-msgstr "Enginn lykill sleginn inn"
+#: actions/block.php:165
+msgid "You have already blocked this user."
+msgstr "Þú hefur nú þegar lokað á þennan notanda."
+
+#: actions/block.php:170
+msgid "Failed to save block information."
+msgstr "Mistókst að vista upplýsingar um notendalokun"
+
+#: actions/bookmarklet.php:50
+#, fuzzy
+msgid "Post to "
+msgstr "Ljósmynd"
 
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 #: actions/confirmaddress.php:75
 msgid "No confirmation code."
 msgstr "Enginn staðfestingarlykill."
 
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
-#: actions/newnotice.php:126 classes/Command.php:223
-msgid "No content!"
-msgstr "Ekkert innihald!"
-
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
-msgid "No email address."
-msgstr "Ekkert tölvupóstfang."
-
-#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
-msgid "No id."
-msgstr "Ekkert kenni."
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
-msgid "No incoming email address."
-msgstr "Ekkert móttökutölvupóstfang."
-
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr "Ekkert stuttnefni uppgefið hjá hinum vefþjóninum."
-
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
-msgid "No nickname."
-msgstr "Ekkert stuttnefni."
-
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229 actions/emailsettings.php:240
-#: actions/imsettings.php:214 actions/smssettings.php:237
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
-msgid "No pending confirmation to cancel."
-msgstr "Engin staðfesting í bið sem þarf að hætta við."
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
-msgstr "Ekkert símanúmer."
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "Staðfestingarlykill fannst ekki."
 
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
-msgstr "Ekkert veffang persónulegrar síðu skilað af vefþjóni."
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "Þessi staðfestingarlykill er ekki fyrir þig!"
 
-#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
-msgid "No registered email address for that user."
-msgstr "Ekkert tölvupóstfang á skrá fyrir þennan notanda."
+#: actions/confirmaddress.php:90
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr "Óþekkt gerð tölvupóstfangs %s"
 
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr "Engin beiðni fundin!"
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr "Þetta tölvupóstfang hefur nú þegar verið staðfest."
 
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
-msgid "No results"
-msgstr "Engar niðurstöður"
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "Gat ekki uppfært notanda."
 
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
-msgstr "Engin stærð."
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr "Gat ekki eytt tölvupóstsstaðfestingu."
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
-msgid "No status found with that ID."
-msgstr "Engin staða fundin með þessu kenni."
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "Staðfesta tölvupóstfang"
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
-msgid "No status with that ID found."
-msgstr "Engin staða með þessu kenni fannst."
+#: actions/confirmaddress.php:159
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr ""
+"Þetta tölvupóstfang, \"%s\", hefur verið staðfest fyrir aðganginn þinn."
 
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
-msgstr "Ekkert svoleiðis OpenID."
+#: actions/conversation.php:99
+msgid "Conversation"
+msgstr ""
 
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
-msgid "No such document."
-msgstr "Ekkert svoleiðis skjal."
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
+msgstr "Babl"
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30 actions/shownotice.php:32
-#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Ekkert svoleiðis babl."
 
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr "Enginn svoleiðis staðfestingarlykill."
-
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-msgid "No such subscription"
-msgstr "Engin svoleiðis áskrift"
-
-#: ../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 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
-msgid "No such user."
-msgstr "Enginn svoleiðis notandi."
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-msgid "No user with that email address or username."
-msgstr "Enginn notandi með þetta tölvupóstfang eða notendanafn"
-
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
-msgstr "Enginn sem hægt er að sýna!"
-
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr "Þetta er ekki staðfestingarlykill."
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
-msgstr "Ekki skráður notandi."
-
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
-msgid "Not a supported data format."
-msgstr "Enginn stuðningur við gagnasnið."
-
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
-msgstr "Ekki tækt Jabber-kenni"
-
-#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-msgid "Not a valid OpenID."
-msgstr "Ekki tækt OpenID"
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
-msgid "Not a valid email address"
-msgstr "Ekki tækt tölvupóstfang"
-
-#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-msgid "Not a valid email address."
-msgstr "Ekki tækt tölvupóstfang."
-
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-#: actions/editgroup.php:186 actions/newgroup.php:137
-#: actions/profilesettings.php:195 actions/register.php:161
-msgid "Not a valid nickname."
-msgstr "Ekki tækt stuttnefni."
-
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
-msgstr "Ekki tækt veffang á persónulega síðu (röng þjónusta)."
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "Get ekki eytt þessu babli."
 
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr "Ekki tækt veffang á persónulega síðu (XRDS ekki skilgreint)."
+#: actions/deletenotice.php:103
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
 
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr "Ekki tækt veffang á persónulega síðu (ekkert YADIS skjal)."
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr "Eyða babli"
 
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
-msgid "Not an image or corrupt file."
-msgstr "Annaðhvort ekki mynd eða þá að skráin er gölluð."
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr "Ertu viss um að þú viljir eyða þessu babli?"
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
-msgid "Not authorized."
-msgstr "Engin heimild."
+#: actions/deletenotice.php:145
+msgid "Do not delete this notice"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
-msgid "Not expecting this response!"
-msgstr "Bjóst ekki við þessu svari!"
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+msgid "Delete this notice"
+msgstr "Eyða þessu babli"
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
-msgid "Not found"
-msgstr "Fannst ekki"
+#: actions/deletenotice.php:157
+msgid "There was a problem with your session token.  Try again, please."
+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 actions/block.php:59 actions/disfavor.php:61
-#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
-#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
-#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
-#: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Ekki innskráð(ur)."
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr "Þetta babl er ekki í uppáhaldi!"
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
-msgid "Not subscribed!."
-msgstr "Ekki í áskrift!"
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "Bæta við sem uppáhaldsbabli"
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
-msgstr "Leit í babli"
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "Ekkert svoleiðis skjal."
 
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
+#: actions/editgroup.php:56
 #, php-format
-msgid "Notice feed for %s"
-msgstr "Bablveita fyrir %s"
+msgid "Edit %s group"
+msgstr "Breyta hópnum %s"
 
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
-msgstr "Babl hefur enga persónulega síðu"
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
+msgstr "Þú verður að hafa skráð þig inn til að búa til hóp."
 
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
-msgid "Notices"
-msgstr "Babl"
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+msgid "You must be an admin to edit the group"
+msgstr "Þú verður að vera stjórnandi til að geta breytt hópnum"
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
-#, php-format
-msgid "Notices tagged with %s"
-msgstr "Babl merkt með %s"
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
+msgstr "Notaðu þetta eyðublað til að breyta hópnum."
 
-#: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
-msgstr "Eldra lykilorð"
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Lýsing er of löng (í mesta lagi 140 tákn)."
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
-msgid "OpenID"
-msgstr "OpenID"
-
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
-msgid "OpenID Account Setup"
-msgstr "Uppsetning OpenID aðgangs"
-
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-msgid "OpenID Auto-Submit"
-msgstr "Sjálfvirk innsending OpenID"
-
-#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
-#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-msgid "OpenID Login"
-msgstr "OpenID notendanafn"
-
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-#: actions/openidlogin.php:102 actions/openidsettings.php:101
-msgid "OpenID URL"
-msgstr "Veffang OpenID"
-
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
-msgid "OpenID authentication cancelled."
-msgstr "OpenID heimild afturkölluð."
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr "Tókst ekki að fá OpenID heimild: %s"
-
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "OpenID mistókst: %s"
-
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr "OpenID fjarlægt."
-
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
-msgstr "Stillingar OpenID"
-
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-msgid "Optionally add a personal message to the invitation."
-msgstr "Bættu persónulegum skilaboðum við boðskortið ef þú vilt."
+#: actions/editgroup.php:253
+msgid "Could not update group."
+msgstr "Gat ekki uppfært hóp."
 
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
-msgid "Partial upload."
-msgstr "Upphal að hluta til."
+#: actions/editgroup.php:269
+msgid "Options saved."
+msgstr "Valmöguleikar vistaðir."
 
-#: ../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 actions/finishopenidlogin.php:118
-#: actions/login.php:231 actions/register.php:372
-#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-msgid "Password"
-msgstr "Lykilorð"
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "Tölvupóstsstillingar"
 
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
-msgid "Password and confirmation do not match."
-msgstr "Lykilorð og staðfesting passa ekki saman."
+#: actions/emailsettings.php:71
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr "Stilla það hvernig þú færð tölvupóst frá %%site.name%%."
 
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
-msgid "Password must be 6 chars or more."
-msgstr "Lykilorð verður að vera 6 tákn eða fleiri."
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "Tölvupóstfang"
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-msgid "Password recovery requested"
-msgstr "Beiðni um að endurheimta lykilorð hefur verið send inn"
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr "Núverandi staðfesta tölvupóstfangið."
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-msgid "Password saved."
-msgstr "Lykilorð vistað."
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "Fjarlægja"
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-msgid "Passwords don't match."
-msgstr "Lykilorðin passa ekki saman."
+#: actions/emailsettings.php:113
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
+"Býð eftir staðfestingu frá þessu netfangi. Athugaðu innhólfið þitt (og "
+"ruslpóstinn þinn!). Þar ættu að vera skilaboð með ítarlegri leiðbeiningum."
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
-msgstr "Fólk"
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "Hætta við"
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
-msgstr "Leit að fólki"
+#: actions/emailsettings.php:121
+msgid "Email Address"
+msgstr "Tölvupóstfang"
 
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
-msgstr "Leit að fólki"
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr "Tölvupóstfang eins og \"notandi@example.org\""
 
-#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
-msgid "Personal"
-msgstr "Persónulegt"
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "Bæta við"
 
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-msgid "Personal message"
-msgstr "Persónuleg skilaboð"
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+msgstr "Móttökutölvupóstur"
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "Símanúmer, með svæðisnúmeri ef við á, án greinarmerkja eða bila"
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
+msgstr "Sendu tölvupóst á þetta póstfang til þess að senda inn nýtt babl."
 
-#: ../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 ""
-"Vinsamlegast athugaðu þessi atriði til þess að vera viss um að þú viljir "
-"gerast áskrifandi að babli þessa notanda. Ef þú baðst ekki um að gerast "
-"áskrifandi að babli, smelltu þá á \"Hætta við\"."
+#: actions/emailsettings.php:145 actions/smssettings.php:162
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr "Búa til nýtt tölvupóstfang til að senda til. Skrifar yfir það gamla."
 
-#: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Senda inn babl þegar Jabber/GTalk staðan breytist."
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
+msgstr "Nýtt"
 
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94 actions/emailsettings.php:86
-#: actions/imsettings.php:68 actions/smssettings.php:94
-#: actions/twittersettings.php:70 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "Stillingar"
 
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163 actions/emailsettings.php:180
-#: actions/imsettings.php:152 actions/smssettings.php:171
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
-msgid "Preferences saved."
-msgstr "Stillingar vistaðar."
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
-msgid "Preferred language"
-msgstr "Tungumál (ákjósanlegt)"
-
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
-msgid "Privacy"
-msgstr "Friðhelgi"
-
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-msgid "Problem saving notice."
-msgstr "Vandamál komu upp við að vista babl."
-
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
-msgid "Profile"
-msgstr "Persónuleg síða"
-
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
-msgstr "Veffang persónulegrar síðu"
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
+msgstr "Sendu mér tilkynningu varðandi nýjar áskriftir í gegnum tölvupóst."
 
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
-msgstr "Stillingar persónulegrar síðu"
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr "Senda mér tölvupóst þegar einhver setur babl í mér í uppáhald hjá sér."
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-msgid "Profile unknown"
-msgstr "Persónuleg síða þekkist ekki"
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
+msgstr "Senda mér tölvupóst þegar einhver sendir mér persónuleg skilaboð."
 
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
-msgid "Public Stream Feed"
-msgstr "Skilaboðaveita almenningsrásarinnar"
+#: actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr ""
 
-#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
-msgid "Public timeline"
-msgstr "Almenningsrás"
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
+msgstr "Leyfa vinum að ýta við mér og senda mér tölvupóst."
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Birta MicroID fyrir Jabber/GTalk netfangið mitt."
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
+msgstr "Ég vil babla í gegnum tölvupóst."
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr "Birta MicroID fyrir tölvupóstfangið mitt."
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr "Nýleg merki"
-
-#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
-msgid "Recover"
-msgstr "Endurheimta"
-
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
-msgid "Recover password"
-msgstr "Endurheimta lykilorð"
-
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-msgid "Recovery code for unknown user."
-msgstr "Lykill fyrir endurheimtingu óþekkts notanda."
-
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
-#: actions/register.php:152 actions/register.php:207 lib/util.php:328
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-msgid "Register"
-msgstr "Nýskrá"
-
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
-msgid "Registration not allowed."
-msgstr "Nýskráning ekki leyfð."
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Vista"
 
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
-msgid "Registration successful"
-msgstr "Nýskráning tókst"
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+msgstr "Stillingar vistaðar."
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
-msgid "Reject"
-msgstr "Hafna"
+#: actions/emailsettings.php:319
+msgid "No email address."
+msgstr "Ekkert tölvupóstfang."
 
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
-msgid "Remember me"
-msgstr "Muna eftir mér"
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
+msgstr "Get ekki staðlað þetta tölvupóstfang"
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
-msgid "Remote profile with no matching profile"
-msgstr "Persónuleg fjarsíða með engri persónulegri síðu sem passar"
+#: actions/emailsettings.php:330
+msgid "Not a valid email address"
+msgstr "Ekki tækt tölvupóstfang"
 
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
-msgstr "Fara í fjaráskrift"
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
+msgstr "Þetta er nú þegar tölvupóstfangið þitt."
 
-#: ../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 actions/emailsettings.php:101
-#: actions/emailsettings.php:134 actions/imsettings.php:102
-#: actions/openidsettings.php:166 actions/smssettings.php:103
-#: actions/smssettings.php:146 actions/twittersettings.php:115
-msgid "Remove"
-msgstr "Fjarlægja"
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another user."
+msgstr "Þetta tölvupóstfang tilheyrir öðrum notanda."
 
-#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
-msgstr "Fjarlægja OpenID"
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+msgstr "Gat ekki sett inn staðfestingarlykil."
 
-#: ../actions/openidsettings.php:73
+#: actions/emailsettings.php:358
 msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
-"Að fjarlægja þetta eina OpenID sem þú ert með gerir innskráningu ómögulega! "
-"Ef þú þarft að fjarlægja það, búðu þá til nýtt OpenID fyrst."
-
-#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
-msgid "Replies"
-msgstr "Svör"
+"Staðfestingarlykill var sendur á tölvupóstfangið sem þú varst að bæta við. "
+"Athugaðu innhólfið þitt (og ruslpóstinn þinn!). Þar ætti "
+"staðfestingarlykillinn að vera og leiðbeingar um hvernig eigi að nota hann. "
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
-#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
-#: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
-#, php-format
-msgid "Replies to %s"
-msgstr "Svör við %s"
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
+msgstr "Engin staðfesting í bið sem þarf að hætta við."
 
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
-msgid "Reset"
-msgstr "Endurstilla"
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "Þetta er rangt snarskilaboðafang."
 
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
-msgid "Reset password"
-msgstr "Endurstilla lykilorð"
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "Hætt við staðfestingu."
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-msgid "SMS"
-msgstr "SMS"
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
+msgstr "Þetta er ekki tölvupóstfangið þitt."
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
-msgid "SMS Phone number"
-msgstr "SMS símanúmer"
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "Tölvupóstfangið hefur verið fjarlægt."
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
-msgstr "SMS stillingar"
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
+msgstr "Ekkert móttökutölvupóstfang."
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
-msgid "SMS confirmation"
-msgstr "SMS staðfesting"
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
+msgstr "Gat ekki uppfært skráarfærslu notanda."
 
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
-msgid "Same as password above"
-msgstr "Sama og lykilorðið hér fyrir ofan"
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
+msgstr "Móttökutölvupóstfang fjarlægt."
 
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
-msgid "Same as password above. Required."
-msgstr "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt."
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
+msgstr "Nýju móttökutölvupóstfangi bætt við."
 
-#: ../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 actions/emailsettings.php:182
-#: actions/facebooksettings.php:114 actions/imsettings.php:157
-#: actions/othersettings.php:117 actions/profilesettings.php:150
-#: actions/smssettings.php:169 actions/subscriptions.php:124
-#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
-msgid "Save"
-msgstr "Vista"
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+msgid "Popular notices"
+msgstr "Vinsælt babl"
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
-msgid "Search"
-msgstr "Leita"
+#: actions/favorited.php:67
+#, php-format
+msgid "Popular notices, page %d"
+msgstr "Vinsælt babl, síða %d"
 
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
-msgstr "Leita í bablveitu"
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
+msgstr "Vinsælasta bablið á síðunni um þessar mundir."
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
-#, php-format
-msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
-"Leita í innihaldi babls á %%site.name%%. Leitarorð eru aðskilin með bili og "
-"verða að vera að minnsta kosti 3 tákn."
 
-#: ../actions/peoplesearch.php:28
-#, php-format
+#: actions/favorited.php:153
 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."
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
 msgstr ""
-"Leita að fólki á %%site.name%% eftir nafni, staðsetningu eða áhugamáli. "
-"Leitarorð eru aðskilin með bili og verða að vera að minnsta kosti 3 tákn."
 
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
-msgid "Select a carrier"
-msgstr "Veldu farsímafyrirtæki"
-
-#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
-#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
-msgid "Send"
-msgstr "Senda"
-
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
-msgstr "Sendu tölvupóst á þetta póstfang til þess að senda inn nýtt babl."
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
-msgstr "Sendu mér tilkynningu varðandi nýjar áskriftir í gegnum tölvupóst."
-
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
-msgid "Send me notices through Jabber/GTalk."
-msgstr "Sendur mér babl í gegnum Jabber/GTalk."
-
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/favorited.php:156
+#, php-format
 msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
-msgstr ""
-"Sendu mér babl í gegnum SMS. Ég veit að það er möguleiki að "
-"farsímafyrirtækið rukki fyrir móttöku á SMSunum."
-
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
 msgstr ""
-"Sendu mér svör í gegnum Jabber/GTalk frá fólki sem ég er ekki áskrifandi að."
-
-#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
-msgid "Settings"
-msgstr "Stillingar"
-
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
-msgid "Settings saved."
-msgstr "Stillingar vistaðar."
 
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr "Sýni vinsælustu merki síðustu viku"
-
-#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:114
-msgid "Someone else already has this OpenID."
-msgstr "Einhver annar hefur þetta OpenID nú þegar."
-
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
-msgstr "Eitthvað undarlegt gerðist."
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
-msgstr "Því miður er móttökutölvupóstur ekki leyfður."
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
-msgstr "Afsakið en þetta er ekki móttökutölvupóstfangið þitt."
-
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
-msgid "Source"
-msgstr "Frumþula"
-
-#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
-msgid "Statistics"
-msgstr "Tölfræði"
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
+msgstr "Uppáhaldsbabl %s"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-msgid "Stored OpenID not found."
-msgstr "Vista OpenID fannst ekki."
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Færslur frá %1$s á %2$s!"
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
-#: actions/showstream.php:197 actions/showstream.php:206
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
-msgid "Subscribe"
-msgstr "Gerast áskrifandi"
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Þetta babl er nú þegar í uppáhaldi!"
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
-msgid "Subscribers"
-msgstr "Áskrifendur"
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Ekki lengur í uppáhaldi"
 
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
-msgid "Subscription authorized"
-msgstr "Áskrift heimiluð"
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr "Notendur í sviðsljósinu"
 
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
-msgid "Subscription rejected"
-msgstr "Áskrift hafnað"
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr "Notendur í sviðsljósinu, síða %d"
 
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27 actions/showstream.php:240
-#: actions/showstream.php:322 actions/subscriptions.php:27
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
-msgid "Subscriptions"
-msgstr "Áskriftir"
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
+msgstr "Úrval nokkurra frábærra notenda á %s"
 
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
-msgid "System error uploading file."
-msgstr "Kerfisvilla kom upp við upphal skráar."
+#: actions/file.php:34
+msgid "No notice id"
+msgstr ""
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
-#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
-msgid "Tags"
-msgstr "Merki"
+#: actions/file.php:38
+msgid "No notice"
+msgstr ""
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "Texti"
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
 
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
-msgid "Text search"
-msgstr "Textaleit"
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
 
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
-msgstr "Þetta OpenID tilheyrir þér ekki."
+#: actions/finishremotesubscribe.php:69
+msgid "Not expecting this response!"
+msgstr "Bjóst ekki við þessu svari!"
 
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
-msgstr "Þetta tölvupóstfang hefur nú þegar verið staðfest."
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "Notandi sem verið er að hlusta á er ekki til."
 
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
-msgstr "Þessi staðfestingarlykill er ekki fyrir þig!"
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+msgstr "Þú getur notað staðbundna áskrift!"
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr "Þetta tölvupóstfang tilheyrir öðrum notanda."
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
+msgstr "Þessi notandi hefur bannað þér að gerast áskrifandi"
 
-#: ../actions/avatar.php:80 actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
-msgstr "Þessi skrá er of stór."
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "Engin heimild."
 
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
-msgid "That is already your Jabber ID."
-msgstr "Þetta er nú þegar Jabber-kennið þitt."
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "Gat ekki breytt beiðnistókum í aðgangstóka."
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
-msgid "That is already your email address."
-msgstr "Þetta er nú þegar tölvupóstfangið þitt."
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Óþekkt útgáfa OMB samskiptamátans."
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
-msgid "That is already your phone number."
-msgstr "Þetta er nú þegar símanúmerið þitt."
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "Villa kom upp í uppfærslu persónulegrar fjarsíðu"
 
-#: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
-msgid "That is not your Jabber ID."
-msgstr "Þetta er ekki Jabber-kennið þitt."
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+msgid "No such group."
+msgstr "Enginn þannig hópur."
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
-msgid "That is not your email address."
-msgstr "Þetta er ekki tölvupóstfangið þitt."
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "Ekkert svoleiðis babl."
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
-msgstr "Þetta er ekki símanúmerið þitt."
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Týndum skránni okkar"
 
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-#: actions/emailsettings.php:367 actions/imsettings.php:349
-msgid "That is the wrong IM address."
-msgstr "Þetta er rangt snarskilaboðafang."
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
+msgstr ""
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
-msgstr "Þetta er rangur staðfestingarlykill."
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-msgid "That phone number already belongs to another user."
-msgstr "Þetta símanúmer tilheyri nú þegar öðrum notanda."
+#: actions/groupblock.php:95
+msgid "User is already blocked from group."
+msgstr ""
 
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49 actions/twitapistatuses.php:330
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-msgid "That's too long. Max notice size is 140 chars."
-msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
+#: actions/groupblock.php:100
+msgid "User is not a member of group."
+msgstr ""
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "Þetta er of langt. Hámarkslengd babls er 255 tákn."
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+msgid "Block user from group"
+msgstr ""
 
-#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/groupblock.php:162
 #, php-format
-msgid "The address \"%s\" has been confirmed for your account."
-msgstr "Þetta tölvupóstfang, \"%s\", hefur verið staðfest fyrir aðganginn þinn."
-
-#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274 actions/emailsettings.php:282
-#: actions/imsettings.php:258 actions/smssettings.php:282
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
-msgid "The address was removed."
-msgstr "Tölvupóstfangið hefur verið fjarlægt."
-
-#: ../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:"
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
 msgstr ""
-"Áskriftin hefur verið heimiluð en afturkallsveffang var ekki sent. Athugaðu "
-"leiðbeiningar síðunnar um það hvernig á að heimila áskrift. Áskriftartókinn "
-"þinn er;"
 
-#: ../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."
+#: actions/groupblock.php:178
+msgid "Do not block this user from this group"
 msgstr ""
-"Áskriftinni hefur verið hafnað en afturkallsveffang var ekki sent. Athugaðu "
-"leiðbeiningar síðunnar um það hvernig á að hafna áskrift alveg."
 
-#: ../actions/subscribers.php:35 actions/subscribers.php:35
-#, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr "Þetta er fólkið sem hlustar á bablið í %s."
-
-#: ../actions/subscribers.php:33 actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr "Þetta er fólkið sem hlustar á bablið í þér."
+#: actions/groupblock.php:179
+msgid "Block this user from this group"
+msgstr ""
 
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
-#, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr "Þetta er fólkið sem %s hlustar á bablið í."
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
+msgstr ""
 
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr "Þetta er fólkið sem þú hlustar á bablið í."
+#: actions/groupbyid.php:74
+msgid "No ID"
+msgstr "Ekkert einkenni"
 
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
-msgid ""
-"These people are already users and you were automatically subscribed to them:"
+#: actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
 msgstr ""
-"Þetta fólk er nú þegar notendur og þú varðst sjálfkrafa áskrifandi að þeim:"
 
-#: ../actions/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
+#: actions/groupdesignsettings.php:141
+msgid "Group design"
 msgstr ""
-"Þessi staðfestingarlykill er of gamall. Vinsamlegast byrjaðu aftur upp á "
-"nýtt."
 
-#: ../lib/openid.php:195
+#: actions/groupdesignsettings.php:152
 msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
 msgstr ""
-"Þetta eyðublað ætti að sendast inn sjálfkrafa. Ef ekki smelltu þá á "
-"innsendingartakkann til að fara til OpenID þjónustuaðilans þíns."
 
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
-#, 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 ""
-"Þetta er í fyrsta skipti sem þú skráir þig inn á %s þannig að við verðum að "
-"tengja OpenID aðganginn þinn við staðbundinn aðgang. Þú getur annaðhvort "
-"búið til nýjan aðgang eða tengst við aðgan sem þú hefur nú þegar búið til."
-
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-msgid "This method requires a POST or DELETE."
-msgstr "Þessi aðferð krefst POST eða 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 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
-msgid "This method requires a POST."
-msgstr "Þessi aðferð krefst POST."
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+msgid "Couldn't update your design."
+msgstr ""
 
-#: ../lib/util.php:164 lib/util.php:246
-msgid "This page is not available in a media type you accept"
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+msgid "Unable to save your design settings!"
 msgstr ""
-"Þessi síða er ekki aðgengileg í margmiðlunargerðinni sem þú tekur á móti"
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
-msgid "Timezone"
-msgstr "Tímabelti"
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+msgid "Design preferences saved."
+msgstr ""
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
-msgid "Timezone not selected."
-msgstr "Tímabelti ekki valið."
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
+msgstr "Einkennismynd hópsins"
 
-#: ../actions/remotesubscribe.php:43
+#: actions/grouplogo.php:150
 #, 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."
+"You can upload a logo image for your group. The maximum file size is %s."
 msgstr ""
-"Til þess að gerast áskrifandi getur þú [skráð þig inn](%%action.login%%) eða "
-"[nýskráð þig](%%action.register%%). Ef þú hefur nú þegar búið til aðgang á "
-"[samvirkandi örbloggsþjónustu](%%doc.openmublog%%), sláðu þá inn veffang "
-"persónulegu síðunnar þinnar hér fyrir neðan."
-
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
-msgid "Two user ids or screen_names must be supplied."
-msgstr "Tvo notendakenni eða skjáarnöfn verða að vera uppgefin."
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
-msgid "URL of your homepage, blog, or profile on another site"
+#: actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
 msgstr ""
-"Veffang heimasíðunnar þinnar, bloggsins þíns eða persónulegrar síðu á öðru "
-"vefsvæði"
-
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-msgid "URL of your profile on another compatible microblogging service"
-msgstr "Veffang persónulegrar síðu á samvirkandi örbloggsþjónustu"
-
-#: ../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 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-msgid "Unexpected form submission."
-msgstr "Bjóst ekki við innsendingu eyðublaðs."
 
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
-msgid "Unexpected password reset."
-msgstr "Bjóst ekki við endurstillingu lykilorðs."
-
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-msgid "Unknown action"
-msgstr "Óþekkt aðgerð"
+#: actions/grouplogo.php:396
+msgid "Logo updated."
+msgstr "Einkennismynd uppfærð."
 
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-msgid "Unknown version of OMB protocol."
-msgstr "Óþekkt útgáfa OMB samskiptamátans."
+#: actions/grouplogo.php:398
+msgid "Failed updating logo."
+msgstr "Tókst ekki að uppfæra einkennismynd"
 
-#: ../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 ""
-"Nema að annað sé tekið fram þá er innihald þessarar síðu varið með "
-"höfundaréttarvernd og aðgengilegt undir "
+#: actions/groupmembers.php:93 lib/groupnav.php:92
+#, php-format
+msgid "%s group members"
+msgstr "Hópmeðlimir %s"
 
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
+#: actions/groupmembers.php:96
 #, php-format
-msgid "Unrecognized address type %s"
-msgstr "Óþekkt gerð tölvupóstfangs %s"
+msgid "%s group members, page %d"
+msgstr "Hópmeðlimir %s, síða %d"
 
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
-msgstr "Fara úr áskrift"
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr "Listi yfir notendur í þessum hóp."
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-msgid "Unsupported OMB version"
-msgstr "OMB útgáfa ekki studd"
+#: actions/groupmembers.php:175 lib/groupnav.php:107
+msgid "Admin"
+msgstr "Stjórnandi"
 
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
-msgid "Unsupported image file format."
-msgstr "Skráarsnið myndar ekki stutt."
+#: actions/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
+msgstr "Loka"
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
-msgstr "Færslur sendar með SMS"
+#: actions/groupmembers.php:441
+msgid "Make user an admin of the group"
+msgstr ""
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
-msgstr "Færslur sendar með snarskilaboðaþjónustu (instant messaging)"
+#: actions/groupmembers.php:473
+msgid "Make Admin"
+msgstr ""
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr "Færslur frá %1$s og vinum á %2$s!"
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
-#, php-format
-msgid "Updates from %1$s on %2$s!"
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
 msgstr "Færslur frá %1$s á %2$s!"
 
-#: ../actions/avatar.php:68 actions/profilesettings.php:161
-#: actions/avatarsettings.php:162 actions/grouplogo.php:232
-msgid "Upload"
-msgstr "Hlaða upp"
-
-#: ../actions/avatar.php:27
+#: actions/groupsearch.php:52
+#, php-format
 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."
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
-"Þú getur hlaðið upp nýrri mynd (notendamynd) hér. Þú getur ekki breytt "
-"myndinni eftir að þú hefur hlaðið henni upp þannig að vertu viss um að hún "
-"sé ferningur. Myndin verður líka að vera gefin út undir leyfi vefsvæðisins. "
-"Notaðu mynd sem tilheyrir þér og þú vilt deila með öðrum."
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr "Hlaða upp mynd á persónulega síðu"
+#: actions/groupsearch.php:58
+msgid "Group search"
+msgstr "Hópleit"
 
-#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+msgid "No results."
 msgstr ""
-"Notaðu þetta eyðublað til þess að bjóða vinum þínum og kunningjum að nota "
-"þessa örbloggsþjónustu."
 
-#: ../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"
+#: actions/groupsearch.php:82
+#, php-format
+msgid ""
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
 msgstr ""
-"Aðeins notað fyrir uppfærslur, tilkynningar og endurheimtingu lykilorða."
-
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
-msgid "User being listened to doesn't exist."
-msgstr "Notandi sem verið er að hlusta á er ekki til."
-
-#: ../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
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-msgid "User has no profile."
-msgstr "Notandi hefur enga persónulega síðu."
-
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
-msgstr "Stuttnefni notanda"
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr "Notandi fannst ekki."
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
-msgid "What timezone are you normally in?"
-msgstr "Í hvaða tímabelti eru í rauninni?"
-
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: actions/groupsearch.php:85
 #, php-format
-msgid "What's up, %s?"
-msgstr "Hvað er að frétta %s?"
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-#: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Staðsetning þín, eins og \"borg, sýsla, land\""
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Hópar"
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/groups.php:64
 #, php-format
-msgid "Wrong image type for '%s'"
-msgstr "Röng gerð myndar fyrir '%s'"
+msgid "Groups, page %d"
+msgstr "Hópar, síða %d"
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/groups.php:90
 #, php-format
-msgid "Wrong size image at '%s'"
-msgstr "Röng stærð myndar á '%s'"
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
-msgid "Yes"
-msgstr "Já"
-
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-msgid "You already have this OpenID!"
-msgstr "Þú ert nú þegar með þetta 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."
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
 msgstr ""
-"Þú ert í þann mund að eyða babli alveg. Þessi aðgerð getur ekki verið "
-"afturkölluð."
-
-#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
-msgstr "Þú ert nú þegar innskráð(ur)!"
-
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-msgid "You are already subscribed to these users:"
-msgstr "Þú ert nú þegar í áskrift að þessum notendum:"
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
-msgid "You are not friends with the specified user."
-msgstr "Þú ert ekki vinur þessa notanda."
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Búa til nýjan hóp"
 
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr "Þú getur breytt lykilorðinu þínu hér. Veldu eitthvað gott lykilorð!"
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
 
-#: ../actions/register.php:135 actions/register.php:145
-msgid "You can create a new account to start posting notices."
-msgstr "Þú getur búið til nýjan aðgang og byrjað að babla."
+#: actions/groupunblock.php:95
+msgid "User is not blocked from group."
+msgstr ""
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "Þú getur fengið SMS í gegnum tölvupóst frá %%site.name%%."
+#: actions/groupunblock.php:128 actions/unblock.php:108
+msgid "Error removing the block."
+msgstr "Vill kom upp við að aflétta notendalokun."
 
-#: ../actions/openidsettings.php:86
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr ""
-"Þú getur fjarlægt OpenID aðganginn frá þínum aðgangi með því að smella á "
-"hnappinn sem er merktur \"Fjarlægja\"."
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "Snarskilaboðastillingar"
 
-#: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2655,1600 +1376,1581 @@ msgstr ""
 "[snarskilaboðaþjónustuna](%%doc.im%%). Settu upp netfangið þitt hér fyrir "
 "neðan og stilltu notkunina."
 
-#: ../actions/profilesettings.php:27
-msgid ""
-"You can update your personal profile info here so people know more about you."
-msgstr ""
-"Þú getur uppfært persónulegu síðuna þína hér þannig að fólk geti lært meira "
-"um þig."
-
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
-msgstr "Þú getur notað staðbundna áskrift!"
-
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
-msgid "You can't register if you don't agree to the license."
-msgstr "Þú getur ekki nýskráð þig nema þú samþykkir leyfið."
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Þessi síða er ekki aðgengileg í "
 
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
-msgid "You did not send us that profile"
-msgstr "Þú sendir okkur ekki þessa persónulegu síðu"
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Núverandi staðfesta Jabber/GTalk snarskilaboðafangið."
 
-#: ../lib/mail.php:147
+#: actions/imsettings.php:114
 #, 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"
+"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 ""
-"Þú hefur nýtt bablpóstfang á %1$s.\n"
-"\n"
-"Sendu tölvupóst á %2$s til að senda inn babl.\n"
-"\n"
-"Ítarlegri tölvupóstleiðbeiningar eru á %3$s.\n"
-"\n"
-"Með kærri kveðju,\n"
-"%4$s"
+"Býð eftir staðfestingu frá þessu netfangi. Athugaðu Jabber/GTalk aðganginn "
+"þinn. Þar ættu að vera skilaboð með ítarlegri leiðbeiningum. (Hefurðu bætt %"
+"s við í vinalistann þinn?)"
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
-msgid "You may not delete another user's status."
-msgstr "Þú getur ekki eytt stöðu annars notanda."
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "Snarskilaboðafang"
 
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/imsettings.php:126
 #, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr "Þú verður að vera innskráð(ur) til að geta boðið öðrum að nota %s"
-
-#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
 msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+"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 ""
-"Við sendum þér tilkynningu þegar þeir sem þú býður samþykkja boðskortið og "
-"skrá sig á síðuna. Takk fyrir að stækka samfélagið!"
-
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr "Auðkenning á þér tókst. Sláðu inn nýtt lykilorð hér fyrir neðan."
+"Jabber eða GTalk netfang eins og \"notandi@eitthvað.is\". Fyrst skaltu vera "
+"viss um að bæta %s við í vinalistann þinn í snarskilaboðaforritinu þínu eða "
+"á GTalk."
 
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
-msgid "Your OpenID URL"
-msgstr "OpenID veffangið þitt"
+#: actions/imsettings.php:143
+msgid "Send me notices through Jabber/GTalk."
+msgstr "Sendur mér babl í gegnum Jabber/GTalk."
 
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
-msgstr "Stuttnefnið þitt á þessum vefþjóni eða skráða tölvupóstfangið."
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr "Senda inn babl þegar Jabber/GTalk staðan breytist."
 
-#: ../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."
+#: actions/imsettings.php:153
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
-"[OpenID](%%doc.openid%%) leyfir þér að skrá þig inn á mörg vefsvæði með sama "
-"notendaaðgangi. Stjórnaðu OpenID tengingunum þínum hér."
-
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
-msgid "a few seconds ago"
-msgstr "fyrir nokkrum sekúndum"
-
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
-#, php-format
-msgid "about %d days ago"
-msgstr "fyrir um %d dögum síðan"
-
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
-#, php-format
-msgid "about %d hours ago"
-msgstr "fyrir um %d klukkutímum síðan"
-
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
-#, php-format
-msgid "about %d minutes ago"
-msgstr "fyrir um %d mínútum síðan"
-
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
-#, php-format
-msgid "about %d months ago"
-msgstr "fyrir um %d mánuðum síðan"
-
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
-msgid "about a day ago"
-msgstr "fyrir um einum degi síðan"
-
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
-msgid "about a minute ago"
-msgstr "fyrir um einni mínútu síðan"
-
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
-msgid "about a month ago"
-msgstr "fyrir um einum mánuði síðan"
-
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
-msgid "about a year ago"
-msgstr "fyrir um einu ári síðan"
-
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
-msgid "about an hour ago"
-msgstr "fyrir um einum klukkutíma síðan"
-
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
-msgstr "eyða"
-
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117 actions/noticesearch.php:136
-#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
-msgid "in reply to..."
-msgstr "svar við..."
-
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124 actions/noticesearch.php:143
-#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
-msgid "reply"
-msgstr "svara"
-
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-msgid "same as password above"
-msgstr "sama og lykilorðið hér fyrir ofan"
-
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
-msgid "unsupported file type"
-msgstr "skráargerð ekki studd"
-
-#: ../lib/util.php:1309 lib/util.php:1443
-msgid "« After"
-msgstr "« Fyrri"
-
-#: 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
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Það kom upp vandamál með setutókann þinn. Vinsamlegast reyndu aftur."
-
-#: actions/disfavor.php:55 actions/disfavor.php:81
-msgid "This notice is not a favorite!"
-msgstr "Þetta babl er ekki í uppáhaldi!"
-
-#: actions/disfavor.php:63 actions/disfavor.php:87
-msgid "Could not delete favorite."
-msgstr "Gat ekki eytt uppáhaldi."
+"Sendu mér svör í gegnum Jabber/GTalk frá fólki sem ég er ekki áskrifandi að."
 
-#: actions/disfavor.php:72 lib/favorform.php:140
-msgid "Favor"
-msgstr "Uppáhald"
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Birta MicroID fyrir Jabber/GTalk netfangið mitt."
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
-msgstr "Senda mér tölvupóst þegar einhver setur babl í mér í uppáhald hjá sér."
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "Ekkert Jabber-kenni"
 
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-msgid "Send me email when someone sends me a private message."
-msgstr "Senda mér tölvupóst þegar einhver sendir mér persónuleg skilaboð."
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr "Get ekki staðlað þetta Jabber kenni"
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
-msgid "This notice is already a favorite!"
-msgstr "Þetta babl er nú þegar í uppáhaldi!"
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "Ekki tækt Jabber-kenni"
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132 actions/favor.php:86
-#: actions/twitapifavorites.php:125 classes/Command.php:152
-msgid "Could not create favorite."
-msgstr "Gat ekki búið til uppáhald."
+#: actions/imsettings.php:299
+msgid "That is already your Jabber ID."
+msgstr "Þetta er nú þegar Jabber-kennið þitt."
 
-#: actions/favor.php:70
-msgid "Disfavor"
-msgstr "Ekki uppáhald"
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr "Jabber-kennið tilheyrir öðrum notanda."
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/imsettings.php:327
 #, php-format
-msgid "%s favorite notices"
-msgstr "Uppáhaldsbabl %s"
+msgid ""
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr ""
+"Staðfestingarlykill var sendur á snarskilaboðafangið sem þú varst að bæta "
+"við. Þú verður að leyfa %s að senda snarskilaboð til þín."
 
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
-#, php-format
-msgid "Feed of favorite notices of %s"
-msgstr "Bablveita uppáhaldsbabls %s"
+#: actions/imsettings.php:387
+msgid "That is not your Jabber ID."
+msgstr "Þetta er ekki Jabber-kennið þitt."
 
-#: actions/inbox.php:28 actions/inbox.php:59
+#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %s - page %d"
 msgstr "Innhólf %s - síða %d"
 
-#: actions/inbox.php:30 actions/inbox.php:62
+#: actions/inbox.php:62
 #, php-format
 msgid "Inbox for %s"
 msgstr "Innhólf %s"
 
-#: actions/inbox.php:53 actions/inbox.php:115
+#: actions/inbox.php:115
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 "Þetta er innhólfið þitt sem sýnir persónuleg skilaboð sem voru send til þín."
 
-#: actions/invite.php:178 actions/invite.php:213
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+#: actions/invite.php:39
+msgid "Invites have been disabled."
 msgstr ""
-"%1$s hefur boðið þér að vera með þeim á %2$s (%3$s).\n"
-"\n"
 
-#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-msgid "Automatically login in the future; "
-msgstr "Skrá mig sjálfkrafa inn í framtíðinni."
+#: actions/invite.php:41
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr "Þú verður að vera innskráð(ur) til að geta boðið öðrum að nota %s"
 
-#: actions/login.php:122 actions/login.php:264
-msgid "For security reasons, please re-enter your "
-msgstr "Af öryggisástæðum, vinsamlegast sláðu aftur inn "
+#: actions/invite.php:72
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "Ótækt tölvupóstfang: %s"
 
-#: actions/login.php:126 actions/login.php:268
-msgid "Login with your username and password. "
-msgstr "Skráðu þig inn með notendanafni og lykilorði. "
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
+msgstr "Boðskort hefur verið sent út"
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
-msgid "That's too long. Max message size is 140 chars."
-msgstr "Þetta er of langt. Hámarkslengd skilaboða er 140 tákn."
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr "Bjóða nýjum notendum að vera með"
 
-#: actions/newmessage.php:65 actions/newmessage.php:128
-msgid "No recipient specified."
-msgstr "Enginn móttökuaðili tilgreindur."
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr "Þú ert nú þegar í áskrift að þessum notendum:"
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206 actions/newmessage.php:131
-#: actions/newmessage.php:168 classes/Command.php:237
-msgid "You can't send a message to this user."
-msgstr "Þú getur ekki sent þessum notanda skilaboð."
+#: actions/invite.php:131 actions/invite.php:139
+#, php-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: actions/invite.php:136
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
+"These people are already users and you were automatically subscribed to them:"
 msgstr ""
-"Ekki senda þér skilaboð. Þú getur sagt þetta í hljóði við sjálfa(n) þig í "
-"staðinn."
-
-#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
-msgid "No such user"
-msgstr "Enginn þannig notandi"
-
-#: actions/newmessage.php:117 actions/newmessage.php:67
-msgid "New message"
-msgstr "Ný skilaboð"
-
-#: actions/noticesearch.php:95 actions/noticesearch.php:146
-msgid "Notice without matching profile"
-msgstr "Babl án persónulegrar síðu sem passar við"
-
-#: actions/openidsettings.php:28 actions/openidsettings.php:70
-#, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr "[OpenID](%%doc.openid%%) leyfir þér að skrá þig inn á margar síður "
+"Þetta fólk er nú þegar notendur og þú varðst sjálfkrafa áskrifandi að þeim:"
 
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
-msgstr "Ef þú vilt bæta OpenID við aðganginn þinn, "
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
+msgstr "Boðskort sent á eftirfarandi aðila:"
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
+#: actions/invite.php:150
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 msgstr ""
-"Að fjarlægja eina OpenID aðganginn þinn gerir það ómögulegt fyrir þig að "
-"skrá þig inn!"
-
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-msgid "You can remove an OpenID from your account "
-msgstr "Þú getur fjarlægt OpenID frá aðganginum þínum "
-
-#: actions/outbox.php:28 actions/outbox.php:58
-#, php-format
-msgid "Outbox for %s - page %d"
-msgstr "Úthólf %s - síða %d"
-
-#: actions/outbox.php:30 actions/outbox.php:61
-#, php-format
-msgid "Outbox for %s"
-msgstr "Úthólf %s"
-
-#: actions/outbox.php:53 actions/outbox.php:116
-msgid "This is your outbox, which lists private messages you have sent."
-msgstr "Þetta er úthólfið þitt sem sýnir persónuleg skilaboð sem þú hefur sent."
+"Við sendum þér tilkynningu þegar þeir sem þú býður samþykkja boðskortið og "
+"skrá sig á síðuna. Takk fyrir að stækka samfélagið!"
 
-#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
-#, php-format
+#: actions/invite.php:162
 msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+"Use this form to invite your friends and colleagues to use this service."
 msgstr ""
-"Leita að fólki á %%site.name%% eftir nafninu þeirra, staðsetningu eða "
-"áhugamáli. "
-
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
-msgid "You can update your personal profile info here "
-msgstr "Þú getur uppfært persónulegar upplýsingar hérna "
-
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
-msgid "User without matching profile"
-msgstr "Notandi með enga persónulega síðu sem passar við"
-
-#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
-msgstr "Þessi staðfestingarlykill er of gamall. "
+"Notaðu þetta eyðublað til þess að bjóða vinum þínum og kunningjum að nota "
+"þessa örbloggsþjónustu."
 
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
-msgstr "Ef þú hefur gleymt eða tapað "
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "Tölvupóstföng"
 
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a "
-msgstr "Auðkenning á þér tókst. Sláðu inn "
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr "Tölvupóstfang vina sem þú vilt bjóða (eitt póstfang í hverja línu)"
 
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-msgid "Your nickname on this server, "
-msgstr "Stuttnefnið þitt á þessum vefþjóni, "
+#: actions/invite.php:192
+msgid "Personal message"
+msgstr "Persónuleg skilaboð"
 
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-msgid "Instructions for recovering your password "
-msgstr "Leiðbeiningar um það hvernig á að endurheimta lykilorð "
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
+msgstr "Bættu persónulegum skilaboðum við boðskortið ef þú vilt."
 
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
-msgid "New password successfully saved. "
-msgstr "Tókst að vista nýtt lykilorð. "
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
+msgstr "Senda"
 
-#: actions/register.php:95 actions/register.php:180
-msgid "Password must be 6 or more characters."
-msgstr "Lykilorð verður að vera að minnsta kosti 6 tákn."
+#: actions/invite.php:226
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s hefur boðið þér að slást í hópinn með þeim á %2$s"
 
-#: actions/register.php:216
+#: actions/invite.php:228
 #, php-format
 msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
+"%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 ""
-"Til hamingju, %s! Frábært að þú skráðir þig á %%%%site.name%%%%. Héðan vilt "
-"þú kannski..."
+"%1$s hefur boðið þér að slást í hópinn með þeim á %2$s (%3$s).\n"
+"\n"
+"%2$s er örbloggsþjónusta sem leyfir þér að fylgjast með með fólki sem þú "
+"þekkir eða öðru áhugaverðu fólki í rauntíma.\n"
+"\n"
+"Þú getur líka sent inn fréttir af þér og deilt hugleiðingum og netveru þinni "
+"með fólki sem þekkir til þín. Þetta er frábær leið til þess að kynnast fólki "
+"sem hefur sömu áhugamál og þú.\n"
+"\n"
+"%1$s sagði:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Þú getur séð persónulega síðu %1$s á %2$s hér:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Ef þig langar til að prófa þjónustuna, smelltu þá á hlekkinn hér fyrir neðan "
+"til að taka þessu boði.\n"
+"\n"
+"%6$s\n"
+"\n"
+"Ef ekki, þá getur þú hunsað þessi skilaboð. Takk fyrir tímann og "
+"þolinmæðina.\n"
+"\n"
+"Með bestu kveðju, %2$s\n"
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
-msgstr "(Þú ættir að fá tölvupóst bráðlega með "
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
+msgstr "Þú verður að hafa skráð þig inn til að bæta þér í hóp."
+
+#: actions/joingroup.php:90 lib/command.php:217
+msgid "You are already a member of that group"
+msgstr "Þú ert nú þegar meðlimur í þessum hópi"
 
-#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
+#: actions/joingroup.php:128 lib/command.php:234
 #, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr ""
-"Til þess að gerast áskrifandi getur þú [skráð þig inn](%%action.login%%),"
+msgid "Could not join user %s to group %s"
+msgstr "Gat ekki bætt notandanum %s í hópinn %s"
 
-#: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/joingroup.php:135 lib/command.php:239
 #, php-format
-msgid "Feed for favorites of %s"
-msgstr "Bablveita uppáhaldsbabls %s"
+msgid "%s joined group %s"
+msgstr "%s bætti sér í hópinn %s"
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-msgid "Could not retrieve favorite notices."
-msgstr "Gat ekki sótt uppáhaldsbabl."
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
+msgstr "Þú verður aða hafa skráð þig inn til að ganga úr hóp."
 
-#: actions/showmessage.php:33 actions/showmessage.php:81
-msgid "No such message."
-msgstr "Engin þannig skilaboð."
+#: actions/leavegroup.php:90 lib/command.php:268
+msgid "You are not a member of that group."
+msgstr "Þú ert ekki meðlimur í þessum hópi."
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
-msgstr "Aðeins sendandi og móttakandi geta lesið þessi skilaboð."
+#: actions/leavegroup.php:119 lib/command.php:278
+msgid "Could not find membership record."
+msgstr "Gat ekki fundið meðlimaskrá."
 
-#: actions/showmessage.php:61 actions/showmessage.php:108
+#: actions/leavegroup.php:127 lib/command.php:284
 #, php-format
-msgid "Message to %1$s on %2$s"
-msgstr "Skilaboð til %1$s á %2$s"
+msgid "Could not remove user %s to group %s"
+msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s"
 
-#: actions/showmessage.php:66 actions/showmessage.php:113
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
-msgid "Message from %1$s on %2$s"
-msgstr "Skilaboð frá %1$s á %2$s"
-
-#: actions/showstream.php:154
-msgid "Send a message"
-msgstr "Senda skilaboð"
+msgid "%s left group %s"
+msgstr "%s gekk úr hópnum %s"
 
-#: actions/smssettings.php:312 actions/smssettings.php:464
-#, php-format
-msgid "Mobile carrier for your phone. "
-msgstr "Farsímafélagið þitt. "
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "Þú hefur nú þegar skráð þig inn."
 
-#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
-#, php-format
-msgid "Direct messages to %s"
-msgstr "Bein skilaboð til %s"
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Ótækt bablinnihald"
 
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
-#, php-format
-msgid "All the direct messages sent to %s"
-msgstr "Öll bein skilaboð til %s"
+#: actions/login.php:143
+msgid "Incorrect username or password."
+msgstr "Rangt notendanafn eða lykilorð."
 
-#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-msgid "Direct Messages You've Sent"
-msgstr "Bein skilaboð sem þú hefur sent"
+#: actions/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
+msgstr "Villa kom upp í stillingu notanda."
 
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
-#, php-format
-msgid "All the direct messages sent from %s"
-msgstr "Öll bein skilaboð send frá %s"
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "Innskráning"
 
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-msgid "No message text!"
-msgstr "Enginn texti í skilaboðum!"
+#: actions/login.php:243
+msgid "Login to site"
+msgstr "Skrá þig inn á síðuna"
 
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-msgid "Recipient user not found."
-msgstr "Móttakandi fannst ekki."
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Stuttnefni"
 
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr "Gat ekki sent bein skilaboð til notenda sem eru ekki vinir þínir."
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Lykilorð"
 
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
-#, php-format
-msgid "%s / Favorites from %s"
-msgstr "%s / Uppáhaldsbabl frá %s"
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "Muna eftir mér"
 
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
-#, php-format
-msgid "%s updates favorited by %s / %s."
-msgstr "%s færslur gerðar að uppáhaldsbabli af %s / %s."
+#: actions/login.php:253 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
+msgstr ""
+"Sjálfvirk innskráning í framtíðinni. Ekki nota þetta á tölvu sem aðrir deila "
+"með þér!"
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
-#, php-format
-msgid "%s added your notice as a favorite"
-msgstr "%s heldur upp á babl frá þér"
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "Tapað eða gleymt lykilorð?"
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
-#, php-format
+#: actions/login.php:282
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
 msgstr ""
-"%1$s gerði bablið þitt á %2$s sem eitt af sínu uppáhaldsbabli.\n"
-"\n"
+"Af öryggisástæðum, vinsamlegast sláðu aftur inn notendanafnið þitt og "
+"lykilorð áður en þú breytir stillingunum þínum."
 
-#: actions/twittersettings.php:27
+#: actions/login.php:286
+#, fuzzy, php-format
 msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
 msgstr ""
-"Bættu Twitter aðganginum þínum við til að senda sjálfkrafa babl til Twitter, "
-""
-
-#: actions/twittersettings.php:41 actions/twittersettings.php:60
-msgid "Twitter settings"
-msgstr "Twitter stillingar"
-
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-msgid "Twitter Account"
-msgstr "Twitter aðgangur"
-
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-msgid "Current verified Twitter account."
-msgstr "Núverandi staðfesti Twitter aðgangurinn."
-
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr "Twitter notendanafn"
-
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-msgid "No spaces, please."
-msgstr "Vinsamlegast engin bil."
-
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
-msgstr "Twitter lykilorð"
-
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-msgid "Automatically send my notices to Twitter."
-msgstr "Sjálfkrafa senda bablið mitt á Twitter."
-
-#: actions/twittersettings.php:75 actions/twittersettings.php:146
-msgid "Send local \"@\" replies to Twitter."
-msgstr "Senda staðbundin \"@\" svör til Twitter."
-
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-msgid "Subscribe to my Twitter friends here."
-msgstr "Gerast áskrifandi að Twitter vinum mínum hérna"
+"Skráðu þig inn með notendanafninu þínu og lykilorði. Ertu ekki með "
+"notendanafn? [Nýskráðu þig](%%action.register%%) eða prófaðu [OpenID](%%"
+"action.openidlogin%%). "
 
-#: actions/twittersettings.php:122
-msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
 msgstr ""
-"Notendanafn má aðeins hafa númer, há- og lágstafi og undirstrik (_). "
-"Hámarkslengd er 15 tákn."
 
-#: actions/twittersettings.php:128 actions/twittersettings.php:334
-msgid "Could not verify your Twitter credentials!"
-msgstr "Gat ekki staðfest Twitter skilríkið!"
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/makeadmin.php:132
 #, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr "Gat ekki sótt aðgangsupplýsingar fyrir \"%s\" frá Twitter"
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-msgid "Unable to save your Twitter settings!"
-msgstr "Gat ekki vistað Twitter stillingarnar þínar!"
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
 
-#: actions/twittersettings.php:174 actions/twittersettings.php:376
-msgid "Twitter settings saved."
-msgstr "Twitter stillingar vistaðar."
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr "Engin núverandi staða"
 
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-msgid "That is not your Twitter account."
-msgstr "Þetta er ekki Twitter aðgangurinn þinn."
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr "Nýr hópur"
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
-msgid "Couldn't remove Twitter user."
-msgstr "Gat ekki fjarlægt Twitter notanda."
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
+msgstr "Notaðu þetta eyðublað til að búa til nýjan hóp."
 
-#: actions/twittersettings.php:212 actions/twittersettings.php:407
-msgid "Twitter account removed."
-msgstr "Twitter aðgangur fjarlægður."
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr "Ný skilaboð"
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
-msgid "Couldn't save Twitter preferences."
-msgstr "Gat ekki vistað Twitter stillingar."
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
+msgstr "Þú getur ekki sent þessum notanda skilaboð."
 
-#: actions/twittersettings.php:245 actions/twittersettings.php:461
-msgid "Twitter preferences saved."
-msgstr "Twitter stillingar vistaðar."
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+msgstr "Ekkert innihald!"
 
-#: actions/userauthorization.php:84 actions/userauthorization.php:86
-msgid "Please check these details to make sure "
-msgstr "Vinsamlegast athugaðu eftirfarandi atriði til að vera viss "
+#: actions/newmessage.php:158
+msgid "No recipient specified."
+msgstr "Enginn móttökuaðili tilgreindur."
 
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
-msgid "The subscription has been authorized, but no "
-msgstr "Áskriftin hefur verið heimiluð en ófullnægjandi"
+#: actions/newmessage.php:164 lib/command.php:370
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly instead."
+msgstr ""
+"Ekki senda þér skilaboð. Þú getur sagt þetta í hljóði við sjálfa(n) þig í "
+"staðinn."
 
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-msgid "The subscription has been rejected, but no "
-msgstr "Áskriftinni hefur verið hafnað en ófullnægjandi "
+#: actions/newmessage.php:181
+msgid "Message sent"
+msgstr ""
 
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-msgid "Command results"
-msgstr "Niðurstöður skipunar"
+#: actions/newmessage.php:185 lib/command.php:375
+#, php-format
+msgid "Direct message to %s sent"
+msgstr "Bein skilaboð send til %s"
 
-#: classes/Channel.php:148 classes/Channel.php:204
-msgid "Command complete"
-msgstr "Fullkláruð skipun"
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
+msgstr "Ajax villa"
 
-#: classes/Channel.php:158 classes/Channel.php:215
-msgid "Command failed"
-msgstr "Misheppnuð skipun"
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "Nýtt babl"
 
-#: classes/Command.php:39 classes/Command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Fyrirgefðu en þessi skipun hefur ekki enn verið útbúin."
+#: actions/newnotice.php:199
+msgid "Notice posted"
+msgstr "Babl sent inn"
 
-#: classes/Command.php:96 classes/Command.php:113
+#: actions/noticesearch.php:68
 #, php-format
-msgid "Subscriptions: %1$s\n"
-msgstr "Áskriftir: %1$s\n"
-
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
-msgid "User has no last notice"
-msgstr "Notandi hefur ekkert nýtt babl"
+msgid ""
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
+msgstr ""
+"Leita í innihaldi babls á %%site.name%%. Leitarorð eru aðskilin með bili og "
+"verða að vera að minnsta kosti 3 tákn."
 
-#: classes/Command.php:146 classes/Command.php:166
-msgid "Notice marked as fave."
-msgstr "Babl gert að uppáhaldi."
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "Textaleit"
 
-#: classes/Command.php:166 classes/Command.php:189
+#: actions/noticesearch.php:91
 #, php-format
-msgid "%1$s (%2$s)"
-msgstr "%1$s (%2$s)"
+msgid "Search results for \"%s\" on %s"
+msgstr ""
 
-#: classes/Command.php:169 classes/Command.php:192
+#: actions/noticesearch.php:121
 #, php-format
-msgid "Fullname: %s"
-msgstr "Fullt nafn: %s"
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
 
-#: classes/Command.php:172 classes/Command.php:195
+#: actions/noticesearch.php:124
 #, php-format
-msgid "Location: %s"
-msgstr "Staðsetning: %s"
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
+msgstr ""
 
-#: classes/Command.php:175 classes/Command.php:198
+#: actions/noticesearchrss.php:89
 #, php-format
-msgid "Homepage: %s"
-msgstr "Heimasíða: %s"
+msgid "Updates with \"%s\""
+msgstr ""
 
-#: classes/Command.php:178 classes/Command.php:201
-#, php-format
-msgid "About: %s"
-msgstr "Um: %s"
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Allar færslur sem passa við \"%s\""
 
-#: classes/Command.php:200 classes/Command.php:228
-#, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
-msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d"
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+"Þessi notandi leyfir ekki að ýta við sér eða hefur ekki staðfest eða skráð "
+"tölvupóstinn sinn."
 
-#: classes/Command.php:214 classes/Command.php:245
-#, php-format
-msgid "Direct message to %s sent"
-msgstr "Bein skilaboð send til %s"
+#: actions/nudge.php:94
+msgid "Nudge sent"
+msgstr "Ýtt við notanda"
 
-#: classes/Command.php:216 classes/Command.php:247
-msgid "Error sending direct message."
-msgstr "Villa kom upp við að senda bein skilaboð"
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr "Ýtt við notanda!"
 
-#: classes/Command.php:263 classes/Command.php:300
-msgid "Specify the name of the user to subscribe to"
-msgstr "Tilgreindu nafn notandans sem þú vilt gerast áskrifandi að"
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+msgstr "Babl hefur enga persónulega síðu"
 
-#: classes/Command.php:270 classes/Command.php:307
+#: actions/oembed.php:86 actions/shownotice.php:180
 #, php-format
-msgid "Subscribed to %s"
-msgstr "Nú ert þú áskrifandi að %s"
+msgid "%1$s's status on %2$s"
+msgstr "Staða %1$s á %2$s"
 
-#: classes/Command.php:288 classes/Command.php:328
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Tilgreindu nafn notandans sem þú vilt hætta sem áskrifandi að"
+#: actions/oembed.php:157
+msgid "content type "
+msgstr ""
 
-#: classes/Command.php:295 classes/Command.php:335
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "Nú ert þú ekki lengur áskrifandi að %s"
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
-msgid "Command not yet implemented."
-msgstr "Skipun hefur ekki verið fullbúin"
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
+msgstr "Enginn stuðningur við gagnasnið."
 
-#: classes/Command.php:313 classes/Command.php:356
-msgid "Notification off."
-msgstr "Tilkynningar af."
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "Leit að fólki"
 
-#: classes/Command.php:315 classes/Command.php:358
-msgid "Can't turn off notification."
-msgstr "Get ekki slökkt á tilkynningum."
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "Leit í babli"
 
-#: classes/Command.php:333 classes/Command.php:379
-msgid "Notification on."
-msgstr "Tilkynningar á."
+#: actions/othersettings.php:60
+msgid "Other Settings"
+msgstr "Aðrar stillingar"
 
-#: classes/Command.php:335 classes/Command.php:381
-msgid "Can't turn on notification."
-msgstr "Get ekki kveikt á tilkynningum."
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr "Sjá um ýmsar aðrar stillingar."
 
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
-msgstr "Skipanir:\n"
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
 
-#: classes/Message.php:53 classes/Message.php:56
-msgid "Could not insert message."
-msgstr "Gat ekki skeytt skilaboðum inn í."
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
+msgstr ""
 
-#: classes/Message.php:63 classes/Message.php:66
-msgid "Could not update message with new URI."
-msgstr "Gat ekki uppfært skilaboð með nýju veffangi."
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
+msgstr "Þjónusta sem sér um sjálfkrafa styttingu."
+
+#: actions/othersettings.php:122
+msgid "View profile designs"
+msgstr ""
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
-msgstr "Notandi án samsvarandi persónulegrar síðu í kerfinu."
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
 
-#: lib/mail.php:147 lib/mail.php:289
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+#: actions/othersettings.php:153
+msgid "URL shortening service is too long (max 50 chars)."
 msgstr ""
-"Þú hefur fengið nýtt sendingarfang á %1$s.\n"
-"\n"
+"Þjónusta sjálfvirkrar vefslóðastyttingar er of löng (í mesta lagi 50 stafir)."
 
-#: lib/mail.php:249 lib/mail.php:508
+#: actions/outbox.php:58
 #, php-format
-msgid "New private message from %s"
-msgstr "Ný persónuleg skilaboð frá %s"
+msgid "Outbox for %s - page %d"
+msgstr "Úthólf %s - síða %d"
 
-#: lib/mail.php:253 lib/mail.php:512
+#: actions/outbox.php:61
 #, php-format
-msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+msgid "Outbox for %s"
+msgstr "Úthólf %s"
+
+#: actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
-"%1$s (%2$s) sendi þér persónuleg skilaboð:\n"
-"\n"
+"Þetta er úthólfið þitt sem sýnir persónuleg skilaboð sem þú hefur sent."
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "Aðeins notandinn getur lesið hans eigin pósthólf."
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "Breyta lykilorði"
 
-#: lib/openid.php:195 lib/openid.php:203
-msgid "This form should automatically submit itself. "
-msgstr "Þetta eyðublað ætti sjálfkrafa að sendast inn. "
+#: actions/passwordsettings.php:69
+msgid "Change your password."
+msgstr "Breyta lykilorðinu þínu."
 
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-msgid "Favorites"
-msgstr "Uppáhald"
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+msgid "Password change"
+msgstr "Lykilorðabreyting"
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-#, php-format
-msgid "%s's favorite notices"
-msgstr "Uppáhaldsbabl %s"
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "Eldra lykilorð"
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-msgid "User"
-msgstr "Notandi"
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "Nýtt lykilorð"
 
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-msgid "Inbox"
-msgstr "Innhólf"
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6 eða fleiri tákn"
 
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-msgid "Your incoming messages"
-msgstr "Mótteknu skilaboðin þín"
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "Staðfesta"
 
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-msgid "Outbox"
-msgstr "Úthólf"
+#: actions/passwordsettings.php:113
+msgid "same as password above"
+msgstr "sama og lykilorðið hér fyrir ofan"
 
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-msgid "Your sent messages"
-msgstr "Skilaboð sem þú hefur sent"
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "Breyta"
 
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-msgid "Twitter"
-msgstr "Twitter"
+#: actions/passwordsettings.php:154 actions/register.php:230
+msgid "Password must be 6 or more characters."
+msgstr "Lykilorð verður að vera að minnsta kosti 6 tákn."
 
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
-msgstr "Samhæfnisvalmöguleikar Twitter"
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "Lykilorðin passa ekki saman."
 
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-msgid "To"
-msgstr "Til"
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "Rangt eldra lykilorð"
 
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-msgid "Could not parse message."
-msgstr "Gat ekki þáttað skilaboðin."
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "Villa kom upp í vistun notanda: ótækt."
 
-#: actions/all.php:63 actions/facebookhome.php:162
-#, php-format
-msgid "%s and friends, page %d"
-msgstr "%s og vinirnir, síða %d"
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "Get ekki vistað nýja lykilorðið."
 
-#: actions/avatarsettings.php:76
-msgid "You can upload your personal avatar."
-msgstr "Þú getur hlaðið upp þinni eigin sjálfsmynd."
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "Lykilorð vistað."
 
-#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
-msgid "Avatar settings"
-msgstr "Stillingar fyrir mynd"
+#: actions/peoplesearch.php:52
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"Leita að fólki á %%site.name%% eftir nafni, staðsetningu eða áhugamáli. "
+"Leitarorð eru aðskilin með bili og verða að vera að minnsta kosti 3 tákn."
 
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-msgid "Original"
-msgstr "Upphafleg mynd"
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "Leit að fólki"
 
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-msgid "Preview"
-msgstr "Forsýn"
+#: actions/peopletag.php:70
+#, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Ekki gilt persónumerki: %s"
 
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
-msgid "Crop"
-msgstr "Skera af"
+#: actions/peopletag.php:144
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr "Notendur sjálfmerktir með %s - síða %d"
 
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-msgid "There was a problem with your session token. "
-msgstr "Það kom upp vandamál með setutókann þinn. "
-
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-msgid "Pick a square area of the image to be your avatar"
-msgstr ""
-"Veldu ferningslaga svæði á upphaflegu myndinni sem einkennismyndina þína"
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "Ótækt bablinnihald"
 
-#: actions/avatarsettings.php:327 actions/grouplogo.php:384
-msgid "Lost our file data."
-msgstr "Týndum skráargögnunum okkar"
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
 
-#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
-msgid "Lost our file."
-msgstr "Týndum skránni okkar"
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "Stillingar persónulegrar síðu"
 
-#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
-#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
-msgid "Unknown file type"
-msgstr "Óþekkt skráargerð"
+#: actions/profilesettings.php:71
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+"Þú getur uppfært persónulegu síðuna þína hér þannig að fólk geti lært meira "
+"um þig."
 
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "Engin persónuleg síða tilgreind"
+#: actions/profilesettings.php:99
+msgid "Profile information"
+msgstr "Upplýsingar á persónulegri síðu"
 
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "Engin persónulega síða með þessu einkenni"
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64 lágstafir eða tölustafir, engin greinarmerki eða bil"
 
-#: actions/block.php:111
-msgid "Block user"
-msgstr "Loka á notanda"
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full name"
+msgstr "Fullt nafn"
 
-#: actions/block.php:129
-msgid "Are you sure you want to block this user? "
-msgstr "Ertu viss um að þú viljir loka á þennan notanda? "
+#: actions/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "Heimasíða"
 
-#: actions/block.php:162
-msgid "You have already blocked this user."
-msgstr "Þú hefur nú þegar lokað á þennan notanda."
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr ""
+"Veffang heimasíðunnar þinnar, bloggsins þíns eða persónulegrar síðu á öðru "
+"vefsvæði"
 
-#: actions/block.php:167
-msgid "Failed to save block information."
-msgstr "Mistókst að vista upplýsingar um notendalokun"
+#: actions/profilesettings.php:122 actions/register.php:460
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Lýstu þér og áhugamálum þínum í 140 táknum"
 
-#: actions/confirmaddress.php:159
-#, php-format
-msgid "The address \"%s\" has been "
-msgstr "Veffangið \"%s\" hefur verið "
+#: actions/profilesettings.php:125 actions/register.php:463
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Lýstu þér og þínum "
 
-#: actions/deletenotice.php:73
-msgid "You are about to permanently delete a notice. "
-msgstr "Þú ert í þann mund að eyða þessu babli að eilífu. "
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "Lýsing"
 
-#: actions/disfavor.php:94
-msgid "Add to favorites"
-msgstr "Bæta við sem uppáhaldsbabli"
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "Staðsetning"
 
-#: actions/editgroup.php:54
-#, php-format
-msgid "Edit %s group"
-msgstr "Breyta hópnum %s"
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "Staðsetning þín, eins og \"borg, sýsla, land\""
 
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-msgid "Inboxes must be enabled for groups to work"
-msgstr "Innhólf verða að vera virk svo hópar virki"
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
+msgstr "Merki"
 
-#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-msgid "You must be logged in to create a group."
-msgstr "Þú verður að hafa skráð þig inn til að búa til hóp."
+#: actions/profilesettings.php:140
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+"Merki fyrir þig (bókstafir, tölustafir, -, ., og _), aðskilin með kommu eða "
+"bili"
 
-#: actions/editgroup.php:87 actions/grouplogo.php:87
-#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
-msgid "No nickname"
-msgstr "Ekkert stuttnefni"
+#: actions/profilesettings.php:144
+msgid "Language"
+msgstr "Tungumál"
 
-#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
-#: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
-msgid "No such group"
-msgstr "Enginn þannig hópur"
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr "Tungumál (ákjósanlegt)"
 
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
-msgid "You must be an admin to edit the group"
-msgstr "Þú verður að vera stjórnandi til að geta breytt hópnum"
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr "Tímabelti"
 
-#: actions/editgroup.php:157
-msgid "Use this form to edit the group."
-msgstr "Notaðu þetta eyðublað til að breyta hópnum."
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
+msgstr "Í hvaða tímabelti eru í rauninni?"
 
-#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
-msgid "Nickname must have only lowercase letters "
-msgstr "Stuttnefni getur aðeins verið lágstafir"
+#: actions/profilesettings.php:160
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+"Gerast sjálfkrafa áskrifandi að hverjum þeim sem gerist áskrifandi að þér "
+"(best fyrir ómannlega notendur)"
 
-#: actions/editgroup.php:198 actions/newgroup.php:149
-msgid "description is too long (max 140 chars)."
-msgstr "Lýsing er of löng (í mesta lagi 140 tákn)."
+#: actions/profilesettings.php:221 actions/register.php:223
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Lýsingin er of löng (í mesta lagi 140 tákn)."
 
-#: actions/editgroup.php:218
-msgid "Could not update group."
-msgstr "Gat ekki uppfært hóp."
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr "Tímabelti ekki valið."
 
-#: actions/editgroup.php:226
-msgid "Options saved."
-msgstr "Valmöguleikar vistaðir."
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr "Tungumál er of langt (í mesta lagi 50 stafir)."
 
-#: actions/emailsettings.php:107 actions/imsettings.php:108
+#: actions/profilesettings.php:246 actions/tagother.php:178
 #, php-format
-msgid "Awaiting confirmation on this address. "
-msgstr "Býð eftir staðfestingu fyrir þetta veffang. "
+msgid "Invalid tag: \"%s\""
+msgstr "Ógilt merki: \"%s\""
 
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-msgid "Make a new email address for posting to; "
-msgstr "Búa til nýtt póstfang til að senda á; "
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
+msgstr "Gat ekki uppfært notanda í sjálfvirka áskrift."
 
-#: actions/emailsettings.php:157
-msgid "Send me email when someone "
-msgstr "Senda mér tölvupóst þegar einhver "
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+msgstr "Gat ekki vistað persónulega síðu."
 
-#: actions/emailsettings.php:168
-msgid "Allow friends to nudge me and send me an email."
-msgstr "Leyfa vinum að ýta við mér og senda mér tölvupóst."
+#: actions/profilesettings.php:336
+msgid "Couldn't save tags."
+msgstr "Gat ekki vistað merki."
 
-#: actions/emailsettings.php:321
-msgid "That email address already belongs "
-msgstr "Þetta tölvupóstfang er nú þegar í eigu "
+#: actions/profilesettings.php:344
+msgid "Settings saved."
+msgstr "Stillingar vistaðar."
 
-#: actions/emailsettings.php:343
-msgid "A confirmation code was sent to the email address you added. "
+#: actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
 msgstr ""
-"Staðfestingarlykill var sendur til tölvupóstfangsins sem þú sendir inn. "
-
-#: actions/facebookhome.php:110
-msgid "Server error - couldn't get user!"
-msgstr "Kerfisvilla - gat ekki náð í notanda!"
 
-#: actions/facebookhome.php:196
-#, php-format
-msgid "If you would like the %s app to automatically update "
-msgstr "Ef þú vilt að %s forritið sjálfkrafa uppfæri "
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
+msgstr "Gat ekki sótt efni úr almenningsveitu."
 
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#: actions/public.php:129
 #, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "Leyfa %s að uppfæra stöðuna mína á Facebook"
-
-#: actions/facebookhome.php:218
-msgid "Skip"
-msgstr "Sleppa"
+msgid "Public timeline, page %d"
+msgstr "Almenningsrás, síða %d"
 
-#: actions/facebookhome.php:235
-msgid "No notice content!"
-msgstr "Innihaldslaust babl!"
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr "Almenningsrás"
 
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-msgid "Pagination"
-msgstr "Uppröðun"
+#: actions/public.php:151
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr ""
 
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-msgid "After"
-msgstr "Eftir"
+#: actions/public.php:155
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr ""
 
-#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
-msgid "Before"
-msgstr "Áður"
+#: actions/public.php:159
+msgid "Public Stream Feed (Atom)"
+msgstr ""
 
-#: actions/facebookinvite.php:70
+#: actions/public.php:179
 #, php-format
-msgid "Thanks for inviting your friends to use %s"
-msgstr "Takk fyrir að bjóða vinum þínum að nota %s"
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
 
-#: actions/facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Boðskort hafa verið send til eftirfarandi notenda:"
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
 
-#: actions/facebookinvite.php:96
+#: actions/public.php:186
 #, php-format
-msgid "You have been invited to %s"
-msgstr "Þér hefur verið boðið til %s"
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
 
-#: actions/facebookinvite.php:105
+#: actions/public.php:233
 #, php-format
-msgid "Invite your friends to use %s"
-msgstr "Bjóddu vinum þínum að nota %s"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
+msgstr ""
 
-#: actions/facebookinvite.php:113
+#: actions/public.php:238
 #, php-format
-msgid "Friends already using %s:"
-msgstr "Vinir sem nú þegar nota %s:"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
+msgstr ""
 
-#: actions/facebookinvite.php:130
-#, php-format
-msgid "Send invitations"
-msgstr "Senda boðskort"
+#: actions/publictagcloud.php:57
+msgid "Public tag cloud"
+msgstr "Merkjaský almenningsins"
 
-#: actions/facebookremove.php:56
-msgid "Couldn't remove Facebook user."
-msgstr "Gat ekki fjarlægt Facebook-notanda."
+#: actions/publictagcloud.php:63
+#, php-format
+msgid "These are most popular recent tags on %s "
+msgstr "Þetta eru vinsælustu nýlegu merkin á %s "
 
-#: actions/facebooksettings.php:65
-msgid "There was a problem saving your sync preferences!"
-msgstr "Það kom upp villa við að vista samstillingarnar þínar!"
+#: actions/publictagcloud.php:69
+#, php-format
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
+msgstr ""
 
-#: actions/facebooksettings.php:67
-msgid "Sync preferences saved."
-msgstr "Samstillingar vistaðar."
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
+msgstr ""
 
-#: actions/facebooksettings.php:90
-msgid "Automatically update my Facebook status with my notices."
-msgstr "Sjálfkrafa uppfærir stöðuna mína á Facebook með bablinu mínu."
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
 
-#: actions/facebooksettings.php:97
-msgid "Send \"@\" replies to Facebook."
-msgstr "Senda \"@\" svör til Facebook."
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
+msgstr "Merkjaský"
 
-#: actions/facebooksettings.php:106
-msgid "Prefix"
-msgstr "Forskeyti"
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "Þú ert nú þegar innskráð(ur)!"
 
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
-msgstr "Strengur til að skeyta fram fyrir babl."
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "Enginn svoleiðis staðfestingarlykill."
 
-#: actions/facebooksettings.php:124
-#, php-format
-msgid "If you would like %s to automatically update "
-msgstr "Ef þú vilt að %s uppfærist sjálfkrafa "
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "Þetta er ekki staðfestingarlykill."
 
-#: actions/facebooksettings.php:147
-msgid "Sync preferences"
-msgstr "Samstillingar"
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr "Lykill fyrir endurheimtingu óþekkts notanda."
 
-#: actions/favor.php:94 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "Ekki lengur í uppáhaldi"
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "Villa kom upp varðandi staðfestingarlykilinn."
 
-#: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
-msgid "Popular notices"
-msgstr "Vinsælt babl"
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
+msgstr ""
+"Þessi staðfestingarlykill er of gamall. Vinsamlegast byrjaðu aftur upp á "
+"nýtt."
 
-#: actions/favorited.php:67
-#, php-format
-msgid "Popular notices, page %d"
-msgstr "Vinsælt babl, síða %d"
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
+msgstr "Gat ekki uppfært notanda með staðfestu tölvupóstfangi."
 
-#: actions/favorited.php:79
-msgid "The most popular notices on the site right now."
-msgstr "Vinsælasta bablið á síðunni um þessar mundir."
+#: actions/recoverpassword.php:152
+msgid ""
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
+msgstr ""
 
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
-msgid "Featured users"
-msgstr "Notendur í sviðsljósinu"
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
+msgstr ""
 
-#: actions/featured.php:71
-#, php-format
-msgid "Featured users, page %d"
-msgstr "Notendur í sviðsljósinu, síða %d"
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
+msgstr ""
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some of the great users on %s"
-msgstr "Úrval nokkurra frábærra notenda á %s"
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
+msgstr ""
 
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
-msgstr "Þessi notandi hefur bannað þér að gerast áskrifandi"
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
+msgstr "Stuttnefnið þitt á þessum vefþjóni eða skráða tölvupóstfangið."
 
-#: actions/groupbyid.php:79
-msgid "No ID"
-msgstr "Ekkert einkenni"
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
+msgstr "Endurheimta"
 
-#: actions/grouplogo.php:138 actions/grouplogo.php:191
-msgid "Group logo"
-msgstr "Einkennismynd hópsins"
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "Endurstilla lykilorð"
 
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
-msgstr "Þú getur hlaðið upp mynd fyrir hópinn þinn."
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr "Endurheimta lykilorð"
 
-#: actions/grouplogo.php:448
-msgid "Logo updated."
-msgstr "Einkennismynd uppfærð."
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
+msgstr "Beiðni um að endurheimta lykilorð hefur verið send inn"
 
-#: actions/grouplogo.php:450
-msgid "Failed updating logo."
-msgstr "Tókst ekki að uppfæra einkennismynd"
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
+msgstr "Óþekkt aðgerð"
 
-#: actions/groupmembers.php:93 lib/groupnav.php:91
-#, php-format
-msgid "%s group members"
-msgstr "Hópmeðlimir %s"
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 eða fleiri tákn og ekki gleyma því!"
 
-#: actions/groupmembers.php:96
-#, php-format
-msgid "%s group members, page %d"
-msgstr "Hópmeðlimir %s, síða %d"
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Sama og lykilorðið hér fyrir ofan"
 
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
-msgstr "Listi yfir notendur í þessum hóp."
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "Endurstilla"
 
-#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
-msgid "Groups"
-msgstr "Hópar"
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "Sláðu inn stuttnefni eða tölvupóstfang."
 
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "Hópar, síða %d"
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
+msgstr "Enginn notandi með þetta tölvupóstfang eða notendanafn"
 
-#: actions/groups.php:90
-#, php-format
-msgid "%%%%site.name%%%% groups let you find and talk with "
-msgstr "Hópar á %%%%site.name%%%% leyfa þér að finna og tala við "
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr "Ekkert tölvupóstfang á skrá fyrir þennan notanda."
 
-#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-msgid "Create a new group"
-msgstr "Búa til nýjan hóp"
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "Villa kom upp í vistun netfangsstaðfestingar."
 
-#: actions/groupsearch.php:57
-#, php-format
+#: actions/recoverpassword.php:325
 msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-msgstr "Leita að hópum á %%site.name%% eftir nafni, staðsetningu eða lýsingu. "
-
-#: actions/groupsearch.php:63
-msgid "Group search"
-msgstr "Hópleit"
-
-#: actions/imsettings.php:70
-msgid "You can send and receive notices through "
-msgstr "Þú getur sent og tekið á móti babli í gegnum "
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr ""
+"Leiðbeiningar um það hvernig þú getur endurheimt lykilorðið þitt hafa verið "
+"sendar á tölvupóstfangið sem er tengt notendaaðganginum þínum."
 
-#: actions/imsettings.php:120
-#, php-format
-msgid "Jabber or GTalk address, "
-msgstr "Jabber eða GTalk vefföng, "
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
+msgstr "Bjóst ekki við endurstillingu lykilorðs."
 
-#: actions/imsettings.php:147
-msgid "Send me replies through Jabber/GTalk "
-msgstr "Sendu mér svör í gegnum Jabber/GTalk "
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "Lykilorð verður að vera 6 tákn eða fleiri."
 
-#: actions/imsettings.php:321
-#, php-format
-msgid "A confirmation code was sent "
-msgstr "Staðfestingarlykill var sendur "
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
+msgstr "Lykilorð og staðfesting passa ekki saman."
 
-#: actions/joingroup.php:65
-msgid "You must be logged in to join a group."
-msgstr "Þú verður að hafa skráð þig inn til að bæta þér í hóp."
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
+msgstr "Tókst að vista nýtt lykilorð. Þú ert núna innskráð(ur)"
 
-#: actions/joingroup.php:95
-msgid "You are already a member of that group"
-msgstr "Þú ert nú þegar meðlimur í þessum hópi"
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
+msgstr "Afsakið en aðeins fólki sem er boðið getur nýskráð sig."
 
-#: actions/joingroup.php:128
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Gat ekki bætt notandanum %s í hópinn %s"
+#: actions/register.php:92
+msgid "Sorry, invalid invitation code."
+msgstr ""
 
-#: actions/joingroup.php:135
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s bætti sér í hópinn %s"
+#: actions/register.php:112
+msgid "Registration successful"
+msgstr "Nýskráning tókst"
 
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
-msgstr "Innhólf verða að vera virk svo að hópar virki."
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "Nýskrá"
 
-#: actions/leavegroup.php:65
-msgid "You must be logged in to leave a group."
-msgstr "Þú verður aða hafa skráð þig inn til að ganga úr hóp."
+#: actions/register.php:135
+msgid "Registration not allowed."
+msgstr "Nýskráning ekki leyfð."
 
-#: actions/leavegroup.php:88
-msgid "No such group."
-msgstr "Enginn þannig hópur."
+#: actions/register.php:198
+msgid "You can't register if you don't agree to the license."
+msgstr "Þú getur ekki nýskráð þig nema þú samþykkir leyfið."
 
-#: actions/leavegroup.php:95
-msgid "You are not a member of that group."
-msgstr "Þú ert ekki meðlimur í þessum hópi."
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "Ekki tækt tölvupóstfang."
 
-#: actions/leavegroup.php:100
-msgid "You may not leave a group while you are its administrator."
-msgstr "Þú getur ekki gengið úr hóp á meðan þú ert stjórnandi hópsins."
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "Tölvupóstfang er nú þegar skráð."
 
-#: actions/leavegroup.php:130
-msgid "Could not find membership record."
-msgstr "Gat ekki fundið meðlimaskrá."
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "Ótækt notendanafn eða lykilorð."
 
-#: actions/leavegroup.php:138
-#, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s"
+#: actions/register.php:342
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
 
-#: actions/leavegroup.php:145
-#, php-format
-msgid "%s left group %s"
-msgstr "%s gekk úr hópnum %s"
+#: actions/register.php:424
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+"1-64 lágstafir eða tölustafir, engin greinarmerki eða bil. Nauðsynlegt."
 
-#: actions/login.php:225 lib/facebookaction.php:304
-msgid "Login to site"
-msgstr "Skrá þig inn á síðuna"
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr "6 eða fleiri tákn. Nauðsynlegt"
 
-#: actions/microsummary.php:69
-msgid "No current status"
-msgstr "Engin núverandi staða"
+#: actions/register.php:433
+msgid "Same as password above. Required."
+msgstr "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt."
 
-#: actions/newgroup.php:53
-msgid "New group"
-msgstr "Nýr hópur"
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "Tölvupóstur"
 
-#: actions/newgroup.php:115
-msgid "Use this form to create a new group."
-msgstr "Notaðu þetta eyðublað til að búa til nýjan hóp."
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
+msgstr ""
+"Aðeins notað fyrir uppfærslur, tilkynningar og endurheimtingu lykilorða."
 
-#: actions/newgroup.php:177
-msgid "Could not create group."
-msgstr "Gat ekki búið til hóp."
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
+msgstr "Lengra nafn, ákjósalegast að það sé \"rétta\" nafnið þitt"
 
-#: actions/newgroup.php:191
-msgid "Could not set group membership."
-msgstr "Gat ekki skráð hópmeðlimi."
+#: actions/register.php:493
+msgid "My text and files are available under "
+msgstr "Textinn og skrárnar mínar eru aðgengilegar undir "
 
-#: actions/newmessage.php:119 actions/newnotice.php:132
-msgid "That's too long. "
-msgstr "Þetta er of langt. "
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
 
-#: actions/newmessage.php:134
-msgid "Don't send a message to yourself; "
-msgstr "Ekki senda þér þín eigin skilaboð; "
+#: actions/register.php:496
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
 
-#: actions/newnotice.php:166
-msgid "Notice posted"
-msgstr "Babl sent inn"
+#: actions/register.php:537
+#, 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 ""
+"Til hamingju %s! Frábært að þú skulir hafa skráð þig á %%%%site.name%%%%. "
+"Héðan vilt þú kannski...\n"
+"\n"
+"* Fara á [persónulegu síðuna þína](%s) senda inn þitt fyrsta babl.\n"
+"* Bæta við [Jabber/GTalk snarskilaboðafangi](%%%%action.imsettings%%%%) svo "
+"þú getir sent inn babl í snarskilaboðum.\n"
+"* [Leita að fólki](%%%%action.peoplesearch%%%%) sem þú þekkir eða hefur sömu "
+"áhugamál og þú. \n"
+"* Uppfæra [persónulegu síðuna](%%%%action.profilesettings%%%%) þína til þess "
+"að leyfa öðrum að kynnast þér betur.\n"
+"* Lesa [vefleiðbeiningarnar](%%%%doc.help%%%%) til þess að læra að babla "
+"betur.\n"
+"\n"
+"Takk fyrir að skrá þig og við vonum að þú njótir þjónustunnar."
 
-#: actions/newnotice.php:200 classes/Channel.php:163
-msgid "Ajax Error"
-msgstr "Ajax villa"
+#: actions/register.php:561
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+"(Þú ættir að fá tölvupóst eftir smá stund. Í tölvupóstinum eru leiðbeiningar "
+"um það hvernig þú staðfestir tölvupóstfangið þitt.)"
 
-#: actions/nudge.php:85
+#: actions/remotesubscribe.php:98
+#, php-format
 msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+"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 ""
-"Þessi notandi leyfir ekki að ýta við sér eða hefur ekki staðfest eða skráð "
-"tölvupóstinn sinn."
+"Til þess að gerast áskrifandi getur þú [skráð þig inn](%%action.login%%) eða "
+"[nýskráð þig](%%action.register%%). Ef þú hefur nú þegar búið til aðgang á "
+"[samvirkandi örbloggsþjónustu](%%doc.openmublog%%), sláðu þá inn veffang "
+"persónulegu síðunnar þinnar hér fyrir neðan."
 
-#: actions/nudge.php:94
-msgid "Nudge sent"
-msgstr "Ýtt við notanda"
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr "Fara í fjaráskrift"
 
-#: actions/nudge.php:97
-msgid "Nudge sent!"
-msgstr "Ýtt við notanda!"
+#: actions/remotesubscribe.php:124
+msgid "Subscribe to a remote user"
+msgstr ""
 
-#: actions/openidlogin.php:97
-msgid "OpenID login"
-msgstr "Innskráning með OpenID"
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "Stuttnefni notanda"
 
-#: actions/openidsettings.php:128
-msgid "Removing your only OpenID "
-msgstr "Fjarlægi eina OpenID einkennið þitt "
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr "Stuttnefni notandans sem þú vilt fylgja"
 
-#: actions/othersettings.php:60
-msgid "Other Settings"
-msgstr "Aðrar stillingar"
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "Veffang persónulegrar síðu"
 
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Sjá um ýmsar aðrar stillingar."
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "Veffang persónulegrar síðu á samvirkandi örbloggsþjónustu"
 
-#: actions/othersettings.php:93
-msgid "URL Auto-shortening"
-msgstr "Sjálfvirk stytting vefslóða"
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
+msgstr "Gerast áskrifandi"
 
-#: actions/othersettings.php:112
-msgid "Service"
-msgstr "Þjónusta"
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr "Ótækt veffang persónulegrar síðu (vitlaust snið)"
 
-#: actions/othersettings.php:113
-msgid "Automatic shortening service to use."
-msgstr "Þjónusta sem sér um sjálfkrafa styttingu."
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "Ekki tækt veffang á persónulega síðu (ekkert YADIS skjal)."
 
-#: actions/othersettings.php:144
-msgid "URL shortening service is too long (max 50 chars)."
+#: actions/remotesubscribe.php:176
+#, fuzzy
+msgid "That’s a local profile! Login to subscribe."
 msgstr ""
-"Þjónusta sjálfvirkrar vefslóðastyttingar er of löng (í mesta lagi 50 "
-"stafir)."
-
-#: actions/passwordsettings.php:69
-msgid "Change your password."
-msgstr "Breyta lykilorðinu þínu."
+"Þetta er staðbundinn persónuaðgangur! Skráðu þig inn til að gerast "
+"áskrifandi."
 
-#: actions/passwordsettings.php:89
-msgid "Password change"
-msgstr "Lykilorðabreyting"
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "Gat ekki komist yfir beiðnistóka."
 
-#: actions/peopletag.php:35
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
 #, php-format
-msgid "Not a valid people tag: %s"
-msgstr "Ekki gilt persónumerki: %s"
+msgid "Replies to %s"
+msgstr "Svör við %s"
 
-#: actions/peopletag.php:47
+#: actions/replies.php:127
 #, php-format
-msgid "Users self-tagged with %s - page %d"
-msgstr "Notendur sjálfmerktir með %s - síða %d"
+msgid "Replies to %s, page %d"
+msgstr "Svör við %s, síða %d"
 
-#: actions/peopletag.php:91
+#: actions/replies.php:144
 #, php-format
-msgid "These are users who have tagged themselves \"%s\" "
-msgstr "Þetta eru notendur sem hafa merkt sjálfa sig með \"%s\" "
-
-#: actions/profilesettings.php:91
-msgid "Profile information"
-msgstr "Upplýsingar á persónulegri síðu"
-
-#: actions/profilesettings.php:124
-msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgid "Replies feed for %s (RSS 1.0)"
 msgstr ""
-"Merki fyrir þig (bókstafir, tölustafir, -, ., og _), aðskilin með kommu eða "
-"bili"
-
-#: actions/profilesettings.php:144
-msgid "Automatically subscribe to whoever "
-msgstr "Sjálfkrafa gerast áskrifandi að þeim "
 
-#: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/replies.php:151
 #, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Ógilt merki: \"%s\""
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr ""
 
-#: actions/profilesettings.php:311
-msgid "Couldn't save tags."
-msgstr "Gat ekki vistað merki."
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Bablveita fyrir hópinn %s"
 
-#: actions/public.php:107
+#: actions/replies.php:198
 #, php-format
-msgid "Public timeline, page %d"
-msgstr "Almenningsrás, síða %d"
-
-#: actions/public.php:173
-msgid "Could not retrieve public stream."
-msgstr "Gat ekki sótt efni úr almenningsveitu."
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
 
-#: actions/public.php:220
+#: actions/replies.php:203
 #, php-format
 msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
 msgstr ""
-"Þetta er [örbloggssþjónustan](http://en.wikipedia.org/wiki/Micro-blogging) "
-"%%site.name%% "
 
-#: actions/publictagcloud.php:57
-msgid "Public tag cloud"
-msgstr "Merkjaský almenningsins"
-
-#: actions/publictagcloud.php:63
+#: actions/replies.php:205
 #, php-format
-msgid "These are most popular recent tags on %s "
-msgstr "Þetta eru vinsælustu nýlegu merkin á %s "
-
-#: actions/publictagcloud.php:119
-msgid "Tag cloud"
-msgstr "Merkjaský"
-
-#: actions/register.php:139 actions/register.php:349
-msgid "Sorry, only invited people can register."
-msgstr "Afsakið en aðeins fólki sem er boðið getur nýskráð sig."
-
-#: actions/register.php:149
-msgid "You can't register if you don't "
-msgstr "Þú getur ekki nýskráð þig ef þú hefur ekki "
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
 
-#: actions/register.php:286
-msgid "With this form you can create "
-msgstr "Með þessu eyðublaði getur þú búið til "
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Skilaboð til %1$s á %2$s"
 
-#: actions/register.php:368
-msgid "1-64 lowercase letters or numbers, "
-msgstr "1-64 lágstafir og tölustafir, "
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%s's favorite notices, page %d"
+msgstr ""
 
-#: actions/register.php:382 actions/register.php:386
-msgid "Used only for updates, announcements, "
-msgstr "Aðeins notað fyrir uppfærslur og tilkynningar, "
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
+msgstr "Gat ekki sótt uppáhaldsbabl."
 
-#: actions/register.php:398
-msgid "URL of your homepage, blog, "
-msgstr "Vefslóð vefsíðunnar þinnar, blogg, "
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Bablveita uppáhaldsbabls %s"
 
-#: actions/register.php:404
-msgid "Describe yourself and your "
-msgstr "Lýstu þér og þínum "
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Bablveita uppáhaldsbabls %s"
 
-#: actions/register.php:410
-msgid "Where you are, like \"City, "
-msgstr "Hvar ertu, t.d. \"Borg, "
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Bablveita uppáhaldsbabls %s"
 
-#: actions/register.php:432
-msgid " except this private data: password, "
-msgstr " nema þessi persónulegu gögn: lykilorð, "
+#: actions/showfavorites.php:205
+msgid ""
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
+msgstr ""
 
-#: actions/register.php:471
+#: actions/showfavorites.php:207
 #, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
-msgstr "Til hamingju %s! Vertu velkomin(n) á %%%%site.name%%%%. "
-
-#: actions/register.php:495
-msgid "(You should receive a message by email "
-msgstr "(Þú ættir að fá tölvupóst "
-
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
 msgstr ""
-"Þetta er staðbundinn persónuaðgangur! Skráðu þig inn til að gerast "
-"áskrifandi."
 
-#: actions/replies.php:118
+#: actions/showfavorites.php:211
 #, php-format
-msgid "Replies to %s, page %d"
-msgstr "Svör við %s, síða %d"
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
 
-#: actions/showfavorites.php:79
-#, php-format
-msgid "%s favorite notices, page %d"
-msgstr "Uppáhaldsbabl %s, síða %d"
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:82 lib/groupnav.php:86
 #, php-format
 msgid "%s group"
 msgstr "%s hópurinn"
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr "%s hópurinn, síða %d"
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:218
 msgid "Group profile"
 msgstr "Hópssíðan"
 
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
 msgid "URL"
 msgstr "Vefslóð"
 
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
 msgid "Note"
 msgstr "Athugasemd"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:293
 msgid "Group actions"
 msgstr "Hópsaðgerðir"
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:328
 #, php-format
-msgid "Notice feed for %s group"
-msgstr "Bablveita fyrir hópinn %s"
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr ""
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:334
+#, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr ""
+
+#: actions/showgroup.php:340
+#, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr ""
+
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "%s hópurinn"
+
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
 msgid "Members"
 msgstr "Meðlimir"
 
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
 #: lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Ekkert)"
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:392
 msgid "All members"
 msgstr "Allir meðlimir"
 
-#: actions/showgroup.php:378
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "Tölfræði"
+
+#: actions/showgroup.php:432
+msgid "Created"
+msgstr ""
+
+#: actions/showgroup.php:448
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
-"**%s** er notendahópur á [örbloggsþjónustunni](http://en.wikipedia.org/wiki"
-"/Micro-blogging) %%%%site.name%%%%  "
+
+#: actions/showgroup.php:454
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
+msgstr ""
+
+#: actions/showgroup.php:482
+msgid "Admins"
+msgstr ""
+
+#: actions/showmessage.php:81
+msgid "No such message."
+msgstr "Engin þannig skilaboð."
 
 #: actions/showmessage.php:98
-msgid "Only the sender and recipient "
-msgstr "Aðeins sendandinn og móttakandi "
+msgid "Only the sender and recipient may read this message."
+msgstr "Aðeins sendandi og móttakandi geta lesið þessi skilaboð."
+
+#: actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr "Skilaboð til %1$s á %2$s"
+
+#: actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr "Skilaboð frá %1$s á %2$s"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Babl sent inn"
 
 #: actions/showstream.php:73
 #, php-format
+msgid " tagged %s"
+msgstr ""
+
+#: actions/showstream.php:79
+#, php-format
 msgid "%s, page %d"
 msgstr "%s, síða %d"
 
-#: actions/showstream.php:143
-msgid "'s profile"
-msgstr "- Persónuleg síða"
+#: actions/showstream.php:122
+#, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr ""
 
-#: actions/showstream.php:236 actions/tagother.php:77
-msgid "User profile"
-msgstr "Persónuleg síða notanda"
+#: actions/showstream.php:129
+#, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr ""
 
-#: actions/showstream.php:240 actions/tagother.php:81
-msgid "Photo"
-msgstr "Ljósmynd"
+#: actions/showstream.php:136
+#, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr ""
 
-#: actions/showstream.php:317
-msgid "User actions"
-msgstr "Notandaaðgerðir"
+#: actions/showstream.php:143
+#, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr ""
 
-#: actions/showstream.php:342
-msgid "Send a direct message to this user"
-msgstr "Senda bein skilaboð til þessa notanda"
+#: actions/showstream.php:148
+#, php-format
+msgid "FOAF for %s"
+msgstr ""
 
-#: actions/showstream.php:343
-msgid "Message"
-msgstr "Skilaboð"
+#: actions/showstream.php:191
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
 
-#: actions/showstream.php:451
-msgid "All subscribers"
-msgstr "Allir áskrifendur"
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
 
-#: actions/showstream.php:533
-msgid "All groups"
-msgstr "Allir hópar"
+#: actions/showstream.php:198
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:234
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
 
-#: actions/showstream.php:542
+#: actions/showstream.php:239
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
+msgstr ""
+
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "SMS stillingar"
+
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr "Þú getur fengið SMS í gegnum tölvupóst frá %%site.name%%."
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Þessi síða er ekki aðgengileg í "
+
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Núverandi staðfesta SMS símanúmerið."
+
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
+msgstr "Býð eftir staðfestingu varðandi þetta símanúmer."
+
+#: actions/smssettings.php:130
+msgid "Confirmation code"
+msgstr "Staðfestingarlykill"
+
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
+msgstr "Sláðu inn lykilinn sem þú fékkst í símann þinn."
+
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
+msgstr "SMS símanúmer"
+
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "Símanúmer, með svæðisnúmeri ef við á, án greinarmerkja eða bila"
+
+#: actions/smssettings.php:174
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
 msgstr ""
-"**%s** hefur notendaaðgang á "
-"[örbloggsþjónustunni](http://en.wikipedia.org/wiki/Micro-blogging) "
-"%%%%site.name%%%%  "
+"Sendu mér babl í gegnum SMS. Ég veit að það er möguleiki að "
+"farsímafyrirtækið rukki fyrir móttöku á SMSunum."
+
+#: actions/smssettings.php:306
+msgid "No phone number."
+msgstr "Ekkert símanúmer."
+
+#: actions/smssettings.php:311
+msgid "No carrier selected."
+msgstr "Ekkert farsímafélag valið."
 
-#: actions/smssettings.php:128
-msgid "Phone number, no punctuation or spaces, "
-msgstr "Símanúmer, engin sértákn eða bil,"
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
+msgstr "Þetta er nú þegar símanúmerið þitt."
 
-#: actions/smssettings.php:162
-msgid "Send me notices through SMS; "
-msgstr "Senda mér babl í gegnum SMS; "
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
+msgstr "Þetta símanúmer tilheyri nú þegar öðrum notanda."
 
-#: actions/smssettings.php:335
-msgid "A confirmation code was sent to the phone number you added. "
-msgstr "Staðfestingarlykill hefur verið sendur í símanúmerið sem þú slóst inn. "
+#: actions/smssettings.php:347
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
+msgstr "Þetta er rangur staðfestingarlykill."
+
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
+msgstr "Þetta er ekki símanúmerið þitt."
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:465
 msgid "Mobile carrier"
 msgstr "Farsímafyrirtæki"
 
+#: actions/smssettings.php:469
+msgid "Select a carrier"
+msgstr "Veldu farsímafyrirtæki"
+
+#: actions/smssettings.php:476
+#, 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 ""
+"Farsímafélagið þitt. Ef þú veist um farsímafélag sem tekur á móti SMS í "
+"gegnum tölvupóst sem er ekki í þessum lista, sendu okkur tölvupóst í %s og "
+"láttu okkur vita."
+
+#: actions/smssettings.php:498
+msgid "No code entered"
+msgstr "Enginn lykill sleginn inn"
+
 #: actions/subedit.php:70
 msgid "You are not subscribed to that profile."
 msgstr "Þú ert ekki áskrifandi."
@@ -4276,13 +2978,31 @@ msgid "%s subscribers, page %d"
 msgstr "%s áskrifendur, síða %d"
 
 #: actions/subscribers.php:63
-msgid "These are the people who listen to "
-msgstr "Þetta er fólkið sem hlustar á "
+msgid "These are the people who listen to your notices."
+msgstr "Þetta er fólkið sem hlustar á bablið í þér."
 
 #: actions/subscribers.php:67
 #, php-format
-msgid "These are the people who "
-msgstr "Þetta er fólkið sem "
+msgid "These are the people who listen to %s's notices."
+msgstr "Þetta er fólkið sem hlustar á bablið í %s."
+
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
+msgstr ""
+
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr ""
+
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
 
 #: actions/subscriptions.php:52
 #, php-format
@@ -4295,27 +3015,36 @@ msgid "%s subscriptions, page %d"
 msgstr "%s áskriftir, síða %d"
 
 #: actions/subscriptions.php:65
-msgid "These are the people whose notices "
-msgstr "Þetta er fólkið þar sem bablið "
+msgid "These are the people whose notices you listen to."
+msgstr "Þetta er fólkið sem þú hlustar á bablið í."
 
 #: actions/subscriptions.php:69
 #, php-format
-msgid "These are the people whose "
-msgstr "Þetta er fólkið þar sem "
-
-#: actions/subscriptions.php:122
-msgid "Jabber"
-msgstr "Jabber snarskilaboðaþjónusta"
+msgid "These are the people whose notices %s listens to."
+msgstr "Þetta er fólkið sem %s hlustar á bablið í."
 
-#: actions/tag.php:43
+#: actions/subscriptions.php:121
 #, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Babl merkt með %s, síða %d"
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
+msgstr ""
 
-#: actions/tag.php:66
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
 #, php-format
-msgid "Messages tagged \"%s\", most recent first"
-msgstr "Skilaboð merkt með \"%s\", nýlegustu skilaboðin fyrst"
+msgid "%s is not listening to anyone."
+msgstr ""
+
+#: actions/subscriptions.php:194
+msgid "Jabber"
+msgstr "Jabber snarskilaboðaþjónusta"
+
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
+msgstr "SMS"
 
 #: actions/tagother.php:33
 msgid "Not logged in"
@@ -4330,11 +3059,19 @@ msgstr "Ekkert einkenni gefið upp."
 msgid "Tag %s"
 msgstr "Merki %s"
 
+#: actions/tagother.php:77 lib/userprofile.php:75
+msgid "User profile"
+msgstr "Persónuleg síða notanda"
+
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
+msgstr "Ljósmynd"
+
 #: actions/tagother.php:141
 msgid "Tag user"
 msgstr "Merkja notanda"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4342,242 +3079,876 @@ msgstr ""
 "Merki fyrir þennan notanda (bókstafir, tölustafir, -, ., og _), aðskilin með "
 "kommu eða bili"
 
-#: actions/tagother.php:164
-msgid "There was a problem with your session token."
-msgstr "Það komu upp vandamál varðandi setutókann þinn."
-
-#: actions/tagother.php:191
+#: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Þú getur aðeins merkt fólk sem þú ert áskrifandi að eða þau sem eru "
 "áskrifendur að þér."
 
-#: actions/tagother.php:198
+#: actions/tagother.php:200
 msgid "Could not save tags."
 msgstr "Gat ekki vistað merki."
 
-#: actions/tagother.php:233
+#: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Notaðu þetta eyðublað til að bæta við merkjum við áskrifendur þína eða þau "
 "sem þú ert áskrifandi að."
 
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Babl merkt með %s, síða %d"
+
+#: actions/tag.php:86
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr ""
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Bablveita fyrir %s"
+
+#: actions/tag.php:98
+#, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr ""
+
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Ekkert þannig merki."
 
-#: actions/tagrss.php:66
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
+msgstr "Aðferð í forritsskilum er í þróun."
+
+#: actions/unsubscribe.php:77
+msgid "No profile id in request."
+msgstr "Ekkert einkenni persónulegrar síðu í beiðni."
+
+#: actions/unsubscribe.php:84
+msgid "No profile with that id."
+msgstr "Enginn persónuleg síða með þessu einkenni."
+
+#: actions/unsubscribe.php:98
+msgid "Unsubscribed"
+msgstr "Ekki lengur áskrifandi"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
 #, php-format
-msgid "Microblog tagged with %s"
-msgstr "Örblogg merkt með %s"
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
 
-#: actions/twitapiblocks.php:47
-msgid "Block user failed."
-msgstr "Mistókst að loka á notanda."
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "Heimila áskriftir"
 
-#: actions/twitapiblocks.php:69
-msgid "Unblock user failed."
-msgstr "Mistókst að opna fyrir notanda."
+#: actions/userauthorization.php:110
+#, fuzzy
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
+msgstr ""
+"Vinsamlegast athugaðu þessi atriði til þess að vera viss um að þú viljir "
+"gerast áskrifandi að babli þessa notanda. Ef þú baðst ekki um að gerast "
+"áskrifandi að babli, smelltu þá á \"Hætta við\"."
 
-#: actions/twitapiusers.php:48
-msgid "Not found."
-msgstr "Fannst ekki."
+#: actions/userauthorization.php:188
+msgid "License"
+msgstr ""
+
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "Samþykkja"
 
-#: actions/twittersettings.php:71
-msgid "Add your Twitter account to automatically send "
-msgstr "Bættu við Twitter aðgangi þínum til að sjálfkrafa senda "
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Gerast áskrifandi að þessum notanda"
 
-#: actions/twittersettings.php:119
-msgid "Twitter user name"
-msgstr "Notendanafn á Twitter"
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "Hafna"
 
-#: actions/twittersettings.php:126
-msgid "Twitter password"
-msgstr "Lykilorð á Twitter"
+#: actions/userauthorization.php:212
+msgid "Reject this subscription"
+msgstr ""
 
-#: actions/twittersettings.php:228
-msgid "Twitter Friends"
-msgstr "Twitter vinir"
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
+msgstr "Engin heimildarbeiðni!"
 
-#: actions/twittersettings.php:327
-msgid "Username must have only numbers, "
-msgstr "Notendanafn má aðeins innihalda tölustafi, "
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+msgstr "Áskrift heimiluð"
 
-#: actions/twittersettings.php:341
-#, php-format
-msgid "Unable to retrieve account information "
-msgstr "Gat ekki náð í aðgangsupplýsingar "
+#: actions/userauthorization.php:249
+#, fuzzy
+msgid ""
+"The subscription has been authorized, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to authorize the "
+"subscription. Your subscription token is:"
+msgstr ""
+"Áskriftin hefur verið heimiluð en afturkallsveffang var ekki sent. Athugaðu "
+"leiðbeiningar síðunnar um það hvernig á að heimila áskrift. Áskriftartókinn "
+"þinn er;"
 
-#: actions/unblock.php:108
-msgid "Error removing the block."
-msgstr "Vill kom upp við að aflétta notendalokun."
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
+msgstr "Áskrift hafnað"
 
-#: actions/unsubscribe.php:50
-msgid "No profile id in request."
-msgstr "Ekkert einkenni persónulegrar síðu í beiðni."
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"Áskriftinni hefur verið hafnað en afturkallsveffang var ekki sent. Athugaðu "
+"leiðbeiningar síðunnar um það hvernig á að hafna áskrift alveg."
 
-#: actions/unsubscribe.php:57
-msgid "No profile with that id."
-msgstr "Enginn persónuleg síða með þessu einkenni."
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
 
-#: actions/unsubscribe.php:71
-msgid "Unsubscribed"
-msgstr "Ekki lengur áskrifandi"
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
 
-#: actions/usergroups.php:63
+#: actions/userauthorization.php:307
 #, php-format
-msgid "%s groups"
-msgstr "Hópar %s"
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Get ekki lesið slóðina fyrir myndina '%s'"
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Röng gerð myndar fyrir '%s'"
+
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr "Ekkert kenni."
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+msgid "Profile design"
+msgstr ""
 
-#: actions/usergroups.php:65
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "Hópar %s, síða %d"
 
-#: classes/Notice.php:104
+#: actions/usergroups.php:130
+msgid "Search for more groups"
+msgstr ""
+
+#: actions/usergroups.php:153
+#, php-format
+msgid "%s is not a member of any group."
+msgstr ""
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Message.php:55
+msgid "Could not insert message."
+msgstr "Gat ekki skeytt skilaboðum inn í."
+
+#: classes/Message.php:65
+msgid "Could not update message with new URI."
+msgstr "Gat ekki uppfært skilaboð með nýju veffangi."
+
+#: classes/Notice.php:164
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %s"
+
+#: classes/Notice.php:179
+msgid "Problem saving notice. Too long."
+msgstr ""
+
+#: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
 msgstr "Gat ekki vistað babl. Óþekktur notandi."
 
-#: classes/Notice.php:109
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Of mikið babl í einu; slakaðu aðeins á og haltu svo áfram eftir nokkrar "
 "mínútur."
 
-#: classes/Notice.php:116
+#: classes/Notice.php:194
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr "Það hefur verið lagt bann við babli frá þér á þessari síðu."
 
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
+msgstr "Vandamál komu upp við að vista babl."
+
+#: classes/Notice.php:1120
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "Gagnagrunnsvilla við innsetningu svars: %s"
+
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr ""
+
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Persónuleg síða"
+
 #: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
+msgstr "Breyta persónulegu stillingunum þínum"
+
+#: lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "Hlaða upp einkennismynd"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr "Breyta lykilorðinu þínu"
+
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
+msgstr "Breyta tölvupóstumsjón"
+
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:124
+msgid "Design your profile"
+msgstr ""
+
+#: lib/accountsettingsaction.php:128
 msgid "Other"
 msgstr "Annað"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:128
 msgid "Other options"
 msgstr "Aðrir valkostir"
 
-#: lib/action.php:130
+#: lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: lib/action.php:145
+#: lib/action.php:159
 msgid "Untitled page"
 msgstr "Ónafngreind síða"
 
-#: lib/action.php:316
+#: lib/action.php:424
 msgid "Primary site navigation"
 msgstr "Stikl aðalsíðu"
 
-#: lib/action.php:322
+#: lib/action.php:430
+msgid "Home"
+msgstr "Heim"
+
+#: lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr "Persónuleg síða og vinarás"
 
-#: lib/action.php:325
-msgid "Search for people or text"
-msgstr "Leita að fólki eða texta"
-
-#: lib/action.php:328
+#: lib/action.php:432
 msgid "Account"
 msgstr "Aðgangur"
 
-#: lib/action.php:328
+#: lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr ""
 "Breyttu tölvupóstinum þínum, einkennismyndinni þinni, lykilorðinu þínu, "
 "persónulegu síðunni þinni"
 
-#: lib/action.php:330
-msgid "Connect to IM, SMS, Twitter"
-msgstr "Tengjast snarskilaboðaþjónustu, SMS, Twitter"
+#: lib/action.php:435
+msgid "Connect"
+msgstr "Tengjast"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Gat ekki framsent til vefþjóns: %s"
+
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
+msgstr "Bjóða"
+
+#: lib/action.php:440 lib/subgroupnav.php:106
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr "Bjóða vinum og vandamönnum að slást í hópinn á %s"
+
+#: lib/action.php:445
+msgid "Logout"
+msgstr "Útskráning"
 
-#: lib/action.php:332
+#: lib/action.php:445
 msgid "Logout from the site"
 msgstr "Skrá þig út af síðunni"
 
-#: lib/action.php:335
-msgid "Login to the site"
-msgstr "Skrá þig inn á síðuna"
-
-#: lib/action.php:338
+#: lib/action.php:450
 msgid "Create an account"
 msgstr "Búa til aðgang"
 
-#: lib/action.php:341
-msgid "Login with OpenID"
-msgstr "Skrá þig inn með OpenID"
+#: lib/action.php:453
+msgid "Login to the site"
+msgstr "Skrá þig inn á síðuna"
+
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
+msgstr "Hjálp"
 
-#: lib/action.php:344
+#: lib/action.php:456
 msgid "Help me!"
 msgstr "Hjálp!"
 
-#: lib/action.php:362
+#: lib/action.php:459
+msgid "Search"
+msgstr "Leita"
+
+#: lib/action.php:459
+msgid "Search for people or text"
+msgstr "Leita að fólki eða texta"
+
+#: lib/action.php:480
 msgid "Site notice"
 msgstr "Babl vefsíðunnar"
 
-#: lib/action.php:417
+#: lib/action.php:546
 msgid "Local views"
 msgstr "Staðbundin sýn"
 
-#: lib/action.php:472
+#: lib/action.php:612
 msgid "Page notice"
 msgstr "Babl síðunnar"
 
-#: lib/action.php:562
+#: lib/action.php:714
 msgid "Secondary site navigation"
 msgstr "Stikl undirsíðu"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:721
+msgid "About"
+msgstr "Um"
+
+#: lib/action.php:723
+msgid "FAQ"
+msgstr "Spurt og svarað"
+
+#: lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/action.php:730
+msgid "Privacy"
+msgstr "Friðhelgi"
+
+#: lib/action.php:732
+msgid "Source"
+msgstr "Frumþula"
+
+#: lib/action.php:734
+msgid "Contact"
+msgstr "Tengiliður"
+
+#: lib/action.php:736
+msgid "Badge"
+msgstr ""
+
+#: lib/action.php:764
 msgid "StatusNet software license"
 msgstr "Hugbúnaðarleyfi StatusNet"
 
-#: lib/action.php:630
+#: lib/action.php:767
+#, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
+msgstr ""
+"**%%site.name%%** er örbloggsþjónusta í boði [%%site.broughtby%%](%%site."
+"broughtbyurl%%). "
+
+#: lib/action.php:769
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** er örbloggsþjónusta."
+
+#: lib/action.php:771
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+"Það keyrir [StatusNet](http://status.net/) örbloggshugbúnaðinn, útgáfu %s, "
+"sem er gefinn út undir [GNU Affero almenningsleyfinu](http://www.fsf.org/"
+"licensing/licenses/agpl-3.0.html)."
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "Hugbúnaðarleyfi StatusNet"
+
+#: lib/action.php:794
 msgid "All "
 msgstr "Allt "
 
-#: lib/action.php:635
+#: lib/action.php:799
 msgid "license."
 msgstr "leyfi."
 
-#: lib/blockform.php:123 lib/blockform.php:153
-msgid "Block this user"
-msgstr "Loka á þennan notanda"
+#: lib/action.php:1052
+msgid "Pagination"
+msgstr "Uppröðun"
 
-#: lib/blockform.php:153
-msgid "Block"
-msgstr "Loka"
+#: lib/action.php:1061
+msgid "After"
+msgstr "Eftir"
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
-msgid "Disfavor this notice"
-msgstr "Taka þetta babl út sem uppáhald"
+#: lib/action.php:1069
+msgid "Before"
+msgstr "Áður"
+
+#: lib/action.php:1117
+msgid "There was a problem with your session token."
+msgstr "Það komu upp vandamál varðandi setutókann þinn."
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+msgid "Provider"
+msgstr ""
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
+msgstr "Niðurstöður skipunar"
+
+#: lib/channel.php:210
+msgid "Command complete"
+msgstr "Fullkláruð skipun"
 
-#: lib/facebookaction.php:268
+#: lib/channel.php:221
+msgid "Command failed"
+msgstr "Misheppnuð skipun"
+
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr "Fyrirgefðu en þessi skipun hefur ekki enn verið útbúin."
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Gat ekki uppfært notanda með staðfestu tölvupóstfangi."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "Ýtt við notanda"
+
+#: lib/command.php:126
 #, php-format
-msgid "To use the %s Facebook Application you need to login "
-msgstr "Til að nota Facebook forritið %s verður þú að skrá þig inn "
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
 
-#: lib/facebookaction.php:271
-msgid " a new account."
-msgstr " nýr aðgangur."
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
 
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-msgid "Published"
-msgstr "Útgefið"
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
+msgstr "Notandi hefur ekkert nýtt babl"
+
+#: lib/command.php:190
+msgid "Notice marked as fave."
+msgstr "Babl gert að uppáhaldi."
+
+#: lib/command.php:315
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#: lib/command.php:318
+#, php-format
+msgid "Fullname: %s"
+msgstr "Fullt nafn: %s"
+
+#: lib/command.php:321
+#, php-format
+msgid "Location: %s"
+msgstr "Staðsetning: %s"
+
+#: lib/command.php:324
+#, php-format
+msgid "Homepage: %s"
+msgstr "Heimasíða: %s"
+
+#: lib/command.php:327
+#, php-format
+msgid "About: %s"
+msgstr "Um: %s"
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d"
+
+#: lib/command.php:377
+msgid "Error sending direct message."
+msgstr "Villa kom upp við að senda bein skilaboð"
+
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d"
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Svara þessu babli"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Vandamál komu upp við að vista babl."
+
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
+msgstr "Tilgreindu nafn notandans sem þú vilt gerast áskrifandi að"
+
+#: lib/command.php:502
+#, php-format
+msgid "Subscribed to %s"
+msgstr "Nú ert þú áskrifandi að %s"
+
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
+msgstr "Tilgreindu nafn notandans sem þú vilt hætta sem áskrifandi að"
+
+#: lib/command.php:530
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr "Nú ert þú ekki lengur áskrifandi að %s"
+
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
+msgstr "Skipun hefur ekki verið fullbúin"
+
+#: lib/command.php:551
+msgid "Notification off."
+msgstr "Tilkynningar af."
+
+#: lib/command.php:553
+msgid "Can't turn off notification."
+msgstr "Get ekki slökkt á tilkynningum."
+
+#: lib/command.php:574
+msgid "Notification on."
+msgstr "Tilkynningar á."
+
+#: lib/command.php:576
+msgid "Can't turn on notification."
+msgstr "Get ekki kveikt á tilkynningum."
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Gat ekki búið til OpenID eyðublað: %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Þú ert ekki áskrifandi."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Þú ert ekki áskrifandi."
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Fólk sem eru áskrifendur að %s"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Þú ert ekki meðlimur í þessum hópi."
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "Þú ert ekki meðlimur í þessum hópi."
+
+#: lib/command.php:670
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+
+#: lib/common.php:192
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Enginn staðfestingarlykill."
+
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:195
+#, fuzzy
+msgid "Go to the installer."
+msgstr "Skrá þig inn á síðuna"
+
+#: lib/connectsettingsaction.php:110
+msgid "IM"
+msgstr "Snarskilaboð"
+
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Færslur sendar með snarskilaboðaþjónustu (instant messaging)"
+
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
+msgstr "Færslur sendar með SMS"
+
+#: lib/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+msgid "Upload file"
+msgstr ""
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+msgid "Change colours"
+msgstr ""
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+msgid "Content"
+msgstr ""
+
+#: lib/designsettings.php:204
+msgid "Sidebar"
+msgstr ""
+
+#: lib/designsettings.php:217
+msgid "Text"
+msgstr "Texti"
+
+#: lib/designsettings.php:230
+msgid "Links"
+msgstr ""
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
+msgstr "Taka þetta babl út sem uppáhald"
 
 #: lib/favorform.php:114 lib/favorform.php:140
 msgid "Favor this notice"
 msgstr "Setja þetta babl í uppáhald"
 
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr "Uppáhald"
+
 #: lib/feedlist.php:64
 msgid "Export data"
 msgstr "Flytja út gögn"
 
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr ""
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr ""
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr ""
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Sía merki"
@@ -4586,57 +3957,83 @@ msgstr "Sía merki"
 msgid "All"
 msgstr "Allt"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Veldu farsímafyrirtæki"
+
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Merki"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "Veldu merki til að þrengja lista"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "Áfram"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "Vefslóð vefsíðu hópsins eða umfjöllunarefnisins"
 
-#: lib/groupeditform.php:151
-msgid "Description"
-msgstr "Lýsing"
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Lýstu hópnum eða umfjöllunarefninu með 140 táknum"
 
-#: lib/groupeditform.php:153
-msgid "Describe the group or topic in 140 chars"
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
 msgstr "Lýstu hópnum eða umfjöllunarefninu með 140 táknum"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:172
+msgid "Description"
+msgstr "Lýsing"
+
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr "Staðsetning hópsins, ef einhver, eins og \"Borg, landshluti, land\""
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
 msgid "Group"
 msgstr "Hópur"
 
-#: lib/groupnav.php:100
-msgid "Admin"
-msgstr "Stjórnandi"
-
 #: lib/groupnav.php:101
+msgid "Blocked"
+msgstr ""
+
+#: lib/groupnav.php:102
+#, php-format
+msgid "%s blocked users"
+msgstr ""
+
+#: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
 msgstr "Breyta hópstillingum %s"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:113
 msgid "Logo"
 msgstr "Einkennismerki"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:114
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "Bæta við eða breyta einkennismerki %s"
 
+#: lib/groupnav.php:120
+#, php-format
+msgid "Add or edit %s design"
+msgstr ""
+
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Hóparnir með flestu meðlimina"
@@ -4651,8 +4048,43 @@ msgid "Tags in %s group's notices"
 msgstr "Merki í babli %s hópsins"
 
 #: lib/htmloutputter.php:104
-msgid "This page is not available in a "
-msgstr "Þessi síða er ekki aðgengileg í "
+msgid "This page is not available in a media type you accept"
+msgstr ""
+"Þessi síða er ekki aðgengileg í margmiðlunargerðinni sem þú tekur á móti"
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr "Upphal að hluta til."
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr "Kerfisvilla kom upp við upphal skráar."
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr "Annaðhvort ekki mynd eða þá að skráin er gölluð."
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr "Skráarsnið myndar ekki stutt."
+
+#: lib/imagefile.php:118
+msgid "Lost our file."
+msgstr "Týndum skránni okkar"
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr "Óþekkt skráargerð"
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr ""
 
 #: lib/joinform.php:114
 msgid "Join"
@@ -4662,43 +4094,81 @@ msgstr "Gerast meðlimur"
 msgid "Leave"
 msgstr "Hætta sem meðlimur"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr "Skráðu þig inn með notendanafni og lykilorði"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr "Búðu til nýjan aðgang"
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
-msgstr "Skráðu þig inn eða nýskráðu þig með OpenID"
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "Aðeins notandinn getur lesið hans eigin pósthólf."
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr "frá"
 
-#: lib/mail.php:175
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "Staðfesting tölvupóstfangs"
+
+#: lib/mail.php:174
 #, php-format
 msgid ""
 "Hey, %s.\n"
 "\n"
-msgstr ""
-"Hey, %s.\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%s\n"
+"\n"
+"If not, just ignore this message.\n"
 "\n"
+"Thanks for your time, \n"
+"%s\n"
+msgstr ""
 
-#: lib/mail.php:236
+#: lib/mail.php:235
 #, php-format
-msgid "%1$s is now listening to "
-msgstr "%1$s hlustar núna á "
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr "%1$s er að hlusta á bablið þitt á %2$s."
+
+#: lib/mail.php:240
+#, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
 
-#: lib/mail.php:254
+#: lib/mail.php:253
 #, php-format
 msgid "Location: %s\n"
 msgstr "Staðsetning: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:255
 #, php-format
 msgid "Homepage: %s\n"
 msgstr "Vefsíða: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
@@ -4707,57 +4177,226 @@ msgstr ""
 "Lýsing: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:285
+#, php-format
+msgid "New email address for posting to %s"
+msgstr "Nýtt tölvupóstfang til að senda á %s"
+
+#: lib/mail.php:288
+#, 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 ""
+"Þú hefur nýtt bablpóstfang á %1$s.\n"
+"\n"
+"Sendu tölvupóst á %2$s til að senda inn babl.\n"
+"\n"
+"Ítarlegri tölvupóstleiðbeiningar eru á %3$s.\n"
+"\n"
+"Með kærri kveðju,\n"
+"%4$s"
+
+#: lib/mail.php:412
+#, php-format
+msgid "%s status"
+msgstr "Staða %s"
+
+#: lib/mail.php:438
+msgid "SMS confirmation"
+msgstr "SMS staðfesting"
+
+#: lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "%s ýtti við þér"
 
-#: lib/mail.php:465
+#: lib/mail.php:466
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
+msgstr ""
+
+#: lib/mail.php:509
+#, php-format
+msgid "New private message from %s"
+msgstr "Ný persónuleg skilaboð frá %s"
+
+#: lib/mail.php:513
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%5$s\n"
+msgstr ""
+
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s heldur upp á babl frá þér"
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
+
+#: lib/mail.php:611
 #, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
-msgstr "%1$s (%2$s) er að spá hvað þú ert að gera "
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, php-format
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+msgstr ""
+
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
 
-#: lib/mail.php:555
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "Gat ekki eytt uppáhaldi."
+
+#: lib/mediafile.php:270
 #, php-format
-msgid "%1$s just added your notice from %2$s"
-msgstr "%1$s bætti við bablinu þínu af %2$s"
+msgid " Try using another %s format."
+msgstr ""
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
-msgid "From"
-msgstr "Frá"
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
 
-#: lib/messageform.php:110
+#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Senda bein skilaboð"
 
-#: lib/noticeform.php:125
-msgid "Send a notice"
-msgstr "Senda babl"
+#: lib/messageform.php:146
+msgid "To"
+msgstr "Til"
 
-#: lib/noticeform.php:152
+#: lib/messageform.php:162 lib/noticeform.php:173
 msgid "Available characters"
 msgstr "Leyfileg tákn"
 
-#: lib/noticelist.php:426
-msgid "in reply to"
-msgstr "sem svar við"
+#: lib/noticeform.php:145
+msgid "Send a notice"
+msgstr "Senda babl"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
+msgstr "Hvað er að frétta %s?"
+
+#: lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:478
+msgid "in context"
+msgstr ""
+
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr "Svara þessu babli"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "Svara"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
-msgid "Delete this notice"
-msgstr "Eyða þessu babli"
-
-#: lib/noticelist.php:474
-msgid "Delete"
-msgstr "Eyða"
-
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Ýta við þessum notanda"
@@ -4770,39 +4409,136 @@ msgstr "Pot"
 msgid "Send a nudge to this user"
 msgstr "Ýta við þessum notanda"
 
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "Villa kom upp við að setja inn nýja persónulega síðu"
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "Villa kom upp við að setja inn mynd"
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "Villa kom upp við að setja inn persónulega fjarsíðu"
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Eyða babli"
+
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
+msgstr "Gat ekki sett inn nýja áskrift."
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "Persónulegt"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "Svör"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr "Uppáhald"
+
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr "Notandi"
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr "Innhólf"
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr "Mótteknu skilaboðin þín"
+
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr "Úthólf"
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr "Skilaboð sem þú hefur sent"
+
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Merki í babli %s"
 
-#: lib/profilelist.php:182
-msgid "(none)"
-msgstr "(ekkert)"
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "Áskriftir"
+
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "Allar áskriftir"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "Áskrifendur"
+
+#: lib/profileaction.php:157
+msgid "All subscribers"
+msgstr "Allir áskrifendur"
+
+#: lib/profileaction.php:177
+msgid "User ID"
+msgstr ""
+
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "Meðlimur síðan"
 
-#: lib/publicgroupnav.php:76
+#: lib/profileaction.php:235
+msgid "All groups"
+msgstr "Allir hópar"
+
+#: lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Almenn"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Notendahópar"
 
-#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Nýleg merki"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Í sviðsljósinu"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Vinsælt"
 
+#: lib/searchaction.php:120
+msgid "Search site"
+msgstr ""
+
+#: lib/searchaction.php:162
+msgid "Search help"
+msgstr ""
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "Fólk"
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr "Finna persónur á þessu vefsvæði"
+
 #: lib/searchgroupnav.php:82
 msgid "Notice"
 msgstr "Babl"
 
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr "Finna innihald babls"
+
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Finna hópa á þessari síðu"
@@ -4811,33 +4547,63 @@ msgstr "Finna hópa á þessari síðu"
 msgid "Untitled section"
 msgstr "Ónafngreindur hluti"
 
-#: lib/subgroupnav.php:81
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Fólk sem %s er áskrifandi að"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:91
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Fólk sem eru áskrifendur að %s"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Hópar sem %s er meðlimur í"
 
-#: lib/subgroupnav.php:104
-#, php-format
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Bjóða vinum og vandamönnum að slást í hópinn á %s"
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
 
-#: lib/subs.php:53
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(ekkert)"
+
+#: lib/subs.php:48
+msgid "Already subscribed!"
+msgstr ""
+
+#: lib/subs.php:52
 msgid "User has blocked you."
 msgstr "Notandinn hefur lokað á þig."
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Gerast áskrifandi að þessum notanda"
+#: lib/subs.php:56
+msgid "Could not subscribe."
+msgstr "Gat ekki farið í áskrift."
+
+#: lib/subs.php:75
+msgid "Could not subscribe other to you."
+msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér."
+
+#: lib/subs.php:124
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Ekki í áskrift!"
+
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
+msgstr "Gat ekki eytt áskrift."
 
 #: lib/tagcloudsection.php:56
 msgid "None"
@@ -4847,14 +4613,104 @@ msgstr "Ekkert"
 msgid "Top posters"
 msgstr "Aðalbablararnir"
 
-#: lib/unblockform.php:120 lib/unblockform.php:150
-msgid "Unblock this user"
-msgstr "Opna á þennan notanda"
-
-#: lib/unblockform.php:150
-msgid "Unblock"
-msgstr "Opna"
-
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Hætta sem áskrifandi að þessum notanda"
+
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "Fara úr áskrift"
+
+#: lib/userprofile.php:116
+msgid "Edit Avatar"
+msgstr ""
+
+#: lib/userprofile.php:236
+msgid "User actions"
+msgstr "Notandaaðgerðir"
+
+#: lib/userprofile.php:248
+msgid "Edit profile settings"
+msgstr ""
+
+#: lib/userprofile.php:249
+msgid "Edit"
+msgstr ""
+
+#: lib/userprofile.php:272
+msgid "Send a direct message to this user"
+msgstr "Senda bein skilaboð til þessa notanda"
+
+#: lib/userprofile.php:273
+msgid "Message"
+msgstr "Skilaboð"
+
+#: lib/util.php:821
+msgid "a few seconds ago"
+msgstr "fyrir nokkrum sekúndum"
+
+#: lib/util.php:823
+msgid "about a minute ago"
+msgstr "fyrir um einni mínútu síðan"
+
+#: lib/util.php:825
+#, php-format
+msgid "about %d minutes ago"
+msgstr "fyrir um %d mínútum síðan"
+
+#: lib/util.php:827
+msgid "about an hour ago"
+msgstr "fyrir um einum klukkutíma síðan"
+
+#: lib/util.php:829
+#, php-format
+msgid "about %d hours ago"
+msgstr "fyrir um %d klukkutímum síðan"
+
+#: lib/util.php:831
+msgid "about a day ago"
+msgstr "fyrir um einum degi síðan"
+
+#: lib/util.php:833
+#, php-format
+msgid "about %d days ago"
+msgstr "fyrir um %d dögum síðan"
+
+#: lib/util.php:835
+msgid "about a month ago"
+msgstr "fyrir um einum mánuði síðan"
+
+#: lib/util.php:837
+#, php-format
+msgid "about %d months ago"
+msgstr "fyrir um %d mánuðum síðan"
+
+#: lib/util.php:839
+msgid "about a year ago"
+msgstr "fyrir um einu ári síðan"
+
+#: lib/webcolor.php:82
+#, php-format
+msgid "%s is not a valid color!"
+msgstr ""
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr "Gat ekki þáttað skilaboðin."
+
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr "Ekki skráður notandi."
+
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr "Afsakið en þetta er ekki móttökutölvupóstfangið þitt."
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr "Því miður er móttökutölvupóstur ekki leyfður."
diff --git a/locale/it/LC_MESSAGES/statusnet.mo b/locale/it/LC_MESSAGES/statusnet.mo
index 00ab59804..479d105b0 100644
--- a/locale/it/LC_MESSAGES/statusnet.mo
+++ b/locale/it/LC_MESSAGES/statusnet.mo
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 1a59adf85..231078cc7 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -1,4300 +1,3011 @@
-# Italian translation of statusnet
-# Copyright (C) 2008 THE statusnet'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the statusnet package.
-# Milo Casagrande <milo@ubuntu.com>, 2008
-#
+# Translation of StatusNet to Italian
 #
+# Author@translatewiki.net: Nemo bis
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: statusnet\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-06-04 14:09+0000\n"
-"Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
-"Language-Team: Italian <tp@lists.linux.it>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:39+0000\n"
+"Language-Team: Italian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
-
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
-#, php-format
-msgid " Search Stream for \"%s\""
-msgstr " Ricerca \"%s\" nel flusso"
-
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-#: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
-msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr ""
-" a eccezione di questi dati personali: password, indirizzo email, indirizzo "
-"messaggistica istantanea, numero di telefono."
-
-# è 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
-#: actions/twitapistatuses.php:347
-#, 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 actions/invite.php:211
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "Hai ricevuto un invito per seguire %1$s su %2$s"
-
-# resa il più 'asessuale' possibile...
-#: ../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 ""
-"Hai ricevuto un invito per seguire %1$s su %2$s (%3$s).\n"
-"\n"
-"%2$s è un servizio di micro-blog che ti consente di rimanere sempre al passo "
-"con le persone che conosci e che ti interessano.\n"
-"\n"
-"Puoi condividere notizie che ti riguardano, i tuoi pensieri o la tua vita in "
-"rete con le persone che conosci ed è anche un ottimo strumento per "
-"conoscerne di nuove 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 al seguente indirizzo:\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"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: it\n"
+"X-Message-Group: out-statusnet\n"
 
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s sta ora seguendo i tuoi messaggi su %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 sta ora seguendo i tuoi messaggi su %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Cordiali saluti,\n"
-"%4$s.\n"
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "%1$s aggiornamenti in risposta agli aggiornamenti da %2$s / %3$s"
-
-#: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr "Stato di %1$s su %2$s"
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "Nessuna tale etichetta."
 
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
-#, php-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
+msgstr "Nessun tale utente."
 
-#  Solo una prova, se non sta bene si ripristina la versione vecchia, giusto per avere l'interfaccia il più tradotta possibile
-#: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/all.php:84
 #, php-format
-msgid "%s Public Stream"
-msgstr "Attività pubblica di %s"
+msgid "%s and friends, page %d"
+msgstr "%s e amici, pagina %d"
 
-#: ../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
-#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amici"
 
-#  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
-#: actions/twitapistatuses.php:33
-#, php-format
-msgid "%s public timeline"
-msgstr "attività pubblica di %s"
+#: actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Feed per gli amici di %s"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
-#, php-format
-msgid "%s status"
-msgstr "stato di %s"
+#: actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Feed per gli amici 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
-#: actions/twitapistatuses.php:199
-#, php-format
-msgid "%s timeline"
-msgstr "Attività di %s"
+#: actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Feed per gli amici di %s"
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/all.php:127
 #, 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.)"
+"This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
-"(Dovresti ricevere, entro breve, un messaggio email con istruzioni su come "
-"confermare il tuo indirizzo email.)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: actions/all.php:132
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
 msgstr ""
-"**%%site.name%%** è un servizio di micro-blog offerto da "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: actions/all.php:134
 #, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** è un servizio di micro-blog. "
-
-#: ../lib/util.php:274 lib/util.php:290
-msgid ". Contributors should be attributed by full name or nickname."
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
-". I collaboratori devono essere indicati col loro nome completo o soprannome."
 
-#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
-#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
 msgstr ""
-"1-64 lettere minuscole o numeri, senza spazi o simboli di punteggiatura"
 
-#: ../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."
+#: actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s e amici"
 
-#: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr "6 o più caratteri"
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr "Aggiornamenti da %1$s e amici su %2$s!"
 
-#  messa al femminile... dovrebbe essere la password
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
-msgid "6 or more characters, and don't forget it!"
-msgstr "6 o più caratteri, e non dimenticarla!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
+msgstr "Metodo delle API non trovato!"
 
-#  Femminile, è la password
-#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
-msgid "6 or more characters. Required."
-msgstr "6 o più caratteri. Richiesta."
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
+msgstr "Questo metodo richiede POST."
 
-#: ../actions/imsettings.php:197 actions/imsettings.php:205
-#, php-format
+#: actions/apiaccountupdatedeliverydevice.php:105
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
 msgstr ""
-"Un codice di conferma è stato inviato all'indirizzo di messaggistica "
-"istantanea che hai aggiunto. Devi approvare %s affinché ti invii messaggi."
 
-#: ../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 email che hai aggiunto. "
-"Controlla la tua casella di posta (e anche la posta indesiderata!) per il "
-"codice e le istruzioni su come usarlo."
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Impossibile aggiornare l'utente."
 
-#: ../actions/smssettings.php:216 actions/smssettings.php:224
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
+#, php-format
 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."
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
 msgstr ""
-"Un codice di conferma è stato inviato al numero di telefono che hai "
-"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 actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
-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 actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
-msgid "API method under construction."
-msgstr "Metodo delle API in lavorazione."
-
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
-msgid "About"
-msgstr "Informazioni"
-
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
-msgid "Accept"
-msgstr "Accetta"
-
-#: ../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 actions/emailsettings.php:120
-#: actions/imsettings.php:127 actions/openidsettings.php:111
-#: actions/smssettings.php:133 actions/twittersettings.php:163
-msgid "Add"
-msgstr "Aggiungi"
-
-#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
-msgstr "Aggiungi OpenID"
-
-#  we don't use 's' in plurals even from english words.
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-msgid "Add or remove OpenIDs"
-msgstr "Aggiungi o rimuovi 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
-#: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
-msgstr "Indirizzo"
-
-#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-msgid "Addresses of friends to invite (one per line)"
-msgstr "Indirizzi email di amici da invitare (uno per riga)"
-
-#: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
-msgid "All subscriptions"
-msgstr "Tutti gli abbonamenti"
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "Impossibile salvare le tue impostazioni di Twitter!"
 
-#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
-#, php-format
-msgid "All updates for %s"
-msgstr "Tutti gli aggiornamenti di %s"
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Impossibile aggiornare l'utente."
 
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
-#, php-format
-msgid "All updates matching search term \"%s\""
-msgstr "Tutti gli aggiornamenti corrispondenti al termine di ricerca \"%s\""
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "L'utente non ha un profilo."
 
-#: ../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
-#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
-msgid "Already logged in."
-msgstr "Accesso già effettuato."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Impossibile salvare il profilo."
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
-msgid "Already subscribed!."
-msgstr "Già abbonato!"
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
+msgstr "Blocco dell'utente non riuscito."
 
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
-msgid "Are you sure you want to delete this notice?"
-msgstr "Sei sicuro di voler eliminare questo messaggio?"
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
+msgstr "Sblocco dell'utente non riuscito."
 
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
-msgid "Authorize subscription"
-msgstr "Autorizza abbonamento"
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "Nessun testo nel messaggio!"
 
-#: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
-msgid "Automatically login in the future; not for shared computers!"
-msgstr "Accedi automaticamente in futuro; non per computer condivisi!"
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Troppo lungo. Il massimo per un messaggio è 140 caratteri."
 
-#: ../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/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "Utente destinatario non trovato."
 
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34 actions/avatarsettings.php:65
-#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
-msgid "Avatar"
-msgstr "Immagine"
+#: actions/apidirectmessagenew.php:150
+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/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
-msgid "Avatar updated."
-msgstr "Immagine aggiornata."
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "Messaggi diretti a %s"
 
-#: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/apidirectmessage.php:93
 #, 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 ""
-"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?)."
-
-#: ../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
-#: actions/smssettings.php:111
-msgid "Awaiting confirmation on this phone number."
-msgstr "Attesa la conferma per questo numero di telefono."
-
-#: ../lib/util.php:1318 lib/util.php:1452
-msgid "Before »"
-msgstr "Precedenti »"
-
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
-#: actions/profilesettings.php:82 actions/register.php:184
-#: actions/profilesettings.php:112 actions/register.php:402
-msgid "Bio"
-msgstr "Biografia"
-
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
-#: actions/register.php:89 actions/updateprofile.php:104
-#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
-msgid "Bio is too long (max 140 chars)."
-msgstr "La biografia è troppo lunga (max 140 caratteri)."
+msgid "All the direct messages sent from %s"
+msgstr "Tutti i messaggi diretti inviati da %s"
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
-msgid "Can't delete this notice."
-msgstr "Impossibile eliminare questo messaggio."
+#: actions/apidirectmessage.php:101
+#, php-format
+msgid "Direct messages to %s"
+msgstr "Messaggi diretti a %s"
 
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/apidirectmessage.php:105
 #, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr "Impossibile leggere l'URL \"%s\" dell'immagine"
+msgid "All the direct messages sent to %s"
+msgstr "Tutti i messaggi diretti inviati a %s"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404 actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-msgid "Can't save new password."
-msgstr "Impossibile salvare la nuova password."
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "Metodo delle API non trovato!"
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62 actions/emailsettings.php:58
-#: actions/imsettings.php:59 actions/smssettings.php:62
-#: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
-msgstr "Annulla"
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
+msgstr "Nessuno stato trovato con quel ID."
 
-#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Impossibile creare l'oggetto OpenID consumer."
+#: actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+msgstr "Questo messaggio è già un preferito!"
 
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
-msgstr "Impossibile normalizzare quell'ID Jabber"
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+msgstr "Impossibile creare preferito."
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
-msgid "Cannot normalize that email address"
-msgstr "Impossibile normalizzare l'indirizzo email"
+#: actions/apifavoritedestroy.php:122
+#, fuzzy
+msgid "That status is not a favorite!"
+msgstr "Questo messaggio non è un preferito!"
 
-#: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
-msgstr "Modifica"
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr "Impossibile eliminare un preferito."
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
-msgstr "Modifica la gestione dell'email"
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
+msgstr "Impossibile seguire l'utente: utente non trovato."
 
-#: ../actions/password.php:32 actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr "Modifica password"
+#: actions/apifriendshipscreate.php:118
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr "Impossibile seguire l'utente: %s è già nel tuo elenco."
 
-#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
-msgid "Change your password"
-msgstr "Modifica la tua password"
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "Impossibile seguire l'utente: utente non trovato."
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-msgid "Change your profile settings"
-msgstr "Modifica le impostazioni del tuo profilo"
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+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
-#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
-#: actions/register.php:376 actions/smssettings.php:122
-msgid "Confirm"
-msgstr "Conferma"
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
+msgstr "Devono essere forniti due ID utente o nominativi."
 
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "Conferma indirizzo"
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Impossibile recuperare l'attività pubblica."
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245 actions/emailsettings.php:256
-#: actions/imsettings.php:230 actions/smssettings.php:253
-#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
-msgid "Confirmation cancelled."
-msgstr "Conferma annullata."
+#: actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Impossibile trovare un qualsiasi stato."
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
-msgid "Confirmation code"
-msgstr "Codice di conferma"
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
+msgid "Could not create group."
+msgstr "Impossibile creare il gruppo."
 
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-msgid "Confirmation code not found."
-msgstr "Codice di conferma non trovato."
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Impossibile creare preferito."
 
-#: ../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."
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+msgid "Could not set group membership."
+msgstr "Impossibile impostare la membership al gruppo."
+
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
 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."
+"Il soprannome deve essere composto solo da lettere minuscole e numeri, senza "
+"spazi."
 
-#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
-msgid "Connect"
-msgstr "Connetti"
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr "Soprannome già in uso. Prova con un altro."
 
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
-msgid "Connect existing account"
-msgstr "Collega a un account esistente"
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "Non è un soprannome valido."
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
-msgid "Contact"
-msgstr "Contatti"
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "L'URL della pagina web non è valido."
 
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
-#, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "Impossibile creare il modulo OpenID: %s"
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "Nome troppo lungo (max 255 caratteri)"
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr "Impossibile seguire l'utente: %s è già nel tuo elenco."
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "La descrizione è troppo lunga (max 140 caratteri)."
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
-msgid "Could not follow user: User not found."
-msgstr "Impossibile seguire l'utente: utente non trovato."
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "Ubicazione troppo lunga (max 255 caratteri)."
 
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
 #, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Impossibile redirigere al server: %s"
-
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
-msgid "Could not save avatar info"
-msgstr "Impossibile salvare le informazioni dell'immagine"
-
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
-msgid "Could not save new profile info"
-msgstr "Impossibile salvare le nuove informazioni del profilo"
-
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
-msgid "Could not subscribe other to you."
-msgstr "Impossibile abbonare altri a te."
+msgid "Too many aliases! Maximum %d."
+msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
-msgid "Could not subscribe."
-msgstr "Impossibile abbonarsi."
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Etichetta non valida: \"%s\""
 
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
-msgstr "Impossibile aggiornare l'utente con l'indirizzo email confermato."
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Soprannome già in uso. Prova con un altro."
 
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-msgid "Couldn't convert request tokens to access tokens."
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
 msgstr ""
-"Impossibile convertire le credenziali di richiesta in credenziali di accesso."
-
-#: ../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
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-msgid "Couldn't delete email confirmation."
-msgstr "Impossibile eliminare l'email di conferma."
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
-msgid "Couldn't delete subscription."
-msgstr "Impossibile eliminare l'abbonamento."
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Sei già un membro di quel gruppo"
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
-msgid "Couldn't find any statuses."
-msgstr "Impossibile trovare un qualsiasi stato."
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
 
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-msgid "Couldn't get a request token."
-msgstr "Impossibile ottenere un token di richiesta."
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Impossibile iscrivere l'utente %s al gruppo %s"
 
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206 actions/emailsettings.php:223
-#: actions/imsettings.php:195 actions/smssettings.php:214
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
-msgid "Couldn't insert confirmation code."
-msgstr "Impossibile inserire il codice di conferma."
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Non sei un membro di quel gruppo."
 
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
-msgstr "Impossibile inserire un nuovo abbonamento."
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Impossibile rimuovere l'utente %s dal gruppo %s"
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-msgid "Couldn't save profile."
-msgstr "Impossibile salvare il profilo."
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "Gruppi di %s"
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
-msgstr "Impossibile aggiornare l'utente per auto-abbonarsi."
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Azioni dei gruppi"
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
-msgid "Couldn't update user record."
-msgstr "Impossibile aggiornare il record dell'utente."
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "Gruppi di %s"
 
-#: ../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
-#: actions/confirmaddress.php:114 actions/emailsettings.php:280
-#: actions/emailsettings.php:411 actions/imsettings.php:252
-#: actions/imsettings.php:395 actions/othersettings.php:162
-#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
-msgid "Couldn't update user."
-msgstr "Impossibile aggiornare l'utente."
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Il gruppo %s è membro di"
 
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
-msgid "Create"
-msgstr "Crea"
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
+msgstr "Questo metodo richiede POST o DELETE."
 
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
-msgid "Create a new user with this nickname."
-msgstr "Crea un nuovo utente con questo soprannome."
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
+msgstr "Non puoi eliminare lo stato di un altro utente."
 
-#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
-msgid "Create new account"
-msgstr "Crea un nuovo account"
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "Immagine aggiornata."
 
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
-msgid "Creating new account for OpenID that already has a user."
-msgstr "Creazione nuovo account per OpenID che ha già un utente."
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
+msgstr "Nessuno stato con quel ID trovato."
 
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "Indirizzo Jabber/GTalk attualmente confermato."
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "Troppo lungo. Lunghezza massima 140 caratteri."
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "Numero di telefono attualmente confermato per gli SMS."
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
+msgstr "Non trovato"
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-msgid "Current confirmed email address."
-msgstr "Indirizzo email attualmente confermato."
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
 
-# aggiunti i due punti, dopo questa stringa c'è lo stato attuale di un utente nella pagina del suo profilo
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
-msgstr "In questo momento:"
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Formato file immagine non supportato."
 
-#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: actions/apitimelinefavorites.php:107
 #, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "Errore del DB nell'inserire un hashtag: %s"
+msgid "%s / Favorites from %s"
+msgstr "%s / Preferiti da %s"
 
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: actions/apitimelinefavorites.php:119
 #, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Errore del DB nell'inserire la risposta: %s"
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
-msgid "Delete notice"
-msgstr "Elimina messaggio"
+msgid "%s updates favorited by %s / %s."
+msgstr "%s aggiornamenti preferiti da %s / %s"
 
-# per renderla 'asessuale' il più possibile...
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "Descriviti assieme ai tuoi interessi in 140 caratteri"
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
+#, php-format
+msgid "%s timeline"
+msgstr "Attività di %s"
 
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87 actions/register.php:172
-#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
-#: actions/register.php:385 lib/accountsettingsaction.php:113
-msgid "Email"
-msgstr "Email"
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "Aggiornamenti da %1$s su %2$s!"
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-msgid "Email Address"
-msgstr "Indirizzo email"
+#: actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Aggiornamenti in risposta a %2$s"
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
-msgstr "Impostazioni email"
+#: actions/apitimelinementions.php:126
+#, 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/register.php:73 actions/register.php:80 actions/register.php:163
-msgid "Email address already exists."
-msgstr "Indirizzo email già esistente."
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#, php-format
+msgid "%s public timeline"
+msgstr "attività pubblica di %s"
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
-msgid "Email address confirmation"
-msgstr "Conferma indirizzo email"
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#, php-format
+msgid "%s updates from everyone!"
+msgstr "Aggiornamenti di %s da tutti!"
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
-msgstr "Indirizzo email, del tipo \"NomeUtente@example.org\""
+#: actions/apitimelinetag.php:101 actions/tag.php:66
+#, php-format
+msgid "Notices tagged with %s"
+msgstr "Messaggi etichettati con %s"
 
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-msgid "Email addresses"
-msgstr "Indirizzi email"
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Aggiornamenti da %1$s su %2$s!"
 
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
-msgid "Enter a nickname or email address."
-msgstr "Inserisci un soprannome o un indirizzo email."
+#: actions/apiusershow.php:96
+msgid "Not found."
+msgstr "Non trovato"
 
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
-msgstr "Inserisci il codice che hai ricevuto sul tuo telefono."
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "Nessun tale documento."
 
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
-msgid "Error authorizing token"
-msgstr "Errore nell'autorizzare il token"
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+msgstr "Nessun soprannome."
 
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
-msgid "Error connecting user to OpenID."
-msgstr "Errore nel collegare l'utente a OpenID."
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "Nessuna dimensione."
 
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
-msgstr "Errore nel connettere l'utente."
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "Dimensione non valida."
 
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
-msgstr "Errore nell'inserire l'immagine"
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "Immagine"
 
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
-msgstr "Errore nell'inserire il nuovo profilo"
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "Qui puoi caricare la tua immagine personale."
 
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
-msgstr "Errore nell'inserire un profilo remoto"
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
+msgstr "Utente senza profilo corrispondente"
 
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
-msgid "Error saving address confirmation."
-msgstr "Errore nel salvare la conferma dell'indirizzo."
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+msgid "Avatar settings"
+msgstr "Impostazioni immagine"
 
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
-msgid "Error saving remote profile"
-msgstr "Errore nel salvare il profilo remoto"
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr "Originale"
 
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-msgid "Error saving the profile."
-msgstr "Errore nel salvare il profilo."
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr "Anteprima"
 
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-msgid "Error saving the user."
-msgstr "Errore nel salvare l'utente."
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+msgid "Delete"
+msgstr "Elimina"
 
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
-msgid "Error saving user; invalid."
-msgstr "Errore nel salvare l'utente; non valido."
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+msgstr "Carica"
 
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
-#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
-#: actions/register.php:108 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-msgid "Error setting user."
-msgstr "Errore nell'impostare l'utente."
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
+msgstr "Ritaglia"
 
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr "Errore nell'aggiornare il profilo"
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+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/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
-msgstr "Errore nell'aggiornare il profilo remoto"
+#: actions/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Invio del modulo inaspettato."
 
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr "Errore con il codice di conferma."
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
+msgstr "Scegli un'area quadrata per la tua immagine personale"
 
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
-msgid "Existing nickname"
-msgstr "Soprannome esistente"
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
+msgstr "Perso il nostro file di dati."
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
-msgid "FAQ"
-msgstr "FAQ"
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+msgstr "Immagine aggiornata."
 
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Errore nell'aggiornare l'immagine."
 
-#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
-#, php-format
-msgid "Feed for friends of %s"
-msgstr "Feed per gli amici di %s"
-
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
-#, php-format
-msgid "Feed for replies to %s"
-msgstr "Feed per le risposte a %s"
-
-#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
-#, php-format
-msgid "Feed for tag %s"
-msgstr "Feed per l'etichetta %s"
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
-msgstr "Ricerca contenuto dei messaggi"
+#: actions/avatarsettings.php:387
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Immagine aggiornata."
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
-msgstr "Ricerca persone in questo sito"
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+msgid "No nickname"
+msgstr "Nessun soprannome"
 
-#: ../actions/login.php:122
-msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
-msgstr ""
-"Per motivi di sicurezza è necessario reinserire il proprio nome utente e la "
-"propria password prima di modificare le impostazioni."
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
+msgstr "Nessun tale gruppo"
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
-#: actions/profilesettings.php:77 actions/register.php:178
-#: actions/profilesettings.php:103 actions/register.php:391
-#: actions/showgroup.php:235 actions/showstream.php:262
-#: actions/tagother.php:105 lib/groupeditform.php:142
-msgid "Full name"
-msgstr "Nome"
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "Profilo utente"
 
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
-#: actions/register.php:86 actions/updateprofile.php:94
-#: actions/editgroup.php:195 actions/newgroup.php:146
-#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
-msgid "Full name is too long (max 255 chars)."
-msgstr "Nome troppo lungo (max 255 caratteri)"
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s e amici, pagina %d"
 
-#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
-msgid "Help"
-msgstr "Aiuto"
+#: actions/blockedfromgroup.php:108
+#, fuzzy
+msgid "A list of the users blocked from joining this group."
+msgstr "Un elenco degli utenti in questo gruppo."
 
-#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
-msgid "Home"
-msgstr "Home"
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Sblocco dell'utente non riuscito."
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
-msgid "Homepage"
-msgstr "Pagina web"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
+msgstr "Sblocca"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
-msgid "Homepage is not a valid URL."
-msgstr "L'URL della pagina web non è valido."
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+msgid "Unblock this user"
+msgstr "Sblocca questo utente"
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
-msgid "I want to post notices by email."
-msgstr "Voglio inviare i messaggi via email"
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Non connesso."
 
-#  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
-#: lib/connectsettingsaction.php:104
-msgid "IM"
-msgstr "MI"
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
+msgstr "Nessun profilo specificato."
 
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
-msgstr "Indirizzo di messaggistica istantanea"
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
+msgstr "Nessun profilo con quel ID."
 
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
-msgstr "Impostazioni messaggistica istantanea"
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Blocca utente"
 
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/block.php:136
 msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
 msgstr ""
-"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
-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 riquadro "
-"sottostante e fai clic su \"Aggiungi\"."
+#: actions/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
+msgid "No"
+msgstr "No"
 
-#: ../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/block.php:149
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Sblocca questo utente"
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-#: actions/emailsettings.php:127 actions/smssettings.php:140
-msgid "Incoming email"
-msgstr "Email di ricezione"
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
+msgstr "Sì"
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
-msgid "Incoming email address removed."
-msgstr "Indirizzo email di ricezione rimosso."
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+msgid "Block this user"
+msgstr "Blocca questo utente"
 
-#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
-msgid "Incorrect old password"
-msgstr "Vecchia password non corretta"
+#: actions/block.php:165
+msgid "You have already blocked this user."
+msgstr "Hai già bloccato questo utente."
 
-#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
-msgid "Incorrect username or password."
-msgstr "Nome utente o password non corretto."
+#: actions/block.php:170
+msgid "Failed to save block information."
+msgstr "Salvataggio delle informazioni per il blocco non riuscito."
 
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
-msgstr ""
-"Le istruzioni per recuperare la tua password sono state inviate "
-"all'indirizzo email registrato nel tuo account."
+#: actions/bookmarklet.php:50
+#, fuzzy
+msgid "Post to "
+msgstr "Fotografia"
 
-#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "URL \"%s\" dell'immagine non valido"
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+msgstr "Nessun codice di conferma."
 
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
-#, php-format
-msgid "Invalid email address: %s"
-msgstr "Indirizzo email non valido: %s"
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "Codice di conferma non trovato."
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
-#, php-format
-msgid "Invalid homepage '%s'"
-msgstr "Pagina web \"%s\" non valida"
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "Quel codice di conferma non è per te!"
 
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/confirmaddress.php:90
 #, php-format
-msgid "Invalid license URL '%s'"
-msgstr "URL \"%s\" della licenza non valido"
-
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
-msgstr "Contenuto del messaggio non valido"
-
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
-msgstr "URI del messaggio non valido"
-
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
-msgstr "URL del messaggio non valido"
+msgid "Unrecognized address type %s"
+msgstr "Tipo di indirizzo non riconosciuto %s"
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "URL \"%s\" del profilo non valido"
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr "Quell'indirizzo è già stato confermato."
 
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
-msgstr "URL del profilo non valido (formato errato)"
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "Impossibile aggiornare l'utente."
 
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
-msgstr "URL del profilo restituito dal server non valido."
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr "Impossibile eliminare l'email di conferma."
 
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
-#: actions/avatarbynickname.php:69
-msgid "Invalid size."
-msgstr "Dimensione non valida."
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "Conferma indirizzo"
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111 actions/finishopenidlogin.php:241
-#: actions/register.php:103 actions/register.php:121
-#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
-msgid "Invalid username or password."
-msgstr "Nome utente o password non valido."
+#: actions/confirmaddress.php:159
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "L'indirizzo \"%s\" è stato confermato per il tuo account."
 
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-msgid "Invitation(s) sent"
-msgstr "Inviti inviati"
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Codice di conferma"
 
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-msgid "Invitation(s) sent to the following people:"
-msgstr "Inviti inviati alle seguenti persone:"
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
+msgstr "Messaggi"
 
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
-msgid "Invite"
-msgstr "Invita"
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
+msgstr "Nessun tale messaggio."
 
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-msgid "Invite new users"
-msgstr "Invita nuovi utenti"
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "Impossibile eliminare questo messaggio."
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
-#, php-format
+#: actions/deletenotice.php:103
+#, fuzzy
 msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
 msgstr ""
-"Gestito dal software di micro-blog [StatusNet](http://status.net/), versione "
-"%s, disponibile sotto licenza [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"Stai per eliminare definitivamente un messaggio. Una volta fatto non sarà "
+"possibile recuperarlo."
 
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
-msgstr "ID Jabber già assegnato a un altro utente."
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr "Elimina messaggio"
 
-#: ../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 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/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr "Sei sicuro di voler eliminare questo messaggio?"
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
-msgid "Language"
-msgstr "Lingua"
+#: actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "Impossibile eliminare questo messaggio."
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
-msgid "Language is too long (max 50 chars)."
-msgstr "La lingua è troppo lunga (max 50 caratteri)."
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+msgid "Delete this notice"
+msgstr "Elimina questo messaggio"
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
-msgid "Location"
-msgstr "Ubicazione"
+#: actions/deletenotice.php:157
+#, fuzzy
+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/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
-#: actions/register.php:92 actions/updateprofile.php:109
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
-msgid "Location is too long (max 255 chars)."
-msgstr "Ubicazione troppo lunga (max 255 caratteri)."
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr "Questo messaggio non è un preferito!"
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
-#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
-#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
-#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
-#, php-format
-msgid "Login"
-msgstr "Accedi"
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "Aggiungi ai preferiti"
 
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Accedi con un account [OpenID](%%doc.openid%%)."
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "Nessun tale documento."
 
-#: ../actions/login.php:126
+#: actions/editgroup.php:56
 #, 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 ""
-"Accedi con nome utente e password. Non hai ancora un nome utente? [Registra]"
-"(%%action.register%%) un nuovo account o prova [OpenID](%%action.openidlogin%"
-"%). "
+msgid "Edit %s group"
+msgstr "Modifica il gruppo %s"
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
-msgid "Logout"
-msgstr "Esci"
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
+msgstr "Devi eseguire l'accesso per creare un gruppo."
 
-#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
-msgid "Longer name, preferably your \"real\" name"
-msgstr "Nome completo, preferibilmente il tuo \"vero\" nome"
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+msgid "You must be an admin to edit the group"
+msgstr "Devi essere amministratore per modificare il gruppo"
 
-#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
-msgid "Lost or forgotten password?"
-msgstr "Password persa o dimenticata?"
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
+msgstr "Usa questo modulo per modificare il gruppo."
 
-#: ../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/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "La descrizione è troppo lunga (max 140 caratteri)."
+
+#: actions/editgroup.php:253
+msgid "Could not update group."
+msgstr "Impossibile aggiornare il gruppo."
+
+#: actions/editgroup.php:269
+msgid "Options saved."
+msgstr "Opzioni salvate."
+
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "Impostazioni email"
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
 #: actions/emailsettings.php:71
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Gestisci la ricezione delle email da %%site.name%%."
 
-#: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
-msgid "Member since"
-msgstr "Membro dal"
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "Indirizzo"
 
-#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
-#, php-format
-msgid "Microblog by %s"
-msgstr "Micro-blog di %s"
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr "Indirizzo email attualmente confermato."
 
-#: ../actions/smssettings.php:304
-#, php-format
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "Rimuovi"
+
+#: actions/emailsettings.php:113
 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."
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
 msgstr ""
-"Operatore di telefonia mobile. Se conosci un operatore che accetta gli SMS "
-"via email, ma non è elencato qui, scrivici a %s."
+"Attesa la conferma per questo indirizzo. Controlla la tua casella di posta "
+"(e anche la posta indesiderata!) per un messaggio con ulteriori istruzioni."
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-msgid "My text and files are available under "
-msgstr "I miei testi e file sono disponibili sotto "
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "Annulla"
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#: actions/emailsettings.php:142 actions/smssettings.php:152
-msgid "New"
-msgstr "Nuovo"
+#: actions/emailsettings.php:121
+msgid "Email Address"
+msgstr "Indirizzo email"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
-#, php-format
-msgid "New email address for posting to %s"
-msgstr "Nuovo indirizzo email per inviare messaggi a %s"
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr "Indirizzo email, del tipo \"NomeUtente@example.org\""
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
-msgid "New incoming email address added."
-msgstr "Nuovo indirizzo email di ricezione aggiunto."
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "Aggiungi"
 
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
-msgid "New nickname"
-msgstr "Nuovo soprannome"
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+msgstr "Email di ricezione"
 
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
-msgstr "Nuovo messaggio"
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
+msgstr "Invia le email a questo indirizzo per scrivere nuovi messaggi."
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-msgid "New password"
-msgstr "Nuova password"
+#: actions/emailsettings.php:145 actions/smssettings.php:162
+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/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
-msgstr "Nuova password salvata con successo. Hai effettuato l'accesso."
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
+msgstr "Nuovo"
 
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151 actions/login.php:101
-#: actions/profilesettings.php:74 actions/register.php:165
-#: actions/login.php:228 actions/profilesettings.php:98
-#: actions/register.php:367 actions/showgroup.php:224
-#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
-msgid "Nickname"
-msgstr "Soprannome"
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
+msgstr "Preferenze"
 
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69 actions/finishopenidlogin.php:181
-#: actions/profilesettings.php:225 actions/register.php:76
-#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
-msgid "Nickname already in use. Try another one."
-msgstr "Soprannome già in uso. Prova con un altro."
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
+msgstr "Inviami avvisi di nuovi abbonamenti via email"
 
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:67 ../actions/updateprofile.php:77
-#: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
-#: actions/register.php:74 actions/updateprofile.php:78
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
-"Il soprannome deve essere composto solo da lettere minuscole e numeri, senza "
-"spazi."
-
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
-msgid "Nickname not allowed."
-msgstr "Soprannome non consentito."
-
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
-msgstr "Soprannome dell'utente che vuoi seguire"
-
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
-msgid "Nickname or email"
-msgstr "Soprannome o email"
+"Inviami un'email quando qualcuno aggiunge un mio messaggio ai preferiti"
 
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
-msgid "No"
-msgstr "No"
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
+msgstr "Inviami un'email quando qualcuno mi invia un messaggio privato"
 
-#: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
-msgstr "Nessun ID di Jabber."
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "Inviami un'email quando qualcuno mi invia un messaggio privato"
 
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
-msgid "No authorization request!"
-msgstr "Nessuna richiesta di autorizzazione!"
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
+msgstr "Consenti ai miei amici di richiamarmi e inviami un'email"
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
-msgid "No carrier selected."
-msgstr "Nessun operatore selezionato."
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
+msgstr "Voglio inviare i messaggi via email"
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
-msgstr "Nessun codice inserito"
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
+msgstr "Pubblica un MicroID per il mio indirizzo email"
 
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
-#: actions/confirmaddress.php:75
-msgid "No confirmation code."
-msgstr "Nessun codice di conferma."
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Salva"
 
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
-#: actions/newnotice.php:126 classes/Command.php:223
-msgid "No content!"
-msgstr "Nessun contenuto!"
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+msgstr "Preferenze salvate."
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr "Nessun indirizzo email."
 
-#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
-msgid "No id."
-msgstr "Nessun ID."
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
-msgid "No incoming email address."
-msgstr "Nessun indirizzo email di ricezione."
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
+msgstr "Impossibile normalizzare l'indirizzo email"
 
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr "Nessun soprannome fornito dal server remoto."
+#: actions/emailsettings.php:330
+msgid "Not a valid email address"
+msgstr "Non è un indirizzo email valido"
 
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
-msgid "No nickname."
-msgstr "Nessun soprannome."
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
+msgstr "Quello è già il tuo indirizzo email."
 
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229 actions/emailsettings.php:240
-#: actions/imsettings.php:214 actions/smssettings.php:237
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
-msgid "No pending confirmation to cancel."
-msgstr "Nessuna conferma da annullare."
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another user."
+msgstr "Quell'indirizzo email appartiene già a un altro utente."
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
-msgstr "Nessun numero di telefono."
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+msgstr "Impossibile inserire il codice di conferma."
 
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
-msgstr "Nessun URL di profilo restituito dal server."
+#: actions/emailsettings.php:358
+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 email che hai aggiunto. "
+"Controlla la tua casella di posta (e anche la posta indesiderata!) per il "
+"codice e le istruzioni su come usarlo."
 
-#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
-msgid "No registered email address for that user."
-msgstr "Nessun indirizzo email registrato per quell'utente."
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
+msgstr "Nessuna conferma da annullare."
 
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr "Nessuna richiesta trovata!"
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "Quello è l'indirizzo di messaggistica sbagliato."
 
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
-msgid "No results"
-msgstr "Nessun risultato"
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "Conferma annullata."
 
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
-msgstr "Nessuna dimensione."
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
+msgstr "Quello non è il tuo indirizzo email."
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
-msgid "No status found with that ID."
-msgstr "Nessuno stato trovato con quel ID."
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "L'indirizzo è stato rimosso."
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
-msgid "No status with that ID found."
-msgstr "Nessuno stato con quel ID trovato."
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
+msgstr "Nessun indirizzo email di ricezione."
 
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
-msgstr "Nessun tale OpenID."
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
+msgstr "Impossibile aggiornare il record dell'utente."
 
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
-msgid "No such document."
-msgstr "Nessun tale documento."
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
+msgstr "Indirizzo email di ricezione rimosso."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30 actions/shownotice.php:32
-#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
-msgid "No such notice."
-msgstr "Nessun tale messaggio."
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
+msgstr "Nuovo indirizzo email di ricezione aggiunto."
 
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr "Nessun codice di ripristino."
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+msgid "Popular notices"
+msgstr "Messaggi famosi"
 
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-msgid "No such subscription"
-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/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 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
-msgid "No such user."
-msgstr "Nessun tale utente."
+#: actions/favorited.php:67
+#, php-format
+msgid "Popular notices, page %d"
+msgstr "Messaggi famosi, pagina %d"
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-msgid "No user with that email address or username."
-msgstr "Nessun utente con quell'email o nome utente."
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
+msgstr "Ecco i messaggi più famosi all'interno del sito."
 
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
-msgstr "Nessuno da mostrare!"
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
 
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr "Non è un codice di ripristino."
+#: actions/favorited.php:153
+msgid ""
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
+msgstr ""
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
-msgstr "Non è un utente registrato."
+#: actions/favorited.php:156
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
+msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
-msgid "Not a supported data format."
-msgstr "Non è un formato di dati supportato."
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
+msgstr "Messaggi preferiti di %s"
 
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
-msgstr "Non è un ID Jabber valido"
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Aggiornamenti da %1$s su %2$s!"
 
-#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-msgid "Not a valid OpenID."
-msgstr "Non è un OpenID valido."
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Questo messaggio è già un preferito!"
 
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
-msgid "Not a valid email address"
-msgstr "Non è un indirizzo email valido"
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Rimuovi preferito"
 
-#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-msgid "Not a valid email address."
-msgstr "Non è un indirizzo email valido."
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr "Utenti in evidenza"
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-#: actions/editgroup.php:186 actions/newgroup.php:137
-#: actions/profilesettings.php:195 actions/register.php:161
-msgid "Not a valid nickname."
-msgstr "Non è un soprannome valido."
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr "Utenti in evidenza, pagina %d"
 
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
-msgstr "Non è un URL di profilo valido (servizio incorretto)."
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
+msgstr "Una selezione dei migliori utenti su %s"
 
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr "Non è un URL di profilo valido (nessun XRDS definito)."
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "Nuovo messaggio"
 
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr "Non è un URL di profilo valido (nessun documento YADIS)."
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Nuovo messaggio"
 
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
-msgid "Not an image or corrupt file."
-msgstr "Non è un'immagine o il file è danneggiato."
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
-msgid "Not authorized."
-msgstr "Non autorizzato."
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Non aspettavo questa risposta!"
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
-msgid "Not found"
-msgstr "Non trovato"
-
-#: ../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 actions/block.php:59 actions/disfavor.php:61
-#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
-#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
-#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
-#: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Non connesso."
-
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
-msgid "Not subscribed!."
-msgstr "Non abbonato!"
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
-msgstr "Ricerca messaggi"
-
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
-#, php-format
-msgid "Notice feed for %s"
-msgstr "Feed dei messaggi per %s"
-
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
-msgstr "Il messaggio non ha un profilo"
-
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
-msgid "Notices"
-msgstr "Messaggi"
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
-#, php-format
-msgid "Notices tagged with %s"
-msgstr "Messaggi etichettati con %s"
-
-#: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
-msgstr "Vecchia password"
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "L'utente che intendi seguire non esiste."
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
-msgid "OpenID"
-msgstr "OpenID"
-
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
-msgid "OpenID Account Setup"
-msgstr "Configurazione account OpenID"
-
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-msgid "OpenID Auto-Submit"
-msgstr "Auto-invio OpenID"
-
-#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
-#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-msgid "OpenID Login"
-msgstr "Accesso OpenID"
-
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-#: actions/openidlogin.php:102 actions/openidsettings.php:101
-msgid "OpenID URL"
-msgstr "URL OpenID"
-
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
-msgid "OpenID authentication cancelled."
-msgstr "Autenticazione OpenID annullata."
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr "Autenticazione OpenID non riuscita: %s"
-
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "Errore OpenID: %s"
-
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr "OpenID rimosso."
-
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
-msgstr "Impostazioni OpenID"
-
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-msgid "Optionally add a personal message to the invitation."
-msgstr "Puoi aggiungere un messaggio personale agli inviti."
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+msgstr "Puoi usare l'abbonamento locale!"
 
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
-msgid "Partial upload."
-msgstr "Caricamento parziale."
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
+msgstr "Quell'utente ti ha bloccato dall'abbonarti."
 
-#: ../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 actions/finishopenidlogin.php:118
-#: actions/login.php:231 actions/register.php:372
-#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-msgid "Password"
-msgstr "Password"
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "Non autorizzato."
 
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
-msgid "Password and confirmation do not match."
-msgstr "La password e la conferma non corrispondono."
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr ""
+"Impossibile convertire le credenziali di richiesta in credenziali di accesso."
 
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
-msgid "Password must be 6 chars or more."
-msgstr "La password dev'essere lunga almeno 6 caratteri."
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Versione del protocollo OMB sconosciuta."
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-msgid "Password recovery requested"
-msgstr "Richiesta password di ripristino"
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "Errore nell'aggiornare il profilo remoto"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-msgid "Password saved."
-msgstr "Password salvata."
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+msgid "No such group."
+msgstr "Nessuna tale gruppo."
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-msgid "Passwords don't match."
-msgstr "Le password non corrispondono."
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "Nessun tale messaggio."
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
-msgstr "Persone"
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Perso il nostro file."
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
-msgstr "Ricerca persone"
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "Nessun profilo specificato."
 
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
-msgstr "Ricerca persone"
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
 
-#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
-msgid "Personal"
-msgstr "Personale"
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "L'utente ti ha bloccato."
 
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-msgid "Personal message"
-msgstr "Messaggio personale"
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "Non sei un membro di quel gruppo."
 
-#: ../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/groupblock.php:136 actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "Blocca utente"
 
-#: ../actions/userauthorization.php:78
+#: actions/groupblock.php:162
+#, php-format
 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\"."
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
 msgstr ""
-"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
-#: actions/imsettings.php:142
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Pubblica un messaggio quando il mio stato Jabber/GTalk cambia"
+#: actions/groupblock.php:178
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "Un elenco degli utenti in questo gruppo."
 
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94 actions/emailsettings.php:86
-#: actions/imsettings.php:68 actions/smssettings.php:94
-#: actions/twittersettings.php:70 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
-msgid "Preferences"
-msgstr "Preferenze"
+#: actions/groupblock.php:179
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "Un elenco degli utenti in questo gruppo."
 
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163 actions/emailsettings.php:180
-#: actions/imsettings.php:152 actions/smssettings.php:171
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
-msgid "Preferences saved."
-msgstr "Preferenze salvate."
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
+msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
-msgid "Preferred language"
-msgstr "Lingua preferita"
+#: actions/groupbyid.php:74
+msgid "No ID"
+msgstr "Nessun ID"
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
-msgid "Privacy"
-msgstr "Privacy"
+#: actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "Devi eseguire l'accesso per creare un gruppo."
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-msgid "Problem saving notice."
-msgstr "Problema nel salvare il messaggio."
+#: actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "Gruppi"
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
-msgid "Profile"
-msgstr "Profilo"
+#: actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
 
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
-msgstr "URL del profilo"
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Impossibile aggiornare l'utente."
 
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
-msgstr "Impostazioni del profilo"
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "Impossibile salvare le tue impostazioni di Twitter!"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-msgid "Profile unknown"
-msgstr "Profilo sconosciuto"
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Preferenze di sincronizzazione salvate."
 
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
-msgid "Public Stream Feed"
-msgstr "Feed del flusso pubblico"
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
+msgstr "Logo del gruppo"
 
-#  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 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
-msgid "Public timeline"
-msgstr "Attività pubblica"
+#: actions/grouplogo.php:150
+#, fuzzy, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr "Puoi caricare un'immagine per il logo del tuo gruppo."
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Pubblica un MicroID per il mio indirizzo Jabber/GTalk"
+#: actions/grouplogo.php:362
+#, fuzzy
+msgid "Pick a square area of the image to be the logo."
+msgstr "Scegli un'area quadrata per la tua immagine personale"
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
-msgid "Publish a MicroID for my email address."
-msgstr "Pubblica un MicroID per il mio indirizzo email"
+#: actions/grouplogo.php:396
+msgid "Logo updated."
+msgstr "Logo aggiornato."
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr "Etichette recenti"
+#: actions/grouplogo.php:398
+msgid "Failed updating logo."
+msgstr "Errore nell'aggiornare il logo."
 
-# pulsante, indica un'azione quindi come gli altri: accedi, abbonati...
-#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
-msgid "Recover"
-msgstr "Recupera"
+#: actions/groupmembers.php:93 lib/groupnav.php:92
+#, php-format
+msgid "%s group members"
+msgstr "Membri del gruppo %s"
 
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
-msgid "Recover password"
-msgstr "Recupero password"
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
+msgstr "Membri del gruppo %s, pagina %d"
 
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-msgid "Recovery code for unknown user."
-msgstr "Codice di recupero per utente sconosciuto."
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr "Un elenco degli utenti in questo gruppo."
 
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
-#: actions/register.php:152 actions/register.php:207 lib/util.php:328
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-msgid "Register"
-msgstr "Registra"
+#: actions/groupmembers.php:175 lib/groupnav.php:107
+msgid "Admin"
+msgstr "Amministra"
 
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
-msgid "Registration not allowed."
-msgstr "Registrazione non consentita."
+#: actions/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
+msgstr "Blocca"
 
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
-msgid "Registration successful"
-msgstr "Registrazione riuscita"
+#: actions/groupmembers.php:441
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "Devi essere amministratore per modificare il gruppo"
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
-msgid "Reject"
-msgstr "Rifiuta"
+#: actions/groupmembers.php:473
+#, fuzzy
+msgid "Make Admin"
+msgstr "Amministra"
 
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
-msgid "Remember me"
-msgstr "Ricordami"
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
-msgid "Remote profile with no matching profile"
-msgstr "Profilo remoto senza profilo corrispondente"
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Aggiornamenti da %1$s su %2$s!"
 
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
-msgstr "Abbonamento remoto"
+#: actions/groupsearch.php:52
+#, fuzzy, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"Ricerca le persone su %%site.name%% per nome, ubicazione o interessi. Separa "
+"i termini di ricerca con degli spazi; lunghezza minima 3 caratteri."
 
-#: ../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 actions/emailsettings.php:101
-#: actions/emailsettings.php:134 actions/imsettings.php:102
-#: actions/openidsettings.php:166 actions/smssettings.php:103
-#: actions/smssettings.php:146 actions/twittersettings.php:115
-msgid "Remove"
-msgstr "Rimuovi"
+#: actions/groupsearch.php:58
+msgid "Group search"
+msgstr "Ricerca gruppi"
 
-#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
-msgstr "Rimuovi OpenID"
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "Nessun risultato"
 
-#: ../actions/openidsettings.php:73
+#: actions/groupsearch.php:82
+#, php-format
 msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
 msgstr ""
-"Rimuovere il tuo unico OpenID renderà impossibile effettuare l'accesso! Se "
-"vuoi rimuoverlo, prima aggiungi un altro OpenID."
 
-#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
-msgid "Replies"
-msgstr "Risposte"
-
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
-#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
-#: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: actions/groupsearch.php:85
 #, php-format
-msgid "Replies to %s"
-msgstr "Risposte a %s"
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
 
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
-msgid "Reset"
-msgstr "Reimposta"
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Gruppi"
 
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
-msgid "Reset password"
-msgstr "Reimposta password"
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Gruppi, pagina %d"
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-msgid "SMS"
-msgstr "SMS"
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
-msgid "SMS Phone number"
-msgstr "Numero di telefono per SMS"
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Crea un nuovo gruppo"
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
-msgstr "Impostazioni SMS"
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
-msgid "SMS confirmation"
-msgstr "Conferma SMS"
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "L'utente ti ha bloccato."
 
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
-msgid "Same as password above"
-msgstr "Stessa password di sopra"
+#: actions/groupunblock.php:128 actions/unblock.php:108
+msgid "Error removing the block."
+msgstr "Errore nel rimuovere il blocco."
 
-#  Femminile, è la password
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
-msgid "Same as password above. Required."
-msgstr "Stessa password di sopra. Richiesta."
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "Impostazioni messaggistica istantanea"
 
-#: ../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 actions/emailsettings.php:182
-#: actions/facebooksettings.php:114 actions/imsettings.php:157
-#: actions/othersettings.php:117 actions/profilesettings.php:150
-#: actions/smssettings.php:169 actions/subscriptions.php:124
-#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
-msgid "Save"
-msgstr "Salva"
+#: actions/imsettings.php:70
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+"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."
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
-msgid "Search"
-msgstr "Ricerca"
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Questa pagina non è disponibile in un "
 
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
-msgstr "Ricerca nel flusso dei feed"
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Indirizzo Jabber/GTalk attualmente confermato."
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/imsettings.php:114
 #, php-format
 msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
+"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 ""
-"Ricerca tra i messaggi su %%site.name%% in base al contenuto. Separa i "
-"termini di ricerca con degli spazi; lunghezza minima 3 caratteri."
+"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?)."
+
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "Indirizzo di messaggistica istantanea"
 
-#: ../actions/peoplesearch.php:28
+#: actions/imsettings.php:126
 #, 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."
+"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 ""
-"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 actions/smssettings.php:304
-#: actions/smssettings.php:457
-msgid "Select a carrier"
-msgstr "Seleziona un operatore"
-
-#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
-#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
-msgid "Send"
-msgstr "Invia"
-
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
-msgstr "Invia le email a questo indirizzo per scrivere nuovi messaggi."
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
-msgstr "Inviami avvisi di nuovi abbonamenti via email"
+"Indirizzo Jabber o GTalk nella forma \"NomeUtente@example.org\". Per prima "
+"cosa, assicurati di aggiungere %s all'elenco dei contatti nel tuo programma "
+"di messaggistica o su GTalk."
 
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Inviami le notifiche via 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 ""
-"Inviami avvisi via SMS: comprendo che potrei incorrere in esorbitanti "
-"bollette da parte del mio operatore"
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr "Pubblica un messaggio quando il mio stato Jabber/GTalk cambia"
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:153
 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"
 
-#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
-msgid "Settings"
-msgstr "Impostazioni"
-
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
-msgid "Settings saved."
-msgstr "Impostazioni salvate."
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr "Ecco le etichette più famose dell'ultima settimana"
-
-#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:114
-msgid "Someone else already has this OpenID."
-msgstr "Qualcun altro ha già questo OpenID."
-
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
-msgstr "È successo qualcosa di strano."
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
-msgstr "Email di ricezione non consentita."
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
-msgstr "Quella non è la tua email di ricezione."
-
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
-msgid "Source"
-msgstr "Sorgenti"
-
-#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
-msgid "Statistics"
-msgstr "Statistiche"
-
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-msgid "Stored OpenID not found."
-msgstr "OpenID memorizzato non trovato."
-
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
-#: actions/showstream.php:197 actions/showstream.php:206
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
-msgid "Subscribe"
-msgstr "Abbonati"
-
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
-msgid "Subscribers"
-msgstr "Abbonati"
-
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
-msgid "Subscription authorized"
-msgstr "Abbonamento autorizzato"
-
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
-msgid "Subscription rejected"
-msgstr "Abbonamento rifiutato"
-
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27 actions/showstream.php:240
-#: actions/showstream.php:322 actions/subscriptions.php:27
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
-msgid "Subscriptions"
-msgstr "Abbonamenti"
-
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
-msgid "System error uploading file."
-msgstr "Errore di sistema nel caricare il file."
-
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
-#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
-msgid "Tags"
-msgstr "Etichette"
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "Testo"
-
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
-msgid "Text search"
-msgstr "Ricerca testo"
-
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
-msgstr "Quel OpenID non ti appartiene."
-
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
-msgstr "Quell'indirizzo è già stato confermato."
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Pubblica un MicroID per il mio indirizzo Jabber/GTalk"
 
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
-msgstr "Quel codice di conferma non è per te!"
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "Nessun ID di Jabber."
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr "Quell'indirizzo email appartiene già a un altro utente."
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr "Impossibile normalizzare quell'ID Jabber"
 
-#: ../actions/avatar.php:80 actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
-msgstr "Quel file è troppo grande."
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "Non è un ID Jabber valido"
 
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "Quello è già il tuo ID di Jabber."
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
-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
-#: actions/smssettings.php:306
-msgid "That is already your phone number."
-msgstr "Quello è già il tuo numero di telefono."
-
-#: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
-msgid "That is not your Jabber ID."
-msgstr "Quello non è il tuo ID di Jabber."
-
-#  previous suggestion missed the dot
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
-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
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
-msgstr "Quello non è il tuo numero di telefono."
-
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-#: actions/emailsettings.php:367 actions/imsettings.php:349
-msgid "That is the wrong IM address."
-msgstr "Quello è l'indirizzo di messaggistica sbagliato."
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
-msgstr "Quello è il numero di conferma errato."
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-msgid "That phone number already belongs to another user."
-msgstr "Quel numero di telefono appartiene già a un altro utente."
-
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49 actions/twitapistatuses.php:330
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-msgid "That's too long. Max notice size is 140 chars."
-msgstr "Troppo lungo. Lunghezza massima 140 caratteri."
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "Troppo lungo. Lunghezza massima 255 caratteri."
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr "ID Jabber già assegnato a un altro utente."
 
-#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/imsettings.php:327
 #, 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/emailsettings.php:282
-#: actions/imsettings.php:258 actions/smssettings.php:282
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
-msgid "The address was removed."
-msgstr "L'indirizzo è stato rimosso."
-
-#: ../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:"
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
 msgstr ""
-"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 è:"
+"Un codice di conferma è stato inviato all'indirizzo di messaggistica "
+"istantanea che hai aggiunto. Devi approvare %s affinché ti invii messaggi."
 
-#: ../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 ""
-"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/imsettings.php:387
+msgid "That is not your Jabber ID."
+msgstr "Quello non è il tuo ID di Jabber."
 
-#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/inbox.php:59
 #, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr "Queste sono le persone che seguono %s."
-
-#: ../actions/subscribers.php:33 actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr "Queste sono le persone che ti seguono."
+msgid "Inbox for %s - page %d"
+msgstr "Casella posta in arrivo di %s - pagina %d"
 
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/inbox.php:62
 #, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr "Queste sono le persone seguite da %s."
-
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr "Queste sono le persone che stai seguendo."
+msgid "Inbox for %s"
+msgstr "Casella posta in arrivo di %s"
 
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
-msgid ""
-"These people are already users and you were automatically subscribed to them:"
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
-"Queste persone sono già utenti e sei stato automaticamente abbonato a loro:"
-
-#: ../actions/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
-msgstr "Questo codice di conferma è scaduto. Ricomincia da capo."
+"Questa è la casella della tua posta in arrivo, contiene i messaggi privati "
+"ricevuti."
 
-#: ../lib/openid.php:195
-msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
+#: actions/invite.php:39
+msgid "Invites have been disabled."
 msgstr ""
-"Questo modulo dovrebbe inviarsi automaticamente. In caso contrario, fai clic "
-"sul pulsante per inviarlo al tuo servizio OpenID."
 
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/invite.php:41
 #, 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 ""
-"Questa è la prima volta che accedi a %s ed è 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
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-msgid "This method requires a POST or DELETE."
-msgstr "Questo metodo richiede POST o DELETE."
+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/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
-msgid "This method requires a POST."
-msgstr "Questo metodo richiede POST."
+#: actions/invite.php:72
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "Indirizzo email non valido: %s"
 
-#: ../lib/util.php:164 lib/util.php:246
-msgid "This page is not available in a media type you accept"
-msgstr "Questa pagina non è disponibile in un tipo di supporto che tu accetti"
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
+msgstr "Inviti inviati"
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
-msgid "Timezone"
-msgstr "Fuso orario"
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr "Invita nuovi utenti"
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
-msgid "Timezone not selected."
-msgstr "Fuso orario non selezionato"
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr "Sei già abbonato a questi utenti:"
 
-#: ../actions/remotesubscribe.php:43
+#: actions/invite.php:131 actions/invite.php:139
 #, php-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: actions/invite.php:136
 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."
+"These people are already users and you were automatically subscribed to them:"
 msgstr ""
-"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 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
-msgid "Two user ids or screen_names must be supplied."
-msgstr "Devono essere forniti due ID utente o nominativi."
-
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL della tua pagina web, blog o profilo su un altro sito"
-
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-msgid "URL of your profile on another compatible microblogging service"
-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/emailsettings.php:144 actions/imsettings.php:118
-#: actions/recoverpassword.php:39 actions/smssettings.php:143
-#: actions/twittersettings.php:108 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-msgid "Unexpected form submission."
-msgstr "Invio del modulo inaspettato."
-
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
-msgid "Unexpected password reset."
-msgstr "Ripristino della password inaspettato."
-
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-msgid "Unknown action"
-msgstr "Azione sconosciuta"
+"Queste persone sono già utenti e sei stato automaticamente abbonato a loro:"
 
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-msgid "Unknown version of OMB protocol."
-msgstr "Versione del protocollo OMB sconosciuta."
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
+msgstr "Inviti inviati alle seguenti persone:"
 
-#: ../lib/util.php:269 lib/util.php:285
+#: actions/invite.php:150
 msgid ""
-"Unless otherwise specified, contents of this site are copyright by the "
-"contributors and available under the "
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 msgstr ""
-"Se non indicato diversamente, i diritti d'autore dei contenuti di questo "
-"sito sono dei singoli utenti e sono disponibili sotto "
+"Riceverai una notifica quando i tuoi invitati accetteranno e si "
+"registreranno sul sito. Grazie per l'aiuto ad accrescere la comunità!"
 
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
-#, php-format
-msgid "Unrecognized address type %s"
-msgstr "Tipo di indirizzo non riconosciuto %s"
+#: actions/invite.php:162
+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."
 
-# è un tentativo, visto che è un pulsante, mi prendo la licenza poetica...
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
-msgstr "Disabbonati"
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "Indirizzi email"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-msgid "Unsupported OMB version"
-msgstr "Versione OMB non supportata"
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr "Indirizzi email di amici da invitare (uno per riga)"
 
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
-msgid "Unsupported image file format."
-msgstr "Formato file immagine non supportato."
+#: actions/invite.php:192
+msgid "Personal message"
+msgstr "Messaggio personale"
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
-msgstr "Aggiornamenti via SMS"
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
+msgstr "Puoi aggiungere un messaggio personale agli inviti."
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
-msgstr "Aggiornamenti via messaggistica istantanea (MI)"
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
+msgstr "Invia"
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/invite.php:226
 #, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr "Aggiornamenti da %1$s e amici su %2$s!"
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "Hai ricevuto un invito per seguire %1$s su %2$s"
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/invite.php:228
 #, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr "Aggiornamenti da %1$s su %2$s!"
-
-#: ../actions/avatar.php:68 actions/profilesettings.php:161
-#: actions/avatarsettings.php:162 actions/grouplogo.php:232
-msgid "Upload"
-msgstr "Carica"
-
-#: ../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."
+"%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 ""
-"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
-msgid "Upload a new profile image"
-msgstr "Carica una nuova immagine per il profilo"
+"Hai ricevuto un invito per seguire %1$s su %2$s (%3$s).\n"
+"\n"
+"%2$s è un servizio di micro-blog che ti consente di rimanere sempre al passo "
+"con le persone che conosci e che ti interessano.\n"
+"\n"
+"Puoi condividere notizie che ti riguardano, i tuoi pensieri o la tua vita in "
+"rete con le persone che conosci ed è anche un ottimo strumento per "
+"conoscerne di nuove 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 al seguente indirizzo:\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/invite.php:114 actions/invite.php:121 actions/invite.php:154
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
-msgstr ""
-"Usa questo modulo per invitare i tuoi amici e colleghi a usare questo "
-"servizio."
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
+msgstr "Devi eseguire l'accesso per iscriverti a un gruppo."
 
-#  Femminile, è l'email
-#: ../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 "Usata solo per aggiornamenti, annunci e recupero password"
+#: actions/joingroup.php:90 lib/command.php:217
+msgid "You are already a member of that group"
+msgstr "Sei già un membro di quel gruppo"
 
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
-msgid "User being listened to doesn't exist."
-msgstr "L'utente che intendi seguire non esiste."
+#: actions/joingroup.php:128 lib/command.php:234
+#, php-format
+msgid "Could not join user %s to group %s"
+msgstr "Impossibile iscrivere l'utente %s al gruppo %s"
 
-#: ../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
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-msgid "User has no profile."
-msgstr "L'utente non ha un profilo."
+#: actions/joingroup.php:135 lib/command.php:239
+#, php-format
+msgid "%s joined group %s"
+msgstr "%s si è iscritto al gruppo %s"
 
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
-msgstr "Soprannome dell'utente"
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
+msgstr "Devi eseguire l'accesso per lasciare un gruppo."
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr "Utente non trovato."
+#: actions/leavegroup.php:90 lib/command.php:268
+msgid "You are not a member of that group."
+msgstr "Non sei un membro di quel gruppo."
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
-msgid "What timezone are you normally in?"
-msgstr "In che fuso orario risiedi solitamente?"
+#: actions/leavegroup.php:119 lib/command.php:278
+msgid "Could not find membership record."
+msgstr "Impossibile trovare il record della membership."
 
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: actions/leavegroup.php:127 lib/command.php:284
 #, php-format
-msgid "What's up, %s?"
-msgstr "Cosa succede %s?"
-
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-#: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Dove ti trovi, tipo \"città, regione, stato\""
+msgid "Could not remove user %s to group %s"
+msgstr "Impossibile rimuovere l'utente %s dal gruppo %s"
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
-msgid "Wrong image type for '%s'"
-msgstr "Tipo di immagine errata per \"%s\""
+msgid "%s left group %s"
+msgstr "%s ha lasciato il gruppo %s"
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
-#, php-format
-msgid "Wrong size image at '%s'"
-msgstr "Dimensione dell'immagine sbagliata a \"%s\""
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "Accesso già effettuato."
 
-#  "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
-#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
-msgid "Yes"
-msgstr "Sì"
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Contenuto del messaggio non valido"
 
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-msgid "You already have this OpenID!"
-msgstr "Hai già questo OpenID!"
+#: actions/login.php:143
+msgid "Incorrect username or password."
+msgstr "Nome utente o password non corretto."
 
-#: ../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/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
+msgstr "Errore nell'impostare l'utente."
 
-#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
-msgstr "Hai già effettuato l'accesso!"
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "Accedi"
 
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-msgid "You are already subscribed to these users:"
-msgstr "Sei già abbonato a questi utenti:"
+#: actions/login.php:243
+msgid "Login to site"
+msgstr "Accedi al sito"
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
-msgid "You are not friends with the specified user."
-msgstr "Non sei amico dell'utente specificato."
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Soprannome"
 
-#: ../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/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Password"
 
-#: ../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 inviare messaggi."
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "Ricordami"
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "Puoi ricevere messaggi SMS attraverso l'email da %%site.name%%."
+#: actions/login.php:253 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
+msgstr "Accedi automaticamente in futuro; non per computer condivisi!"
 
-#: ../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 facendo clic su \"Rimuovi\"."
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "Password persa o dimenticata?"
 
-#: ../actions/imsettings.php:28 actions/imsettings.php:28
-#, php-format
+#: actions/login.php:282
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
 msgstr ""
-"Puoi inviare e ricevere messaggi attraverso i servizi di [messaggistica "
-"istantanea](%%doc.im%%) Jabber/GTalk. Configura il tuo indirizzo e le "
-"impostazioni qui di seguito."
+"Per motivi di sicurezza è necessario reinserire il proprio nome utente e la "
+"propria password prima di modificare le impostazioni."
 
-#: ../actions/profilesettings.php:27
+#: actions/login.php:286
+#, fuzzy, php-format
 msgid ""
-"You can update your personal profile info here so people know more about you."
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
 msgstr ""
-"Qui puoi aggiornare le informazioni del tuo profilo personale, così gli "
-"altri potranno conoscere qualcosa in più di te."
-
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
-msgstr "Puoi usare l'abbonamento locale!"
-
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
-msgid "You can't register if you don't agree to the license."
-msgstr "Non puoi registrarti se non accetti la licenza."
-
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
-msgid "You did not send us that profile"
-msgstr "Non hai inviato quel profilo"
+"Accedi con nome utente e password. Non hai ancora un nome utente? [Registra]"
+"(%%action.register%%) un nuovo account o prova [OpenID](%%action.openidlogin%"
+"%). "
 
-#: ../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"
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
 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 %3$s.\n"
-"\n"
-"Cordiali saluti,\n"
-"%4$s"
-
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
-msgid "You may not delete another user's status."
-msgstr "Non puoi eliminare lo stato di un altro utente."
 
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/makeadmin.php:95
 #, 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 actions/invite.php:142
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
-"Riceverai una notifica quando i tuoi invitati accetteranno e si "
-"registreranno sul sito. Grazie per l'aiuto ad accrescere la comunità!"
-
-# per la par condicio ho sostituito 'sei stato identificato'
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr "Sei ora identificato/a. Inserisci una nuova password qui di seguito. "
-
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
-msgid "Your OpenID URL"
-msgstr "Il tuo URL OpenID"
-
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
+msgid "%s is already an admin for group \"%s\"."
 msgstr ""
-"Il tuo soprannome su questo server o il tuo indirizzo email registrato."
 
-#: ../actions/openidsettings.php:28
+#: actions/makeadmin.php:132
 #, php-format
-msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
-"account.  Manage your associated OpenIDs from here."
+msgid "Can't get membership record for %s in group %s"
 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:992 lib/util.php:945
-msgid "a few seconds ago"
-msgstr "pochi secondi fa"
-
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: actions/makeadmin.php:145
 #, php-format
-msgid "about %d days ago"
-msgstr "circa %d giorni fa"
+msgid "Can't make %s an admin for group %s"
+msgstr ""
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
-#, php-format
-msgid "about %d hours ago"
-msgstr "circa %d ore fa"
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr "Nessuno stato corrente"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
-#, php-format
-msgid "about %d minutes ago"
-msgstr "circa %d minuti fa"
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr "Nuovo gruppo"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
-#, php-format
-msgid "about %d months ago"
-msgstr "circa %d mesi fa"
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
+msgstr "Usa questo modulo per creare un nuovo gruppo."
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
-msgid "about a day ago"
-msgstr "circa un giorno fa"
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr "Nuovo messaggio"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
-msgid "about a minute ago"
-msgstr "circa un minuto fa"
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
+msgstr "Non puoi inviare un messaggio a questo utente."
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
-msgid "about a month ago"
-msgstr "circa un mese fa"
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+msgstr "Nessun contenuto!"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
-msgid "about a year ago"
-msgstr "circa un anno fa"
+#: actions/newmessage.php:158
+msgid "No recipient specified."
+msgstr "Nessun destinatario specificato."
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
-msgid "about an hour ago"
-msgstr "circa un'ora fa"
+#: actions/newmessage.php:164 lib/command.php:370
+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/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
-msgstr "elimina"
-
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117 actions/noticesearch.php:136
-#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
-msgid "in reply to..."
-msgstr "in risposta a..."
-
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124 actions/noticesearch.php:143
-#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
-msgid "reply"
-msgstr "rispondi"
-
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-msgid "same as password above"
-msgstr "stessa password di sopra"
+#: actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "Messaggio"
 
-#  wrong capitalization in previous suggestion
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
-msgid "unsupported file type"
-msgstr "tipo di file non supportato"
-
-#: ../lib/util.php:1309 lib/util.php:1443
-msgid "« After"
-msgstr "« Successivi"
-
-#: 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
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-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/newmessage.php:185 lib/command.php:375
+#, php-format
+msgid "Direct message to %s sent"
+msgstr "Messaggio diretto a %s inviato"
 
-#: actions/disfavor.php:55 actions/disfavor.php:81
-msgid "This notice is not a favorite!"
-msgstr "Questo messaggio non è un preferito!"
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
+msgstr "Errore di Ajax"
 
-#: actions/disfavor.php:63 actions/disfavor.php:87
-msgid "Could not delete favorite."
-msgstr "Impossibile eliminare un preferito."
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "Nuovo messaggio"
 
-#: actions/disfavor.php:72 lib/favorform.php:140
-msgid "Favor"
-msgstr "Preferito"
+#: actions/newnotice.php:199
+msgid "Notice posted"
+msgstr "Messaggio inviato"
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
+#: actions/noticesearch.php:68
+#, php-format
+msgid ""
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
 msgstr ""
-"Inviami un'email quando qualcuno aggiunge un mio messaggio ai preferiti"
-
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-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 actions/favor.php:81
-#: actions/twitapifavorites.php:118
-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 actions/favor.php:86
-#: actions/twitapifavorites.php:125 classes/Command.php:152
-msgid "Could not create favorite."
-msgstr "Impossibile creare preferito."
+"Ricerca tra i messaggi su %%site.name%% in base al contenuto. Separa i "
+"termini di ricerca con degli spazi; lunghezza minima 3 caratteri."
 
-#: actions/favor.php:70
-msgid "Disfavor"
-msgstr "Non preferito"
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "Ricerca testo"
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
-#, php-format
-msgid "%s favorite notices"
-msgstr "Messaggi preferiti di %s"
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr " Ricerca \"%s\" nel flusso"
 
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/noticesearch.php:121
 #, php-format
-msgid "Feed of favorite notices of %s"
-msgstr "Feed dei messaggi preferiti di %s"
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
 
-#: actions/inbox.php:28 actions/inbox.php:59
+#: actions/noticesearch.php:124
 #, php-format
-msgid "Inbox for %s - page %d"
-msgstr "Casella posta in arrivo di %s - pagina %d"
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
+msgstr ""
 
-#: actions/inbox.php:30 actions/inbox.php:62
-#, php-format
-msgid "Inbox for %s"
-msgstr "Casella posta in arrivo di %s"
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Aggiornamenti da %1$s su %2$s!"
 
-#: actions/inbox.php:53 actions/inbox.php:115
-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/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Tutti gli aggiornamenti corrispondenti al termine di ricerca \"%s\""
 
-#: actions/invite.php:178 actions/invite.php:213
-#, php-format
+#: actions/nudge.php:85
 msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
-"Hai ricevuto un invito per seguire %1$s su %2$s (%3$s).\n"
-"\n"
+"Questo utente non consente i richiami oppure non ha confermato o impostato "
+"ancora il suo indirizzo email."
 
-#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-msgid "Automatically login in the future; "
-msgstr "Accesso automatico in futuro; "
+#: actions/nudge.php:94
+msgid "Nudge sent"
+msgstr "Richiamo inviato"
 
-#: actions/login.php:122 actions/login.php:264
-msgid "For security reasons, please re-enter your "
-msgstr "Per motivi di sicurezza reinserire la propria "
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr "Richiamo inviato!"
 
-#: actions/login.php:126 actions/login.php:268
-msgid "Login with your username and password. "
-msgstr "Accedi con il tuo nome utente e password. "
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+msgstr "Il messaggio non ha un profilo"
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
-msgid "That's too long. Max message size is 140 chars."
-msgstr "Troppo lungo. Il massimo per un messaggio è 140 caratteri."
+#: actions/oembed.php:86 actions/shownotice.php:180
+#, php-format
+msgid "%1$s's status on %2$s"
+msgstr "Stato di %1$s su %2$s"
 
-#: actions/newmessage.php:65 actions/newmessage.php:128
-msgid "No recipient specified."
-msgstr "Nessun destinatario specificato."
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Connetti"
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206 actions/newmessage.php:131
-#: actions/newmessage.php:168 classes/Command.php:237
-msgid "You can't send a message to this user."
-msgstr "Non puoi inviare un messaggio a questo utente."
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "Non inviarti un messaggio, piuttosto ripetilo a voce dolcemente."
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
+msgstr "Non è un formato di dati supportato."
 
-#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
-msgid "No such user"
-msgstr "Nessun tale utente"
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "Ricerca persone"
 
-#: actions/newmessage.php:117 actions/newmessage.php:67
-msgid "New message"
-msgstr "Nuovo messaggio"
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "Ricerca messaggi"
 
-#: actions/noticesearch.php:95 actions/noticesearch.php:146
-msgid "Notice without matching profile"
-msgstr "Messaggio senza un profilo corrispondente"
+#: actions/othersettings.php:60
+msgid "Other Settings"
+msgstr "Altre impostazioni"
 
-#: actions/openidsettings.php:28 actions/openidsettings.php:70
-#, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr "[OpenID](%%doc.openid%%) ti consente di collegarti a molti siti "
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr "Gestisci altre opzioni."
 
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
-msgstr "Se vuoi aggiungere un OpenID al tuo account, "
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr "Rimuovere il tuo unico OpenID ti impedirà di eseguire l'accesso! "
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
+msgstr ""
 
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-msgid "You can remove an OpenID from your account "
-msgstr "Puoi rimuovere un OpenID dal tuo account "
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
+msgstr "Servizio di autoriduzione da usare."
 
-#: actions/outbox.php:28 actions/outbox.php:58
+#: actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "Impostazioni del profilo"
+
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/othersettings.php:153
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Il servizio di riduzione degli URL è troppo lungo (max 50 caratteri)"
+
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %s - page %d"
 msgstr "Casella posta inviata di %s - pagina %d"
 
-#: actions/outbox.php:30 actions/outbox.php:61
+#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Casella posta inviata di %s"
 
-#: actions/outbox.php:53 actions/outbox.php:116
+#: actions/outbox.php:116
 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 actions/peoplesearch.php:52
-#, 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/passwordsettings.php:58
+msgid "Change password"
+msgstr "Modifica password"
 
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
-msgid "You can update your personal profile info here "
-msgstr "Qui puoi aggiornare il tuo profilo personale "
+#: actions/passwordsettings.php:69
+msgid "Change your password."
+msgstr "Modifica la tua password."
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
-msgid "User without matching profile"
-msgstr "Utente senza profilo corrispondente"
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+msgid "Password change"
+msgstr "Cambio password"
 
-#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
-msgstr "Questo codice di conferma è troppo vecchio. "
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "Vecchia password"
 
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
-msgstr "Se hai dimenticato o perso la tua"
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "Nuova password"
 
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a "
-msgstr "Sei ora identificato. Inserisci un "
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6 o più caratteri"
 
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-msgid "Your nickname on this server, "
-msgstr "Il tuo soprannome su questo server, "
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "Conferma"
 
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-msgid "Instructions for recovering your password "
-msgstr "Istruzioni per il recupero della password "
+#: actions/passwordsettings.php:113
+msgid "same as password above"
+msgstr "stessa password di sopra"
 
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
-msgid "New password successfully saved. "
-msgstr "Nuova password salvata con successo. "
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "Modifica"
 
-#: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:154 actions/register.php:230
 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/a 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 actions/remotesubscribe.php:74
-#, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr "Per abbonarti, puoi [eseguire l'accesso](%%action.login%%),"
-
-#: actions/showfavorites.php:61 actions/showfavorites.php:145
-#, php-format
-msgid "Feed for favorites of %s"
-msgstr "Feed dei preferiti di %s"
-
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-msgid "Could not retrieve favorite notices."
-msgstr "Impossibile recuperare i messaggi preferiti."
-
-#: actions/showmessage.php:33 actions/showmessage.php:81
-msgid "No such message."
-msgstr "Nessun tale messaggio."
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "Le password non corrispondono."
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
-msgstr "Solo mittente e destinatario possono leggere questo messaggio."
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "Vecchia password non corretta"
 
-#: actions/showmessage.php:61 actions/showmessage.php:108
-#, php-format
-msgid "Message to %1$s on %2$s"
-msgstr "Messaggio a %1$s su %2$s"
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "Errore nel salvare l'utente; non valido."
 
-#: actions/showmessage.php:66 actions/showmessage.php:113
-#, php-format
-msgid "Message from %1$s on %2$s"
-msgstr "Messaggio da %1$s su %2$s"
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "Impossibile salvare la nuova password."
 
-#: actions/showstream.php:154
-msgid "Send a message"
-msgstr "Invia un messaggio"
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "Password salvata."
 
-#: actions/smssettings.php:312 actions/smssettings.php:464
+#: actions/peoplesearch.php:52
 #, php-format
-msgid "Mobile carrier for your phone. "
-msgstr "Operatore mobile del tuo telefono. "
+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 ""
+"Ricerca le persone su %%site.name%% per nome, ubicazione o interessi. Separa "
+"i termini di ricerca con degli spazi; lunghezza minima 3 caratteri."
 
-#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
-#, php-format
-msgid "Direct messages to %s"
-msgstr "Messaggi diretti a %s"
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "Ricerca persone"
 
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/peopletag.php:70
 #, php-format
-msgid "All the direct messages sent to %s"
-msgstr "Tutti i messaggi diretti inviati a %s"
-
-#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-msgid "Direct Messages You've Sent"
-msgstr "Messaggi diretti inviati"
+msgid "Not a valid people tag: %s"
+msgstr "Non è un'etichetta valida di persona: %s"
 
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/peopletag.php:144
 #, php-format
-msgid "All the direct messages sent from %s"
-msgstr "Tutti i messaggi diretti inviati da %s"
-
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-msgid "No message text!"
-msgstr "Nessun testo nel messaggio!"
-
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-msgid "Recipient user not found."
-msgstr "Utente destinatario non trovato."
-
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-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."
+msgid "Users self-tagged with %s - page %d"
+msgstr "Utenti auto-etichettati con %s - pagina %d"
 
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
-#, php-format
-msgid "%s / Favorites from %s"
-msgstr "%s / Preferiti da %s"
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "Contenuto del messaggio non valido"
 
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/postnotice.php:90
 #, php-format
-msgid "%s updates favorited by %s / %s."
-msgstr "%s aggiornamenti preferiti da %s / %s"
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
-#, php-format
-msgid "%s added your notice as a favorite"
-msgstr "%s ha aggiunto il tuo messaggio tra i suoi preferiti"
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "Impostazioni del profilo"
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
-#, php-format
+#: actions/profilesettings.php:71
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+"You can update your personal profile info here so people know more about you."
 msgstr ""
-"%1$s ha appena aggiunto il tuo messaggio da %2$s tra i suoi preferiti.\n"
-"\n"
+"Qui puoi aggiornare le informazioni del tuo profilo personale, così gli "
+"altri potranno conoscere qualcosa in più di te."
 
-#: actions/twittersettings.php:27
-msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+#: actions/profilesettings.php:99
+msgid "Profile information"
+msgstr "Informazioni sul profilo"
+
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
-"Aggiungi il tuo account Twitter per inviare automaticamente i tuoi messaggi "
-"su Twitter, "
+"1-64 lettere minuscole o numeri, senza spazi o simboli di punteggiatura"
 
-#: actions/twittersettings.php:41 actions/twittersettings.php:60
-msgid "Twitter settings"
-msgstr "Impostazioni Twitter"
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full name"
+msgstr "Nome"
 
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-msgid "Twitter Account"
-msgstr "Account Twitter"
+#: actions/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "Pagina web"
 
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-msgid "Current verified Twitter account."
-msgstr "Account Twitter attualmente verificato."
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "URL della tua pagina web, blog o profilo su un altro sito"
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr "Nome utente di Twitter"
+#: actions/profilesettings.php:122 actions/register.php:460
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Descriviti assieme ai tuoi interessi in 140 caratteri"
 
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-msgid "No spaces, please."
-msgstr "Niente spazi, grazie."
+#: actions/profilesettings.php:125 actions/register.php:463
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Descrivi te e i tuoi "
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
-msgstr "Password di Twitter"
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "Biografia"
 
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-msgid "Automatically send my notices to Twitter."
-msgstr "Invia automaticamente i miei messaggi a Twitter"
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "Ubicazione"
 
-#: actions/twittersettings.php:75 actions/twittersettings.php:146
-msgid "Send local \"@\" replies to Twitter."
-msgstr "Invia le risposte \"@\" locali a Twitter"
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "Dove ti trovi, tipo \"città, regione, stato\""
 
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-msgid "Subscribe to my Twitter friends here."
-msgstr "Abbonami ai miei amici di Twitter"
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
+msgstr "Etichette"
 
-#: actions/twittersettings.php:122
+#: actions/profilesettings.php:140
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
-"Il nome utente deve contenere solo numeri, lettere maiuscole e minuscole e "
-"trattini bassi (_) (max 15 caratteri)."
-
-#: actions/twittersettings.php:128 actions/twittersettings.php:334
-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
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-msgid "Unable to save your Twitter settings!"
-msgstr "Impossibile salvare le tue impostazioni di Twitter!"
-
-#: actions/twittersettings.php:174 actions/twittersettings.php:376
-msgid "Twitter settings saved."
-msgstr "Impostazioni di Twitter salvate."
-
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-msgid "That is not your Twitter account."
-msgstr "Quello non è il tuo account Twitter."
-
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
-msgid "Couldn't remove Twitter user."
-msgstr "Impossibile rimuovere l'utente Twitter."
-
-#: actions/twittersettings.php:212 actions/twittersettings.php:407
-msgid "Twitter account removed."
-msgstr "Account Twitter rimosso."
-
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
-msgid "Couldn't save Twitter preferences."
-msgstr "Impossibile salvare le preferenze di Twitter."
+"Le tue etichette (lettere, numeri, -, . e _), separate da virgole o spazi"
 
-#: actions/twittersettings.php:245 actions/twittersettings.php:461
-msgid "Twitter preferences saved."
-msgstr "Preferenze di Twitter salvate."
+#: actions/profilesettings.php:144
+msgid "Language"
+msgstr "Lingua"
 
-#: actions/userauthorization.php:84 actions/userauthorization.php:86
-msgid "Please check these details to make sure "
-msgstr "Controlla questi dettagli per assicurarti "
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr "Lingua preferita"
 
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
-msgid "The subscription has been authorized, but no "
-msgstr "L'abbonamento è stato autorizzato, ma non "
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr "Fuso orario"
 
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-msgid "The subscription has been rejected, but no "
-msgstr "L'abbonamento è stato rifiutato, ma non "
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
+msgstr "In che fuso orario risiedi solitamente?"
 
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-msgid "Command results"
-msgstr "Risultati comando"
+#: actions/profilesettings.php:160
+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)"
 
-#: classes/Channel.php:148 classes/Channel.php:204
-msgid "Command complete"
-msgstr "Comando completato"
+#: actions/profilesettings.php:221 actions/register.php:223
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "La biografia è troppo lunga (max 140 caratteri)."
 
-#: classes/Channel.php:158 classes/Channel.php:215
-msgid "Command failed"
-msgstr "Comando non riuscito"
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr "Fuso orario non selezionato"
 
-#: classes/Command.php:39 classes/Command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Questo comando non è ancora implementato"
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr "La lingua è troppo lunga (max 50 caratteri)."
 
-#: classes/Command.php:96 classes/Command.php:113
+#: actions/profilesettings.php:246 actions/tagother.php:178
 #, php-format
-msgid "Subscriptions: %1$s\n"
-msgstr "Abbonamenti: %1$s\n"
-
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
-msgid "User has no last notice"
-msgstr "L'utente non ha un ultimo messaggio"
-
-#: classes/Command.php:146 classes/Command.php:166
-msgid "Notice marked as fave."
-msgstr "Messaggio indicato come preferito."
+msgid "Invalid tag: \"%s\""
+msgstr "Etichetta non valida: \"%s\""
 
-#: classes/Command.php:166 classes/Command.php:189
-#, php-format
-msgid "%1$s (%2$s)"
-msgstr "%1$s (%2$s)"
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
+msgstr "Impossibile aggiornare l'utente per auto-abbonarsi."
 
-#: classes/Command.php:169 classes/Command.php:192
-#, php-format
-msgid "Fullname: %s"
-msgstr "Nome completo: %s"
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+msgstr "Impossibile salvare il profilo."
 
-#: classes/Command.php:172 classes/Command.php:195
-#, php-format
-msgid "Location: %s"
-msgstr "Ubicazione: %s"
+#: actions/profilesettings.php:336
+msgid "Couldn't save tags."
+msgstr "Impossibile salvare le etichette."
 
-#: classes/Command.php:175 classes/Command.php:198
-#, php-format
-msgid "Homepage: %s"
-msgstr "Pagina web: %s"
+#: actions/profilesettings.php:344
+msgid "Settings saved."
+msgstr "Impostazioni salvate."
 
-#: classes/Command.php:178 classes/Command.php:201
+#: actions/public.php:83
 #, php-format
-msgid "About: %s"
-msgstr "Informazioni: %s"
+msgid "Beyond the page limit (%s)"
+msgstr ""
 
-#: classes/Command.php:200 classes/Command.php:228
-#, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
-msgstr "Messaggio troppo lungo - massimo 140 caratteri, inviati %d"
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
+msgstr "Impossibile recuperare l'attività pubblica."
 
-#: classes/Command.php:214 classes/Command.php:245
+#: actions/public.php:129
 #, php-format
-msgid "Direct message to %s sent"
-msgstr "Messaggio diretto a %s inviato"
+msgid "Public timeline, page %d"
+msgstr "Attività pubblica, pagina %d"
 
-#: classes/Command.php:216 classes/Command.php:247
-msgid "Error sending direct message."
-msgstr "Errore nell'inviare il messaggio diretto."
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr "Attività pubblica"
 
-#: classes/Command.php:263 classes/Command.php:300
-msgid "Specify the name of the user to subscribe to"
-msgstr "Specifica il nome dell'utente a cui abbonarti"
+#: actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Feed del flusso pubblico"
 
-#: classes/Command.php:270 classes/Command.php:307
-#, php-format
-msgid "Subscribed to %s"
-msgstr "Abbonato a %s"
+#: actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Feed del flusso pubblico"
 
-#: classes/Command.php:288 classes/Command.php:328
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Specifica il nome dell'utente da cui annullare l'abbonamento"
+#: actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Feed del flusso pubblico"
 
-#: classes/Command.php:295 classes/Command.php:335
+#: actions/public.php:179
 #, php-format
-msgid "Unsubscribed from %s"
-msgstr "Abbonamento a %s annullato"
-
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
-msgid "Command not yet implemented."
-msgstr "Comando non ancora implementato."
-
-#: classes/Command.php:313 classes/Command.php:356
-msgid "Notification off."
-msgstr "Notifiche disattivate."
-
-#: classes/Command.php:315 classes/Command.php:358
-msgid "Can't turn off notification."
-msgstr "Impossibile disattivare le notifiche."
-
-#: classes/Command.php:333 classes/Command.php:379
-msgid "Notification on."
-msgstr "Notifiche attivate."
-
-#: classes/Command.php:335 classes/Command.php:381
-msgid "Can't turn on notification."
-msgstr "Impossibile attivare le notifiche."
-
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
-msgstr "Comandi:\n"
-
-#: classes/Message.php:53 classes/Message.php:56
-msgid "Could not insert message."
-msgstr "Impossibile inserire messaggio."
-
-#: classes/Message.php:63 classes/Message.php:66
-msgid "Could not update message with new URI."
-msgstr "Impossibile aggiornare il messaggio con il nuovo URI."
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
-msgstr "Utente senza profilo corrispondente nel sistema."
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
 
-#: lib/mail.php:147 lib/mail.php:289
+#: actions/public.php:186
 #, php-format
 msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+"Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
-"Hai un nuovo indirizzo di ricezione su %1$s.\n"
-"\n"
 
-#: lib/mail.php:249 lib/mail.php:508
-#, php-format
-msgid "New private message from %s"
-msgstr "Nuovo messaggio privato da %s"
-
-#: lib/mail.php:253 lib/mail.php:512
+#: actions/public.php:233
 #, php-format
 msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
-"%1$s (%2$s) ti ha inviato un messaggio privato:\n"
-"\n"
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "Solo l'utente può leggere la propria casella di posta."
+#: actions/public.php:238
+#, fuzzy, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
+msgstr ""
+"Questo è %%site.name%%, un servizio di [micro-blog](http://it.wikipedia.org/"
+"wiki/Microblogging) "
 
-#: lib/openid.php:195 lib/openid.php:203
-msgid "This form should automatically submit itself. "
-msgstr "Questo modulo dovrebbe inviarsi automaticamente. "
+#: actions/publictagcloud.php:57
+msgid "Public tag cloud"
+msgstr "Insieme delle etichette"
 
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-msgid "Favorites"
-msgstr "Preferiti"
+#: actions/publictagcloud.php:63
+#, fuzzy, php-format
+msgid "These are most popular recent tags on %s "
+msgstr "Queste sono le etichette più usate e recenti su %s "
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/publictagcloud.php:69
 #, php-format
-msgid "%s's favorite notices"
-msgstr "Messaggi preferiti di %s"
-
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-msgid "User"
-msgstr "Utente"
-
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-msgid "Inbox"
-msgstr "In arrivo"
-
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-msgid "Your incoming messages"
-msgstr "I tuoi messaggi in arrivo"
-
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-msgid "Outbox"
-msgstr "Inviati"
-
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-msgid "Your sent messages"
-msgstr "I tuoi messaggi inviati"
-
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-msgid "Twitter"
-msgstr "Twitter"
-
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
-msgstr "Opzioni di integrazione Twitter"
-
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-msgid "To"
-msgstr "A"
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
+msgstr ""
 
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-msgid "Could not parse message."
-msgstr "Impossibile analizzare il messaggio."
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
+msgstr ""
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/publictagcloud.php:75
 #, php-format
-msgid "%s and friends, page %d"
-msgstr "%s e amici, pagina %d"
-
-#: actions/avatarsettings.php:76
-msgid "You can upload your personal avatar."
-msgstr "Qui puoi caricare la tua immagine personale."
-
-#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
-msgid "Avatar settings"
-msgstr "Impostazioni immagine"
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
 
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-msgid "Original"
-msgstr "Originale"
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
+msgstr "Insieme etichette"
 
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-msgid "Preview"
-msgstr "Anteprima"
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "Hai già effettuato l'accesso!"
 
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
-msgid "Crop"
-msgstr "Ritaglia"
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "Nessun codice di ripristino."
 
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-msgid "There was a problem with your session token. "
-msgstr "C'è stato un problema con il tuo token di sessione. "
-
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-msgid "Pick a square area of the image to be your avatar"
-msgstr "Scegli un'area quadrata per la tua immagine personale"
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "Non è un codice di ripristino."
 
-#: actions/avatarsettings.php:327 actions/grouplogo.php:384
-msgid "Lost our file data."
-msgstr "Perso il nostro file di dati."
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr "Codice di recupero per utente sconosciuto."
 
-#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
-msgid "Lost our file."
-msgstr "Perso il nostro file."
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "Errore con il codice di conferma."
 
-#  wrong capitalization in previous suggestion
-#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
-#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
-msgid "Unknown file type"
-msgstr "Tipo di file sconosciuto"
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
+msgstr "Questo codice di conferma è scaduto. Ricomincia da capo."
 
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "Nessun profilo specificato."
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
+msgstr "Impossibile aggiornare l'utente con l'indirizzo email confermato."
 
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "Nessun profilo con quel ID."
+#: actions/recoverpassword.php:152
+msgid ""
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
+msgstr ""
 
-#: actions/block.php:111
-msgid "Block user"
-msgstr "Blocca utente"
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
+msgstr ""
 
-#: actions/block.php:129
-msgid "Are you sure you want to block this user? "
-msgstr "Vuoi veramente bloccare questo utente? "
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
+msgstr ""
 
-#: actions/block.php:162
-msgid "You have already blocked this user."
-msgstr "Hai già bloccato questo utente."
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
+msgstr ""
 
-#: actions/block.php:167
-msgid "Failed to save block information."
-msgstr "Salvataggio delle informazioni per il blocco non riuscito."
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
+msgstr ""
+"Il tuo soprannome su questo server o il tuo indirizzo email registrato."
 
-#: actions/confirmaddress.php:159
-#, php-format
-msgid "The address \"%s\" has been "
-msgstr "L'indirizzo \"%s\" è stato "
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
+msgstr "Recupera"
 
-#: actions/deletenotice.php:73
-msgid "You are about to permanently delete a notice. "
-msgstr "Stai per eliminare definitivamente un messaggio. "
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "Reimposta password"
 
-#: actions/disfavor.php:94
-msgid "Add to favorites"
-msgstr "Aggiungi ai preferiti"
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr "Recupero password"
 
-#: actions/editgroup.php:54
-#, php-format
-msgid "Edit %s group"
-msgstr "Modifica il gruppo %s"
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
+msgstr "Richiesta password di ripristino"
 
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-msgid "Inboxes must be enabled for groups to work"
-msgstr "La casella della posta in arrivo deve essere abilitata per funzionare"
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
+msgstr "Azione sconosciuta"
 
-#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-msgid "You must be logged in to create a group."
-msgstr "Devi eseguire l'accesso per creare un gruppo."
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 o più caratteri, e non dimenticarla!"
 
-#: actions/editgroup.php:87 actions/grouplogo.php:87
-#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
-msgid "No nickname"
-msgstr "Nessun soprannome"
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Stessa password di sopra"
 
-#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
-#: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
-msgid "No such group"
-msgstr "Nessun tale gruppo"
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "Reimposta"
 
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
-msgid "You must be an admin to edit the group"
-msgstr "Devi essere amministratore per modificare il gruppo"
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "Inserisci un soprannome o un indirizzo email."
 
-#: actions/editgroup.php:157
-msgid "Use this form to edit the group."
-msgstr "Usa questo modulo per modificare il gruppo."
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
+msgstr "Nessun utente con quell'email o nome utente."
 
-#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
-msgid "Nickname must have only lowercase letters "
-msgstr "Il soprannome deve essere composto solo da lettere minuscole "
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr "Nessun indirizzo email registrato per quell'utente."
 
-#: actions/editgroup.php:198 actions/newgroup.php:149
-msgid "description is too long (max 140 chars)."
-msgstr "La descrizione è troppo lunga (max 140 caratteri)."
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "Errore nel salvare la conferma dell'indirizzo."
 
-#: actions/editgroup.php:218
-msgid "Could not update group."
-msgstr "Impossibile aggiornare il gruppo."
+#: actions/recoverpassword.php:325
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr ""
+"Le istruzioni per recuperare la tua password sono state inviate "
+"all'indirizzo email registrato nel tuo account."
 
-#: actions/editgroup.php:226
-msgid "Options saved."
-msgstr "Opzioni salvate."
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
+msgstr "Ripristino della password inaspettato."
 
-#: actions/emailsettings.php:107 actions/imsettings.php:108
-#, php-format
-msgid "Awaiting confirmation on this address. "
-msgstr "Attesa la conferma per questo indirizzo. "
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "La password dev'essere lunga almeno 6 caratteri."
 
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-msgid "Make a new email address for posting to; "
-msgstr "Crea un nuovo indirizzo email per inviare messaggi; "
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
+msgstr "La password e la conferma non corrispondono."
 
-#: actions/emailsettings.php:157
-msgid "Send me email when someone "
-msgstr "Inviami un'email quando qualcuno "
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
+msgstr "Nuova password salvata con successo. Hai effettuato l'accesso."
 
-# per non usare una traduzione troppo fedele e forse un po' banale (gomitata, spintarella), facciamo come abbiamo fatto con Pidgin in Ubuntu, trasformando 'nudge' in un richiamo, anche perché è quello che realmente fa.
-#: actions/emailsettings.php:168
-msgid "Allow friends to nudge me and send me an email."
-msgstr "Consenti ai miei amici di richiamarmi e inviami un'email"
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
+msgstr "Spiacenti, solo le persone invitate possono registrarsi."
 
-#: actions/emailsettings.php:321
+#: actions/register.php:92
 #, fuzzy
-msgid "That email address already belongs "
-msgstr "Quell'indirizzo email appartiene già "
-
-#: actions/emailsettings.php:343
-msgid "A confirmation code was sent to the email address you added. "
-msgstr ""
-"Un codice di conferma è stato inviato all'indirizzo email che hai aggiunto. "
+msgid "Sorry, invalid invitation code."
+msgstr "Errore con il codice di conferma."
 
-#: actions/facebookhome.php:110
-msgid "Server error - couldn't get user!"
-msgstr "Errore del server: impossibile recuperare l'utente."
+#: actions/register.php:112
+msgid "Registration successful"
+msgstr "Registrazione riuscita"
 
-#: actions/facebookhome.php:196
-#, php-format
-#, fuzzy
-msgid "If you would like the %s app to automatically update "
-msgstr "Se vuoi che l'applicazione %s aggiorni automaticamente "
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "Registra"
 
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "Consenti a %s di aggiornare il mio stato su Facebook"
+#: actions/register.php:135
+msgid "Registration not allowed."
+msgstr "Registrazione non consentita."
 
-#: actions/facebookhome.php:218
-msgid "Skip"
-msgstr "Salta"
+#: actions/register.php:198
+msgid "You can't register if you don't agree to the license."
+msgstr "Non puoi registrarti se non accetti la licenza."
 
-#: actions/facebookhome.php:235
-msgid "No notice content!"
-msgstr "Nessun contenuto!"
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "Non è un indirizzo email valido."
 
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-msgid "Pagination"
-msgstr "Paginazione"
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "Indirizzo email già esistente."
 
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-msgid "After"
-msgstr "Successivi"
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "Nome utente o password non valido."
 
-#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
-msgid "Before"
-msgstr "Precedenti"
+#: actions/register.php:342
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
 
-#: actions/facebookinvite.php:70
-#, php-format
-msgid "Thanks for inviting your friends to use %s"
-msgstr "Grazie per aver invitato i tuoi amici a usare %s"
+#: actions/register.php:424
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+"1-64 lettere minuscole o numeri, niente punteggiatura o spazi. Richiesto."
 
-#: actions/facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Gli inviti sono stati inviati ai seguenti utenti:"
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr "6 o più caratteri. Richiesta."
 
-#: actions/facebookinvite.php:96
-#, php-format
-msgid "You have been invited to %s"
-msgstr "Hai un invito per %s"
+#: actions/register.php:433
+msgid "Same as password above. Required."
+msgstr "Stessa password di sopra. Richiesta."
 
-#: actions/facebookinvite.php:105
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Invita i tuoi amici a usare %s"
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "Email"
 
-#: actions/facebookinvite.php:113
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Amici che già usano %s:"
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
+msgstr "Usata solo per aggiornamenti, annunci e recupero password"
 
-#: actions/facebookinvite.php:130
-#, php-format
-msgid "Send invitations"
-msgstr "Invia"
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
+msgstr "Nome completo, preferibilmente il tuo \"vero\" nome"
 
-#: actions/facebookremove.php:56
-msgid "Couldn't remove Facebook user."
-msgstr "Impossibile rimuovere l'utente Facebook."
+#: actions/register.php:493
+msgid "My text and files are available under "
+msgstr "I miei testi e file sono disponibili sotto "
 
-#: actions/facebooksettings.php:65
-msgid "There was a problem saving your sync preferences!"
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
 msgstr ""
-"Si è verificato un problema nel salvare le preferenze di sincronizzazione."
-
-#: actions/facebooksettings.php:67
-msgid "Sync preferences saved."
-msgstr "Preferenze di sincronizzazione salvate."
-
-#: actions/facebooksettings.php:90
-msgid "Automatically update my Facebook status with my notices."
-msgstr "Aggiorna automaticamente il mio stato su Facebook con i miei messaggi"
-
-#: actions/facebooksettings.php:97
-msgid "Send \"@\" replies to Facebook."
-msgstr "Invia le risposte \"@\" a Facebook"
-
-#: actions/facebooksettings.php:106
-msgid "Prefix"
-msgstr "Prefisso"
 
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
-msgstr "Una stringa con cui iniziare i messaggi."
-
-#: actions/facebooksettings.php:124
-#, php-format
+#: actions/register.php:496
 #, fuzzy
-msgid "If you would like %s to automatically update "
-msgstr "Se vuoi che %s aggiorni automaticamente "
-
-#: actions/facebooksettings.php:147
-msgid "Sync preferences"
-msgstr "Preferenze di sincronizzazione"
-
-# da chiarire dove e come appaia
-#: actions/favor.php:94 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "Rimuovi preferito"
-
-# prova per 'famosi', al massimo si cambia
-#: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
-msgid "Popular notices"
-msgstr "Messaggi famosi"
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+" a eccezione di questi dati personali: password, indirizzo email, indirizzo "
+"messaggistica istantanea, numero di telefono."
 
-# prova per 'famosi', al massimo si cambia
-#: actions/favorited.php:67
+#: actions/register.php:537
 #, php-format
-msgid "Popular notices, page %d"
-msgstr "Messaggi famosi, pagina %d"
-
-#: actions/favorited.php:79
-msgid "The most popular notices on the site right now."
-msgstr "Ecco i messaggi più famosi all'interno del sito."
-
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
-msgid "Featured users"
-msgstr "Utenti in evidenza"
+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/featured.php:71
-#, php-format
-msgid "Featured users, page %d"
-msgstr "Utenti in evidenza, pagina %d"
+#: actions/register.php:561
+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/featured.php:99
+#: actions/remotesubscribe.php:98
 #, php-format
-msgid "A selection of some of the great users on %s"
-msgstr "Una selezione dei migliori utenti su %s"
-
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
-msgstr "Quell'utente ti ha bloccato dall'abbonarti."
-
-#: actions/groupbyid.php:79
-msgid "No ID"
-msgstr "Nessun ID"
-
-#: actions/grouplogo.php:138 actions/grouplogo.php:191
-msgid "Group logo"
-msgstr "Logo del gruppo"
+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 ""
+"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/grouplogo.php:149
-msgid "You can upload a logo image for your group."
-msgstr "Puoi caricare un'immagine per il logo del tuo gruppo."
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr "Abbonamento remoto"
 
-#: actions/grouplogo.php:448
-msgid "Logo updated."
-msgstr "Logo aggiornato."
+#: actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Abbonati a questo utente"
 
-#: actions/grouplogo.php:450
-msgid "Failed updating logo."
-msgstr "Errore nell'aggiornare il logo."
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "Soprannome dell'utente"
 
-#: actions/groupmembers.php:93 lib/groupnav.php:91
-#, php-format
-msgid "%s group members"
-msgstr "Membri del gruppo %s"
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr "Soprannome dell'utente che vuoi seguire"
 
-#: actions/groupmembers.php:96
-#, php-format
-msgid "%s group members, page %d"
-msgstr "Membri del gruppo %s, pagina %d"
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "URL del profilo"
 
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
-msgstr "Un elenco degli utenti in questo gruppo."
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "URL del tuo profilo su un altro servizio di micro-blog compatibile"
 
-#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
-msgid "Groups"
-msgstr "Gruppi"
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
+msgstr "Abbonati"
 
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "Gruppi, pagina %d"
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr "URL del profilo non valido (formato errato)"
 
-#: actions/groups.php:90
-#, php-format
+#: actions/remotesubscribe.php:168
 #, fuzzy
-msgid "%%%%site.name%%%% groups let you find and talk with "
-msgstr "I gruppi di %%%%site.name%%%% ti consentono di cercare e parlare con "
-
-#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-msgid "Create a new group"
-msgstr "Crea un nuovo gruppo"
-
-#: actions/groupsearch.php:57
-#, php-format
 msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-msgstr "Ricerca gruppi su %%site.name%% per nome, ubicazione o descrizione. "
-
-#: actions/groupsearch.php:63
-msgid "Group search"
-msgstr "Ricerca gruppi"
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "Non è un URL di profilo valido (nessun documento YADIS)."
 
-#: actions/imsettings.php:70
+#: actions/remotesubscribe.php:176
 #, fuzzy
-msgid "You can send and receive notices through "
-msgstr "Puoi inviare e ricevere messaggi attraverso "
+msgid "That’s a local profile! Login to subscribe."
+msgstr "Quello è un profilo locale! Accedi per abbonarti."
 
-#: actions/imsettings.php:120
-#, php-format
+#: actions/remotesubscribe.php:183
 #, fuzzy
-msgid "Jabber or GTalk address, "
-msgstr "Indirizzo Jabber o GTalk, "
+msgid "Couldn’t get a request token."
+msgstr "Impossibile ottenere un token di richiesta."
 
-#: actions/imsettings.php:147
-msgid "Send me replies through Jabber/GTalk "
-msgstr "Inviami le risposte via Jabber/GTalk "
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
+#, php-format
+msgid "Replies to %s"
+msgstr "Risposte a %s"
 
-#: actions/imsettings.php:321
+#: actions/replies.php:127
 #, php-format
-msgid "A confirmation code was sent "
-msgstr "Un codice di conferma è stato inviato "
+msgid "Replies to %s, page %d"
+msgstr "Risposte a %s, pagina %d"
 
-#: actions/joingroup.php:65
-msgid "You must be logged in to join a group."
-msgstr "Devi eseguire l'accesso per iscriverti a un gruppo."
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Feed dei messaggi per %s"
 
-#: actions/joingroup.php:95
-msgid "You are already a member of that group"
-msgstr "Sei già un membro di quel gruppo"
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Feed dei messaggi per %s"
 
-#: actions/joingroup.php:128
+#: actions/replies.php:158
 #, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Impossibile iscrivere l'utente %s al gruppo %s"
+msgid "Replies feed for %s (Atom)"
+msgstr "Feed dei messaggi per %s"
 
-#: actions/joingroup.php:135
+#: actions/replies.php:198
 #, php-format
-msgid "%s joined group %s"
-msgstr "%s si è iscritto al gruppo %s"
-
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
 msgstr ""
-"Le caselle di posta in arrivo devono essere abilitate per i gruppi per poter "
-"funzionare."
-
-#: actions/leavegroup.php:65
-msgid "You must be logged in to leave a group."
-msgstr "Devi eseguire l'accesso per lasciare un gruppo."
-
-#: actions/leavegroup.php:88
-msgid "No such group."
-msgstr "Nessuna tale gruppo."
-
-#: actions/leavegroup.php:95
-msgid "You are not a member of that group."
-msgstr "Non sei un membro di quel gruppo."
-
-#: actions/leavegroup.php:100
-msgid "You may not leave a group while you are its administrator."
-msgstr "Non puoi lasciare un gruppo fintantoché ne sei amministratore."
-
-#: actions/leavegroup.php:130
-msgid "Could not find membership record."
-msgstr "Impossibile trovare il record della membership."
 
-#: actions/leavegroup.php:138
+#: actions/replies.php:203
 #, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "Impossibile rimuovere l'utente %s dal gruppo %s"
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
 
-#: actions/leavegroup.php:145
+#: actions/replies.php:205
 #, php-format
-msgid "%s left group %s"
-msgstr "%s ha lasciato il gruppo %s"
-
-#: actions/login.php:225 lib/facebookaction.php:304
-msgid "Login to site"
-msgstr "Accedi al sito"
-
-#: actions/microsummary.php:69
-msgid "No current status"
-msgstr "Nessuno stato corrente"
-
-#: actions/newgroup.php:53
-msgid "New group"
-msgstr "Nuovo gruppo"
-
-#: actions/newgroup.php:115
-msgid "Use this form to create a new group."
-msgstr "Usa questo modulo per creare un nuovo gruppo."
-
-#: actions/newgroup.php:177
-msgid "Could not create group."
-msgstr "Impossibile creare il gruppo."
-
-#: actions/newgroup.php:191
-msgid "Could not set group membership."
-msgstr "Impossibile impostare la membership al gruppo."
-
-#: actions/newmessage.php:119 actions/newnotice.php:132
-msgid "That's too long. "
-msgstr "È troppo lungo. "
-
-#: actions/newmessage.php:134
-msgid "Don't send a message to yourself; "
-msgstr "Non inviare un messaggio a te stesso; "
-
-#: actions/newnotice.php:166
-msgid "Notice posted"
-msgstr "Messaggio inviato"
-
-#: actions/newnotice.php:200 classes/Channel.php:163
-msgid "Ajax Error"
-msgstr "Errore di Ajax"
-
-#: actions/nudge.php:85
 msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
-"Questo utente non consente i richiami oppure non ha confermato o impostato "
-"ancora il suo indirizzo email."
 
-#: actions/nudge.php:94
-msgid "Nudge sent"
-msgstr "Richiamo inviato"
-
-#: actions/nudge.php:97
-msgid "Nudge sent!"
-msgstr "Richiamo inviato!"
-
-#: actions/openidlogin.php:97
-msgid "OpenID login"
-msgstr "Accesso OpenID"
-
-#: actions/openidsettings.php:128
-#, fuzzy
-msgid "Removing your only OpenID "
-msgstr "Rimuovere l'unico OpenID "
-
-#: actions/othersettings.php:60
-msgid "Other Settings"
-msgstr "Altre impostazioni"
-
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Gestisci altre opzioni."
-
-# o andare con un 'accorciamento'? auto-accorciamento?
-#: actions/othersettings.php:93
-msgid "URL Auto-shortening"
-msgstr "Autoriduzione degli URL"
-
-#: actions/othersettings.php:112
-msgid "Service"
-msgstr "Servizio"
-
-# o andare con 'accorciamento'? auto-accorciamento?
-#: actions/othersettings.php:113
-msgid "Automatic shortening service to use."
-msgstr "Servizio di autoriduzione da usare."
-
-# in caso, accorciamento anche qui.
-#: actions/othersettings.php:144
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "Il servizio di riduzione degli URL è troppo lungo (max 50 caratteri)"
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Messaggio a %1$s su %2$s"
 
-#: actions/passwordsettings.php:69
-msgid "Change your password."
-msgstr "Modifica la tua password."
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "Messaggi preferiti di %s, pagina %d"
 
-#: actions/passwordsettings.php:89
-msgid "Password change"
-msgstr "Cambio password"
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
+msgstr "Impossibile recuperare i messaggi preferiti."
 
-#: actions/peopletag.php:35
+#: actions/showfavorites.php:170
 #, php-format
-msgid "Not a valid people tag: %s"
-msgstr "Non è un'etichetta valida di persona: %s"
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Feed per gli amici di %s"
 
-#: actions/peopletag.php:47
+#: actions/showfavorites.php:177
 #, php-format
-msgid "Users self-tagged with %s - page %d"
-msgstr "Utenti auto-etichettati con %s - pagina %d"
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Feed per gli amici di %s"
 
-#: actions/peopletag.php:91
+#: actions/showfavorites.php:184
 #, php-format
-msgid "These are users who have tagged themselves \"%s\" "
-msgstr "Questi sono gli utenti che si sono etichettati con \"%s\" "
-
-#: actions/profilesettings.php:91
-msgid "Profile information"
-msgstr "Informazioni sul profilo"
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Feed per gli amici di %s"
 
-#: actions/profilesettings.php:124
+#: actions/showfavorites.php:205
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""
-"Le tue etichette (lettere, numeri, -, . e _), separate da virgole o spazi"
-
-#: actions/profilesettings.php:144
-#, fuzzy
-msgid "Automatically subscribe to whoever "
-msgstr "Abbonami automaticamente a chi "
-
-#: actions/profilesettings.php:229 actions/tagother.php:176
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Etichetta non valida: \"%s\""
-
-#: actions/profilesettings.php:311
-msgid "Couldn't save tags."
-msgstr "Impossibile salvare le etichette."
-
-#  Solo una prova, se non sta bene si ripristina la versione vecchia, giusto per avere l'interfaccia il più tradotta possibile
-#: actions/public.php:107
-#, php-format
-msgid "Public timeline, page %d"
-msgstr "Attività pubblica, pagina %d"
-
-#: actions/public.php:173
-msgid "Could not retrieve public stream."
-msgstr "Impossibile recuperare l'attività pubblica."
 
-#: actions/public.php:220
+#: actions/showfavorites.php:207
 #, php-format
 msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
 msgstr ""
-"Questo è %%site.name%%, un servizio di [micro-"
-"blog](http://it.wikipedia.org/wiki/Microblogging) "
-
-#: actions/publictagcloud.php:57
-msgid "Public tag cloud"
-msgstr "Insieme delle etichette"
-
-#: actions/publictagcloud.php:63
-#, php-format
-#, fuzzy
-msgid "These are most popular recent tags on %s "
-msgstr "Queste sono le etichette più usate e recenti su %s "
-
-#: actions/publictagcloud.php:119
-msgid "Tag cloud"
-msgstr "Insieme etichette"
-
-#: actions/register.php:139 actions/register.php:349
-msgid "Sorry, only invited people can register."
-msgstr "Spiacenti, solo le persone invitate possono registrarsi."
-
-#: actions/register.php:149
-#, fuzzy
-msgid "You can't register if you don't "
-msgstr "Non puoi registrarti se non "
-
-#: actions/register.php:286
-#, fuzzy
-msgid "With this form you can create "
-msgstr "Tramite questo modulo puoi creare "
-
-#: actions/register.php:368
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, "
-msgstr "1-64 lettere minuscole o numeri, "
-
-#  Femminile, è l'email
-#: actions/register.php:382 actions/register.php:386
-#, fuzzy
-msgid "Used only for updates, announcements, "
-msgstr "Usata solo per aggiornamenti, annunci "
-
-#: actions/register.php:398
-#, fuzzy
-msgid "URL of your homepage, blog, "
-msgstr "URL della tua pagina web, blog "
-
-# per renderla 'asessuale' il più possibile...
-#: actions/register.php:404
-#, fuzzy
-msgid "Describe yourself and your "
-msgstr "Descrivi te e i tuoi "
-
-#: actions/register.php:410
-#, fuzzy
-msgid "Where you are, like \"City, "
-msgstr "Dove ti trovi, tipo \"città, "
-
-#: actions/register.php:432
-#, fuzzy
-msgid " except this private data: password, "
-msgstr " a eccezione di questi dati personali: password, "
-
-#: actions/register.php:471
-#, fuzzy, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
-msgstr "Congratulazioni %s! Benvenuto/a su %%%%site.name%%%%. "
-
-#: actions/register.php:495
-#, fuzzy
-msgid "(You should receive a message by email "
-msgstr "(Dovresti ricevere un messaggio email "
-
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
-msgstr "Quello è un profilo locale! Accedi per abbonarti."
 
-#: actions/replies.php:118
+#: actions/showfavorites.php:211
 #, php-format
-msgid "Replies to %s, page %d"
-msgstr "Risposte a %s, pagina %d"
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
 
-#: actions/showfavorites.php:79
-#, php-format
-msgid "%s favorite notices, page %d"
-msgstr "Messaggi preferiti di %s, pagina %d"
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:82 lib/groupnav.php:86
 #, php-format
 msgid "%s group"
 msgstr "Gruppi di %s"
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr "Gruppi di %s, pagina %d"
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:218
 msgid "Group profile"
 msgstr "Profilo del gruppo"
 
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
 msgid "URL"
 msgstr "URL"
 
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
 msgid "Note"
 msgstr "Nota"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:293
 msgid "Group actions"
 msgstr "Azioni dei gruppi"
 
-#: actions/showgroup.php:323
-#, php-format
-msgid "Notice feed for %s group"
+#: actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Feed dei messaggi per il gruppo %s"
+
+#: actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Feed dei messaggi per il gruppo %s"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Feed dei messaggi per il gruppo %s"
+
+#: actions/showgroup.php:345
+#, php-format
+msgid "FOAF for %s group"
+msgstr "Casella posta inviata di %s"
+
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
 msgid "Members"
 msgstr "Membri"
 
-# femminile, è relativo alle etichette
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
 #: lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(nessuno)"
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:392
 msgid "All members"
 msgstr "Tutti i membri"
 
-#: actions/showgroup.php:378
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "Statistiche"
+
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Crea"
+
+#: actions/showgroup.php:448
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
-"**%s** è un gruppo su %%%%site.name%%%%, un servizio di [micro-"
-"blog](http://it.wikipedia.org/wiki/Microblogging) "
+
+#: actions/showgroup.php:454
+#, fuzzy, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
+msgstr ""
+"**%s** è un gruppo su %%%%site.name%%%%, un servizio di [micro-blog](http://"
+"it.wikipedia.org/wiki/Microblogging) "
+
+#: actions/showgroup.php:482
+#, fuzzy
+msgid "Admins"
+msgstr "Amministra"
+
+#: actions/showmessage.php:81
+msgid "No such message."
+msgstr "Nessun tale messaggio."
 
 #: actions/showmessage.php:98
+msgid "Only the sender and recipient may read this message."
+msgstr "Solo mittente e destinatario possono leggere questo messaggio."
+
+#: actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr "Messaggio a %1$s su %2$s"
+
+#: actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr "Messaggio da %1$s su %2$s"
+
+#: actions/shownotice.php:90
 #, fuzzy
-msgid "Only the sender and recipient "
-msgstr "Solo mittente e destinatario "
+msgid "Notice deleted."
+msgstr "Messaggio inviato"
 
 #: actions/showstream.php:73
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "Messaggi etichettati con %s"
+
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, pagina %d"
 
-#: actions/showstream.php:143
-#, fuzzy
-msgid "'s profile"
-msgstr "Profilo"
+#: actions/showstream.php:122
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Feed dei messaggi per il gruppo %s"
 
-#: actions/showstream.php:236 actions/tagother.php:77
-msgid "User profile"
-msgstr "Profilo utente"
+#: actions/showstream.php:129
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Feed dei messaggi per %s"
 
-#: actions/showstream.php:240 actions/tagother.php:81
-msgid "Photo"
-msgstr "Fotografia"
+#: actions/showstream.php:136
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Feed dei messaggi per %s"
 
-#: actions/showstream.php:317
-msgid "User actions"
-msgstr "Azioni utente"
+#: actions/showstream.php:143
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Feed dei messaggi per %s"
 
-#: actions/showstream.php:342
-msgid "Send a direct message to this user"
-msgstr "Invia un messaggio diretto a questo utente"
+#: actions/showstream.php:148
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Casella posta inviata di %s"
 
-#: actions/showstream.php:343
-msgid "Message"
-msgstr "Messaggio"
+#: actions/showstream.php:191
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
 
-#: actions/showstream.php:451
-msgid "All subscribers"
-msgstr "Tutti gli abbonati"
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
 
-#: actions/showstream.php:533
-msgid "All groups"
-msgstr "Tutti i gruppi"
+#: actions/showstream.php:198
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
 
-#: actions/showstream.php:542
+#: actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+
+#: actions/showstream.php:239
+#, fuzzy, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
 msgstr ""
-"**%s** ha un account su %%%%site.name%%%%, un servizio di [micro-"
-"blog](http://it.wikipedia.org/wiki/Microblogging) "
+"**%s** ha un account su %%%%site.name%%%%, un servizio di [micro-blog]"
+"(http://it.wikipedia.org/wiki/Microblogging) "
+
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "Impostazioni SMS"
 
-#: actions/smssettings.php:128
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr "Puoi ricevere messaggi SMS attraverso l'email da %%site.name%%."
+
+#: actions/smssettings.php:91
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, "
-msgstr "Numero di telefono, senza punteggiatura o spazi, "
+msgid "SMS is not available."
+msgstr "Questa pagina non è disponibile in un "
+
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Numero di telefono attualmente confermato per gli SMS."
+
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
+msgstr "Attesa la conferma per questo numero di telefono."
 
-#: actions/smssettings.php:162
+#: actions/smssettings.php:130
+msgid "Confirmation code"
+msgstr "Codice di conferma"
+
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
+msgstr "Inserisci il codice che hai ricevuto sul tuo telefono."
+
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
+msgstr "Numero di telefono per SMS"
+
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "Numero di telefono, senza punteggiatura o spazi, con il prefisso"
+
+#: actions/smssettings.php:174
+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/smssettings.php:306
+msgid "No phone number."
+msgstr "Nessun numero di telefono."
+
+#: actions/smssettings.php:311
+msgid "No carrier selected."
+msgstr "Nessun operatore selezionato."
+
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
+msgstr "Quello è già il tuo numero di telefono."
+
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
+msgstr "Quel numero di telefono appartiene già a un altro utente."
+
+#: actions/smssettings.php:347
 #, fuzzy
-msgid "Send me notices through SMS; "
-msgstr "Inviami le notifiche via SMS; "
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"Un codice di conferma è stato inviato al numero di telefono che hai "
+"aggiunto. Controlla la tua casella di posta (e anche la posta indesiderata!) "
+"per il codice e le istruzioni su come usarlo."
 
-#: actions/smssettings.php:335
-msgid "A confirmation code was sent to the phone number you added. "
-msgstr "Un codice di conferma è stato inviato al numero di telefono aggiunto. "
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
+msgstr "Quello è il numero di conferma errato."
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
+msgstr "Quello non è il tuo numero di telefono."
+
+#: actions/smssettings.php:465
 msgid "Mobile carrier"
 msgstr "Operatore telefonico"
 
+#: actions/smssettings.php:469
+msgid "Select a carrier"
+msgstr "Seleziona un operatore"
+
+#: actions/smssettings.php:476
+#, 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/smssettings.php:498
+msgid "No code entered"
+msgstr "Nessun codice inserito"
+
 #: actions/subedit.php:70
 msgid "You are not subscribed to that profile."
 msgstr "Non sei abbonato a quel profilo."
@@ -4322,14 +3033,31 @@ msgid "%s subscribers, page %d"
 msgstr "Abbonati a %s, pagina %d"
 
 #: actions/subscribers.php:63
-#, fuzzy
-msgid "These are the people who listen to "
-msgstr "Queste sono le persone che seguono "
+msgid "These are the people who listen to your notices."
+msgstr "Queste sono le persone che ti seguono."
 
 #: actions/subscribers.php:67
-#, fuzzy, php-format
-msgid "These are the people who "
-msgstr "Queste sono le persone che "
+#, php-format
+msgid "These are the people who listen to %s's notices."
+msgstr "Queste sono le persone che seguono %s."
+
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
+msgstr ""
+
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr ""
+
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
 
 #: actions/subscriptions.php:52
 #, php-format
@@ -4342,28 +3070,36 @@ msgid "%s subscriptions, page %d"
 msgstr "Abbonamenti di %s, pagina %d"
 
 #: actions/subscriptions.php:65
-#, fuzzy
-msgid "These are the people whose notices "
-msgstr "Queste sono le persone i cui messaggi "
+msgid "These are the people whose notices you listen to."
+msgstr "Queste sono le persone che stai seguendo."
 
 #: actions/subscriptions.php:69
+#, php-format
+msgid "These are the people whose notices %s listens to."
+msgstr "Queste sono le persone seguite da %s."
+
+#: actions/subscriptions.php:121
+#, php-format
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
+msgstr ""
+
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
 #, fuzzy, php-format
-msgid "These are the people whose "
-msgstr "Queste sono le persone i cui "
+msgid "%s is not listening to anyone."
+msgstr "%1$s sta ora seguendo "
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:194
 msgid "Jabber"
 msgstr "Jabber"
 
-#: actions/tag.php:43
-#, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Messaggi etichettati con %s, pagina %d"
-
-#: actions/tag.php:66
-#, php-format
-msgid "Messages tagged \"%s\", most recent first"
-msgstr "Messaggi etichettati con \"%s\", i più recenti"
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
+msgstr "SMS"
 
 #: actions/tagother.php:33
 msgid "Not logged in"
@@ -4378,11 +3114,19 @@ msgstr "Nessun argomento ID."
 msgid "Tag %s"
 msgstr "Etichetta %s"
 
+#: actions/tagother.php:77 lib/userprofile.php:75
+msgid "User profile"
+msgstr "Profilo utente"
+
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
+msgstr "Fotografia"
+
 #: actions/tagother.php:141
 msgid "Tag user"
 msgstr "Etichette utente"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4390,246 +3134,889 @@ msgstr ""
 "Etichette per questo utente (lettere, numeri, -, . e _), separate da virgole "
 "o spazi"
 
-#: actions/tagother.php:164
-msgid "There was a problem with your session token."
-msgstr "C'è stato un problema con il tuo token di sessione."
-
-#: actions/tagother.php:191
+#: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Puoi etichettare sole le persone a cui sei abbonato o che sono abbonate a te."
 
-#: actions/tagother.php:198
+#: actions/tagother.php:200
 msgid "Could not save tags."
 msgstr "Impossibile salvare le etichette."
 
-#: actions/tagother.php:233
+#: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Usa questo modulo per aggiungere etichette ai tuoi abbonati o ai tuoi "
 "abbonamenti."
 
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Messaggi etichettati con %s, pagina %d"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Feed dei messaggi per %s"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Feed dei messaggi per %s"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Feed dei messaggi per %s"
+
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Nessuna tale etichetta."
 
-#: actions/tagrss.php:66
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
+msgstr "Metodo delle API in lavorazione."
+
+#: actions/unsubscribe.php:77
+msgid "No profile id in request."
+msgstr "Nessun ID di profilo nella richiesta."
+
+#: actions/unsubscribe.php:84
+msgid "No profile with that id."
+msgstr "Nessun profilo con quel ID."
+
+#: actions/unsubscribe.php:98
+msgid "Unsubscribed"
+msgstr "Annullato abbonamento"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
 #, php-format
-msgid "Microblog tagged with %s"
-msgstr "Micro-blog etichettati con %s"
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
 
-#: actions/twitapiblocks.php:47
-msgid "Block user failed."
-msgstr "Blocco dell'utente non riuscito."
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "Autorizza abbonamento"
 
-#: actions/twitapiblocks.php:69
-msgid "Unblock user failed."
-msgstr "Sblocco dell'utente non riuscito."
+#: actions/userauthorization.php:110
+#, fuzzy
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
+msgstr ""
+"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/twitapiusers.php:48
-msgid "Not found."
-msgstr "Non trovato"
+#: actions/userauthorization.php:188
+#, fuzzy
+msgid "License"
+msgstr "licenza."
+
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "Accetta"
 
-#: actions/twittersettings.php:71
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Abbonati a questo utente"
+
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "Rifiuta"
+
+#: actions/userauthorization.php:212
 #, fuzzy
-msgid "Add your Twitter account to automatically send "
-msgstr "Aggiungi il tuo account Twitter per inviare automaticamente "
+msgid "Reject this subscription"
+msgstr "Abbonamenti di %s"
 
-#: actions/twittersettings.php:119
-msgid "Twitter user name"
-msgstr "Nome utente di Twitter"
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
+msgstr "Nessuna richiesta di autorizzazione!"
 
-#: actions/twittersettings.php:126
-msgid "Twitter password"
-msgstr "Password di Twitter"
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+msgstr "Abbonamento autorizzato"
 
-# elenca quali sono i propri amici su twitter
-#: actions/twittersettings.php:228
-msgid "Twitter Friends"
-msgstr "Amici su Twitter"
+#: actions/userauthorization.php:249
+#, fuzzy
+msgid ""
+"The subscription has been authorized, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to authorize the "
+"subscription. Your subscription token is:"
+msgstr ""
+"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:259
+msgid "Subscription rejected"
+msgstr "Abbonamento rifiutato"
 
-#: actions/twittersettings.php:327
+#: actions/userauthorization.php:261
 #, fuzzy
-msgid "Username must have only numbers, "
-msgstr "Il nome utente deve avere solo numeri, "
+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'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/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
 
-#: actions/twittersettings.php:341
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
 #, fuzzy, php-format
-msgid "Unable to retrieve account information "
-msgstr "Impossibile recuperare informazioni sull'account "
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Impossibile leggere l'URL \"%s\" dell'immagine"
 
-#: actions/unblock.php:108
-msgid "Error removing the block."
-msgstr "Errore nel rimuovere il blocco."
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Tipo di immagine errata per \"%s\""
 
-#: actions/unsubscribe.php:50
-msgid "No profile id in request."
-msgstr "Nessun ID di profilo nella richiesta."
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr "Nessun ID."
 
-#: actions/unsubscribe.php:57
-msgid "No profile with that id."
-msgstr "Nessun profilo con quel ID."
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "Impostazioni del profilo"
 
-#: actions/unsubscribe.php:71
-msgid "Unsubscribed"
-msgstr "Annullato abbonamento"
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
 
-#: actions/usergroups.php:63
-#, php-format
-msgid "%s groups"
-msgstr "Gruppi di %s"
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "Gruppi di %s, pagina %d"
 
-#: classes/Notice.php:104
+#: actions/usergroups.php:130
+#, fuzzy
+msgid "Search for more groups"
+msgstr "Ricerca persone o per testo"
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "Non sei un membro di quel gruppo."
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Message.php:55
+msgid "Could not insert message."
+msgstr "Impossibile inserire messaggio."
+
+#: classes/Message.php:65
+msgid "Could not update message with new URI."
+msgstr "Impossibile aggiornare il messaggio con il nuovo URI."
+
+#: classes/Notice.php:164
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "Errore del DB nell'inserire un hashtag: %s"
+
+#: classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Problema nel salvare il messaggio."
+
+#: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
 msgstr "Problema nel salvare il messaggio. Utente sconosciuto."
 
-#: classes/Notice.php:109
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Troppi messaggi troppo velocemente; fai una pausa e scrivi di nuovo tra "
 "qualche minuto."
 
-#: classes/Notice.php:116
+#: classes/Notice.php:194
+#, fuzzy
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+"Troppi messaggi troppo velocemente; fai una pausa e scrivi di nuovo tra "
+"qualche minuto."
+
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr "Ti è proibito inviare messaggi su questo sito."
 
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
+msgstr "Problema nel salvare il messaggio."
+
+#: classes/Notice.php:1120
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "Errore del DB nell'inserire la risposta: %s"
+
+#: classes/User.php:347
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Messaggio a %1$s su %2$s"
+
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Profilo"
+
 #: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
+msgstr "Modifica le impostazioni del tuo profilo"
+
+#: lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "Carica un'immagine"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr "Modifica la tua password"
+
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
+msgstr "Modifica la gestione dell'email"
+
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:124
+#, fuzzy
+msgid "Design your profile"
+msgstr "Profilo utente"
+
+#: lib/accountsettingsaction.php:128
 msgid "Other"
 msgstr "Altro"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:128
 msgid "Other options"
 msgstr "Altre opzioni"
 
-#: lib/action.php:130
+#: lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: lib/action.php:145
+#: lib/action.php:159
 msgid "Untitled page"
 msgstr "Pagina senza nome"
 
-#: lib/action.php:316
+#: lib/action.php:424
 msgid "Primary site navigation"
 msgstr "Esplorazione sito primaria"
 
-#: lib/action.php:322
+#: lib/action.php:430
+msgid "Home"
+msgstr "Home"
+
+#: lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr "Profilo personale e attività degli amici"
 
-#: lib/action.php:325
-msgid "Search for people or text"
-msgstr "Ricerca persone o per testo"
-
-#: lib/action.php:328
+#: lib/action.php:432
 msgid "Account"
 msgstr "Account"
 
-#: lib/action.php:328
+#: lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr "Modifica la tua email, immagine, password o il tuo profilo"
 
-#: lib/action.php:330
-msgid "Connect to IM, SMS, Twitter"
-msgstr "Connettiti con MI, SMS e Twitter"
+#: lib/action.php:435
+msgid "Connect"
+msgstr "Connetti"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Impossibile redirigere al server: %s"
+
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
+msgstr "Invita"
+
+#: lib/action.php:440 lib/subgroupnav.php:106
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr "Invita amici e colleghi a seguirti su %s"
+
+#: lib/action.php:445
+msgid "Logout"
+msgstr "Esci"
 
-#: lib/action.php:332
+#: lib/action.php:445
 msgid "Logout from the site"
 msgstr "Sconnettiti dal sito"
 
-#: lib/action.php:335
-msgid "Login to the site"
-msgstr "Accedi al sito"
-
-#: lib/action.php:338
+#: lib/action.php:450
 msgid "Create an account"
 msgstr "Crea un account"
 
-#: lib/action.php:341
-msgid "Login with OpenID"
-msgstr "Accedi con OpenID"
+#: lib/action.php:453
+msgid "Login to the site"
+msgstr "Accedi al sito"
 
-#: lib/action.php:344
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
+msgstr "Aiuto"
+
+#: lib/action.php:456
 msgid "Help me!"
 msgstr "Aiutami!"
 
-#: lib/action.php:362
+#: lib/action.php:459
+msgid "Search"
+msgstr "Ricerca"
+
+#: lib/action.php:459
+msgid "Search for people or text"
+msgstr "Ricerca persone o per testo"
+
+#: lib/action.php:480
 msgid "Site notice"
 msgstr "Messaggio del sito"
 
-#: lib/action.php:417
+#: lib/action.php:546
 msgid "Local views"
 msgstr "Viste locali"
 
-#: lib/action.php:472
+#: lib/action.php:612
 msgid "Page notice"
 msgstr "Pagina messaggio"
 
-#: lib/action.php:562
+#: lib/action.php:714
 msgid "Secondary site navigation"
 msgstr "Esplorazione secondaria del sito"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:721
+msgid "About"
+msgstr "Informazioni"
+
+#: lib/action.php:723
+msgid "FAQ"
+msgstr "FAQ"
+
+#: lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/action.php:730
+msgid "Privacy"
+msgstr "Privacy"
+
+#: lib/action.php:732
+msgid "Source"
+msgstr "Sorgenti"
+
+#: lib/action.php:734
+msgid "Contact"
+msgstr "Contatti"
+
+#: lib/action.php:736
+#, fuzzy
+msgid "Badge"
+msgstr "Richiama"
+
+#: lib/action.php:764
 msgid "StatusNet software license"
 msgstr "Licenza del software statusnet"
 
-#: lib/action.php:630
+#: lib/action.php:767
+#, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
+msgstr ""
+"**%%site.name%%** è un servizio di micro-blog offerto da [%%site.broughtby%%]"
+"(%%site.broughtbyurl%%). "
+
+#: lib/action.php:769
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** è un servizio di micro-blog. "
+
+#: lib/action.php:771
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+"Gestito dal software di micro-blog [StatusNet](http://status.net/), versione "
+"%s, disponibile sotto licenza [GNU Affero General Public License](http://www."
+"fsf.org/licensing/licenses/agpl-3.0.html)."
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "Licenza del software statusnet"
+
+#: lib/action.php:794
 msgid "All "
 msgstr "Tutto "
 
-#: lib/action.php:635
+#: lib/action.php:799
 msgid "license."
 msgstr "licenza."
 
-#: lib/blockform.php:123 lib/blockform.php:153
-msgid "Block this user"
-msgstr "Blocca questo utente"
+#: lib/action.php:1052
+msgid "Pagination"
+msgstr "Paginazione"
 
-# azione
-#: lib/blockform.php:153
-msgid "Block"
-msgstr "Blocca"
+#: lib/action.php:1061
+msgid "After"
+msgstr "Successivi"
 
-# è un suggerimento
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
-msgid "Disfavor this notice"
-msgstr "Togli questo messaggio dai preferiti"
+#: lib/action.php:1069
+msgid "Before"
+msgstr "Precedenti"
+
+#: lib/action.php:1117
+msgid "There was a problem with your session token."
+msgstr "C'è stato un problema con il tuo token di sessione."
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "Profilo"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
+msgstr "Risultati comando"
+
+#: lib/channel.php:210
+msgid "Command complete"
+msgstr "Comando completato"
 
-#: lib/facebookaction.php:268
+#: lib/channel.php:221
+msgid "Command failed"
+msgstr "Comando non riuscito"
+
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr "Questo comando non è ancora implementato"
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Impossibile aggiornare l'utente con l'indirizzo email confermato."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "Richiamo inviato"
+
+#: lib/command.php:126
 #, php-format
-msgid "To use the %s Facebook Application you need to login "
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
+msgstr "L'utente non ha un ultimo messaggio"
+
+#: lib/command.php:190
+msgid "Notice marked as fave."
+msgstr "Messaggio indicato come preferito."
+
+#: lib/command.php:315
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#: lib/command.php:318
+#, php-format
+msgid "Fullname: %s"
+msgstr "Nome completo: %s"
+
+#: lib/command.php:321
+#, php-format
+msgid "Location: %s"
+msgstr "Ubicazione: %s"
+
+#: lib/command.php:324
+#, php-format
+msgid "Homepage: %s"
+msgstr "Pagina web: %s"
+
+#: lib/command.php:327
+#, php-format
+msgid "About: %s"
+msgstr "Informazioni: %s"
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr "Messaggio troppo lungo - massimo 140 caratteri, inviati %d"
+
+#: lib/command.php:377
+msgid "Error sending direct message."
+msgstr "Errore nell'inviare il messaggio diretto."
+
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "Messaggio troppo lungo - massimo 140 caratteri, inviati %d"
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Rispondi a questo messaggio"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Problema nel salvare il messaggio."
+
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
+msgstr "Specifica il nome dell'utente a cui abbonarti"
+
+#: lib/command.php:502
+#, php-format
+msgid "Subscribed to %s"
+msgstr "Abbonato a %s"
+
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
+msgstr "Specifica il nome dell'utente da cui annullare l'abbonamento"
+
+#: lib/command.php:530
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr "Abbonamento a %s annullato"
+
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
+msgstr "Comando non ancora implementato."
+
+#: lib/command.php:551
+msgid "Notification off."
+msgstr "Notifiche disattivate."
+
+#: lib/command.php:553
+msgid "Can't turn off notification."
+msgstr "Impossibile disattivare le notifiche."
+
+#: lib/command.php:574
+msgid "Notification on."
+msgstr "Notifiche attivate."
+
+#: lib/command.php:576
+msgid "Can't turn on notification."
+msgstr "Impossibile attivare le notifiche."
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Impossibile creare il modulo OpenID: %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Non sei abbonato a quel profilo."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Non sei abbonato a quel profilo."
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Impossibile abbonare altri a te."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Persone abbonate a %s"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Non sei un membro di quel gruppo."
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "Non sei un membro di quel gruppo."
+
+#: lib/command.php:670
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+
+#: lib/common.php:192
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Nessun codice di conferma."
+
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
 msgstr ""
-"Per utilizzare l'applicazione Facebook %s è necessario eseguire l'accesso "
 
-#: lib/facebookaction.php:271
+#: lib/common.php:195
 #, fuzzy
-msgid " a new account."
-msgstr " un nuovo account."
+msgid "Go to the installer."
+msgstr "Accedi al sito"
+
+#: lib/connectsettingsaction.php:110
+msgid "IM"
+msgstr "MI"
+
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Aggiornamenti via messaggistica istantanea (MI)"
+
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
+msgstr "Aggiornamenti via SMS"
+
+#: lib/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Carica"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Modifica la tua password"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Connetti"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Ricerca"
+
+#: lib/designsettings.php:217
+msgid "Text"
+msgstr "Testo"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Elenco"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
+msgstr ""
 
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-msgid "Published"
-msgstr "Pubblicato"
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
+msgstr "Togli questo messaggio dai preferiti"
 
 #: lib/favorform.php:114 lib/favorform.php:140
 msgid "Favor this notice"
 msgstr "Rendi questo messaggio un favorito"
 
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr "Preferito"
+
 #: lib/feedlist.php:64
 msgid "Export data"
 msgstr "Esporta dati"
 
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr ""
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr ""
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr ""
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Filtra etichette"
@@ -4638,59 +4025,84 @@ msgstr "Filtra etichette"
 msgid "All"
 msgstr "Tutto"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Seleziona un operatore"
+
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Etichetta"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "Scegli un'etichetta per ridurre l'elenco"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "Vai"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "URL della pagina web o del blog per il gruppo o l'argomento"
 
-#: lib/groupeditform.php:151
-msgid "Description"
-msgstr "Descrizione"
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Descrivi il gruppo o l'argomento in 140 caratteri"
 
-# per renderla 'asessuale' il più possibile...
-#: lib/groupeditform.php:153
-msgid "Describe the group or topic in 140 chars"
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
 msgstr "Descrivi il gruppo o l'argomento in 140 caratteri"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:172
+msgid "Description"
+msgstr "Descrizione"
+
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr "Dove è situato il gruppo, tipo \"città, regione, stato\""
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
 msgid "Group"
 msgstr "Gruppo"
 
-# potrebbe essere lunga...
-#: lib/groupnav.php:100
-msgid "Admin"
-msgstr "Amministra"
-
 #: lib/groupnav.php:101
+#, fuzzy
+msgid "Blocked"
+msgstr "Blocca"
+
+#: lib/groupnav.php:102
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Blocca utente"
+
+#: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
 msgstr "Modifica le proprietà del gruppo %s"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:113
 msgid "Logo"
 msgstr "Logo"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:114
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "Aggiungi o modifica il logo di %s"
 
+#: lib/groupnav.php:120
+#, fuzzy, php-format
+msgid "Add or edit %s design"
+msgstr "Aggiungi o modifica il logo di %s"
+
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "I gruppi più numerosi"
@@ -4705,11 +4117,43 @@ msgid "Tags in %s group's notices"
 msgstr "Etichette nei messaggi del gruppo %s"
 
 #: lib/htmloutputter.php:104
-#, fuzzy
-msgid "This page is not available in a "
-msgstr "Questa pagina non è disponibile in un "
+msgid "This page is not available in a media type you accept"
+msgstr "Questa pagina non è disponibile in un tipo di supporto che tu accetti"
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Puoi caricare un'immagine per il logo del tuo gruppo."
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr "Caricamento parziale."
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr "Errore di sistema nel caricare il file."
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr "Non è un'immagine o il file è danneggiato."
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr "Formato file immagine non supportato."
+
+#: lib/imagefile.php:118
+msgid "Lost our file."
+msgstr "Perso il nostro file."
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr "Tipo di file sconosciuto"
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr ""
 
-# è relativo ai gruppi
 #: lib/joinform.php:114
 msgid "Join"
 msgstr "Iscriviti"
@@ -4718,43 +4162,87 @@ msgstr "Iscriviti"
 msgid "Leave"
 msgstr "Lascia"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr "Accedi con nome utente e password"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr "Iscriviti per un nuovo account"
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
-msgstr "Accedi o registrati con OpenID"
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "Solo l'utente può leggere la propria casella di posta."
 
-#: lib/mail.php:175
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr " via "
+
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "Conferma indirizzo email"
+
+#: lib/mail.php:174
 #, php-format
 msgid ""
 "Hey, %s.\n"
 "\n"
-msgstr ""
-"Ehi, %s\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
 "\n"
+"\t%s\n"
+"\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
+msgstr ""
 
-#: lib/mail.php:236
+#: lib/mail.php:235
+#, php-format
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr "%1$s sta ora seguendo i tuoi messaggi su %2$s."
+
+#: lib/mail.php:240
 #, fuzzy, php-format
-msgid "%1$s is now listening to "
-msgstr "%1$s sta ora seguendo "
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
+"%1$s sta ora seguendo i tuoi messaggi su %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Cordiali saluti,\n"
+"%4$s.\n"
 
-#: lib/mail.php:254
+#: lib/mail.php:253
 #, php-format
 msgid "Location: %s\n"
 msgstr "Ubicazione: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:255
 #, php-format
 msgid "Homepage: %s\n"
 msgstr "Pagina web: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
@@ -4763,58 +4251,226 @@ msgstr ""
 "Biografia: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:285
+#, php-format
+msgid "New email address for posting to %s"
+msgstr "Nuovo indirizzo email per inviare messaggi a %s"
+
+#: lib/mail.php:288
+#, 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 %3$s.\n"
+"\n"
+"Cordiali saluti,\n"
+"%4$s"
+
+#: lib/mail.php:412
+#, php-format
+msgid "%s status"
+msgstr "stato di %s"
+
+#: lib/mail.php:438
+msgid "SMS confirmation"
+msgstr "Conferma SMS"
+
+#: lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "%s ti ha richiamato"
 
-#: lib/mail.php:465
+#: lib/mail.php:466
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
+msgstr ""
+
+#: lib/mail.php:509
+#, php-format
+msgid "New private message from %s"
+msgstr "Nuovo messaggio privato da %s"
+
+#: lib/mail.php:513
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%5$s\n"
+msgstr ""
+
+#: lib/mail.php:554
 #, fuzzy, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
-msgstr "%1$s (%2$s) si chiede cosa tu "
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s ha aggiunto il tuo messaggio tra i suoi preferiti"
 
-#: lib/mail.php:555
+#: lib/mail.php:556
 #, php-format
-msgid "%1$s just added your notice from %2$s"
-msgstr "%1$s ha appena aggiunto il tuo messaggio da %2$s"
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
 
-# è 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'...).
-#: lib/mailbox.php:229 lib/noticelist.php:380
-msgid "From"
-msgstr "Da"
+#: lib/mail.php:613
+#, php-format
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+msgstr ""
+
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
 
-#: lib/messageform.php:110
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+msgid "Could not determine file's mime-type!"
+msgstr "Impossibile recuperare l'attività pubblica."
+
+#: lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Invia un messaggio diretto"
 
-#: lib/noticeform.php:125
-msgid "Send a notice"
-msgstr "Invia un messaggio"
+#: lib/messageform.php:146
+msgid "To"
+msgstr "A"
 
-#: lib/noticeform.php:152
+#: lib/messageform.php:162 lib/noticeform.php:173
 msgid "Available characters"
 msgstr "Caratteri disponibili"
 
-#: lib/noticelist.php:426
-msgid "in reply to"
-msgstr "in risposta a"
+#: lib/noticeform.php:145
+msgid "Send a notice"
+msgstr "Invia un messaggio"
+
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
+msgstr "Cosa succede, %s?"
+
+#: lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "Nessun contenuto!"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr "Rispondi a questo messaggio"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "Rispondi"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
-msgid "Delete this notice"
-msgstr "Elimina questo messaggio"
-
-#: lib/noticelist.php:474
-msgid "Delete"
-msgstr "Elimina"
-
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Richiama questo utente"
@@ -4827,41 +4483,139 @@ msgstr "Richiama"
 msgid "Send a nudge to this user"
 msgstr "Invia un richiamo a questo utente"
 
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "Errore nell'inserire il nuovo profilo"
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "Errore nell'inserire l'immagine"
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "Errore nell'inserire un profilo remoto"
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Elimina messaggio"
+
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
+msgstr "Impossibile inserire un nuovo abbonamento."
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "Personale"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "Risposte"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr "Preferiti"
+
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr "Utente"
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr "In arrivo"
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr "I tuoi messaggi in arrivo"
+
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr "Inviati"
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr "I tuoi messaggi inviati"
+
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Etichette nei messaggi di %s"
 
-# femminile, è relativo alle etichette
-#: lib/profilelist.php:182
-msgid "(none)"
-msgstr "(nessuna)"
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "Abbonamenti"
+
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "Tutti gli abbonamenti"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "Abbonati"
+
+#: lib/profileaction.php:157
+msgid "All subscribers"
+msgstr "Tutti gli abbonati"
+
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "Utente"
+
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "Membro dal"
+
+#: lib/profileaction.php:235
+msgid "All groups"
+msgstr "Tutti i gruppi"
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Pubblico"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Gruppi dell'utente"
 
-#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Etichette recenti"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "In evidenza"
 
-# è una prova, è il nome di una scheda, al massimo si cambia, però popolari mi pare troppo banale.
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Famosi"
 
+#: lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Ricerca"
+
+#: lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Ricerca"
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "Persone"
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr "Ricerca persone in questo sito"
+
 #: lib/searchgroupnav.php:82
 msgid "Notice"
 msgstr "Messaggio"
 
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr "Ricerca contenuto dei messaggi"
+
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Ricerca gruppi in questo sito"
@@ -4870,33 +4624,63 @@ msgstr "Ricerca gruppi in questo sito"
 msgid "Untitled section"
 msgstr "Sezione senza nome"
 
-#: lib/subgroupnav.php:81
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Persone a cui %s è abbonato"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:91
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Persone abbonate a %s"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Il gruppo %s è membro di"
 
-#: lib/subgroupnav.php:104
-#, php-format
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Invita amici e colleghi a seguirti su %s"
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(nessuna)"
+
+#: lib/subs.php:48
+msgid "Already subscribed!"
+msgstr ""
 
-#: lib/subs.php:53
+#: lib/subs.php:52
 msgid "User has blocked you."
 msgstr "L'utente ti ha bloccato."
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Abbonati a questo utente"
+#: lib/subs.php:56
+msgid "Could not subscribe."
+msgstr "Impossibile abbonarsi."
+
+#: lib/subs.php:75
+msgid "Could not subscribe other to you."
+msgstr "Impossibile abbonare altri a te."
+
+#: lib/subs.php:124
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Non abbonato!"
+
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
+msgstr "Impossibile eliminare l'abbonamento."
 
 #: lib/tagcloudsection.php:56
 msgid "None"
@@ -4906,70 +4690,106 @@ msgstr "Nessuno"
 msgid "Top posters"
 msgstr "Chi scrive più messaggi"
 
-#: lib/unblockform.php:120 lib/unblockform.php:150
-msgid "Unblock this user"
-msgstr "Sblocca questo utente"
-
-# azione
-#: lib/unblockform.php:150
-msgid "Unblock"
-msgstr "Sblocca"
-
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Annulla l'abbonamento da questo utente"
 
-#~ msgid "Code not yet ready."
-#~ msgstr "Codice non ancora implementato."
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "Disabbonati"
+
+#: lib/userprofile.php:116
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "Immagine"
+
+#: lib/userprofile.php:236
+msgid "User actions"
+msgstr "Azioni utente"
+
+#: lib/userprofile.php:248
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Impostazioni del profilo"
+
+#: lib/userprofile.php:249
+msgid "Edit"
+msgstr ""
+
+#: lib/userprofile.php:272
+msgid "Send a direct message to this user"
+msgstr "Invia un messaggio diretto a questo utente"
 
-#~ msgid "Export and delete your user information."
-#~ msgstr "Esporta ed elimina le tue informazioni personali."
+#: lib/userprofile.php:273
+msgid "Message"
+msgstr "Messaggio"
+
+#: lib/util.php:821
+msgid "a few seconds ago"
+msgstr "pochi secondi fa"
+
+#: lib/util.php:823
+msgid "about a minute ago"
+msgstr "circa un minuto fa"
+
+#: lib/util.php:825
+#, php-format
+msgid "about %d minutes ago"
+msgstr "circa %d minuti fa"
+
+#: lib/util.php:827
+msgid "about an hour ago"
+msgstr "circa un'ora fa"
 
-#~ msgid "Delete my account"
-#~ msgstr "Elimina il mio account"
+#: lib/util.php:829
+#, php-format
+msgid "about %d hours ago"
+msgstr "circa %d ore fa"
 
-#~ msgid "Delete my account confirmation"
-#~ msgstr "Conferma l'eliminazione dell'account"
+#: lib/util.php:831
+msgid "about a day ago"
+msgstr "circa un giorno fa"
 
-#~ msgid "Check if you are sure you want to delete your account."
-#~ msgstr "Seleziona per eliminare veramente il tuo account."
+#: lib/util.php:833
+#, php-format
+msgid "about %d days ago"
+msgstr "circa %d giorni fa"
 
-# messa così perché è una descrizione della pagina, compare in alto
-#~ msgid "Showing recently popular notices"
-#~ msgstr "Ecco i messaggi più famosi"
+#: lib/util.php:835
+msgid "about a month ago"
+msgstr "circa un mese fa"
 
-#~ msgid "Tag a person"
-#~ msgstr "Etichetta una persona"
+#: lib/util.php:837
+#, php-format
+msgid "about %d months ago"
+msgstr "circa %d mesi fa"
 
-#~ msgid "List"
-#~ msgstr "Elenco"
+#: lib/util.php:839
+msgid "about a year ago"
+msgstr "circa un anno fa"
 
-#~ msgid "Icons"
-#~ msgstr "Icone"
+#: lib/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "L'URL della pagina web non è valido."
 
-#~ msgid ""
-#~ "Hey, %s.\n"
-#~ "\n"
-#~ "Someone just entered this email address on %s.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Ehi %s.\n"
-#~ "\n"
-#~ "Qualcuno ha appena inserito questo indirizzo email in %s.\n"
-#~ "\n"
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "Impossibile confermare l'email."
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr "Impossibile analizzare il messaggio."
 
-#~ msgid "Email address"
-#~ msgstr "Indirizzo email"
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr "Non è un utente registrato."
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Errore nell'inserire un messaggio"
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr "Quella non è la tua email di ricezione."
 
-#~ 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 ""
-#~ "Se hai dimenticato o perso la tua password, puoi riceverne una nuova "
-#~ "all'indirizzo email memorizzato nel tuo account."
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr "Email di ricezione non consentita."
diff --git a/locale/ja/LC_MESSAGES/statusnet.mo b/locale/ja/LC_MESSAGES/statusnet.mo
index 7026035cc..3fd89d064 100644
--- a/locale/ja/LC_MESSAGES/statusnet.mo
+++ b/locale/ja/LC_MESSAGES/statusnet.mo
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index bb7d777ba..eb63104c8 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -1,4515 +1,3983 @@
-# #-#-#-#-#  statusnet.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
-#
-# #-#-#-#-#  statusnet.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.
+# Translation of StatusNet to Japanese
 #
+# Author@translatewiki.net: Fryed-peach
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-05-19 00:01+0000\n"
-"Last-Translator: Roberto A Tsuchiya <beto.tsuchiya@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:42+0000\n"
+"Language-Team: Japanese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ja\n"
+"X-Message-Group: out-statusnet\n"
 
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
-#, php-format
-msgid " Search Stream for \"%s\""
-msgstr "\"%s\" のストリームを検索"
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "そのような通知はありません。"
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-#: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
-msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr "個人情報を除く:パスワード、メールアドレス、IMアドレス、電話番号"
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
+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/all.php:84
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s & ともだち"
 
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
+msgid "%s and friends"
+msgstr "%s と友人"
 
-#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
+#: actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "%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 ""
+#: actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "%s のともだちのフィード"
 
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s は %2$s であなたの通知を聞いています。"
+#: actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "%s のともだちのフィード"
 
-#: ../lib/mail.php:126
+#: actions/all.php:127
 #, 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"
+"This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
-"%1$s は %2$s であなたの通知を聞いています。\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"確かにあなたの,\n"
-"%4$s.\n"
 
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/all.php:132
 #, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
 msgstr ""
 
-#: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/all.php:134
 #, php-format
-msgid "%1$s's status on %2$s"
-msgstr "%1$ のステータス %2$s"
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
-#, php-format
-msgid "%s (%s)"
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
 #, php-format
-msgid "%s Public Stream"
-msgstr "%s パブリックストリーム"
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+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
-#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
-#, php-format
-msgid "%s and friends"
+#: actions/all.php:165
+#, fuzzy
+msgid "You and friends"
 msgstr "%s & ともだち"
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
 #, php-format
-msgid "%s public timeline"
-msgstr "%s パブリックタイムライン"
-
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
-#, php-format
-msgid "%s status"
-msgstr "%s ステータス"
-
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
-#, php-format
-msgid "%s timeline"
-msgstr "%s タイムライン"
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
-#, php-format
-msgid "%s updates from everyone!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
+msgstr "API メソッドが見つかりません！"
+
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
 msgstr ""
 
-#: ../actions/register.php:213
+#: actions/apiaccountupdatedeliverydevice.php:105
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
 msgstr ""
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "ユーザを更新できません"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
 msgstr ""
-"**%%site.name%%** は [%%site.broughtby%%](%%site.broughtbyurl%%) が提供するマ"
-"イクロブロギングサービスです。 "
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
-#, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** はマイクロブロギングサービスです。"
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
+msgstr ""
 
-#: ../lib/util.php:274 lib/util.php:290
-msgid ". Contributors should be attributed by full name or nickname."
-msgstr "コントリビューターはニックネームかフルネームで記載されています。"
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "ユーザを更新できません"
 
-#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
-#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1～64字以内で、小文字アルファベット、数字、スペース。（句読点を除く）"
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+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/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "プロファイルを保存できません"
 
-#: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr "6文字以上"
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
+msgstr "ユーザのブロックに失敗しました。"
 
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
-msgid "6 or more characters, and don't forget it!"
-msgstr "6文字以上。お忘れなく！"
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
+msgstr "ユーザのアンブロックに失敗しました。"
 
-#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
-msgid "6 or more characters. Required."
-msgstr "6文字以上が必須です。"
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr ""
 
-#: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "長すぎます。通知は最大 140 字までです。"
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
+#: actions/apidirectmessage.php:89
 #, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+msgid "Direct messages from %s"
 msgstr ""
-"確認用コードを入力されたIMアドレスに送信しました。メッセージを確認するには、%"
-"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."
+#: actions/apidirectmessage.php:93
+#, php-format
+msgid "All the direct messages sent from %s"
 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 actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
-msgid "API method not found!"
+#: actions/apidirectmessage.php:101
+#, php-format
+msgid "Direct messages to %s"
 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 actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
-msgid "API method under construction."
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
-msgid "About"
-msgstr "About"
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "API メソッドが見つかりません！"
 
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
-msgid "Accept"
-msgstr "承認"
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
+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 actions/emailsettings.php:120
-#: actions/imsettings.php:127 actions/openidsettings.php:111
-#: actions/smssettings.php:133 actions/twittersettings.php:163
-msgid "Add"
-msgstr "追加"
+#: actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
+msgstr ""
 
-#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
-msgstr "OpenIDを追加"
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-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
-#: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
-msgstr "住所"
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+msgstr ""
 
-#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-msgid "Addresses of friends to invite (one per line)"
+#: actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
 msgstr ""
 
-#: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
-msgid "All subscriptions"
-msgstr "全てのサブスクリプション"
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr ""
 
-#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
-#, php-format
-msgid "All updates for %s"
-msgstr "%sの全てのサブスクリプション"
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
+msgstr "利用者をフォローできませんでした: 利用者が見つかりません。"
 
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/apifriendshipscreate.php:118
 #, php-format
-msgid "All updates matching search term \"%s\""
-msgstr "\"%s\" にヒットするすべてのアップデート"
+msgid "Could not follow user: %s is already on your list."
+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
-#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
-msgid "Already logged in."
-msgstr "既にログインしています。"
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "サーバへリダイレクトできません : %s"
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
-msgid "Already subscribed!."
-msgstr "既に購読しています。"
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
 
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
-msgid "Are you sure you want to delete this notice?"
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
-msgid "Authorize subscription"
-msgstr "購読を許可"
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "ユーザを更新できません"
 
-#: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
-msgid "Automatically login in the future; not for shared computers!"
-msgstr "将来的には非共用PCでの自動ログイン"
+#: actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "ユーザを更新できません"
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr ""
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
+#, fuzzy
+msgid "Could not create group."
+msgstr "アバターを保存できません"
 
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34 actions/avatarsettings.php:65
-#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
-msgid "Avatar"
-msgstr "アバター"
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "アバターを保存できません"
 
-#: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
-msgid "Avatar updated."
-msgstr "アバターが更新されました。"
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+#, fuzzy
+msgid "Could not set group membership."
+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?)"
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
 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/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr "そのニックネームは既に使用されています。他のものを試してみて下さい。"
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "有効なニックネームではありません。"
 
-#: ../lib/util.php:1318 lib/util.php:1452
-#, fuzzy
-msgid "Before »"
-msgstr "前 >>"
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "ホームページのURLが不適切です。"
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
-#: actions/profilesettings.php:82 actions/register.php:184
-#: actions/profilesettings.php:112 actions/register.php:402
-msgid "Bio"
-msgstr "バイオグラフィ"
-
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
-#: actions/register.php:89 actions/updateprofile.php:104
-#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
-msgid "Bio is too long (max 140 chars)."
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "フルネームが長すぎます。（255字まで）"
+
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
 msgstr "バイオグラフィが長すぎます。（最長140字）"
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
-msgid "Can't delete this notice."
-msgstr "この通知を削除できません。"
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "場所が長すぎます。（255字まで）"
 
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
 #, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr "アバターURL　を読み取れません '%s'"
+msgid "Too many aliases! Maximum %d."
+msgstr ""
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404 actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-msgid "Can't save new password."
-msgstr "新しいパスワードを保存できません。"
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "不正なホームページ '%s'"
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62 actions/emailsettings.php:58
-#: actions/imsettings.php:59 actions/smssettings.php:62
-#: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
-msgstr "キャンセル"
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "そのニックネームは既に使用されています。他のものを試してみて下さい。"
 
-#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "OpenID consumer object を生成できません。"
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
 
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
-msgstr "その Jabbar ID を正規化できません"
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "既にログイン済みです。"
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
-msgid "Cannot normalize that email address"
-msgstr "そのメールアドレスを正規化できません"
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
 
-#: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
-msgstr "変更"
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "サーバへリダイレクトできません : %s"
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
-msgstr "メールの扱いを変更"
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "そのプロファイルは送信されていません。"
 
-#: ../actions/password.php:32 actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr "パスワードの変更"
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "OpenIDを作成できません : %s"
 
-#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
-msgid "Change your password"
-msgstr "パスワードの変更"
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "%s グループ"
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-msgid "Change your profile settings"
-msgstr "プロファイル設定の変更"
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+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
-#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
-#: actions/register.php:376 actions/smssettings.php:122
-msgid "Confirm"
-msgstr "確認"
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "%s グループ"
 
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "アドレスの確認"
+#: actions/apigrouplist.php:103
+#, php-format
+msgid "Groups %s is a member of on %s."
+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
-#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
-msgid "Confirmation cancelled."
-msgstr "確認作業がキャンセルされました。"
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
+msgstr ""
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
-msgid "Confirmation code"
-msgstr "確認コード"
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
+msgstr ""
 
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-msgid "Confirmation code not found."
-msgstr "確認コードが見つかりません。"
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+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."
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
-msgid "Connect"
-msgstr "接続"
-
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
-msgid "Connect existing account"
-msgstr "既存のアカウントと接続"
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "長すぎます。通知は最大 140 字までです。"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
-msgid "Contact"
-msgstr "コンタクト"
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
+msgstr ""
 
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
 #, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "OpenIDを作成できません : %s"
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "サポート外の画像形式です。"
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/apitimelinefavorites.php:107
 #, php-format
-msgid "Could not follow user: %s is already on your list."
+msgid "%s / Favorites from %s"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
-msgid "Could not follow user: User not found."
+#: actions/apitimelinefavorites.php:119
+#, php-format
+msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
-msgid "Could not redirect to server: %s"
-msgstr "サーバへリダイレクトできません : %s"
+msgid "%s timeline"
+msgstr "%s のタイムライン"
 
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
-msgid "Could not save avatar info"
-msgstr "アバターを保存できません"
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
 
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
-msgid "Could not save new profile info"
-msgstr "新しいプロファイルを保存できません"
+#: actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$ のステータス %2$s"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
-msgid "Could not subscribe other to you."
+#: actions/apitimelinementions.php:126
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
-msgid "Could not subscribe."
-msgstr ""
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#, php-format
+msgid "%s public timeline"
+msgstr "%s の公開タイムライン"
 
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#, php-format
+msgid "%s updates from everyone!"
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-msgid "Couldn't convert request tokens to access tokens."
-msgstr "リクエストトークンをアクセストークンに変換できません"
+#: actions/apitimelinetag.php:101 actions/tag.php:66
+#, php-format
+msgid "Notices tagged with %s"
+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
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-msgid "Couldn't delete email confirmation."
-msgstr "メール承認を削除できません"
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "マイクロブログ by %s"
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
-msgid "Couldn't delete subscription."
-msgstr "サブスクリプションを削除できません"
+#: actions/apiusershow.php:96
+msgid "Not found."
+msgstr "見つかりません。"
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
-msgid "Couldn't find any statuses."
-msgstr ""
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "そのようなドキュメントはありません。"
 
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-msgid "Couldn't get a request token."
-msgstr "リクエストトークンを取得できません"
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+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
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
-msgid "Couldn't insert confirmation code."
-msgstr "確認コードを追加できません"
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "サイズがありません。"
 
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
-msgstr "サブスクリプションを追加できません"
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "不正なサイズ。"
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-msgid "Couldn't save profile."
-msgstr "プロファイルを保存できません"
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "アバター"
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
-msgid "Couldn't update user record."
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
 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
-#: actions/confirmaddress.php:114 actions/emailsettings.php:280
-#: actions/emailsettings.php:411 actions/imsettings.php:252
-#: actions/imsettings.php:395 actions/othersettings.php:162
-#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
-msgid "Couldn't update user."
-msgstr "ユーザを更新できません"
-
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
-msgid "Create"
-msgstr "作成"
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+#, fuzzy
+msgid "Avatar settings"
+msgstr "設定"
 
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
-msgid "Create a new user with this nickname."
-msgstr "このニックネームで新しくユーザを作成"
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
-msgid "Create new account"
-msgstr "アカウントを作成"
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
-msgid "Creating new account for OpenID that already has a user."
-msgstr "既にユーザの存在するOpenIDでアカウントを作成しています"
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+msgid "Delete"
+msgstr "削除"
 
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "確認された最新の　Jabber/GTakk アドレス"
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+msgstr "アップロード"
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
 msgstr ""
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-msgid "Current confirmed email address."
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
-msgstr "最新"
+#: actions/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "予期せぬフォーム送信です。"
 
-#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
-#, php-format
-msgid "DB error inserting hashtag: %s"
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "返信を追加する際にデータベースエラー : %s"
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
-msgid "Delete notice"
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
 msgstr ""
 
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "140字以内で自己紹介"
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+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 actions/register.php:381
-#: actions/register.php:385 lib/accountsettingsaction.php:113
-msgid "Email"
-msgstr "メール"
+#: actions/avatarsettings.php:363
+msgid "Failed updating avatar."
+msgstr "アバターの更新に失敗しました。"
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-msgid "Email Address"
-msgstr ""
+#: actions/avatarsettings.php:387
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "アバターが更新されました。"
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
-msgstr "メール設定"
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+#, fuzzy
+msgid "No nickname"
+msgstr "ニックネームがありません。"
 
-#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-msgid "Email address already exists."
-msgstr "メールアドレスが既に存在します。"
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+#, fuzzy
+msgid "No such group"
+msgstr "そのような通知はありません。"
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
-msgid "Email address confirmation"
-msgstr "メールアドレス確認"
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "プロファイルがありません。"
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s & ともだち"
+
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
 msgstr ""
 
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-msgid "Email addresses"
-msgstr "メールアドレス"
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "ユーザのアンブロックに失敗しました。"
 
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
-msgid "Enter a nickname or email address."
-msgstr "ニックネームかメールアドレスを入力してください。"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
+msgstr "アンブロック"
 
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+msgid "Unblock this user"
+msgstr "このユーザをアンブロックする"
+
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "ログインしていません。"
+
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
 msgstr ""
 
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
-msgid "Error authorizing token"
-msgstr "認証トークンエラー"
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
-msgid "Error connecting user to OpenID."
-msgstr "ユーザとOpenIDとの接続エラー"
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#, fuzzy
+msgid "Block user"
+msgstr "そのようなユーザはいません。"
 
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
-msgstr "ユーザ接続エラー"
+#: actions/block.php:136
+msgid ""
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
-msgstr "アバター追加エラー"
+#: actions/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
+msgid "No"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
-msgstr "プロファイル追加エラー"
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user"
+msgstr "このユーザをアンブロックする"
 
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
-msgstr "リモートプロファイル追加エラー"
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
+msgstr ""
 
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
-msgid "Error saving address confirmation."
-msgstr "アドレス確認保存エラー"
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+msgid "Block this user"
+msgstr "このユーザをブロックする"
 
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
-msgid "Error saving remote profile"
-msgstr "リモートプロファイル保存エラー"
+#: actions/block.php:165
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "既にログイン済みです。"
 
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-msgid "Error saving the profile."
-msgstr "プロファイル保存エラー"
+#: actions/block.php:170
+msgid "Failed to save block information."
+msgstr ""
 
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-msgid "Error saving the user."
-msgstr "ユーザ保存エラー"
+#: actions/bookmarklet.php:50
+msgid "Post to "
+msgstr ""
 
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
-msgid "Error saving user; invalid."
-msgstr "ユーザ保存エラー; 不正なユーザ"
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+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 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-msgid "Error setting user."
-msgstr "ユーザ設定エラー"
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "確認コードが見つかりません。"
 
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr "プロファイル更新エラー"
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "その確認コードはあなたのものではありません！"
 
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
-msgstr "リモートプロファイル更新エラー"
+#: actions/confirmaddress.php:90
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr "不明なアドレスタイプ %s"
 
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr "確認コードにエラーがあります。"
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr "そのアドレスは既に承認されています。"
 
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
-msgid "Existing nickname"
-msgstr "既に存在するニックネーム"
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "ユーザを更新できません"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
-msgid "FAQ"
-msgstr "よくある質問"
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr "メール承認を削除できません"
 
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
-msgid "Failed updating avatar."
-msgstr "アバターの更新に失敗しました。"
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "アドレスの確認"
 
-#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/confirmaddress.php:159
 #, php-format
-msgid "Feed for friends of %s"
-msgstr "%s のともだちのフィード"
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "アドレス \"%s\" はあなたのアカウントとして承認されています。"
 
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
-#, php-format
-msgid "Feed for replies to %s"
-msgstr "%s の返信のフィード"
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "確認コード"
 
-#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
-#, php-format
-msgid "Feed for tag %s"
-msgstr ""
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
+msgstr "通知"
 
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
-msgstr ""
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
+msgstr "そのような通知はありません。"
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
-msgstr ""
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "この通知を削除できません。"
 
-#: ../actions/login.php:122
+#: actions/deletenotice.php:103
 msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
 msgstr ""
-"セキュリティー上の理由により、設定を変更する前にユーザ名とパスワードを入力し"
-"て下さい。"
-
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
-#: actions/profilesettings.php:77 actions/register.php:178
-#: actions/profilesettings.php:103 actions/register.php:391
-#: actions/showgroup.php:235 actions/showstream.php:262
-#: actions/tagother.php:105 lib/groupeditform.php:142
-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
-#: actions/editgroup.php:195 actions/newgroup.php:146
-#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
-msgid "Full name is too long (max 255 chars)."
-msgstr "フルネームが長すぎます。（255字まで）"
 
-#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
-msgid "Help"
-msgstr "ヘルプ"
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr ""
 
-#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
-msgid "Home"
-msgstr "ホーム"
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr "本当にこの通知を削除しますか？"
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
-msgid "Homepage"
-msgstr "ホームページ"
+#: actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "この通知を削除できません。"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
-msgid "Homepage is not a valid URL."
-msgstr "ホームページのURLが不適切です。"
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+msgid "Delete this notice"
+msgstr "この通知を削除"
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
-msgid "I want to post notices by email."
+#: actions/deletenotice.php:157
+msgid "There was a problem with your session token.  Try again, please."
 msgstr ""
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
 msgstr ""
 
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
-msgstr "IMアドレス"
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr ""
 
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
-msgstr "IM設定"
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "そのようなドキュメントはありません。"
 
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
+#: actions/editgroup.php:56
+#, php-format
+msgid "Edit %s group"
 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を追加する場合、下のボックスにある\"Add\"をつリックして下さい。"
 
-#: ../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."
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
 msgstr ""
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-#: actions/emailsettings.php:127 actions/smssettings.php:140
-msgid "Incoming email"
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+msgid "You must be an admin to edit the group"
 msgstr ""
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
-msgid "Incoming email address removed."
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
 msgstr ""
 
-#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
-msgid "Incorrect old password"
-msgstr "古いパスワードが間違っています。"
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "バイオグラフィが長すぎます。（最長140字）"
 
-#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
-msgid "Incorrect username or password."
-msgstr "ユーザ名またはパスワードが間違っています。"
+#: actions/editgroup.php:253
+#, fuzzy
+msgid "Could not update group."
+msgstr "ユーザを更新できません"
 
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
-msgstr "登録されたメールアドレスにパスワードの回復方法をおおくりしました。"
+#: actions/editgroup.php:269
+#, fuzzy
+msgid "Options saved."
+msgstr "設定が保存されました。"
 
-#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "不正なアバターURL '%s'"
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "メール設定"
 
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/emailsettings.php:71
 #, php-format
-msgid "Invalid email address: %s"
-msgstr "不正なメールアドレス：%s'"
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
-#, php-format
-msgid "Invalid homepage '%s'"
-msgstr "不正なホームページ '%s'"
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "住所"
 
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
-#, php-format
-msgid "Invalid license URL '%s'"
-msgstr "不正なライセンスURL '%s'"
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr ""
 
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
-msgstr "不正な通知内容"
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "削除"
 
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
-msgstr "不正な通知uri"
+#: actions/emailsettings.php:113
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
+"このアドレスは確認待ちです。受信ボックス（とスパムボックス）に追加の指示が書"
+"かれたメッセージが届いていないか確認してください。"
 
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
-msgstr "不正な通知url"
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "中止"
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "不正なプロファイルURL '%s'。"
+#: actions/emailsettings.php:121
+msgid "Email Address"
+msgstr ""
 
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
-msgstr "不正なプロファイルURL。（形式不備）"
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
-msgstr "不正なプロファイルURLがサーバから返されました。"
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "追加"
 
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
-#: actions/avatarbynickname.php:69
-msgid "Invalid size."
-msgstr "不正なサイズ。"
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+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
-#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
-msgid "Invalid username or password."
-msgstr "不正なユーザ名またはパスワード。"
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
+msgstr ""
 
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-msgid "Invitation(s) sent"
+#: actions/emailsettings.php:145 actions/smssettings.php:162
+msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-msgid "Invitation(s) sent to the following people:"
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
 msgstr ""
 
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
-msgid "Invite"
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
+msgstr "設定"
+
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-msgid "Invite new users"
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
-#, php-format
-msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
 msgstr ""
-"マイクロブロギングソフト [StatusNet](http://status.net/) , バージョン %s で動い"
-"ています。 ライセンス [GNU Affero General Public License](http://www.fsf.org/"
-"licensing/licenses/agpl-3.0.html)。"
 
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
-msgstr "Jabber ID ｊは既に別のユーザが使用しています。"
+#: actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
+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."
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
 msgstr ""
-"\"UserName@example.org\" といった Jabber または GTalk のアドレス。まず、%s を"
-"IMクライアントやGTalkに追加して下さい。"
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
-msgid "Language"
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
 msgstr ""
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
-msgid "Language is too long (max 50 chars)."
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
 msgstr ""
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
-msgid "Location"
-msgstr "場所"
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+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
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
-msgid "Location is too long (max 255 chars)."
-msgstr "場所が長すぎます。（255字まで）"
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+msgstr "設定が保存されました。"
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
-#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
-#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
-#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
-#, php-format
-msgid "Login"
-msgstr "ログイン"
+#: actions/emailsettings.php:319
+msgid "No email address."
+msgstr ""
 
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "[OpenID](%%doc.openid%%) でログイン。"
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
+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%"
-"%). "
+#: actions/emailsettings.php:330
+msgid "Not a valid email address"
 msgstr ""
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
-msgid "Logout"
-msgstr "ログアウト"
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
+msgstr ""
 
-#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
-msgid "Longer name, preferably your \"real\" name"
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another user."
 msgstr ""
 
-#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
-msgid "Lost or forgotten password?"
-msgstr "パスワードを紛失、忘れた？"
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+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."
+#: actions/emailsettings.php:358
+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/emailsettings.php:27 actions/emailsettings.php:27
-#: actions/emailsettings.php:71
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr ""
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
+msgstr "認証待ちのものはありません。"
 
-#: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
-msgid "Member since"
-msgstr "からのメンバー"
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "その IM アドレスは不正です。"
 
-#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
-#, php-format
-msgid "Microblog by %s"
-msgstr "マイクロブログ by %s"
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+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."
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-msgid "My text and files are available under "
-msgstr "の下でテキスト及びファイルを利用可能"
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "アドレスは削除されました。"
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#: actions/emailsettings.php:142 actions/smssettings.php:152
-msgid "New"
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
 msgstr ""
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
-#, php-format
-msgid "New email address for posting to %s"
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
 msgstr ""
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
-msgid "New incoming email address added."
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
-msgid "New nickname"
-msgstr "新しいニックネーム"
-
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
-msgstr "新しい通知"
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
+msgstr ""
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-msgid "New password"
-msgstr "新しいパスワード"
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+#, fuzzy
+msgid "Popular notices"
+msgstr "そのような通知はありません。"
 
-#: ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
-msgstr "新しいパスワードの保存に成功しました。ログインしています。"
+#: actions/favorited.php:67
+#, fuzzy, php-format
+msgid "Popular notices, page %d"
+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
-#: actions/login.php:228 actions/profilesettings.php:98
-#: actions/register.php:367 actions/showgroup.php:224
-#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
-msgid "Nickname"
-msgstr "ニックネーム"
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
+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
-#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
-msgid "Nickname already in use. Try another one."
-msgstr "そのニックネームは既に使用されています。他のものを試してみて下さい。"
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+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
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#: actions/favorited.php:153
+msgid ""
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
 msgstr ""
-"ニックネームには、小文字アルファベットと数字のみ使用できます。スペースは使用"
-"できません。"
 
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
-msgid "Nickname not allowed."
-msgstr "そのニックネームは使用できません。"
+#: actions/favorited.php:156
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
+msgstr ""
 
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
-msgstr "フォローしたいユーザのニックネーム"
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
 
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
-msgid "Nickname or email"
-msgstr "ニックネームまたはメールアドレス"
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "マイクロブログ by %s"
 
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
-msgid "No"
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
 msgstr ""
 
-#: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
-msgstr "Jabbar ID はありません。"
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr ""
 
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
-msgid "No authorization request!"
-msgstr "認証のリクエストがありません。"
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr ""
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
-msgid "No carrier selected."
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
 msgstr ""
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
-#: actions/confirmaddress.php:75
-msgid "No confirmation code."
-msgstr "確認コードがありません。"
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "新しい通知"
 
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
-#: actions/newnotice.php:126 classes/Command.php:223
-msgid "No content!"
-msgstr "コンテンツがありません！"
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "新しい通知"
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
-msgid "No email address."
+#: actions/file.php:42
+msgid "No attachments"
 msgstr ""
 
-#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
-msgid "No id."
-msgstr "id がありません。"
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
-msgid "No incoming email address."
+#: actions/file.php:51
+msgid "No uploaded attachments"
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr "リモートユーザのニックネームがありません。"
+#: actions/finishremotesubscribe.php:69
+msgid "Not expecting this response!"
+msgstr "想定外のレスポンスです！"
 
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
-msgid "No nickname."
-msgstr "ニックネームがありません。"
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+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
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
-msgid "No pending confirmation to cancel."
-msgstr "認証待ちのものはありません。"
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+msgstr "ローカルサブスクリプションを使用可能です！"
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
-msgstr "サーバから提供されるプロファイルURLはありません。"
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "認証されていません。"
 
-#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
-msgid "No registered email address for that user."
-msgstr "そのユーザにはメールアドレスの登録がありません。"
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "リクエストトークンをアクセストークンに変換できません"
 
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr "リクエストがありません！"
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "予期せぬ OMB プロトコルのバージョンです。"
 
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
-msgid "No results"
-msgstr "結果なし"
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "リモートプロファイル更新エラー"
 
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
-msgstr "サイズがありません。"
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+#, fuzzy
+msgid "No such group."
+msgstr "そのような通知はありません。"
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
-msgid "No status found with that ID."
-msgstr ""
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "そのような通知はありません。"
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
-msgid "No status with that ID found."
-msgstr ""
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "そのような通知はありません。"
 
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
-msgstr "そのようなOpenIDはありません。"
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
+msgstr ""
 
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
-msgid "No such document."
-msgstr "そのようなドキュメントはありません。"
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+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 actions/shownotice.php:87
-#: lib/deleteaction.php:51
-msgid "No such notice."
-msgstr "そのような通知はありません。"
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "プロファイルがありません。"
 
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr "そのような回復コードはありません。"
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "そのプロファイルは送信されていません。"
 
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-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 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
-msgid "No such user."
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
 msgstr "そのようなユーザはいません。"
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-msgid "No user with that email address or username."
+#: actions/groupblock.php:162
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
 msgstr ""
 
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
-msgstr "表示できるユーザはいません。"
+#: actions/groupblock.php:178
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "サーバへリダイレクトできません : %s"
 
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr "回復コードではありません。"
+#: actions/groupblock.php:179
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "このユーザをブロックする"
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
 msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
-msgid "Not a supported data format."
+#: actions/groupbyid.php:74
+msgid "No ID"
 msgstr ""
 
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
-msgstr "有効な Jabber ID ではありません。"
-
-#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-msgid "Not a valid OpenID."
-msgstr "有効な OpenID ではありません。"
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
-msgid "Not a valid email address"
+#: actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
 msgstr ""
 
-#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-msgid "Not a valid email address."
-msgstr "有効なメールアドレスではありません。"
-
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-#: actions/editgroup.php:186 actions/newgroup.php:137
-#: actions/profilesettings.php:195 actions/register.php:161
-msgid "Not a valid nickname."
-msgstr "有効なニックネームではありません。"
-
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
-msgstr "有効なプロファイルURLではありません。（間違ったサービス）"
-
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr "有効なプロファイルURLではありません。（XRDSの定義が無い）"
-
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr "有効なプロファイルURLではありません。（XRDSドキュメントが無い）"
-
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
-msgid "Not an image or corrupt file."
-msgstr "画像ではないかファイルが破損しています。"
+#: actions/groupdesignsettings.php:141
+msgid "Group design"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
-msgid "Not authorized."
-msgstr "認証されていません。"
+#: actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
-msgid "Not expecting this response!"
-msgstr "想定外のレスポンスです！"
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "ユーザを更新できません"
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
-msgid "Not found"
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+msgid "Unable to save your design settings!"
 msgstr ""
 
-#: ../actions/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 actions/block.php:59 actions/disfavor.php:61
-#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
-#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
-#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
-#: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "ログインしていません。"
-
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
-msgid "Not subscribed!."
-msgstr "購読していません！"
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "設定が保存されました。"
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
 msgstr ""
 
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
+#: actions/grouplogo.php:150
 #, php-format
-msgid "Notice feed for %s"
-msgstr "%sの通知フィード"
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
 
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
-msgstr "通知にはプロファイルはありません。"
+#: actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
+msgstr ""
 
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
-msgid "Notices"
-msgstr "通知"
+#: actions/grouplogo.php:396
+#, fuzzy
+msgid "Logo updated."
+msgstr "アバターが更新されました。"
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/grouplogo.php:398
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "アバターの更新に失敗しました。"
+
+#: actions/groupmembers.php:93 lib/groupnav.php:92
 #, php-format
-msgid "Notices tagged with %s"
+msgid "%s group members"
 msgstr ""
 
-#: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
-msgstr "古いパスワード"
-
-#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
-msgid "OpenID"
-msgstr "OpenID"
-
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
-msgid "OpenID Account Setup"
-msgstr "OpenID アカウントセットアップ"
-
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-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
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-msgid "OpenID Login"
-msgstr "OpenID ログイン"
-
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-#: actions/openidlogin.php:102 actions/openidsettings.php:101
-msgid "OpenID URL"
-msgstr "OpenID URL"
-
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
-msgid "OpenID authentication cancelled."
-msgstr "OpenID での認証がキャンセルされました。"
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr "OpenID での認証に失敗しました : %s"
-
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "OpenID 障害 : %s"
-
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr "OpenID は消去されました。"
-
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
-msgstr "OpenID 設定"
-
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-msgid "Optionally add a personal message to the invitation."
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
 msgstr ""
 
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
-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 actions/finishopenidlogin.php:118
-#: actions/login.php:231 actions/register.php:372
-#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-msgid "Password"
-msgstr "パスワード"
-
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
-msgid "Password and confirmation do not match."
-msgstr "パスワードと確認が一致しません。"
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr ""
 
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
-msgid "Password must be 6 chars or more."
-msgstr "パスワードは6字以上でなければいけません。"
+#: actions/groupmembers.php:175 lib/groupnav.php:107
+msgid "Admin"
+msgstr "管理者"
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-msgid "Password recovery requested"
-msgstr "パスワード回復のリクエストされました"
+#: actions/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
+msgstr "ブロック"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-msgid "Password saved."
-msgstr "パスワードが保存されました。"
+#: actions/groupmembers.php:441
+msgid "Make user an admin of the group"
+msgstr ""
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-msgid "Passwords don't match."
-msgstr "パスワードが一致しません。"
+#: actions/groupmembers.php:473
+#, fuzzy
+msgid "Make Admin"
+msgstr "管理者"
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
 msgstr ""
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "マイクロブログ by %s"
+
+#: actions/groupsearch.php:52
+#, fuzzy, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
+"%%site.name%% の人を名前、場所、興味から検索。検索語はスペース区切る。3字以上"
 
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
+#: actions/groupsearch.php:58
+#, fuzzy
+msgid "Group search"
 msgstr "ピープルサーチ"
 
-#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
-msgid "Personal"
-msgstr "パーソナル"
-
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-msgid "Personal message"
-msgstr ""
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "結果なし"
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
+#: actions/groupsearch.php:82
+#, php-format
+msgid ""
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
 msgstr ""
 
-#: ../actions/userauthorization.php:78
+#: actions/groupsearch.php:85
+#, php-format
 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\"."
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
 msgstr ""
-"ユーザの通知を購読するには詳細を確認して下さい。購読しない場合は、\"Cancel\" "
-"キャンセルをクリックして下さい。"
-
-#: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Jabber/GTalkのステータスが変更された時に通知を送る。"
 
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94 actions/emailsettings.php:86
-#: actions/imsettings.php:68 actions/smssettings.php:94
-#: actions/twittersettings.php:70 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
-msgid "Preferences"
-msgstr "設定"
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
+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
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
-msgid "Preferences saved."
-msgstr "設定が保存されました。"
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
-msgid "Preferred language"
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
 msgstr ""
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
-msgid "Privacy"
-msgstr "プライバシー"
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+#, fuzzy
+msgid "Create a new group"
+msgstr "アカウントを作成"
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-msgid "Problem saving notice."
-msgstr "通知を保存する際に問題が発生しました。"
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
-msgid "Profile"
-msgstr "プロファイル"
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "プロファイルがありません。"
 
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
-msgstr "プロファイルURL"
+#: actions/groupunblock.php:128 actions/unblock.php:108
+msgid "Error removing the block."
+msgstr "ブロックの削除エラー"
 
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
-msgstr "プロファイル設定"
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "IM設定"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-msgid "Profile unknown"
-msgstr "プロファイルが不明"
+#: actions/imsettings.php:70
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+"Jabber/GTalk [instant messages](%%doc.im%%)　経由で通知の送信、受信が可能で"
+"す。下のアドレスを設定して下さい。"
 
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
-msgid "Public Stream Feed"
-msgstr "パブリックフィード"
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "このページはあなたが承認したメディアタイプでは利用できません。"
 
-#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
-msgid "Public timeline"
-msgstr "パブリックタイムライン"
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "確認された最新の　Jabber/GTakk アドレス"
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#: actions/imsettings.php:114
+#, 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:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
-msgid "Publish a MicroID for my email address."
-msgstr ""
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "IMアドレス"
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
+#: actions/imsettings.php:126
+#, 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 ""
+"\"UserName@example.org\" といった Jabber または GTalk のアドレス。まず、%s を"
+"IMクライアントやGTalkに追加して下さい。"
 
-#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
-msgid "Recover"
-msgstr "回復"
-
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
-msgid "Recover password"
-msgstr "パスワードを回復"
-
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-msgid "Recovery code for unknown user."
-msgstr "不明なユーザのための回復コード。"
+#: actions/imsettings.php:143
+msgid "Send me notices through Jabber/GTalk."
+msgstr "Jabber/GTalk で私に通知を送って下さい。"
 
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
-#: actions/register.php:152 actions/register.php:207 lib/util.php:328
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-msgid "Register"
-msgstr "登録"
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr "Jabber/GTalkのステータスが変更された時に通知を送る。"
 
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
-msgid "Registration not allowed."
+#: actions/imsettings.php:153
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
-msgid "Registration successful"
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
-msgid "Reject"
-msgstr "拒否"
-
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
-msgid "Remember me"
-msgstr "ログイン状態を保持"
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "Jabbar ID はありません。"
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
-msgid "Remote profile with no matching profile"
-msgstr "リモートプロファイルと一致するものがありません"
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr "その Jabbar ID を正規化できません"
 
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
-msgstr "リモートサブスクライブ"
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "有効な Jabber ID ではありません。"
 
-#: ../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 actions/emailsettings.php:101
-#: actions/emailsettings.php:134 actions/imsettings.php:102
-#: actions/openidsettings.php:166 actions/smssettings.php:103
-#: actions/smssettings.php:146 actions/twittersettings.php:115
-msgid "Remove"
-msgstr "削除"
+#: actions/imsettings.php:299
+msgid "That is already your Jabber ID."
+msgstr "その Jabber ID は既にあなたのものです。"
 
-#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
-msgstr "OpenID を削除"
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr "Jabber ID ｊは既に別のユーザが使用しています。"
 
-#: ../actions/openidsettings.php:73
+#: actions/imsettings.php:327
+#, php-format
 msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
 msgstr ""
-"最後の OpenID を削除すると、ログインできなくなります！削除するまえに、別の "
-"OpenID を追加して下さい。"
+"確認用コードを入力された IM アドレスに送信しました。あなたにメッセージを送れ"
+"るようにするには%sを承認してください。"
 
-#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
-msgid "Replies"
-msgstr "返信"
+#: actions/imsettings.php:387
+msgid "That is not your Jabber ID."
+msgstr "その Jabber ID はあなたのものではありません。"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
-#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
-#: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: actions/inbox.php:59
 #, php-format
-msgid "Replies to %s"
-msgstr "%s への返信"
-
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
-msgid "Reset"
-msgstr "リセット"
-
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
-msgid "Reset password"
-msgstr "パスワードをリセット"
+msgid "Inbox for %s - page %d"
+msgstr ""
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-msgid "SMS"
+#: actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
 msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
-msgid "SMS Phone number"
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
+#: actions/invite.php:39
+msgid "Invites have been disabled."
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
-msgid "SMS confirmation"
+#: actions/invite.php:41
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
 msgstr ""
 
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
-msgid "Same as password above"
-msgstr "上と同じパスワード"
+#: actions/invite.php:72
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "不正なメールアドレス：%s'"
 
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
-msgid "Same as password above. Required."
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
 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 actions/emailsettings.php:182
-#: actions/facebooksettings.php:114 actions/imsettings.php:157
-#: actions/othersettings.php:117 actions/profilesettings.php:150
-#: actions/smssettings.php:169 actions/subscriptions.php:124
-#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
-msgid "Save"
-msgstr "保存"
-
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
-msgid "Search"
-msgstr "検索"
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr ""
 
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
-msgstr "ストリームフィードを検索"
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr ""
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/invite.php:131 actions/invite.php:139
 #, 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字以上"
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../actions/peoplesearch.php:28
-#, php-format
+#: actions/invite.php:136
 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."
+"These people are already users and you were automatically subscribed to them:"
 msgstr ""
-"%%site.name%% の人を名前、場所、興味から検索。検索語はスペース区切る。3字以上"
 
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
-msgid "Select a carrier"
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
 msgstr ""
 
-#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
-#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
-msgid "Send"
-msgstr "送る"
-
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
+#: actions/invite.php:150
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 msgstr ""
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
+#: actions/invite.php:162
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
-msgid "Send me notices through Jabber/GTalk."
-msgstr "Jabber/GTalk で私に通知を送って下さい。"
+#: actions/invite.php:187
+msgid "Email addresses"
+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."
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr "招待する友人のアドレス (一行に一つ)"
+
+#: actions/invite.php:192
+msgid "Personal message"
 msgstr ""
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
-#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
-msgid "Settings"
-msgstr "設定"
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
+msgstr "送る"
 
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
-msgid "Settings saved."
-msgstr "設定が保存されました。"
+#: actions/invite.php:226
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s があなたを %2$s へ招待しました"
+
+#: actions/invite.php:228
+#, 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"
+"%2$s における %1$s のプロフィールページを以下で見ることができます:\n"
+"\n"
+"%5$s\n"
+"\n"
+"このサービスを試してみたい場合は以下のリンクをクリックしてこの招待に応じてく"
+"ださい。\n"
+"\n"
+"%6$s\n"
+"\n"
+"そうでない場合はこのメッセージを無視することができます。お時間をいただきあり"
+"がとうございました。\n"
+"\n"
+"%2$s\n"
 
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
 msgstr ""
 
-#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:114
-msgid "Someone else already has this OpenID."
-msgstr "既に他の人がこの OpenID を使用しています。"
+#: actions/joingroup.php:90 lib/command.php:217
+#, fuzzy
+msgid "You are already a member of that group"
+msgstr "既にログイン済みです。"
 
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
-msgstr "不測の事態が発生しました。"
+#: actions/joingroup.php:128 lib/command.php:234
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s"
+msgstr "サーバへリダイレクトできません : %s"
 
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
+#: actions/joingroup.php:135 lib/command.php:239
+#, php-format
+msgid "%s joined group %s"
 msgstr ""
 
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
-msgid "Source"
-msgstr "ソース"
+#: actions/leavegroup.php:90 lib/command.php:268
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "そのプロファイルは送信されていません。"
 
-#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
-msgid "Statistics"
-msgstr "統計データ"
+#: actions/leavegroup.php:119 lib/command.php:278
+msgid "Could not find membership record."
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-msgid "Stored OpenID not found."
-msgstr "保存された OpenID は見つかりません。"
+#: actions/leavegroup.php:127 lib/command.php:284
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "OpenIDを作成できません : %s"
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
-#: actions/showstream.php:197 actions/showstream.php:206
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
-msgid "Subscribe"
-msgstr "購読"
+#: actions/leavegroup.php:134 lib/command.php:289
+#, php-format
+msgid "%s left group %s"
+msgstr ""
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
-msgid "Subscribers"
-msgstr "購読者"
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "既にログインしています。"
 
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
-msgid "Subscription authorized"
-msgstr "購読が許可"
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "不正な通知内容"
 
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
-msgid "Subscription rejected"
-msgstr "購読が拒否"
+#: actions/login.php:143
+msgid "Incorrect username or password."
+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
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
-msgid "Subscriptions"
-msgstr "サブスクリプション"
+#: actions/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
+msgstr "ユーザ設定エラー"
 
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
-msgid "System error uploading file."
-msgstr "ファイルのアップロードでシステムエラー"
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "ログイン"
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
-#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
-msgid "Tags"
+#: actions/login.php:243
+msgid "Login to site"
 msgstr ""
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr ""
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "ニックネーム"
 
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
-msgid "Text search"
-msgstr "文字検索"
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "パスワード"
 
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
-msgstr "その OpenID はあなたのものではありません。"
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "ログイン状態を保持"
 
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
-msgstr "そのアドレスは既に承認されています。"
+#: actions/login.php:253 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
+msgstr "以降は自動的にログインする。共用コンピューターでは避けましょう！"
 
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
-msgstr "その確認コードはあなたのものではありません！"
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "パスワードを紛失、忘れた？"
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
+#: actions/login.php:282
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
 msgstr ""
+"セキュリティー上の理由により、設定を変更する前にユーザ名とパスワードを入力し"
+"て下さい。"
 
-#: ../actions/avatar.php:80 actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
-msgstr "ファイルサイズが大きすぎます。"
-
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
-msgid "That is already your Jabber ID."
-msgstr "その Jabber ID は既にあなたのものです。"
-
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
-msgid "That is already your email address."
+#: actions/login.php:286
+#, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
 msgstr ""
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
-msgid "That is already your phone number."
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
 msgstr ""
 
-#: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
-msgid "That is not your Jabber ID."
-msgstr "その Jabber ID はあなたのものではありません。"
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
-msgid "That is not your email address."
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
 msgstr ""
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
 msgstr ""
 
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-#: actions/emailsettings.php:367 actions/imsettings.php:349
-msgid "That is the wrong IM address."
-msgstr "その IM アドレスは不正です。"
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr ""
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
+#: actions/newgroup.php:53
+msgid "New group"
 msgstr ""
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-msgid "That phone number already belongs to another user."
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
 msgstr ""
 
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49 actions/twitapistatuses.php:330
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-msgid "That's too long. Max notice size is 140 chars."
-msgstr "長すぎます。通知は最大 140 字までです。"
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr ""
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
-msgid "That's too long. Max notice size is 255 chars."
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
 msgstr ""
 
-#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
-#, php-format
-msgid "The address \"%s\" has been confirmed for your account."
-msgstr "アドレス \"%s\" はあなたのアカウントとして承認されています。"
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+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
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
-msgid "The address was removed."
-msgstr "アドレスは削除されました。"
+#: actions/newmessage.php:158
+msgid "No recipient specified."
+msgstr ""
 
-#: ../actions/userauthorization.php:312
+#: actions/newmessage.php:164 lib/command.php:370
 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:"
+"Don't send a message to yourself; just say it to yourself quietly instead."
 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."
+#: actions/newmessage.php:181
+msgid "Message sent"
 msgstr ""
 
-#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/newmessage.php:185 lib/command.php:375
 #, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr "%s　の通知を聞いている人"
+msgid "Direct message to %s sent"
+msgstr ""
 
-#: ../actions/subscribers.php:33 actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr "あなたの通知を聞いている人"
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
+msgstr ""
 
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
-#, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr "%s が通知を聞いている人"
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "新しい通知"
 
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr "あなたが通知を聞いている人"
+#: actions/newnotice.php:199
+#, fuzzy
+msgid "Notice posted"
+msgstr "通知"
 
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/noticesearch.php:68
+#, php-format
 msgid ""
-"These people are already users and you were automatically subscribed to them:"
-msgstr ""
+"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/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
-msgstr "確認コードが古すぎます。もう一度やり直してください。"
+#: actions/noticesearch.php:78
+msgid "Text search"
+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/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "\"%s\" のストリームを検索"
 
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/noticesearch.php:121
 #, 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."
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 msgstr ""
-"これが %s への初回のログインです。OpenIDとの関連付けが必要です。アカウントを"
-"新規作成するか、既存のアカウントとの関連付けのどちらかを下さい。"
 
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-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 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
-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
-#: actions/profilesettings.php:138
-msgid "Timezone"
+#: actions/noticesearch.php:124
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
-msgid "Timezone not selected."
-msgstr ""
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "マイクロブログ by %s"
 
-#: ../actions/remotesubscribe.php:43
+#: actions/noticesearchrss.php:91
 #, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "検索語「%s」に一致するすべての更新"
+
+#: actions/nudge.php:85
 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."
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
-"サブスクライブするには、[ログイン](%%action.login%%) するか, [登録](%%action."
-"register%%) を行って下さい。既に [compatible microblogging site](%%doc."
-"openmublog%%) にアカウントを持っおもちの場合は、下にプロファイルURLを入力して"
-"下さい."
 
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
-msgid "Two user ids or screen_names must be supplied."
+#: actions/nudge.php:94
+msgid "Nudge sent"
 msgstr ""
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "ホームページ、ブログ、プロファイル、その他サイトの URL"
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr ""
 
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-msgid "URL of your profile on another compatible microblogging service"
-msgstr "プロファイルサービスまたはマイクロブロギングサービスのURL"
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+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 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-msgid "Unexpected form submission."
-msgstr "予期せぬフォーム送信です。"
+#: actions/oembed.php:86 actions/shownotice.php:180
+#, php-format
+msgid "%1$s's status on %2$s"
+msgstr "%2$s における %1$ の状態"
 
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
-msgid "Unexpected password reset."
-msgstr "予期せぬパスワードのリセットです。"
+#: actions/oembed.php:157
+msgid "content type "
+msgstr "内容種別 "
 
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-msgid "Unknown action"
+#: actions/oembed.php:160
+msgid "Only "
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-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 "
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
 msgstr ""
-"特に断りが無い場合は、このサイトのコンテンツの著作権は著作者に帰属し、下記条"
-"件の下で使用可能です。"
 
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
-#, php-format
-msgid "Unrecognized address type %s"
-msgstr "不明なアドレスタイプ %s"
-
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
-msgstr "サブスクライブ中止"
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr ""
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-msgid "Unsupported OMB version"
-msgstr "サポート外の OMB バージョン"
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr ""
 
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
-msgid "Unsupported image file format."
-msgstr "サポート外の画像形式です。"
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "設定"
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
+#: actions/othersettings.php:71
+msgid "Manage various other options."
 msgstr ""
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
+#: actions/othersettings.php:108
+msgid " (free service)"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
-#, php-format
-msgid "Updates from %1$s on %2$s!"
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
 msgstr ""
 
-#: ../actions/avatar.php:68 actions/profilesettings.php:161
-#: actions/avatarsettings.php:162 actions/grouplogo.php:232
-msgid "Upload"
-msgstr "アップロード"
+#: actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+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."
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
 msgstr ""
-"\"アバター\" (ユーザの画像) をアップロード。 アップロードした後では画像の編集"
-"はできません。サイズが大きすぎないか（小さすぎないか）確認して下さい。サイト"
-"のライセンスが適用されます。自身で所有していて、共有したい画像を使用して下さ"
-"い。"
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
+#: actions/othersettings.php:153
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "場所が長すぎます。（255字まで）"
+
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %s - page %d"
 msgstr ""
 
-#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
+#: actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
 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/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
-msgid "User being listened to doesn't exist."
-msgstr "リストされているユーザは存在しません。"
+#: actions/passwordsettings.php:58
+msgid "Change password"
+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
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-msgid "User has no profile."
-msgstr "プロファイルがありません。"
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "パスワードの変更"
 
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
-msgstr "ユーザのニックネーム"
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#, fuzzy
+msgid "Password change"
+msgstr "パスワードが保存されました。"
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr ""
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "古いパスワード"
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
-msgid "What timezone are you normally in?"
-msgstr ""
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "新しいパスワード"
 
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
-#, php-format
-msgid "What's up, %s?"
-msgstr "最近どう %s?"
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6文字以上"
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-#: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "いる場所, 例えば \"City, State (or Region), Country\""
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "確認"
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
-#, php-format
-msgid "Wrong image type for '%s'"
-msgstr "不正な画像形式。'%s'"
+#: actions/passwordsettings.php:113
+msgid "same as password above"
+msgstr "上のパスワードと同じ"
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
-#, php-format
-msgid "Wrong size image at '%s'"
-msgstr "不正な画像サイズ。'%s'"
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "変更"
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
-msgid "Yes"
+#: actions/passwordsettings.php:154 actions/register.php:230
+msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-msgid "You already have this OpenID!"
-msgstr "既にこの OpenID を使用しています。"
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+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/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "古いパスワードが間違っています。"
 
-#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
-msgstr "既にログイン済みです。"
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "ユーザ保存エラー; 不正なユーザ"
 
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-msgid "You are already subscribed to these users:"
-msgstr ""
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "新しいパスワードを保存できません。"
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
-msgid "You are not friends with the specified user."
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "パスワードが保存されました。"
+
+#: actions/peoplesearch.php:52
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+"Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
+"%%site.name%% の人を名前、場所、興味から検索。検索語はスペース区切る。3字以上"
 
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr "パスワードはここで変更できます。良いものを選んで下さい！"
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "ピープルサーチ"
 
-#: ../actions/register.php:135 actions/register.php:145
-msgid "You can create a new account to start posting notices."
-msgstr "アカウントを作成して通知の投稿が可能です。"
+#: actions/peopletag.php:70
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "有効なメールアドレスではありません。"
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
+#: actions/peopletag.php:144
 #, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
+msgid "Users self-tagged with %s - page %d"
 msgstr ""
 
-#: ../actions/openidsettings.php:86
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr "\"削除\"をクリックして OpenID を削除できます。"
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "不正な通知内容"
 
-#: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/postnotice.php:90
 #, php-format
-msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
-"Jabber/GTalk [instant messages](%%doc.im%%)　経由で通知の送信、受信が可能で"
-"す。下のアドレスを設定して下さい。"
 
-#: ../actions/profilesettings.php:27
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "プロファイル設定"
+
+#: actions/profilesettings.php:71
 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
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
-msgstr "ローカルサブスクリプションを使用可能です！"
+#: actions/profilesettings.php:99
+#, fuzzy
+msgid "Profile information"
+msgstr "プロファイルが不明"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
-msgid "You can't register if you don't agree to the license."
-msgstr "ライセンスに同意頂けない場合は登録できません。"
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く"
 
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
-msgid "You did not send us that profile"
-msgstr "そのプロファイルは送信されていません。"
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full 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/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "ホームページ"
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
-msgid "You may not delete another user's status."
-msgstr ""
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "ホームページ、ブログ、プロファイル、その他サイトの URL"
 
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr ""
+#: actions/profilesettings.php:122 actions/register.php:460
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "140字以内で自己紹介"
 
-#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
+#: actions/profilesettings.php:125 actions/register.php:463
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "140字以内で自己紹介"
 
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr "確認されました。新しいパスワードを入力して下さい。"
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "自己紹介"
 
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
-msgid "Your OpenID URL"
-msgstr "あなたの OpenID URL"
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "場所"
 
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
-msgstr "このサーバでのニックネーム、または登録したメールアドレス。"
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "いる場所, 例えば \"City, State (or Region), Country\""
 
-#: ../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."
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
 msgstr ""
-"[OpenID](%%doc.openid%%) を使って同じアカウントで様々なウェブサイトへログイン"
-"することができます。ここで関連付ける OpenID を管理して下さい。"
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
-msgid "a few seconds ago"
-msgstr "数秒前"
+#: actions/profilesettings.php:140
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
-#, php-format
-msgid "about %d days ago"
-msgstr "約 %d 日前"
+#: actions/profilesettings.php:144
+msgid "Language"
+msgstr ""
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
-#, php-format
-msgid "about %d hours ago"
-msgstr "約 %d 時間前"
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr ""
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
-#, php-format
-msgid "about %d minutes ago"
-msgstr "約 %d 分前"
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr ""
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
-#, php-format
-msgid "about %d months ago"
-msgstr "約 %d ヵ月前"
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
+msgstr ""
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
-msgid "about a day ago"
-msgstr "約 1 日前"
+#: actions/profilesettings.php:160
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr "自分を購読している者を自動的に購読する (非人間に最適)"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
-msgid "about a minute ago"
-msgstr "約 1 分前"
+#: actions/profilesettings.php:221 actions/register.php:223
+#, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "自己紹介が長すぎます (最長140文字)。"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
-msgid "about a month ago"
-msgstr "約 1 ヵ月前"
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr ""
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
-msgid "about a year ago"
-msgstr "約 1 年前"
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr ""
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
-msgid "about an hour ago"
-msgstr "約 1 時間前"
+#: actions/profilesettings.php:246 actions/tagother.php:178
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "不正なホームページ '%s'"
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
 msgstr ""
 
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117 actions/noticesearch.php:136
-#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
-msgid "in reply to..."
-msgstr "...に対しての返信"
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+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 actions/noticesearch.php:194
-msgid "reply"
-msgstr "返信"
+#: actions/profilesettings.php:336
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "プロファイルを保存できません"
 
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-msgid "same as password above"
-msgstr "上のパスワードと同じ"
+#: actions/profilesettings.php:344
+msgid "Settings saved."
+msgstr "設定が保存されました。"
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
-msgid "unsupported file type"
+#: actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
 msgstr ""
 
-#: ../lib/util.php:1309 lib/util.php:1443
-#, fuzzy
-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
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-msgid "There was a problem with your session token. Try again, please."
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
 msgstr ""
 
-#: actions/disfavor.php:55 actions/disfavor.php:81
-msgid "This notice is not a favorite!"
-msgstr ""
+#: actions/public.php:129
+#, fuzzy, php-format
+msgid "Public timeline, page %d"
+msgstr "パブリックタイムライン"
 
-#: actions/disfavor.php:63 actions/disfavor.php:87
-msgid "Could not delete favorite."
-msgstr ""
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr "パブリックタイムライン"
 
-#: actions/disfavor.php:72 lib/favorform.php:140
-msgid "Favor"
-msgstr ""
+#: actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "パブリックフィード"
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
-msgstr ""
+#: actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "パブリックフィード"
 
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-msgid "Send me email when someone sends me a private message."
-msgstr ""
+#: actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "パブリックフィード"
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
-msgid "This notice is already a favorite!"
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
 msgstr ""
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132 actions/favor.php:86
-#: actions/twitapifavorites.php:125 classes/Command.php:152
-msgid "Could not create favorite."
+#: actions/public.php:182
+msgid "Be the first to post!"
 msgstr ""
 
-#: actions/favor.php:70
-msgid "Disfavor"
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/public.php:233
 #, php-format
-msgid "%s favorite notices"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/public.php:238
 #, php-format
-msgid "Feed of favorite notices of %s"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
 msgstr ""
 
-#: actions/inbox.php:28 actions/inbox.php:59
+#: actions/publictagcloud.php:57
+#, fuzzy
+msgid "Public tag cloud"
+msgstr "パブリックフィード"
+
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "Inbox for %s - page %d"
+msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/inbox.php:30 actions/inbox.php:62
+#: actions/publictagcloud.php:69
 #, php-format
-msgid "Inbox for %s"
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
 
-#: actions/inbox.php:53 actions/inbox.php:115
-msgid "This is your inbox, which lists your incoming private messages."
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
 msgstr ""
 
-#: actions/invite.php:178 actions/invite.php:213
+#: actions/publictagcloud.php:75
 #, php-format
 msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
 msgstr ""
 
-#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-msgid "Automatically login in the future; "
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
 msgstr ""
 
-#: actions/login.php:122 actions/login.php:264
-msgid "For security reasons, please re-enter your "
-msgstr ""
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "既にログイン済みです。"
 
-#: actions/login.php:126 actions/login.php:268
-msgid "Login with your username and password. "
-msgstr ""
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "そのような回復コードはありません。"
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
-msgid "That's too long. Max message size is 140 chars."
-msgstr ""
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "回復コードではありません。"
 
-#: actions/newmessage.php:65 actions/newmessage.php:128
-msgid "No recipient specified."
-msgstr ""
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr "不明なユーザのための回復コード。"
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206 actions/newmessage.php:131
-#: actions/newmessage.php:168 classes/Command.php:237
-msgid "You can't send a message to this user."
-msgstr ""
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "確認コードにエラーがあります。"
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr ""
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
+msgstr "確認コードが古すぎます。もう一度やり直してください。"
 
-#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
-msgid "No such user"
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
 msgstr ""
 
-#: actions/newmessage.php:117 actions/newmessage.php:67
-msgid "New message"
+#: actions/recoverpassword.php:152
+msgid ""
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
 msgstr ""
 
-#: actions/noticesearch.php:95 actions/noticesearch.php:146
-msgid "Notice without matching profile"
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
-#: actions/openidsettings.php:28 actions/openidsettings.php:70
-#, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
 msgstr ""
 
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
 msgstr ""
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr ""
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
+msgstr "このサーバでのニックネーム、または登録したメールアドレス。"
 
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-msgid "You can remove an OpenID from your account "
-msgstr ""
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
+msgstr "回復"
 
-#: actions/outbox.php:28 actions/outbox.php:58
-#, php-format
-msgid "Outbox for %s - page %d"
-msgstr ""
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "パスワードをリセット"
 
-#: actions/outbox.php:30 actions/outbox.php:61
-#, php-format
-msgid "Outbox for %s"
-msgstr ""
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr "パスワードを回復"
 
-#: actions/outbox.php:53 actions/outbox.php:116
-msgid "This is your outbox, which lists private messages you have sent."
-msgstr ""
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
+msgstr "パスワード回復のリクエストされました"
 
-#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
-#, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
 msgstr ""
 
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
-msgid "You can update your personal profile info here "
-msgstr ""
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "6文字以上。忘れないでください！"
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
-msgid "User without matching profile"
-msgstr ""
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "上と同じパスワード"
 
-#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
-msgstr ""
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "リセット"
 
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
-msgstr ""
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "ニックネームかメールアドレスを入力してください。"
 
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a "
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
 msgstr ""
 
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-msgid "Your nickname on this server, "
-msgstr ""
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr "そのユーザにはメールアドレスの登録がありません。"
 
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-msgid "Instructions for recovering your password "
-msgstr ""
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "アドレス確認保存エラー"
 
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
-msgid "New password successfully saved. "
-msgstr ""
+#: actions/recoverpassword.php:325
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr "登録されたメールアドレスにパスワードの回復方法をおおくりしました。"
 
-#: actions/register.php:95 actions/register.php:180
-msgid "Password must be 6 or more characters."
-msgstr ""
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
+msgstr "予期せぬパスワードのリセットです。"
 
-#: actions/register.php:216
-#, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
-msgstr ""
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "パスワードは6字以上でなければいけません。"
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
-msgstr ""
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
+msgstr "パスワードと確認が一致しません。"
 
-#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
-#, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr ""
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
+msgstr "新しいパスワードの保存に成功しました。ログインしています。"
 
-#: actions/showfavorites.php:61 actions/showfavorites.php:145
-#, php-format
-msgid "Feed for favorites of %s"
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-msgid "Could not retrieve favorite notices."
-msgstr ""
+#: actions/register.php:92
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "確認コードにエラーがあります。"
 
-#: actions/showmessage.php:33 actions/showmessage.php:81
-msgid "No such message."
+#: actions/register.php:112
+msgid "Registration successful"
 msgstr ""
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
-msgstr ""
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "登録"
 
-#: actions/showmessage.php:61 actions/showmessage.php:108
-#, php-format
-msgid "Message to %1$s on %2$s"
+#: actions/register.php:135
+msgid "Registration not allowed."
 msgstr ""
 
-#: actions/showmessage.php:66 actions/showmessage.php:113
-#, php-format
-msgid "Message from %1$s on %2$s"
-msgstr ""
+#: actions/register.php:198
+msgid "You can't register if you don't agree to the license."
+msgstr "ライセンスに同意頂けない場合は登録できません。"
 
-#: actions/showstream.php:154
-msgid "Send a message"
-msgstr ""
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "有効なメールアドレスではありません。"
 
-#: actions/smssettings.php:312 actions/smssettings.php:464
-#, php-format
-msgid "Mobile carrier for your phone. "
-msgstr ""
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "メールアドレスが既に存在します。"
 
-#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
-#, php-format
-msgid "Direct messages to %s"
-msgstr ""
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "不正なユーザ名またはパスワード。"
 
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
-#, php-format
-msgid "All the direct messages sent to %s"
+#: actions/register.php:342
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-msgid "Direct Messages You've Sent"
+#: actions/register.php:424
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
+"1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く。必須です。"
 
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
-#, php-format
-msgid "All the direct messages sent from %s"
-msgstr ""
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr "6文字以上。必須です。"
 
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-msgid "No message text!"
+#: actions/register.php:433
+msgid "Same as password above. Required."
 msgstr ""
 
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-msgid "Recipient user not found."
-msgstr ""
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "メール"
 
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
+msgstr "更新、アナウンス、パスワードリカバリーでのみ使用されます。"
 
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
-#, php-format
-msgid "%s / Favorites from %s"
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
-#, php-format
-msgid "%s updates favorited by %s / %s."
-msgstr ""
+#: actions/register.php:493
+msgid "My text and files are available under "
+msgstr "の下でテキスト及びファイルを利用可能"
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
-#, php-format
-msgid "%s added your notice as a favorite"
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
+#: actions/register.php:496
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr "個人情報を除く:パスワード、メールアドレス、IMアドレス、電話番号"
+
+#: actions/register.php:537
 #, php-format
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
+"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/twittersettings.php:27
+#: actions/register.php:561
 msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
 msgstr ""
+"(メールアドレスを確認する方法を読んで、すぐにメールによるメッセージを受け取る"
+"ようにしてください)"
 
-#: actions/twittersettings.php:41 actions/twittersettings.php:60
-msgid "Twitter settings"
+#: actions/remotesubscribe.php:98
+#, php-format
+msgid ""
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
+"サブスクライブするには、[ログイン](%%action.login%%) するか, [登録](%%action."
+"register%%) を行って下さい。既に [compatible microblogging site](%%doc."
+"openmublog%%) にアカウントを持っおもちの場合は、下にプロファイルURLを入力して"
+"下さい."
 
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-msgid "Twitter Account"
-msgstr ""
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr "リモートサブスクライブ"
 
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-msgid "Current verified Twitter account."
-msgstr ""
+#: actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "購読が許可"
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr ""
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "ユーザのニックネーム"
 
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-msgid "No spaces, please."
-msgstr ""
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr "フォローしたいユーザのニックネーム"
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
-msgstr ""
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "プロファイルURL"
 
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-msgid "Automatically send my notices to Twitter."
-msgstr ""
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "プロファイルサービスまたはマイクロブロギングサービスのURL"
 
-#: actions/twittersettings.php:75 actions/twittersettings.php:146
-msgid "Send local \"@\" replies to Twitter."
-msgstr ""
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
+msgstr "購読"
 
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-msgid "Subscribe to my Twitter friends here."
-msgstr ""
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr "不正なプロファイルURL。（形式不備）"
 
-#: actions/twittersettings.php:122
+#: actions/remotesubscribe.php:168
+#, fuzzy
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
-msgstr ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "有効なプロファイルURLではありません。（XRDSドキュメントが無い）"
 
-#: actions/twittersettings.php:128 actions/twittersettings.php:334
-msgid "Could not verify your Twitter credentials!"
+#: actions/remotesubscribe.php:176
+msgid "That’s a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "リクエストトークンを取得できません"
+
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
 #, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr ""
+msgid "Replies to %s"
+msgstr "%s への返信"
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-msgid "Unable to save your Twitter settings!"
-msgstr ""
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %s, page %d"
+msgstr "%s への返信"
 
-#: actions/twittersettings.php:174 actions/twittersettings.php:376
-msgid "Twitter settings saved."
-msgstr ""
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "%sの通知フィード"
 
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-msgid "That is not your Twitter account."
-msgstr ""
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "%sの通知フィード"
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
-msgid "Couldn't remove Twitter user."
-msgstr ""
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "%sの通知フィード"
 
-#: actions/twittersettings.php:212 actions/twittersettings.php:407
-msgid "Twitter account removed."
+#: actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
 msgstr ""
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
-msgid "Couldn't save Twitter preferences."
+#: actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
 msgstr ""
 
-#: actions/twittersettings.php:245 actions/twittersettings.php:461
-msgid "Twitter preferences saved."
+#: actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: actions/userauthorization.php:84 actions/userauthorization.php:86
-msgid "Please check these details to make sure "
-msgstr ""
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "%s への返信"
 
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
-msgid "The subscription has been authorized, but no "
-msgstr ""
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "そのような通知はありません。"
 
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-msgid "The subscription has been rejected, but no "
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
 msgstr ""
 
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-msgid "Command results"
-msgstr ""
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "%s のともだちのフィード"
 
-#: classes/Channel.php:148 classes/Channel.php:204
-msgid "Command complete"
-msgstr ""
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "%s のともだちのフィード"
 
-#: classes/Channel.php:158 classes/Channel.php:215
-msgid "Command failed"
-msgstr ""
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "%s のともだちのフィード"
 
-#: classes/Command.php:39 classes/Command.php:44
-msgid "Sorry, this command is not yet implemented."
+#: actions/showfavorites.php:205
+msgid ""
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""
 
-#: classes/Command.php:96 classes/Command.php:113
+#: actions/showfavorites.php:207
 #, php-format
-msgid "Subscriptions: %1$s\n"
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
-msgid "User has no last notice"
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
 msgstr ""
 
-#: classes/Command.php:146 classes/Command.php:166
-msgid "Notice marked as fave."
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
 msgstr ""
 
-#: classes/Command.php:166 classes/Command.php:189
+#: actions/showgroup.php:82 lib/groupnav.php:86
 #, php-format
-msgid "%1$s (%2$s)"
+msgid "%s group"
 msgstr ""
 
-#: classes/Command.php:169 classes/Command.php:192
+#: actions/showgroup.php:84
 #, php-format
-msgid "Fullname: %s"
+msgid "%s group, page %d"
 msgstr ""
 
-#: classes/Command.php:172 classes/Command.php:195
-#, php-format
-msgid "Location: %s"
-msgstr ""
+#: actions/showgroup.php:218
+#, fuzzy
+msgid "Group profile"
+msgstr "そのような通知はありません。"
 
-#: classes/Command.php:175 classes/Command.php:198
-#, php-format
-msgid "Homepage: %s"
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
+msgid "URL"
 msgstr ""
 
-#: classes/Command.php:178 classes/Command.php:201
-#, php-format
-msgid "About: %s"
-msgstr ""
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
+#, fuzzy
+msgid "Note"
+msgstr "通知"
 
-#: classes/Command.php:200 classes/Command.php:228
-#, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
 msgstr ""
 
-#: classes/Command.php:214 classes/Command.php:245
-#, php-format
-msgid "Direct message to %s sent"
+#: actions/showgroup.php:293
+msgid "Group actions"
 msgstr ""
 
-#: classes/Command.php:216 classes/Command.php:247
-msgid "Error sending direct message."
-msgstr ""
+#: actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "%sの通知フィード"
 
-#: classes/Command.php:263 classes/Command.php:300
-msgid "Specify the name of the user to subscribe to"
-msgstr ""
+#: actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "%sの通知フィード"
 
-#: classes/Command.php:270 classes/Command.php:307
-#, php-format
-msgid "Subscribed to %s"
-msgstr ""
+#: actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "%sの通知フィード"
 
-#: classes/Command.php:288 classes/Command.php:328
-msgid "Specify the name of the user to unsubscribe from"
-msgstr ""
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "%sの通知フィード"
 
-#: classes/Command.php:295 classes/Command.php:335
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr ""
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
+#, fuzzy
+msgid "Members"
+msgstr "からのメンバー"
 
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
-msgid "Command not yet implemented."
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/tagcloudsection.php:71
+msgid "(None)"
 msgstr ""
 
-#: classes/Command.php:313 classes/Command.php:356
-msgid "Notification off."
+#: actions/showgroup.php:392
+msgid "All members"
 msgstr ""
 
-#: classes/Command.php:315 classes/Command.php:358
-msgid "Can't turn off notification."
-msgstr ""
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "統計データ"
 
-#: classes/Command.php:333 classes/Command.php:379
-msgid "Notification on."
-msgstr ""
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "作成"
 
-#: classes/Command.php:335 classes/Command.php:381
-msgid "Can't turn on notification."
+#: actions/showgroup.php:448
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
+#: actions/showgroup.php:454
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
 msgstr ""
 
-#: classes/Message.php:53 classes/Message.php:56
-msgid "Could not insert message."
-msgstr ""
+#: actions/showgroup.php:482
+#, fuzzy
+msgid "Admins"
+msgstr "管理者"
 
-#: classes/Message.php:63 classes/Message.php:66
-msgid "Could not update message with new URI."
+#: actions/showmessage.php:81
+msgid "No such message."
 msgstr ""
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: lib/mail.php:147 lib/mail.php:289
+#: actions/showmessage.php:108
 #, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: lib/mail.php:249 lib/mail.php:508
+#: actions/showmessage.php:113
 #, php-format
-msgid "New private message from %s"
+msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: lib/mail.php:253 lib/mail.php:512
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "通知"
+
+#: actions/showstream.php:73
 #, php-format
-msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+msgid " tagged %s"
 msgstr ""
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
+#: actions/showstream.php:79
+#, php-format
+msgid "%s, page %d"
 msgstr ""
 
-#: lib/openid.php:195 lib/openid.php:203
-msgid "This form should automatically submit itself. "
-msgstr ""
+#: actions/showstream.php:122
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "%sの通知フィード"
 
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-msgid "Favorites"
-msgstr ""
+#: actions/showstream.php:129
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "%sの通知フィード"
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-#, php-format
-msgid "%s's favorite notices"
-msgstr ""
+#: actions/showstream.php:136
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "%sの通知フィード"
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-msgid "User"
-msgstr ""
+#: actions/showstream.php:143
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "%sの通知フィード"
 
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-msgid "Inbox"
+#: actions/showstream.php:148
+#, php-format
+msgid "FOAF for %s"
 msgstr ""
 
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-msgid "Your incoming messages"
+#: actions/showstream.php:191
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
 msgstr ""
 
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-msgid "Outbox"
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
 msgstr ""
 
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-msgid "Your sent messages"
+#: actions/showstream.php:198
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-msgid "Twitter"
+#: actions/showstream.php:234
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
+#: actions/showstream.php:239
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
 msgstr ""
 
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-msgid "To"
+#: actions/smssettings.php:58
+msgid "SMS Settings"
 msgstr ""
 
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-msgid "Could not parse message."
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: actions/all.php:63 actions/facebookhome.php:162
-#, fuzzy, php-format
-msgid "%s and friends, page %d"
-msgstr "%s & ともだち"
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "このページはあなたが承認したメディアタイプでは利用できません。"
 
-#: actions/avatarsettings.php:76
-msgid "You can upload your personal avatar."
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
-#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
-#, fuzzy
-msgid "Avatar settings"
-msgstr "設定"
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
+msgstr "この電話番号は確認待ちです。"
 
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-msgid "Original"
-msgstr ""
+#: actions/smssettings.php:130
+msgid "Confirmation code"
+msgstr "確認コード"
 
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-msgid "Preview"
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
 msgstr ""
 
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
-msgid "Crop"
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
 msgstr ""
 
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-msgid "There was a problem with your session token. "
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-msgid "Pick a square area of the image to be your avatar"
+#: actions/smssettings.php:174
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
 msgstr ""
 
-#: actions/avatarsettings.php:327 actions/grouplogo.php:384
-msgid "Lost our file data."
+#: actions/smssettings.php:306
+msgid "No phone number."
 msgstr ""
 
-#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
-#, fuzzy
-msgid "Lost our file."
-msgstr "そのような通知はありません。"
-
-#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
-#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
-msgid "Unknown file type"
+#: actions/smssettings.php:311
+msgid "No carrier selected."
 msgstr ""
 
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
 msgstr ""
 
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
 msgstr ""
 
-#: actions/block.php:111
+#: actions/smssettings.php:347
 #, fuzzy
-msgid "Block user"
-msgstr "そのようなユーザはいません。"
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr "その確認コードはあなたのものではありません！"
 
-#: actions/block.php:129
-msgid "Are you sure you want to block this user? "
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
 msgstr ""
 
-#: actions/block.php:162
-#, fuzzy
-msgid "You have already blocked this user."
-msgstr "既にログイン済みです。"
-
-#: actions/block.php:167
-msgid "Failed to save block information."
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
 msgstr ""
 
-#: actions/confirmaddress.php:159
-#, fuzzy, php-format
-msgid "The address \"%s\" has been "
-msgstr "アドレスは削除されました。"
-
-#: actions/deletenotice.php:73
-msgid "You are about to permanently delete a notice. "
+#: actions/smssettings.php:465
+msgid "Mobile carrier"
 msgstr ""
 
-#: actions/disfavor.php:94
-msgid "Add to favorites"
+#: actions/smssettings.php:469
+msgid "Select a carrier"
 msgstr ""
 
-#: actions/editgroup.php:54
+#: actions/smssettings.php:476
 #, php-format
-msgid "Edit %s group"
-msgstr ""
-
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-msgid "Inboxes must be enabled for groups to work"
+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/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-msgid "You must be logged in to create a group."
+#: actions/smssettings.php:498
+msgid "No code entered"
 msgstr ""
 
-#: actions/editgroup.php:87 actions/grouplogo.php:87
-#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
+#: actions/subedit.php:70
 #, fuzzy
-msgid "No nickname"
-msgstr "ニックネームがありません。"
+msgid "You are not subscribed to that profile."
+msgstr "そのプロファイルは送信されていません。"
 
-#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
-#: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
+#: actions/subedit.php:83
 #, fuzzy
-msgid "No such group"
-msgstr "そのような通知はありません。"
-
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
-msgid "You must be an admin to edit the group"
-msgstr ""
-
-#: actions/editgroup.php:157
-msgid "Use this form to edit the group."
-msgstr ""
+msgid "Could not save subscription."
+msgstr "サブスクリプションを作成できません"
 
-#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+#: actions/subscribe.php:55
 #, fuzzy
-msgid "Nickname must have only lowercase letters "
-msgstr ""
-"ニックネームには、小文字アルファベットと数字のみ使用できます。スペースは使用"
-"できません。"
+msgid "Not a local user."
+msgstr "そのようなユーザはいません。"
 
-#: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/subscribe.php:69
 #, fuzzy
-msgid "description is too long (max 140 chars)."
-msgstr "バイオグラフィが長すぎます。（最長140字）"
+msgid "Subscribed"
+msgstr "購読"
 
-#: actions/editgroup.php:218
-#, fuzzy
-msgid "Could not update group."
-msgstr "ユーザを更新できません"
+#: actions/subscribers.php:50
+#, fuzzy, php-format
+msgid "%s subscribers"
+msgstr "購読者"
 
-#: actions/editgroup.php:226
-#, fuzzy
-msgid "Options saved."
-msgstr "設定が保存されました。"
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %d"
+msgstr ""
 
-#: actions/emailsettings.php:107 actions/imsettings.php:108
-#, fuzzy, php-format
-msgid "Awaiting confirmation on this address. "
-msgstr "確認コードにエラーがあります。"
+#: actions/subscribers.php:63
+msgid "These are the people who listen to your notices."
+msgstr "あなたの通知を聞いている人"
 
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-msgid "Make a new email address for posting to; "
+#: actions/subscribers.php:67
+#, php-format
+msgid "These are the people who listen to %s's notices."
+msgstr "%s　の通知を聞いている人"
+
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
 msgstr ""
 
-#: actions/emailsettings.php:157
-msgid "Send me email when someone "
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
 
-#: actions/emailsettings.php:168
-msgid "Allow friends to nudge me and send me an email."
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
 msgstr ""
 
-#: actions/emailsettings.php:321
-#, fuzzy
-msgid "That email address already belongs "
-msgstr "メールアドレスが既に存在します。"
+#: actions/subscriptions.php:52
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "全てのサブスクリプション"
 
-#: actions/emailsettings.php:343
-#, fuzzy
-msgid "A confirmation code was sent to the email address you added. "
-msgstr ""
-"確認用コードを入力されたIMアドレスに送信しました。メッセージを確認するには、%"
-"sを承認して下さい。"
+#: actions/subscriptions.php:54
+#, fuzzy, php-format
+msgid "%s subscriptions, page %d"
+msgstr "全てのサブスクリプション"
 
-#: actions/facebookhome.php:110
-msgid "Server error - couldn't get user!"
-msgstr ""
+#: actions/subscriptions.php:65
+msgid "These are the people whose notices you listen to."
+msgstr "あなたが通知を聞いている人"
 
-#: actions/facebookhome.php:196
+#: actions/subscriptions.php:69
 #, php-format
-msgid "If you would like the %s app to automatically update "
-msgstr ""
+msgid "These are the people whose notices %s listens to."
+msgstr "%s が通知を聞いている人"
 
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#: actions/subscriptions.php:121
 #, php-format
-msgid "Allow %s to update my Facebook status"
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
 msgstr ""
 
-#: actions/facebookhome.php:218
-msgid "Skip"
-msgstr ""
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s は %2$s であなたの通知を聞いています。"
 
-#: actions/facebookhome.php:235
+#: actions/subscriptions.php:194
 #, fuzzy
-msgid "No notice content!"
-msgstr "コンテンツがありません！"
+msgid "Jabber"
+msgstr "Jabbar ID はありません。"
 
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-msgid "Pagination"
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
 msgstr ""
 
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/tagother.php:33
 #, fuzzy
-msgid "After"
-msgstr "<< 前"
+msgid "Not logged in"
+msgstr "ログインしていません。"
 
-#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/tagother.php:39
 #, fuzzy
-msgid "Before"
-msgstr "前 >>"
+msgid "No id argument."
+msgstr "そのようなドキュメントはありません。"
 
-#: actions/facebookinvite.php:70
+#: actions/tagother.php:65
 #, php-format
-msgid "Thanks for inviting your friends to use %s"
+msgid "Tag %s"
 msgstr ""
 
-#: actions/facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr ""
+#: actions/tagother.php:77 lib/userprofile.php:75
+#, fuzzy
+msgid "User profile"
+msgstr "プロファイルがありません。"
 
-#: actions/facebookinvite.php:96
-#, php-format
-msgid "You have been invited to %s"
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
 msgstr ""
 
-#: actions/facebookinvite.php:105
-#, fuzzy, php-format
-msgid "Invite your friends to use %s"
-msgstr "%s のともだちのフィード"
-
-#: actions/facebookinvite.php:113
-#, php-format
-msgid "Friends already using %s:"
+#: actions/tagother.php:141
+msgid "Tag user"
 msgstr ""
 
-#: actions/facebookinvite.php:130
-#, php-format
-msgid "Send invitations"
+#: actions/tagother.php:151
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
 msgstr ""
 
-#: actions/facebookremove.php:56
-#, fuzzy
-msgid "Couldn't remove Facebook user."
-msgstr "ユーザを更新できません"
-
-#: actions/facebooksettings.php:65
-msgid "There was a problem saving your sync preferences!"
+#: actions/tagother.php:193
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/facebooksettings.php:67
+#: actions/tagother.php:200
 #, fuzzy
-msgid "Sync preferences saved."
-msgstr "設定が保存されました。"
-
-#: actions/facebooksettings.php:90
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
+msgid "Could not save tags."
+msgstr "アバターを保存できません"
 
-#: actions/facebooksettings.php:97
-msgid "Send \"@\" replies to Facebook."
+#: actions/tagother.php:236
+msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/facebooksettings.php:106
-#, fuzzy
-msgid "Prefix"
-msgstr "プロファイル"
-
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
-msgstr ""
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "マイクロブログ by %s"
 
-#: actions/facebooksettings.php:124
-#, php-format
-msgid "If you would like %s to automatically update "
-msgstr ""
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "%sの通知フィード"
 
-#: actions/facebooksettings.php:147
-#, fuzzy
-msgid "Sync preferences"
-msgstr "設定"
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "%sの通知フィード"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr ""
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "%sの通知フィード"
 
-#: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
+#: actions/tagrss.php:35
 #, fuzzy
-msgid "Popular notices"
+msgid "No such tag."
 msgstr "そのような通知はありません。"
 
-#: actions/favorited.php:67
-#, fuzzy, php-format
-msgid "Popular notices, page %d"
-msgstr "そのような通知はありません。"
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
+msgstr "API メソッドが工事中です。"
 
-#: actions/favorited.php:79
-msgid "The most popular notices on the site right now."
-msgstr ""
+#: actions/unsubscribe.php:77
+msgid "No profile id in request."
+msgstr "リクエスト内にプロファイルIDがありません。"
 
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
-msgid "Featured users"
-msgstr ""
+#: actions/unsubscribe.php:84
+msgid "No profile with that id."
+msgstr "そのIDはプロファイルではありません。"
 
-#: actions/featured.php:71
-#, php-format
-msgid "Featured users, page %d"
-msgstr ""
+#: actions/unsubscribe.php:98
+msgid "Unsubscribed"
+msgstr "サブスクライブ解除済み"
 
-#: actions/featured.php:99
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
 #, php-format
-msgid "A selection of some of the great users on %s"
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
-msgstr ""
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "購読を許可"
 
-#: actions/groupbyid.php:79
-msgid "No ID"
+#: actions/userauthorization.php:110
+#, fuzzy
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
 msgstr ""
+"ユーザの通知を購読するには詳細を確認して下さい。購読しない場合は、\"Cancel\" "
+"キャンセルをクリックして下さい。"
 
-#: actions/grouplogo.php:138 actions/grouplogo.php:191
-msgid "Group logo"
-msgstr ""
+#: actions/userauthorization.php:188
+#, fuzzy
+msgid "License"
+msgstr "ライセンス。"
 
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
-msgstr ""
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "承認"
 
-#: actions/grouplogo.php:448
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
 #, fuzzy
-msgid "Logo updated."
-msgstr "アバターが更新されました。"
+msgid "Subscribe to this user"
+msgstr "購読が許可"
+
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "拒否"
 
-#: actions/grouplogo.php:450
+#: actions/userauthorization.php:212
 #, fuzzy
-msgid "Failed updating logo."
-msgstr "アバターの更新に失敗しました。"
+msgid "Reject this subscription"
+msgstr "全てのサブスクリプション"
 
-#: actions/groupmembers.php:93 lib/groupnav.php:91
-#, php-format
-msgid "%s group members"
-msgstr ""
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
+msgstr "認証のリクエストがありません。"
 
-#: actions/groupmembers.php:96
-#, php-format
-msgid "%s group members, page %d"
-msgstr ""
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+msgstr "購読が許可"
 
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
+#: actions/userauthorization.php:249
+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/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
-msgid "Groups"
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
+msgstr "購読が拒否"
+
+#: actions/userauthorization.php:261
+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/groups.php:64
+#: actions/userauthorization.php:296
 #, php-format
-msgid "Groups, page %d"
+msgid "Listener URI ‘%s’ not found here"
 msgstr ""
 
-#: actions/groups.php:90
+#: actions/userauthorization.php:301
 #, php-format
-msgid "%%%%site.name%%%% groups let you find and talk with "
+msgid "Listenee URI ‘%s’ is too long."
 msgstr ""
 
-#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-#, fuzzy
-msgid "Create a new group"
-msgstr "アカウントを作成"
-
-#: actions/groupsearch.php:57
-#, fuzzy, php-format
-msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr ""
-"%%site.name%% の人を名前、場所、興味から検索。検索語はスペース区切る。3字以上"
 
-#: actions/groupsearch.php:63
-#, fuzzy
-msgid "Group search"
-msgstr "ピープルサーチ"
-
-#: actions/imsettings.php:70
-msgid "You can send and receive notices through "
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr ""
 
-#: actions/imsettings.php:120
+#: actions/userauthorization.php:338
 #, php-format
-msgid "Jabber or GTalk address, "
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr ""
 
-#: actions/imsettings.php:147
-#, fuzzy
-msgid "Send me replies through Jabber/GTalk "
-msgstr "Jabber/GTalk で私に通知を送って下さい。"
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "アバターURL　を読み取れません '%s'"
 
-#: actions/imsettings.php:321
+#: actions/userauthorization.php:348
 #, fuzzy, php-format
-msgid "A confirmation code was sent "
-msgstr "確認コードがありません。"
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "不正な画像形式。'%s'"
 
-#: actions/joingroup.php:65
-msgid "You must be logged in to join a group."
-msgstr ""
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr "id がありません。"
 
-#: actions/joingroup.php:95
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
 #, fuzzy
-msgid "You are already a member of that group"
-msgstr "既にログイン済みです。"
-
-#: actions/joingroup.php:128
-#, fuzzy, php-format
-msgid "Could not join user %s to group %s"
-msgstr "サーバへリダイレクトできません : %s"
+msgid "Profile design"
+msgstr "プロファイル設定"
 
-#: actions/joingroup.php:135
-#, php-format
-msgid "%s joined group %s"
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
 msgstr ""
 
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
 msgstr ""
 
-#: actions/leavegroup.php:65
-msgid "You must be logged in to leave a group."
-msgstr ""
+#: actions/usergroups.php:64
+#, php-format
+msgid "%s groups, page %d"
+msgstr "%s グループ, %d ページ"
 
-#: actions/leavegroup.php:88
+#: actions/usergroups.php:130
 #, fuzzy
-msgid "No such group."
-msgstr "そのような通知はありません。"
+msgid "Search for more groups"
+msgstr "人々かテキストを検索"
 
-#: actions/leavegroup.php:95
-#, fuzzy
-msgid "You are not a member of that group."
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
 msgstr "そのプロファイルは送信されていません。"
 
-#: actions/leavegroup.php:100
-msgid "You may not leave a group while you are its administrator."
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
 
-#: actions/leavegroup.php:130
-msgid "Could not find membership record."
+#: classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
 msgstr ""
 
-#: actions/leavegroup.php:138
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "OpenIDを作成できません : %s"
-
-#: actions/leavegroup.php:145
+#: classes/File.php:147
 #, php-format
-msgid "%s left group %s"
+msgid "A file this large would exceed your user quota of %d bytes."
 msgstr ""
 
-#: actions/login.php:225 lib/facebookaction.php:304
-msgid "Login to site"
+#: classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
-#: actions/microsummary.php:69
-msgid "No current status"
+#: classes/Message.php:55
+msgid "Could not insert message."
 msgstr ""
 
-#: actions/newgroup.php:53
-msgid "New group"
+#: classes/Message.php:65
+msgid "Could not update message with new URI."
 msgstr ""
 
-#: actions/newgroup.php:115
-msgid "Use this form to create a new group."
+#: classes/Notice.php:164
+#, php-format
+msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: actions/newgroup.php:177
-#, fuzzy
-msgid "Could not create group."
-msgstr "アバターを保存できません"
-
-#: actions/newgroup.php:191
+#: classes/Notice.php:179
 #, fuzzy
-msgid "Could not set group membership."
-msgstr "サブスクリプションを作成できません"
-
-#: actions/newmessage.php:119 actions/newnotice.php:132
-#, fuzzy
-msgid "That's too long. "
-msgstr "ファイルサイズが大きすぎます。"
-
-#: actions/newmessage.php:134
-msgid "Don't send a message to yourself; "
-msgstr ""
+msgid "Problem saving notice. Too long."
+msgstr "通知を保存する際に問題が発生しました。"
 
-#: actions/newnotice.php:166
+#: classes/Notice.php:183
 #, fuzzy
-msgid "Notice posted"
-msgstr "通知"
+msgid "Problem saving notice. Unknown user."
+msgstr "通知を保存する際に問題が発生しました。"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
-msgid "Ajax Error"
+#: classes/Notice.php:188
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: actions/nudge.php:85
+#: classes/Notice.php:194
 msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
 msgstr ""
 
-#: actions/nudge.php:94
-msgid "Nudge sent"
+#: classes/Notice.php:202
+msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: actions/nudge.php:97
-msgid "Nudge sent!"
-msgstr ""
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
+msgstr "通知を保存する際に問題が発生しました。"
 
-#: actions/openidlogin.php:97
-#, fuzzy
-msgid "OpenID login"
-msgstr "OpenID ログイン"
+#: classes/Notice.php:1120
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "返信を追加する際にデータベースエラー : %s"
 
-#: actions/openidsettings.php:128
-#, fuzzy
-msgid "Removing your only OpenID "
-msgstr "OpenID を削除"
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr ""
 
-#: actions/othersettings.php:60
-#, fuzzy
-msgid "Other Settings"
-msgstr "設定"
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "プロファイル"
 
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr ""
+#: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
+msgstr "プロファイル設定の変更"
 
-#: actions/othersettings.php:93
-msgid "URL Auto-shortening"
-msgstr ""
+#: lib/accountsettingsaction.php:112
+msgid "Upload an avatar"
+msgstr "アバターのアップロード"
 
-#: actions/othersettings.php:112
-#, fuzzy
-msgid "Service"
-msgstr "検索"
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr "パスワードの変更"
 
-#: actions/othersettings.php:113
-msgid "Automatic shortening service to use."
-msgstr ""
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
+msgstr "メールの扱いを変更"
 
-#: actions/othersettings.php:144
-#, fuzzy
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "場所が長すぎます。（255字まで）"
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
 
-#: actions/passwordsettings.php:69
+#: lib/accountsettingsaction.php:124
 #, fuzzy
-msgid "Change your password."
-msgstr "パスワードの変更"
+msgid "Design your profile"
+msgstr "プロファイルがありません。"
 
-#: actions/passwordsettings.php:89
-#, fuzzy
-msgid "Password change"
-msgstr "パスワードが保存されました。"
+#: lib/accountsettingsaction.php:128
+msgid "Other"
+msgstr "その他"
 
-#: actions/peopletag.php:35
-#, fuzzy, php-format
-msgid "Not a valid people tag: %s"
-msgstr "有効なメールアドレスではありません。"
+#: lib/accountsettingsaction.php:128
+msgid "Other options"
+msgstr "その他のオプション"
 
-#: actions/peopletag.php:47
+#: lib/action.php:144
 #, php-format
-msgid "Users self-tagged with %s - page %d"
+msgid "%s - %s"
 msgstr ""
 
-#: actions/peopletag.php:91
-#, php-format
-msgid "These are users who have tagged themselves \"%s\" "
+#: lib/action.php:159
+msgid "Untitled page"
+msgstr "名称未設定ページ"
+
+#: lib/action.php:424
+msgid "Primary site navigation"
 msgstr ""
 
-#: actions/profilesettings.php:91
-#, fuzzy
-msgid "Profile information"
-msgstr "プロファイルが不明"
+#: lib/action.php:430
+msgid "Home"
+msgstr "ホーム"
 
-#: actions/profilesettings.php:124
-msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+#: lib/action.php:430
+msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: actions/profilesettings.php:144
-msgid "Automatically subscribe to whoever "
-msgstr ""
+#: lib/action.php:432
+msgid "Account"
+msgstr "アカウント"
 
-#: actions/profilesettings.php:229 actions/tagother.php:176
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "不正なホームページ '%s'"
+#: lib/action.php:432
+msgid "Change your email, avatar, password, profile"
+msgstr "メールアドレス、アバター、パスワード、プロパティの変更"
 
-#: actions/profilesettings.php:311
-#, fuzzy
-msgid "Couldn't save tags."
-msgstr "プロファイルを保存できません"
+#: lib/action.php:435
+msgid "Connect"
+msgstr "接続"
 
-#: actions/public.php:107
-#, fuzzy, php-format
-msgid "Public timeline, page %d"
-msgstr "パブリックタイムライン"
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "サーバへリダイレクトできません : %s"
 
-#: actions/public.php:173
-msgid "Could not retrieve public stream."
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
 msgstr ""
 
-#: actions/public.php:220
+#: lib/action.php:440 lib/subgroupnav.php:106
 #, php-format
-msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
+msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: actions/publictagcloud.php:57
-#, fuzzy
-msgid "Public tag cloud"
-msgstr "パブリックフィード"
+#: lib/action.php:445
+msgid "Logout"
+msgstr "ログアウト"
 
-#: actions/publictagcloud.php:63
-#, php-format
-msgid "These are most popular recent tags on %s "
-msgstr ""
+#: lib/action.php:445
+msgid "Logout from the site"
+msgstr "サイトからログアウト"
 
-#: actions/publictagcloud.php:119
-msgid "Tag cloud"
-msgstr ""
+#: lib/action.php:450
+msgid "Create an account"
+msgstr "アカウントを作成"
 
-#: actions/register.php:139 actions/register.php:349
-msgid "Sorry, only invited people can register."
-msgstr ""
+#: lib/action.php:453
+msgid "Login to the site"
+msgstr "サイトへログイン"
 
-#: actions/register.php:149
-#, fuzzy
-msgid "You can't register if you don't "
-msgstr "ライセンスに同意頂けない場合は登録できません。"
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
+msgstr "ヘルプ"
 
-#: actions/register.php:286
-msgid "With this form you can create "
-msgstr ""
+#: lib/action.php:456
+msgid "Help me!"
+msgstr "助けて！"
 
-#: actions/register.php:368
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, "
-msgstr "1～64字以内で、小文字アルファベット、数字、スペース。（句読点を除く）"
+#: lib/action.php:459
+msgid "Search"
+msgstr "検索"
 
-#: actions/register.php:382 actions/register.php:386
-#, fuzzy
-msgid "Used only for updates, announcements, "
-msgstr "更新、アナウンス、パスワードリカバリーでのみ使用されます。"
+#: lib/action.php:459
+msgid "Search for people or text"
+msgstr "人々かテキストを検索"
 
-#: actions/register.php:398
+#: lib/action.php:480
 #, fuzzy
-msgid "URL of your homepage, blog, "
-msgstr "ホームページ、ブログ、プロファイル、その他サイトの URL"
+msgid "Site notice"
+msgstr "新しい通知"
 
-#: actions/register.php:404
-#, fuzzy
-msgid "Describe yourself and your "
-msgstr "140字以内で自己紹介"
+#: lib/action.php:546
+msgid "Local views"
+msgstr ""
 
-#: actions/register.php:410
+#: lib/action.php:612
 #, fuzzy
-msgid "Where you are, like \"City, "
-msgstr "いる場所, 例えば \"City, State (or Region), Country\""
+msgid "Page notice"
+msgstr "新しい通知"
 
-#: actions/register.php:432
+#: lib/action.php:714
 #, fuzzy
-msgid " except this private data: password, "
-msgstr "個人情報を除く:パスワード、メールアドレス、IMアドレス、電話番号"
+msgid "Secondary site navigation"
+msgstr "サブスクリプション"
 
-#: actions/register.php:471
-#, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
-msgstr ""
+#: lib/action.php:721
+msgid "About"
+msgstr "解説"
 
-#: actions/register.php:495
-msgid "(You should receive a message by email "
-msgstr ""
+#: lib/action.php:723
+msgid "FAQ"
+msgstr "よくある質問"
 
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
+#: lib/action.php:727
+msgid "TOS"
 msgstr ""
 
-#: actions/replies.php:118
-#, fuzzy, php-format
-msgid "Replies to %s, page %d"
-msgstr "%s への返信"
+#: lib/action.php:730
+msgid "Privacy"
+msgstr "プライバシー"
 
-#: actions/showfavorites.php:79
-#, php-format
-msgid "%s favorite notices, page %d"
+#: lib/action.php:732
+msgid "Source"
+msgstr "ソース"
+
+#: lib/action.php:734
+msgid "Contact"
+msgstr "連絡先"
+
+#: lib/action.php:736
+#, fuzzy
+msgid "Badge"
+msgstr "突く"
+
+#: lib/action.php:764
+msgid "StatusNet software license"
 msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: lib/action.php:767
 #, php-format
-msgid "%s group"
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
+"**%%site.name%%** は [%%site.broughtby%%](%%site.broughtbyurl%%) が提供するマ"
+"イクロブログサービスです。 "
 
-#: actions/showgroup.php:79
+#: lib/action.php:769
 #, php-format
-msgid "%s group, page %d"
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** はマイクロブログサービスです。 "
+
+#: lib/action.php:771
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
+"マイクロブロギングソフト [StatusNet](http://status.net/) , バージョン %s で動"
+"いています。 ライセンス [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)。"
 
-#: actions/showgroup.php:206
+#: lib/action.php:785
 #, fuzzy
-msgid "Group profile"
-msgstr "そのような通知はありません。"
+msgid "Site content license"
+msgstr "新しい通知"
 
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
-msgid "URL"
+#: lib/action.php:794
+msgid "All "
 msgstr ""
 
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
-#, fuzzy
-msgid "Note"
-msgstr "通知"
+#: lib/action.php:799
+msgid "license."
+msgstr "ライセンス。"
 
-#: actions/showgroup.php:270
-msgid "Group actions"
+#: lib/action.php:1052
+msgid "Pagination"
 msgstr ""
 
-#: actions/showgroup.php:323
-#, fuzzy, php-format
-msgid "Notice feed for %s group"
-msgstr "%sの通知フィード"
-
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: lib/action.php:1061
 #, fuzzy
-msgid "Members"
-msgstr "からのメンバー"
-
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
-msgid "(None)"
-msgstr ""
+msgid "After"
+msgstr "<< 前"
 
-#: actions/showgroup.php:370
-msgid "All members"
-msgstr ""
+#: lib/action.php:1069
+#, fuzzy
+msgid "Before"
+msgstr "前 >>"
 
-#: actions/showgroup.php:378
-#, php-format
-msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+#: lib/action.php:1117
+msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/showmessage.php:98
-msgid "Only the sender and recipient "
+#: lib/attachmentlist.php:87
+msgid "Attachments"
 msgstr ""
 
-#: actions/showstream.php:73
-#, php-format
-msgid "%s, page %d"
+#: lib/attachmentlist.php:265
+msgid "Author"
 msgstr ""
 
-#: actions/showstream.php:143
+#: lib/attachmentlist.php:278
 #, fuzzy
-msgid "'s profile"
+msgid "Provider"
 msgstr "プロファイル"
 
-#: actions/showstream.php:236 actions/tagother.php:77
-#, fuzzy
-msgid "User profile"
-msgstr "プロファイルがありません。"
-
-#: actions/showstream.php:240 actions/tagother.php:81
-msgid "Photo"
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
 msgstr ""
 
-#: actions/showstream.php:317
-msgid "User actions"
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
 msgstr ""
 
-#: actions/showstream.php:342
-msgid "Send a direct message to this user"
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
 msgstr ""
 
-#: actions/showstream.php:343
-msgid "Message"
+#: lib/channel.php:210
+msgid "Command complete"
 msgstr ""
 
-#: actions/showstream.php:451
-#, fuzzy
-msgid "All subscribers"
-msgstr "購読者"
+#: lib/channel.php:221
+msgid "Command failed"
+msgstr ""
 
-#: actions/showstream.php:533
-msgid "All groups"
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: actions/showstream.php:542
+#: lib/command.php:88
 #, php-format
-msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+msgid "Could not find a user with nickname %s"
+msgstr "ユーザを更新できません"
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: actions/smssettings.php:128
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, "
-msgstr "1～64字以内で、小文字アルファベット、数字、スペース。（句読点を除く）"
+#: lib/command.php:99
+#, php-format
+msgid "Nudge sent to %s"
+msgstr ""
 
-#: actions/smssettings.php:162
-#, fuzzy
-msgid "Send me notices through SMS; "
-msgstr "Jabber/GTalk で私に通知を送って下さい。"
+#: lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
 
-#: actions/smssettings.php:335
-#, fuzzy
-msgid "A confirmation code was sent to the phone number you added. "
-msgstr "その確認コードはあなたのものではありません！"
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
 
-#: actions/smssettings.php:453
-msgid "Mobile carrier"
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
 msgstr ""
 
-#: actions/subedit.php:70
-#, fuzzy
-msgid "You are not subscribed to that profile."
-msgstr "そのプロファイルは送信されていません。"
+#: lib/command.php:190
+msgid "Notice marked as fave."
+msgstr ""
 
-#: actions/subedit.php:83
-#, fuzzy
-msgid "Could not save subscription."
-msgstr "サブスクリプションを作成できません"
+#: lib/command.php:315
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr ""
 
-#: actions/subscribe.php:55
-#, fuzzy
-msgid "Not a local user."
-msgstr "そのようなユーザはいません。"
+#: lib/command.php:318
+#, php-format
+msgid "Fullname: %s"
+msgstr ""
 
-#: actions/subscribe.php:69
-#, fuzzy
-msgid "Subscribed"
-msgstr "購読"
+#: lib/command.php:321
+#, php-format
+msgid "Location: %s"
+msgstr ""
 
-#: actions/subscribers.php:50
-#, fuzzy, php-format
-msgid "%s subscribers"
-msgstr "購読者"
+#: lib/command.php:324
+#, php-format
+msgid "Homepage: %s"
+msgstr ""
 
-#: actions/subscribers.php:52
+#: lib/command.php:327
 #, php-format
-msgid "%s subscribers, page %d"
+msgid "About: %s"
 msgstr ""
 
-#: actions/subscribers.php:63
-#, fuzzy
-msgid "These are the people who listen to "
-msgstr "%s　の通知を聞いている人"
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr ""
 
-#: actions/subscribers.php:67
-#, fuzzy, php-format
-msgid "These are the people who "
-msgstr "%s　の通知を聞いている人"
+#: lib/command.php:377
+msgid "Error sending direct message."
+msgstr ""
 
-#: actions/subscriptions.php:52
-#, fuzzy, php-format
-msgid "%s subscriptions"
-msgstr "全てのサブスクリプション"
+#: lib/command.php:431
+#, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr ""
 
-#: actions/subscriptions.php:54
+#: lib/command.php:439
 #, fuzzy, php-format
-msgid "%s subscriptions, page %d"
-msgstr "全てのサブスクリプション"
+msgid "Reply to %s sent"
+msgstr "この通知へ返信"
 
-#: actions/subscriptions.php:65
+#: lib/command.php:441
 #, fuzzy
-msgid "These are the people whose notices "
-msgstr "%s が通知を聞いている人"
+msgid "Error saving notice."
+msgstr "通知を保存する際に問題が発生しました。"
 
-#: actions/subscriptions.php:69
-#, fuzzy, php-format
-msgid "These are the people whose "
-msgstr "%s　の通知を聞いている人"
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
 
-#: actions/subscriptions.php:122
-#, fuzzy
-msgid "Jabber"
-msgstr "Jabbar ID はありません。"
+#: lib/command.php:502
+#, php-format
+msgid "Subscribed to %s"
+msgstr ""
 
-#: actions/tag.php:43
-#, fuzzy, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "マイクロブログ by %s"
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
 
-#: actions/tag.php:66
+#: lib/command.php:530
 #, php-format
-msgid "Messages tagged \"%s\", most recent first"
+msgid "Unsubscribed from %s"
 msgstr ""
 
-#: actions/tagother.php:33
-#, fuzzy
-msgid "Not logged in"
-msgstr "ログインしていません。"
-
-#: actions/tagother.php:39
-#, fuzzy
-msgid "No id argument."
-msgstr "そのようなドキュメントはありません。"
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
+msgstr ""
 
-#: actions/tagother.php:65
-#, php-format
-msgid "Tag %s"
+#: lib/command.php:551
+msgid "Notification off."
 msgstr ""
 
-#: actions/tagother.php:141
-msgid "Tag user"
+#: lib/command.php:553
+msgid "Can't turn off notification."
 msgstr ""
 
-#: actions/tagother.php:149
-msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+#: lib/command.php:574
+msgid "Notification on."
 msgstr ""
 
-#: actions/tagother.php:164
-msgid "There was a problem with your session token."
+#: lib/command.php:576
+msgid "Can't turn on notification."
 msgstr ""
 
-#: actions/tagother.php:191
-msgid ""
-"You can only tag people you are subscribed to or who are subscribed to you."
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "OpenIDを作成できません : %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: actions/tagother.php:198
+#: lib/command.php:618
 #, fuzzy
-msgid "Could not save tags."
-msgstr "アバターを保存できません"
+msgid "You are not subscribed to anyone."
+msgstr "そのプロファイルは送信されていません。"
 
-#: actions/tagother.php:233
-msgid "Use this form to add tags to your subscribers or subscriptions."
-msgstr ""
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "そのプロファイルは送信されていません。"
 
-#: actions/tagrss.php:35
+#: lib/command.php:637
 #, fuzzy
-msgid "No such tag."
-msgstr "そのような通知はありません。"
+msgid "No one is subscribed to you."
+msgstr "リモートサブスクライブ"
 
-#: actions/tagrss.php:66
-#, fuzzy, php-format
-msgid "Microblog tagged with %s"
-msgstr "マイクロブログ by %s"
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "リモートサブスクライブ"
 
-#: actions/twitapiblocks.php:47
-msgid "Block user failed."
-msgstr "ユーザのブロックに失敗しました。"
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "そのプロファイルは送信されていません。"
 
-#: actions/twitapiblocks.php:69
-msgid "Unblock user failed."
-msgstr "ユーザのアンブロックに失敗しました。"
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "そのプロファイルは送信されていません。"
 
-#: actions/twitapiusers.php:48
-msgid "Not found."
-msgstr "見つかりません。"
+#: lib/command.php:670
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+
+#: lib/common.php:192
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "確認コードがありません。"
 
-#: actions/twittersettings.php:71
-msgid "Add your Twitter account to automatically send "
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: actions/twittersettings.php:119
-msgid "Twitter user name"
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: actions/twittersettings.php:126
-msgid "Twitter password"
-msgstr "Twitterパスワード"
-
-#: actions/twittersettings.php:228
-msgid "Twitter Friends"
-msgstr "Twitterフレンド"
+#: lib/common.php:195
+#, fuzzy
+msgid "Go to the installer."
+msgstr "サイトへログイン"
 
-#: actions/twittersettings.php:327
-msgid "Username must have only numbers, "
+#: lib/connectsettingsaction.php:110
+msgid "IM"
 msgstr ""
 
-#: actions/twittersettings.php:341
-#, php-format
-msgid "Unable to retrieve account information "
-msgstr "アカウント情報を取得できません"
-
-#: actions/unblock.php:108
-msgid "Error removing the block."
-msgstr "ブロックの削除エラー"
-
-#: actions/unsubscribe.php:50
-msgid "No profile id in request."
-msgstr "リクエスト内にプロファイルIDがありません。"
-
-#: actions/unsubscribe.php:57
-msgid "No profile with that id."
-msgstr "そのIDはプロファイルではありません。"
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr ""
 
-#: actions/unsubscribe.php:71
-msgid "Unsubscribed"
-msgstr "サブスクライブ解除済み"
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
+msgstr ""
 
-#: actions/usergroups.php:63
-#, php-format
-msgid "%s groups"
-msgstr "%s グループ"
+#: lib/dberroraction.php:60
+msgid "Database error"
+msgstr ""
 
-#: actions/usergroups.php:65
-#, php-format
-msgid "%s groups, page %d"
-msgstr "%s グループ, %d ページ"
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
 
-#: classes/Notice.php:104
+#: lib/designsettings.php:105
 #, fuzzy
-msgid "Problem saving notice. Unknown user."
-msgstr "通知を保存する際に問題が発生しました。"
+msgid "Upload file"
+msgstr "アップロード"
 
-#: classes/Notice.php:109
+#: lib/designsettings.php:109
 msgid ""
-"Too many notices too fast; take a breather and post again in a few minutes."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 
-#: classes/Notice.php:116
-msgid "You are banned from posting notices on this site."
+#: lib/designsettings.php:139
+msgid "On"
 msgstr ""
 
-#: lib/accountsettingsaction.php:108
-msgid "Upload an avatar"
-msgstr "アバターのアップロード"
-
-#: lib/accountsettingsaction.php:119
-msgid "Other"
-msgstr "その他"
-
-#: lib/accountsettingsaction.php:120
-msgid "Other options"
-msgstr "その他のオプション"
-
-#: lib/action.php:130
-#, php-format
-msgid "%s - %s"
+#: lib/designsettings.php:155
+msgid "Off"
 msgstr ""
 
-#: lib/action.php:145
-msgid "Untitled page"
-msgstr "名称未設定ページ"
-
-#: lib/action.php:316
-msgid "Primary site navigation"
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
 msgstr ""
 
-#: lib/action.php:322
-msgid "Personal profile and friends timeline"
+#: lib/designsettings.php:161
+msgid "Tile background image"
 msgstr ""
 
-#: lib/action.php:325
-msgid "Search for people or text"
-msgstr "人々かテキストを検索"
-
-#: lib/action.php:328
-msgid "Account"
-msgstr "アカウント"
-
-#: lib/action.php:328
-msgid "Change your email, avatar, password, profile"
-msgstr "メールアドレス、アバター、パスワード、プロパティの変更"
-
-#: lib/action.php:330
-msgid "Connect to IM, SMS, Twitter"
-msgstr "IM、SMS、Twitterに接続"
-
-#: lib/action.php:332
-msgid "Logout from the site"
-msgstr "サイトからログアウト"
-
-#: lib/action.php:335
-msgid "Login to the site"
-msgstr "サイトへログイン"
-
-#: lib/action.php:338
-msgid "Create an account"
-msgstr "アカウントを作成"
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "パスワードの変更"
 
-#: lib/action.php:341
-msgid "Login with OpenID"
-msgstr "OpenIDでログイン"
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
 
-#: lib/action.php:344
-msgid "Help me!"
-msgstr "助けて！"
+#: lib/designsettings.php:191
+msgid "Content"
+msgstr "内容"
 
-#: lib/action.php:362
+#: lib/designsettings.php:204
 #, fuzzy
-msgid "Site notice"
-msgstr "新しい通知"
+msgid "Sidebar"
+msgstr "検索"
 
-#: lib/action.php:417
-msgid "Local views"
+#: lib/designsettings.php:217
+msgid "Text"
 msgstr ""
 
-#: lib/action.php:472
+#: lib/designsettings.php:230
 #, fuzzy
-msgid "Page notice"
-msgstr "新しい通知"
+msgid "Links"
+msgstr "ログイン"
 
-#: lib/action.php:562
-#, fuzzy
-msgid "Secondary site navigation"
-msgstr "サブスクリプション"
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
 
-#: lib/action.php:602 lib/action.php:623
-msgid "StatusNet software license"
+#: lib/designsettings.php:248
+msgid "Restore default designs"
 msgstr ""
 
-#: lib/action.php:630
-msgid "All "
+#: lib/designsettings.php:254
+msgid "Reset back to default"
 msgstr ""
 
-#: lib/action.php:635
-msgid "license."
-msgstr "ライセンス。"
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
 
-#: lib/blockform.php:123 lib/blockform.php:153
-msgid "Block this user"
-msgstr "このユーザをブロックする"
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
+msgstr ""
 
-#: lib/blockform.php:153
-msgid "Block"
-msgstr "ブロック"
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
+msgstr ""
 
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr ""
 
-#: lib/facebookaction.php:268
-#, php-format
-msgid "To use the %s Facebook Application you need to login "
-msgstr ""
-
-#: lib/facebookaction.php:271
-msgid " a new account."
-msgstr "新しいアカウント"
-
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-msgid "Published"
-msgstr "発行済"
-
 #: lib/favorform.php:114 lib/favorform.php:140
 msgid "Favor this notice"
 msgstr "この通知をお気に入りにする"
 
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr ""
+
 #: lib/feedlist.php:64
 msgid "Export data"
 msgstr "データのエクスポート"
 
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr ""
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr ""
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr ""
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "タグのフィルター"
@@ -4518,58 +3986,84 @@ msgstr "タグのフィルター"
 msgid "All"
 msgstr ""
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
+msgstr ""
+
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "タグ"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "移動"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "グループやトピックのホームページやブログの URL"
 
-#: lib/groupeditform.php:151
-msgid "Description"
-msgstr "概要"
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "グループやトピックを140字以内記述"
 
-#: lib/groupeditform.php:153
-msgid "Describe the group or topic in 140 chars"
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
 msgstr "グループやトピックを140字以内記述"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:172
+msgid "Description"
+msgstr "概要"
+
+#: lib/groupeditform.php:179
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr "いる場所, 例えば \"City, State (or Region), Country\""
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
 msgid "Group"
 msgstr "グループ"
 
-#: lib/groupnav.php:100
-msgid "Admin"
-msgstr "管理者"
-
 #: lib/groupnav.php:101
+#, fuzzy
+msgid "Blocked"
+msgstr "ブロック"
+
+#: lib/groupnav.php:102
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "そのようなユーザはいません。"
+
+#: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
 msgstr "%s グループプロパティを編集"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:113
 msgid "Logo"
 msgstr "ロゴ"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:114
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "%s ロゴの追加や編集"
 
+#: lib/groupnav.php:120
+#, fuzzy, php-format
+msgid "Add or edit %s design"
+msgstr "%s ロゴの追加や編集"
+
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "メンバー数が多いグループ"
@@ -4584,10 +4078,44 @@ msgid "Tags in %s group's notices"
 msgstr "%s グループの通知にあるタグ"
 
 #: lib/htmloutputter.php:104
-#, fuzzy
-msgid "This page is not available in a "
+msgid "This page is not available in a media type you accept"
 msgstr "このページはあなたが承認したメディアタイプでは利用できません。"
 
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "長すぎます。通知は最大 140 字までです。"
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr "不完全なアップロード。"
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr "ファイルのアップロードでシステムエラー"
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr "画像ではないかファイルが破損しています。"
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr "サポート外の画像形式です。"
+
+#: lib/imagefile.php:118
+#, fuzzy
+msgid "Lost our file."
+msgstr "そのような通知はありません。"
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr ""
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr ""
+
 #: lib/joinform.php:114
 msgid "Join"
 msgstr "参加"
@@ -4596,99 +4124,305 @@ msgstr "参加"
 msgid "Leave"
 msgstr "離れる"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr "ユーザ名とパスワードでログイン"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr "新しいアカウントでサインアップ"
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
-msgstr "OpenIDでログインまたは登録"
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+msgid "from"
+msgstr "から "
 
-#: lib/mail.php:175
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "メールアドレス確認"
+
+#: lib/mail.php:174
 #, php-format
 msgid ""
 "Hey, %s.\n"
 "\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%s\n"
+"\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
 msgstr ""
 
-#: lib/mail.php:236
+#: lib/mail.php:235
+#, php-format
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr "%1$s は %2$s であなたの通知を購読しています。"
+
+#: lib/mail.php:240
 #, fuzzy, php-format
-msgid "%1$s is now listening to "
-msgstr "%1$s は %2$s であなたの通知を聞いています。"
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
+"%1$s は %2$s であなたの通知を聞いています。\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"確かにあなたの,\n"
+"%4$s.\n"
 
-#: lib/mail.php:254
+#: lib/mail.php:253
 #, php-format
 msgid "Location: %s\n"
 msgstr "場所: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:255
 #, php-format
 msgid "Homepage: %s\n"
 msgstr "ホームページ: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:461
+#: lib/mail.php:285
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: lib/mail.php:288
+#, 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 ""
+
+#: lib/mail.php:412
+#, php-format
+msgid "%s status"
+msgstr "%s の状態"
+
+#: lib/mail.php:438
+msgid "SMS confirmation"
+msgstr ""
+
+#: lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "あなたは %s に突かれています"
 
-#: lib/mail.php:465
+#: lib/mail.php:466
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
+msgstr ""
+
+#: lib/mail.php:509
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:513
 #, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
+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 ""
 
-#: lib/mail.php:555
+#: lib/mail.php:554
 #, fuzzy, php-format
-msgid "%1$s just added your notice from %2$s"
+msgid "%s (@%s) added your notice as a favorite"
 msgstr "%1$s は %2$s であなたの通知を聞いています。"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
-msgid "From"
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, php-format
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+msgstr ""
+
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
 msgstr ""
 
-#: lib/messageform.php:110
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "ユーザを更新できません"
+
+#: lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "直接通知を送る"
 
-#: lib/noticeform.php:125
-msgid "Send a notice"
-msgstr "通知を送る"
+#: lib/messageform.php:146
+msgid "To"
+msgstr ""
 
-#: lib/noticeform.php:152
+#: lib/messageform.php:162 lib/noticeform.php:173
 msgid "Available characters"
 msgstr "利用可能な文字"
 
-#: lib/noticelist.php:426
+#: lib/noticeform.php:145
+msgid "Send a notice"
+msgstr "通知を送る"
+
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
+msgstr "最近どう %s?"
+
+#: lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:478
 #, fuzzy
-msgid "in reply to"
-msgstr "...に対しての返信"
+msgid "in context"
+msgstr "コンテンツがありません！"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr "この通知へ返信"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "返信"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
-msgid "Delete this notice"
-msgstr "この通知を削除"
-
-#: lib/noticelist.php:474
-msgid "Delete"
-msgstr "削除"
-
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "このユーザを突く"
@@ -4701,39 +4435,139 @@ msgstr "突く"
 msgid "Send a nudge to this user"
 msgstr "このユーザへ突きを送る"
 
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "プロファイル追加エラー"
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "アバター追加エラー"
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "リモートプロファイル追加エラー"
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "新しい通知"
+
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
+msgstr "サブスクリプションを追加できません"
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "パーソナル"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "返信"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr ""
+
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr ""
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr ""
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr ""
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr ""
+
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/profilelist.php:182
-msgid "(none)"
-msgstr "(なし)"
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "サブスクリプション"
 
-#: lib/publicgroupnav.php:76
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "すべての購読"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "購読者"
+
+#: lib/profileaction.php:157
+#, fuzzy
+msgid "All subscribers"
+msgstr "購読者"
+
+#: lib/profileaction.php:177
+msgid "User ID"
+msgstr ""
+
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "からのメンバー"
+
+#: lib/profileaction.php:235
+msgid "All groups"
+msgstr ""
+
+#: lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "パブリック"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "ユーザグループ"
 
-#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "最近のタグ"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr ""
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "人気"
 
+#: lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "検索"
+
+#: lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "検索"
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr ""
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr ""
+
 #: lib/searchgroupnav.php:82
 msgid "Notice"
 msgstr "通知"
 
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr ""
+
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "このサイト上のグループを検索する"
@@ -4742,35 +4576,64 @@ msgstr "このサイト上のグループを検索する"
 msgid "Untitled section"
 msgstr "名称未設定のセクション"
 
-#: lib/subgroupnav.php:81
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: lib/subgroupnav.php:83
 #, fuzzy, php-format
 msgid "People %s subscribes to"
 msgstr "リモートサブスクライブ"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:91
 #, fuzzy, php-format
 msgid "People subscribed to %s"
 msgstr "リモートサブスクライブ"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:104
-#, php-format
-msgid "Invite friends and colleagues to join you on %s"
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
 msgstr ""
 
-#: lib/subs.php:53
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(なし)"
+
+#: lib/subs.php:48
+msgid "Already subscribed!"
+msgstr ""
+
+#: lib/subs.php:52
 #, fuzzy
 msgid "User has blocked you."
 msgstr "プロファイルがありません。"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: lib/subs.php:56
+msgid "Could not subscribe."
+msgstr ""
+
+#: lib/subs.php:75
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: lib/subs.php:124
 #, fuzzy
-msgid "Subscribe to this user"
-msgstr "購読が許可"
+msgid "Not subscribed!"
+msgstr "購読していません！"
+
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
+msgstr "サブスクリプションを削除できません"
 
 #: lib/tagcloudsection.php:56
 msgid "None"
@@ -4780,34 +4643,106 @@ msgstr ""
 msgid "Top posters"
 msgstr "上位投稿者"
 
-#: lib/unblockform.php:120 lib/unblockform.php:150
-msgid "Unblock this user"
-msgstr "このユーザをアンブロックする"
-
-#: lib/unblockform.php:150
-msgid "Unblock"
-msgstr "アンブロック"
-
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "このユーザからのサブスクライブを解除する"
 
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "サブスクライブ中止"
+
+#: lib/userprofile.php:116
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "アカウントを作成"
+msgid "Edit Avatar"
+msgstr "アバター"
+
+#: lib/userprofile.php:236
+msgid "User actions"
+msgstr ""
+
+#: lib/userprofile.php:248
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "プロファイル設定"
+
+#: lib/userprofile.php:249
+msgid "Edit"
+msgstr ""
+
+#: lib/userprofile.php:272
+msgid "Send a direct message to this user"
+msgstr ""
+
+#: lib/userprofile.php:273
+msgid "Message"
+msgstr ""
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "メールを確認できません"
+#: lib/util.php:821
+msgid "a few seconds ago"
+msgstr "数秒前"
+
+#: lib/util.php:823
+msgid "about a minute ago"
+msgstr "約 1 分前"
 
-#~ msgid "Email address"
-#~ msgstr "メールアドレス"
+#: lib/util.php:825
+#, php-format
+msgid "about %d minutes ago"
+msgstr "約 %d 分前"
 
-#~ msgid "Error inserting notice"
-#~ msgstr "通知追加エラー"
+#: lib/util.php:827
+msgid "about an hour ago"
+msgstr "約 1 時間前"
 
-#~ 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 ""
-#~ "パスワードを忘れた場合、登録されたアドレスで新しいものを受け取ることができ"
-#~ "ます。"
+#: lib/util.php:829
+#, php-format
+msgid "about %d hours ago"
+msgstr "約 %d 時間前"
+
+#: lib/util.php:831
+msgid "about a day ago"
+msgstr "約 1 日前"
+
+#: lib/util.php:833
+#, php-format
+msgid "about %d days ago"
+msgstr "約 %d 日前"
+
+#: lib/util.php:835
+msgid "about a month ago"
+msgstr "約 1 ヵ月前"
+
+#: lib/util.php:837
+#, php-format
+msgid "about %d months ago"
+msgstr "約 %d ヵ月前"
+
+#: lib/util.php:839
+msgid "about a year ago"
+msgstr "約 1 年前"
+
+#: lib/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "ホームページのURLが不適切です。"
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr ""
+
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr ""
+
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr ""
diff --git a/locale/ko/LC_MESSAGES/statusnet.mo b/locale/ko/LC_MESSAGES/statusnet.mo
index 2b177ff86..870956380 100644
--- a/locale/ko/LC_MESSAGES/statusnet.mo
+++ b/locale/ko/LC_MESSAGES/statusnet.mo
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 7bbdcdcf2..19a9f4a6e 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -1,4135 +1,2979 @@
-# 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.
+# Translation of StatusNet to Korean
 #
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-06-23 04:01+0000\n"
-"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:45+0000\n"
+"Language-Team: Korean\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
-
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
-#, 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
-#: actions/finishopenidlogin.php:110
-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
-#: actions/twitapistatuses.php:347
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr "%1$s / %2$s에게 답신 업데이트"
-
-#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s님이 귀하를 %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"
-"%1$s님이 말하기를:\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 lib/mail.php:241
-#, 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"
-"\t%3$s\n"
-"\n"
-"그럼 이만,%4$s.\n"
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "%1$s님이 %2$s/%3$s의 업데이트에 답변했습니다."
-
-#: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr "%1$s의 상태 (%2$s에서)"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ko\n"
+"X-Message-Group: out-statusnet\n"
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "그러한 태그가 없습니다."
 
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
-#, php-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
+msgstr "그러한 사용자는 없습니다."
 
-#: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/all.php:84
 #, php-format
-msgid "%s Public Stream"
-msgstr "%s 퍼블릭 스트림"
+msgid "%s and friends, page %d"
+msgstr "%s 와 친구들, %d 페이지"
 
-#: ../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
-#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s 및 친구들"
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
-#, php-format
-msgid "%s public timeline"
-msgstr "%s 공개 타임라인"
+#: actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "%s의 친구들을 위한 피드"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
-#, php-format
-msgid "%s status"
-msgstr "%s 상태"
+#: actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "%s의 친구들을 위한 피드"
 
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
-#, php-format
-msgid "%s timeline"
-msgstr "%s 타임라인"
+#: actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "%s의 친구들을 위한 피드"
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/all.php:127
 #, 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 "(지금 귀하는 귀하의 이메일 주소를 확인하는 방법에 대한 지침을 메일로 받으셨습니다.)"
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: actions/all.php:132
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
 msgstr ""
-"**%%site.name%%** 는 [%%site.broughtby%%](%%site.broughtbyurl%%)가 제공하는 "
-"마이크로블로깅서비스입니다."
-
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
-#, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** 는 마이크로블로깅서비스입니다."
-
-#: ../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
-#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다."
-
-#: ../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
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr "6글자 이상"
 
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
-msgid "6 or more characters, and don't forget it!"
-msgstr "6글자 이상, 잊어 버리지 마십시오!"
-
-#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
-msgid "6 or more characters. Required."
-msgstr "6글자 이상이 필요합니다."
-
-#: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/all.php:134
 #, 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 "추가한 이메일로 인증 코드를 보냈습니다. 수신함(또는 스팸함)을 확인하셔서 코드와 사용법을 확인하여 주시기 바랍니다."
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
 
-#: ../actions/smssettings.php:216 actions/smssettings.php:224
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#, php-format
 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 actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
-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 actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
-msgid "API method under construction."
-msgstr "API 메서드를 구성중 입니다."
-
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
-msgid "About"
-msgstr "정보"
-
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
-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 actions/emailsettings.php:120
-#: actions/imsettings.php:127 actions/openidsettings.php:111
-#: actions/smssettings.php:133 actions/twittersettings.php:163
-msgid "Add"
-msgstr "추가"
-
-#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
-msgstr "OpenID 추가"
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-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
-#: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
-msgstr "주소"
-
-#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-msgid "Addresses of friends to invite (one per line)"
-msgstr "초청할 친구들의 주소 (한 줄에 한 명씩)"
-
-#: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
-msgid "All subscriptions"
-msgstr "모든 예약 구독"
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
 
-#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
-#, php-format
-msgid "All updates for %s"
-msgstr "%s의 모든 업데이트"
+#: actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s 및 친구들"
 
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
 #, 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
-#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
-msgid "Already logged in."
-msgstr "이미 로그인 하셨습니다."
-
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
-msgid "Already subscribed!."
-msgstr "이미 구독하고 있습니다."
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
-msgid "Are you sure you want to delete this notice?"
-msgstr "정말로 통지를 삭제하시겠습니까?"
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr "%1$s 및 %2$s에 있는 친구들의 업데이트!"
 
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
-msgid "Authorize subscription"
-msgstr "구독을 허가"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
+msgstr "API 메서드를 찾을 수 없습니다."
 
-#: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
-msgid "Automatically login in the future; not for shared computers!"
-msgstr "앞으로는 자동으로 로그인합니다. 공용 컴퓨터에서는 이용하지 마십시오!"
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
+msgstr "이 메서드는 등록을 요구합니다."
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/apiaccountupdatedeliverydevice.php:105
 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 actions/avatarsettings.php:65
-#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
-msgid "Avatar"
-msgstr "아바타"
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
 
-#: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
-msgid "Avatar updated."
-msgstr "아바타가 업데이트 되었습니다."
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "사용자를 업데이트 할 수 없습니다."
 
-#: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
 #, 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
-#: actions/smssettings.php:111
-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
-#: actions/profilesettings.php:112 actions/register.php:402
-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
-#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
-msgid "Bio is too long (max 140 chars)."
-msgstr "자기소개가 너무 깁니다. (최대 140글자)"
-
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
-msgid "Can't delete this notice."
-msgstr "이 통지를 지울 수 없습니다."
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
 
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
-#, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr "아바타 URL '%s'을(를) 읽어낼 수 없습니다."
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "트위터 환경설정을 저장할 수 없습니다."
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404 actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-msgid "Can't save new password."
-msgstr "새 비밀번호를 저장 할 수 없습니다."
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+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
-#: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
-msgstr "취소"
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "이용자가 프로필을 가지고 있지 않습니다."
 
-#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "OpenID consumer object를 생성할 수 없습니다."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "프로필을 저장 할 수 없습니다."
 
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
-msgstr "그 Jabbar ID를 정규화 할 수 없습니다."
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
+msgstr "사용자 차단에 실패했습니다."
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
-msgid "Cannot normalize that email address"
-msgstr "그 이메일 주소를 정규화 할 수 없습니다."
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
+msgstr "사용자 차단 해제에 실패했습니다."
 
-#: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
-msgstr "변환"
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "메시지 내용이 없습니다!"
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
-msgstr "이메일 처리 변경"
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "메시지가 너무 길어요. 최대로 140자까지 입력하실 수 있습니다."
 
-#: ../actions/password.php:32 actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr "비밀번호 바꾸기"
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "받는 사용자가 없습니다."
 
-#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
-msgid "Change your password"
-msgstr "비밀번호 바꾸기"
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr "당신의 친구가 아닌 사용자에게 직접 메시지를 보낼 수 없습니다."
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-msgid "Change your profile settings"
-msgstr "프로필 세팅 바꾸기"
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "%s에게 직접 메시지"
 
-#: ../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
-#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
-#: actions/register.php:376 actions/smssettings.php:122
-msgid "Confirm"
-msgstr "인증"
+#: actions/apidirectmessage.php:93
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr "%s에서 보낸 모든 직접 메시지"
 
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "주소 인증"
+#: actions/apidirectmessage.php:101
+#, php-format
+msgid "Direct messages to %s"
+msgstr "%s에게 직접 메시지"
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245 actions/emailsettings.php:256
-#: actions/imsettings.php:230 actions/smssettings.php:253
-#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
-msgid "Confirmation cancelled."
-msgstr "인증 취소"
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr "%s에게 모든 직접 메시지"
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
-msgid "Confirmation code"
-msgstr "인증 코드"
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "API 메서드를 찾을 수 없습니다."
 
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-msgid "Confirmation code not found."
-msgstr "인증 코드가 없습니다."
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
+msgstr "그 ID로 발견된 상태가 없습니다."
 
-#: ../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/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+msgstr "이 게시글은 이미 좋아하는 게시글입니다."
 
-#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
-msgid "Connect"
-msgstr "연결"
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+msgstr "좋아하는 게시글을 생성할 수 없습니다."
 
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
-msgid "Connect existing account"
-msgstr "기존의 계정으로 접속"
+#: actions/apifavoritedestroy.php:122
+#, fuzzy
+msgid "That status is not a favorite!"
+msgstr "이 메시지는 favorite이 아닙니다."
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
-msgid "Contact"
-msgstr "연락하기"
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr "favorite을 삭제할 수 없습니다."
 
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
-#, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "OpenID를 작성 할 수 없습니다 : %s"
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
+msgstr "따라가실 수 없습니다 : 사용자가 없습니다."
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "따라가실 수 없습니다 : %s 님은 이미 리스트에 있습니다."
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
-msgid "Could not follow user: User not found."
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
 msgstr "따라가실 수 없습니다 : 사용자가 없습니다."
 
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr "서버에 재접속 할 수 없습니다 : %s"
-
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
-msgid "Could not save avatar info"
-msgstr "아바타(Avatar)를 저장 할 수 없습니다."
-
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
-msgid "Could not save new profile info"
-msgstr "새 프로필 정보를 저장 할 수 없습니다."
-
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
-msgid "Could not subscribe other to you."
-msgstr "다른 사람을 구독 하실 수 없습니다."
-
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
-msgid "Could not subscribe."
-msgstr "구독 하실 수 없습니다."
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
-msgstr "이 이메일 주소로 사용자를 업데이트 할 수 없습니다."
-
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-msgid "Couldn't convert request tokens to access tokens."
-msgstr "리퀘스트 토큰을 엑세스 토큰으로 변환 할 수 없습니다."
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+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
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-msgid "Couldn't delete email confirmation."
-msgstr "이메일 승인을 삭제 할 수 없습니다."
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
+msgstr "두 개의 사용자 ID나 대화명을 입력해야 합니다."
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
-msgid "Couldn't delete subscription."
-msgstr "예약 구독을 삭제 할 수 없습니다."
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "공개 stream을 불러올 수 없습니다."
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
-msgid "Couldn't find any statuses."
+#: actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
 msgstr "어떠한 상태도 찾을 수 없습니다."
 
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-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
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
-msgid "Couldn't insert confirmation code."
-msgstr "확인 코드를 추가 할 수 없습니다."
-
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
-msgstr "예약 구독을 추가 할 수 없습니다."
-
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-msgid "Couldn't save profile."
-msgstr "프로필을 저장 할 수 없습니다."
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
-msgstr "자동구독에 사용자를 업데이트 할 수 없습니다."
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
-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
-#: actions/confirmaddress.php:114 actions/emailsettings.php:280
-#: actions/emailsettings.php:411 actions/imsettings.php:252
-#: actions/imsettings.php:395 actions/othersettings.php:162
-#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
-msgid "Couldn't update user."
-msgstr "사용자를 업데이트 할 수 없습니다."
-
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
-msgid "Create"
-msgstr "생성"
-
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
-msgid "Create a new user with this nickname."
-msgstr "이 닉네임으로 새 사용자를 생성"
-
-#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
-msgid "Create new account"
-msgstr "새 계정을 생성"
-
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
-msgid "Creating new account for OpenID that already has a user."
-msgstr "이미 사용자가 있는 OpenID로 새 계정을 생성"
-
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "확인된 최신의 Jabber/GTalk 계정"
-
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "확인된 최신의 SMS가 가능한 휴대폰 번호"
-
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-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 classes/Notice.php:91
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "해쉬테그를 추가 할 때에 데이타베이스 에러 : %s"
-
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "답신을 추가 할 때에 데이타베이스 에러 : %s"
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
-msgid "Delete notice"
-msgstr "통지 삭제"
-
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "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 actions/register.php:381
-#: actions/register.php:385 lib/accountsettingsaction.php:113
-msgid "Email"
-msgstr "이메일"
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-msgid "Email Address"
-msgstr "이메일 주소"
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
-msgstr "이메일 세팅"
-
-#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-msgid "Email address already exists."
-msgstr "이메일 주소가 이미 존재 합니다."
-
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
-msgid "Email address confirmation"
-msgstr "이메일 주소 확인서"
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
-msgstr "\"UserName@example.org\" 와 같은 이메일 계정"
-
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-msgid "Email addresses"
-msgstr "이메일 주소"
-
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
-msgid "Enter a nickname or email address."
-msgstr "별명이나 이메일 계정을 입력하십시오."
-
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
-msgstr "휴대폰으로 받으신 인증번호를 입력하십시오."
-
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
-msgid "Error authorizing token"
-msgstr "인증 토큰 에러"
-
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
-msgid "Error connecting user to OpenID."
-msgstr "OpenID로 접속 오류"
-
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
-msgstr "사용자의 접속 오류"
-
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
-msgstr "아바타 추가 오류"
-
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
-msgstr "새 프로필 추가 오류"
-
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
-msgstr "리모트 프로필 추가 오류"
-
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
-msgid "Error saving address confirmation."
-msgstr "주소 확인 저장 에러"
-
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
-msgid "Error saving remote profile"
-msgstr "리모트 프로필 저장 오류"
-
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-msgid "Error saving the profile."
-msgstr "프로필 저장 오류"
-
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-msgid "Error saving the user."
-msgstr "사용자 저장 오류"
-
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
-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 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-msgid "Error setting user."
-msgstr "사용자 세팅 오류"
-
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr "프로필 업데이트 오류"
-
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
-msgstr "리모트 프로필 업데이트 오류"
-
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr "확인 코드 오류"
-
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
-msgid "Existing nickname"
-msgstr "존재하는 별명"
-
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
-msgid "FAQ"
-msgstr "자주 묻는 질문"
-
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
-msgid "Failed updating avatar."
-msgstr "아바타 업데이트 실패"
-
-#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
-#, 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 actions/replies.php:134
-#: actions/repliesrss.php:71
-#, php-format
-msgid "Feed for replies to %s"
-msgstr "%s의 답신 피드"
-
-#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
-#, php-format
-msgid "Feed for tag %s"
-msgstr "%s 태그의 피드"
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
-msgstr "통지들의 내용 찾기"
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-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/apigroupcreate.php:136 actions/newgroup.php:204
+msgid "Could not create group."
+msgstr "새 그룹을 만들 수 없습니다."
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
-#: actions/profilesettings.php:77 actions/register.php:178
-#: actions/profilesettings.php:103 actions/register.php:391
-#: actions/showgroup.php:235 actions/showstream.php:262
-#: actions/tagother.php:105 lib/groupeditform.php:142
-msgid "Full name"
-msgstr "실명"
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+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
-#: actions/editgroup.php:195 actions/newgroup.php:146
-#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
-msgid "Full name is too long (max 255 chars)."
-msgstr "실명이 너무 깁니다. (최대 255글자)"
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+msgid "Could not set group membership."
+msgstr "그룹 맴버십을 세팅할 수 없습니다."
 
-#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
-msgid "Help"
-msgstr "도움말"
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"별명은 반드시 영소문자와 숫자로만 이루어져야 하며 스페이스의 사용이 불가 합니"
+"다."
 
-#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
-msgid "Home"
-msgstr "홈"
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr "별명이 이미 사용중 입니다. 다른 별명을 시도해 보십시오."
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
-msgid "Homepage"
-msgstr "홈페이지"
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "유효한 별명이 아닙니다"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "홈페이지 주소형식이 올바르지 않습니다."
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
-msgid "I want to post notices by email."
-msgstr "이메일로 통보를 포스트 하길 원합니다."
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
-msgstr "메신저"
-
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
-msgstr "메신저 주소"
-
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
-msgstr "메신저 설정"
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "실명이 너무 깁니다. (최대 255글자)"
 
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
-msgstr "만일 계정을 이미 가지고 계신다면, 계정과 비밀 번호로 OpenID로 접속하기 위하여 입력해 주세요."
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "설명이 너무 길어요. (최대 140글자)"
 
-#: ../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/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "위치가 너무 깁니다. (최대 255글자)"
 
-#: ../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/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-#: actions/emailsettings.php:127 actions/smssettings.php:140
-msgid "Incoming email"
-msgstr "받은 이메일"
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "유효하지 않은태그: \"%s\""
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
-msgid "Incoming email address removed."
-msgstr "받은 이메일 계정 삭제"
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "별명이 이미 사용중 입니다. 다른 별명을 시도해 보십시오."
 
-#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
-msgid "Incorrect old password"
-msgstr "기존 비밀 번호가 틀렸습니다"
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
 
-#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
-msgid "Incorrect username or password."
-msgstr "틀린 계정 또는 비밀 번호"
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "당신은 이미 이 그룹의 멤버입니다."
 
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
-msgstr "가입하신 이메일로 비밀 번호 재발급에 관한 안내를 보냈습니다."
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
 
-#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "옳지 않은 아바타 URL '%s'"
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "그룹 %s에 %s는 가입할 수 없습니다."
 
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
-#, php-format
-msgid "Invalid email address: %s"
-msgstr "옳지 않은 이메일 주소 : %s"
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "당신은 해당 그룹의 멤버가 아닙니다."
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
-#, php-format
-msgid "Invalid homepage '%s'"
-msgstr "옳지 않은 홈페이지 '%s'"
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "그룹 %s에서 %s 사용자를 제거할 수 없습니다."
 
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
 #, php-format
-msgid "Invalid license URL '%s'"
-msgstr "옳지 않은 라이선스 URL '%s'"
-
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
-msgstr "옳지 않은 통지 내용"
-
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
-msgstr "옳지 않은 통지 uri"
-
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
-msgstr "옳지 않은 통지 url"
+msgid "%s groups"
+msgstr "%s 그룹"
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "옳지 않은 프로필 URL '%s'."
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "그룹 행동"
 
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
-msgstr "옳지 않은 프로필 URL (나쁜 포멧)"
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "%s 그룹"
 
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
-msgstr "서버에 의하여 돌아온 옳지 않은 프로필 URL "
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "%s 그룹들은  의 멤버입니다."
 
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
-#: actions/avatarbynickname.php:69
-msgid "Invalid size."
-msgstr "옳지 않은 크기"
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
+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
-#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
-msgid "Invalid username or password."
-msgstr "사용자 이름이나 비밀 번호가 틀렸습니다."
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
+msgstr "당신은 다른 사용자의 상태를 삭제하지 않아도 된다."
 
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-msgid "Invitation(s) sent"
-msgstr "초대권을 보냈습니다"
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "아바타가 업데이트 되었습니다."
 
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-msgid "Invitation(s) sent to the following people:"
-msgstr "다음 사람들에게 초대권을 보냈습니다:"
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
+msgstr "발견된 ID의 상태가 없습니다."
 
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
-msgid "Invite"
-msgstr "초대"
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "너무 깁니다. 통지의 최대 길이는 140글자 입니다."
 
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-msgid "Invite new users"
-msgstr "새 사용자를 초대"
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
+msgstr "찾지 못함"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
 #, php-format
-msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
+msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
-"이 사이트는 [StatusNet](http://status.net/) 마이크로블로깅 소프트웨어 %s 버전을 사용합니다. StatusNet는 "
-"[GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html) 라이선스에 따라 사용할 수 "
-"있습니다."
 
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
-msgstr "Jabber ID가 이미 다른 사용자에 의하여 사용되고 있습니다."
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "지원하지 않는 그림 파일 형식입니다."
 
-#: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/apitimelinefavorites.php:107
 #, 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 ""
-"\"UserName@example.org\" 와 같은 Jabber 또는 GTalk 계정은 귀하의 메신저나 GTalk 친구목록에 반드시 %s "
-"주소를 추가하여 주십시오."
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
-msgid "Language"
-msgstr "언어"
-
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
-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
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
-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
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
-msgid "Location is too long (max 255 chars)."
-msgstr "위치가 너무 깁니다. (최대 255글자)"
+msgid "%s / Favorites from %s"
+msgstr "%s / %s의 좋아하는 글들"
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
-#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
-#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
-#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: actions/apitimelinefavorites.php:119
 #, php-format
-msgid "Login"
-msgstr "로그인"
+msgid "%s updates favorited by %s / %s."
+msgstr "%s 좋아하는 글이 업데이트 됐습니다. %S에 의해 / %s."
 
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "[OpenID](%%doc.openid%%)로 로그인하세요."
+msgid "%s timeline"
+msgstr "%s 타임라인"
 
-#: ../actions/login.php:126
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, 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 lib/action.php:332
-msgid "Logout"
-msgstr "로그아웃"
-
-#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
-msgid "Longer name, preferably your \"real\" name"
-msgstr "더욱 긴 이름을 요구합니다."
-
-#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
-msgid "Lost or forgotten password?"
-msgstr "비밀 번호를 잊으셨나요?"
+msgid "Updates from %1$s on %2$s!"
+msgstr "%2$s에 있는 %1$s의 업데이트!"
 
-#: ../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/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / %2$s에게 답신 업데이트"
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#: actions/emailsettings.php:71
+#: actions/apitimelinementions.php:126
 #, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr "%%site.name%%에서 어떻게 이메일을 받을지 정하십시오."
-
-#: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
-msgid "Member since"
-msgstr "가입한 때"
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr "%1$s님이 %2$s/%3$s의 업데이트에 답변했습니다."
 
-#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
 #, php-format
-msgid "Microblog by %s"
-msgstr "%s의 마이크로블로그"
+msgid "%s public timeline"
+msgstr "%s 공개 타임라인"
 
-#: ../actions/smssettings.php:304
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
 #, 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
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-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
-#: actions/emailsettings.php:142 actions/smssettings.php:152
-msgid "New"
-msgstr "새로운"
+msgid "%s updates from everyone!"
+msgstr "모두로부터의 업데이트 %s개!"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: actions/apitimelinetag.php:101 actions/tag.php:66
 #, php-format
-msgid "New email address for posting to %s"
-msgstr "%s에 포스팅 할 새로운 이메일 주소"
-
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
-msgid "New incoming email address added."
-msgstr "새로운 이메일 주소가 추가 되었습니다."
-
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
-msgid "New nickname"
-msgstr "새로운 별명"
-
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
-msgstr "새로운 통지"
-
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-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
-#: actions/login.php:228 actions/profilesettings.php:98
-#: actions/register.php:367 actions/showgroup.php:224
-#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
-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
-#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
-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
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "별명은 반드시 영소문자와 숫자로만 이루어져야 하며 스페이스의 사용이 불가 합니다."
-
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
-msgid "Nickname not allowed."
-msgstr "별명 사용이 불가 합니다."
-
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
-msgstr "따라가고 싶은 사용자의 별명"
-
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
-msgid "Nickname or email"
-msgstr "별명 또는 이메일"
-
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
-msgid "No"
-msgstr "아니오"
-
-#: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
-msgstr "Jabber ID가 아닙니다."
-
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
-msgid "No authorization request!"
-msgstr "허용되지 않는 요청입니다."
-
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
-msgid "No carrier selected."
-msgstr "통신회사가 선택 되지 않았습니다."
-
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
-msgstr "코드가 입력 되지 않았습니다."
-
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
-#: actions/confirmaddress.php:75
-msgid "No confirmation code."
-msgstr "확인 코드가 없습니다."
-
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
-#: actions/newnotice.php:126 classes/Command.php:223
-msgid "No content!"
-msgstr "내용이 없습니다!"
-
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
-msgid "No email address."
-msgstr "이메일이 추가 되지 않았습니다."
+msgid "Notices tagged with %s"
+msgstr "%s 태그된 통지"
 
-#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
-msgid "No id."
-msgstr "id가 없습니다."
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "%2$s에 있는 %1$s의 업데이트!"
 
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
-msgid "No incoming email address."
-msgstr "이메일 주소가 없습니다."
+#: actions/apiusershow.php:96
+msgid "Not found."
+msgstr "찾을 수가 없습니다."
 
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr "리모트 사용자의 별명이 없습니다."
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "그러한 문서는 없습니다."
 
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
 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
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
-msgid "No pending confirmation to cancel."
-msgstr "취소 할 대기중인 인증이 없습니다."
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
-msgstr "휴대폰 번호가 없습니다."
-
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
-msgstr "서버로부터 제공되는 프로필 URL가 없습니다."
-
-#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
-msgid "No registered email address for that user."
-msgstr "그 사용자는 등록된 메일주소가 없습니다."
-
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr "리퀘스트가 없습니다!"
-
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
-msgid "No results"
-msgstr "결과 없음"
-
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
 #: actions/avatarbynickname.php:64
 msgid "No size."
 msgstr "사이즈가 없습니다."
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
-msgid "No status found with that ID."
-msgstr "그 ID로 발견된 상태가 없습니다."
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "옳지 않은 크기"
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
-msgid "No status with that ID found."
-msgstr "발견된 ID의 상태가 없습니다."
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "아바타"
 
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
-msgstr "그러한 OpenID는 없습니다."
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "당신의 개인적인 아바타를 업로드할 수 있습니다."
 
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
-msgid "No such document."
-msgstr "그러한 문서는 없습니다."
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
+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 actions/shownotice.php:87
-#: lib/deleteaction.php:51
-msgid "No such notice."
-msgstr "그러한 통지는 없습니다."
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+msgid "Avatar settings"
+msgstr "아바타 설정"
 
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr "그러한 복구 코드는 없습니다."
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr "원래 설정"
 
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-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 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
-msgid "No such user."
-msgstr "그러한 사용자는 없습니다."
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr "미리보기"
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-msgid "No user with that email address or username."
-msgstr "그러한 이메일 주소나 계정을 가진 사용자는 없습니다."
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+msgid "Delete"
+msgstr "삭제"
 
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
-msgstr "표시 할 사용자가 없습니다."
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+msgstr "올리기"
 
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr "복구 코드가 아닙니다."
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
+msgstr "자르기"
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
-msgstr "가입된 사용자가 아닙니다."
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr "세션토큰에 문제가 있습니다. 다시 시도해주세요."
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
-msgid "Not a supported data format."
-msgstr "지원하는 형식의 데이터가 아닙니다."
+#: actions/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "잘못된 폼 제출"
 
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
-msgstr "유효한 Jabber ID가 아닙니다."
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
+msgstr "당신의 아바타가 될 이미지영역을 지정하세요."
 
-#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-msgid "Not a valid OpenID."
-msgstr "유효한 OpenID가 아닙니다."
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
+msgstr "파일 데이터를 잃어버렸습니다."
 
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
-msgid "Not a valid email address"
-msgstr "유효한 이메일 주소가 아닙니다."
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+msgstr "아바타가 업데이트 되었습니다."
 
-#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-msgid "Not a valid email address."
-msgstr "유효한 이메일 주소가 아닙니다."
+#: actions/avatarsettings.php:363
+msgid "Failed updating avatar."
+msgstr "아바타 업데이트 실패"
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-#: actions/editgroup.php:186 actions/newgroup.php:137
-#: actions/profilesettings.php:195 actions/register.php:161
-msgid "Not a valid nickname."
-msgstr "유효한 별명이 아닙니다"
+#: actions/avatarsettings.php:387
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "아바타가 업데이트 되었습니다."
 
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
-msgstr "유효한 프로필 URL이 아닙니다. (잘못된 서비스)"
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+msgid "No nickname"
+msgstr "닉네임이 없습니다"
 
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr "유효한 프로필 URL이 아닙니다. (XRDS의 정의가 없습니다)"
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
+msgstr "그러한 그룹이 없습니다."
 
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr "유효한 프로필 URL이 아닙니다. (YADIS 문서가 없습니다)"
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "이용자 프로필"
 
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
-msgid "Not an image or corrupt file."
-msgstr "그림 파일이 아니거나 손상된 파일 입니다."
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s 와 친구들, %d 페이지"
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
-msgid "Not authorized."
-msgstr "인증이 되지 않았습니다."
+#: actions/blockedfromgroup.php:108
+#, fuzzy
+msgid "A list of the users blocked from joining this group."
+msgstr "이 그룹의 회원리스트"
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
-msgid "Not expecting this response!"
-msgstr "예상치 못한 반응 입니다."
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "사용자 차단 해제에 실패했습니다."
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
-msgid "Not found"
-msgstr "찾지 못함"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
+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 actions/block.php:59 actions/disfavor.php:61
-#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
-#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
-#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
-#: actions/unsubscribe.php:27 lib/deleteaction.php:66
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+msgid "Unblock this user"
+msgstr "이 사용자를 차단해제합니다."
+
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "로그인하고 있지 않습니다."
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
-msgid "Not subscribed!."
-msgstr "구독하고 있지 않습니다!"
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
-msgstr "통지 검색"
-
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
-#, php-format
-msgid "Notice feed for %s"
-msgstr "%s의 통지 피드"
-
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
-msgstr "통지에 프로필이 없습니다."
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
+msgstr "프로필을 지정하지 않았습니다."
 
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
-msgid "Notices"
-msgstr "통지"
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
+msgstr "해당 ID의 프로필이 없습니다."
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
-#, php-format
-msgid "Notices tagged with %s"
-msgstr "%s 태그된 통지"
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+msgid "Block user"
+msgstr "사용자를 차단합니다."
 
-#: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
-msgstr "기존 비밀 번호"
+#: actions/block.php:136
+msgid ""
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
+msgstr ""
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
-msgid "OpenID"
-msgstr "OpenID"
-
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
-msgid "OpenID Account Setup"
-msgstr "OpenID 계정 셋업"
-
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-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
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-msgid "OpenID Login"
-msgstr "OpenID 로그인"
-
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-#: actions/openidlogin.php:102 actions/openidsettings.php:101
-msgid "OpenID URL"
-msgstr "OpenID URL"
-
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
-msgid "OpenID authentication cancelled."
-msgstr "OpenID 로의 인증이 취소되었습니다."
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr "OpenID 로의 인증에 실패 : %s"
-
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "OpenID 장해 : %s"
-
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr "OpenID 는 제거되었습니다."
-
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
-msgstr "OpenID 설정"
-
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-msgid "Optionally add a personal message to the invitation."
-msgstr "초대장에 메시지 첨부하기."
+#: actions/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
+msgid "No"
+msgstr "아니오"
 
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
-msgid "Partial upload."
-msgstr "불완전한 업로드."
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user"
+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 actions/finishopenidlogin.php:118
-#: actions/login.php:231 actions/register.php:372
-#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-msgid "Password"
-msgstr "비밀 번호"
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
+msgstr "네, 맞습니다."
 
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
-msgid "Password and confirmation do not match."
-msgstr "비밀 번호가 일치하지 않습니다."
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+msgid "Block this user"
+msgstr "이 사용자 차단하기"
 
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
-msgid "Password must be 6 chars or more."
-msgstr "비밀 번호는 6자 이상이어야 합니다."
+#: actions/block.php:165
+msgid "You have already blocked this user."
+msgstr "당신은 이미 이 사용자를 차단하고 있습니다."
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-msgid "Password recovery requested"
-msgstr "비밀 번호 복구가 요청되었습니다."
+#: actions/block.php:170
+msgid "Failed to save block information."
+msgstr "정보차단을 저장하는데 실패했습니다."
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-msgid "Password saved."
-msgstr "비밀 번호 저장"
+#: actions/bookmarklet.php:50
+#, fuzzy
+msgid "Post to "
+msgstr "사진"
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-msgid "Passwords don't match."
-msgstr "비밀 번호가 일치하지 않습니다."
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+msgstr "확인 코드가 없습니다."
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
-msgstr "사람들"
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "인증 코드가 없습니다."
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
-msgstr "사람 찾기"
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "그 인증 코드는 귀하의 것이 아닙니다!"
 
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
-msgstr "사람 찾기"
+#: actions/confirmaddress.php:90
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr "인식되지않은 주소유형 %s"
 
-#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
-msgid "Personal"
-msgstr "개인적인"
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr "그 주소는 이미 승인되었습니다."
 
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-msgid "Personal message"
-msgstr "개인적인 메시지"
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "사용자를 업데이트 할 수 없습니다."
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "지역번호와 함께 띄어쓰기 없이 번호를 적어 주세요."
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+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/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "주소 인증"
 
-#: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Jabber/GTalk의 상태가 변경되었을 때 통지를 보냅니다."
+#: actions/confirmaddress.php:159
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "\"%s\" 는 귀하의 계정으로 승인되었습니다."
 
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94 actions/emailsettings.php:86
-#: actions/imsettings.php:68 actions/smssettings.php:94
-#: actions/twittersettings.php:70 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
-msgid "Preferences"
-msgstr "설정"
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+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
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
-msgid "Preferences saved."
-msgstr "설정이 저장되었습니다."
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
+msgstr "통지"
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
-msgid "Preferred language"
-msgstr "언어 설정"
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
+msgstr "그러한 통지는 없습니다."
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
-msgid "Privacy"
-msgstr "개인정보 취급방침"
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "이 통지를 지울 수 없습니다."
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-msgid "Problem saving notice."
-msgstr "통지를 저장하는데 문제가 발생했습니다."
+#: actions/deletenotice.php:103
+#, fuzzy
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+"영구적으로 게시글을 삭제하려고 합니다. 한번 삭제되면, 복구할 수 없습니다."
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
-msgid "Profile"
-msgstr "프로필"
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr "통지 삭제"
 
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
-msgstr "프로필 URL"
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr "정말로 통지를 삭제하시겠습니까?"
 
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
-msgstr "프로필 세팅"
+#: actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "이 통지를 지울 수 없습니다."
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-msgid "Profile unknown"
-msgstr "알 수 없는 프로필"
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+msgid "Delete this notice"
+msgstr "이 게시글 삭제하기"
 
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
-msgid "Public Stream Feed"
-msgstr "퍼블릭 스트림 피드"
+#: actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
+msgstr "세션토큰에 문제가 있습니다. 다시 시도해주세요."
 
-#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
-msgid "Public timeline"
-msgstr "퍼블릭 타임라인"
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr "이 메시지는 favorite이 아닙니다."
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Jabber/GTalk 계정을 위한 MicroID의 생성"
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "좋아하는 게시글로 추가하기"
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
-msgid "Publish a MicroID for my email address."
-msgstr "이메일 주소를 위한 MicroID의 생성"
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "그러한 문서는 없습니다."
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr "최근 태그"
+#: actions/editgroup.php:56
+#, php-format
+msgid "Edit %s group"
+msgstr "%s 그룹 편집"
 
-#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
-msgid "Recover"
-msgstr "복구"
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
+msgstr "그룹을 만들기 위해서는 로그인해야 합니다."
 
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
-msgid "Recover password"
-msgstr "비밀 번호 복구"
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+msgid "You must be an admin to edit the group"
+msgstr "관리자만 그룹을 편집할 수 있습니다."
 
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-msgid "Recovery code for unknown user."
-msgstr "알 수 없는 취소를 위한 리커버리 코드"
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
+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
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-msgid "Register"
-msgstr "회원가입"
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "설명이 너무 길어요. (최대 140글자)"
 
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
-msgid "Registration not allowed."
-msgstr "가입이 허용되지 않습니다."
+#: actions/editgroup.php:253
+msgid "Could not update group."
+msgstr "그룹을 업데이트 할 수 없습니다."
 
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
-msgid "Registration successful"
-msgstr "회원 가입이 성공적입니다."
+#: actions/editgroup.php:269
+msgid "Options saved."
+msgstr "옵션들이 저장되었습니다."
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
-msgid "Reject"
-msgstr "거부"
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "이메일 세팅"
 
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
-msgid "Remember me"
-msgstr "자동 로그인"
+#: actions/emailsettings.php:71
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr "%%site.name%%에서 어떻게 이메일을 받을지 정하십시오."
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
-msgid "Remote profile with no matching profile"
-msgstr "리모트 프로필과 일치하는 것이 없습니다."
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "주소"
 
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
-msgstr "리모트 구독 예약"
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+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 actions/emailsettings.php:101
-#: actions/emailsettings.php:134 actions/imsettings.php:102
-#: actions/openidsettings.php:166 actions/smssettings.php:103
-#: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
 msgid "Remove"
 msgstr "삭제"
 
-#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
-msgstr "OpenID 삭제"
-
-#: ../actions/openidsettings.php:73
+#: actions/emailsettings.php:113
 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 lib/personal.php:55 lib/personalgroupnav.php:103
-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
-#: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
-#, php-format
-msgid "Replies to %s"
-msgstr "%s에 답신"
-
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
-msgid "Reset"
-msgstr "초기화"
-
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
-msgid "Reset password"
-msgstr "비밀 번호 초기화"
-
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-msgid "SMS"
-msgstr "SMS"
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
+"이 주소는 인증 대기중입니다. 수신함(또는 스팸함)을 확인하셔서 지침을 확인해 "
+"주시기 바랍니다."
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: actions/emailsettings.php:117 actions/imsettings.php:120
 #: actions/smssettings.php:126
-msgid "SMS Phone number"
-msgstr "SMS 휴대폰 번호"
-
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
-msgstr "SMS 세팅"
-
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
-msgid "SMS confirmation"
-msgstr "SMS 인증"
-
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
-msgid "Same as password above"
-msgstr "위와 같은 비밀 번호"
-
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
-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 actions/emailsettings.php:182
-#: actions/facebooksettings.php:114 actions/imsettings.php:157
-#: actions/othersettings.php:117 actions/profilesettings.php:150
-#: actions/smssettings.php:169 actions/subscriptions.php:124
-#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
-msgid "Save"
-msgstr "저장"
-
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
-msgid "Search"
-msgstr "검색"
-
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
-msgstr "스트림 피드를 검색"
+msgid "Cancel"
+msgstr "취소"
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
-#, php-format
-msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
-msgstr "%%site.name%% 의 통지를 내용으로부터 검색. 검색어는 스페이스로 구분한다; 적어도 3글자 이상 필요."
+#: actions/emailsettings.php:121
+msgid "Email Address"
+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 "%%site.name%% 의 사람을 이름, 장소, 흥미로 검색. 검색어는 스페이스 구분한다; 적어도 3글자 이상 필요."
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr "\"UserName@example.org\" 와 같은 이메일 계정"
 
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
-msgid "Select a carrier"
-msgstr "통신 회사를 선택 하세요."
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "추가"
 
-#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
-#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
-msgid "Send"
-msgstr "보내기"
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+msgstr "받은 이메일"
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
 msgstr "새로운 통지를 올리려면 이 주소로 메일을 보내십시오/"
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
-msgstr "새로운 예약 구독의 통지를 이메일로 보내주세요."
-
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
-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/emailsettings.php:145 actions/smssettings.php:162
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr "포스팅을 위한 새 이메일 계정의 생성; 전 이메일 계정은 취소."
 
-#: ../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/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
+msgstr "새로운"
 
-#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
-msgid "Settings"
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
 msgstr "설정"
 
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
-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
-#: actions/finishaddopenid.php:114
-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
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
-msgstr "예측 하지 못한 사태가 발생했습니다."
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
-msgstr "죄송합니다. 이메일이 허용되지 않습니다."
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
-msgstr "죄송합니다. 귀하의 이메일이 아닙니다."
-
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
-msgid "Source"
-msgstr "소스 코드"
-
-#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
-msgid "Statistics"
-msgstr "통계"
-
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-msgid "Stored OpenID not found."
-msgstr "저장된 OpenID를 찾을 수 없습니다."
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
+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
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
-msgid "Subscribe"
-msgstr "구독"
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr "누군가 내 글을 좋아하는 게시글로 추가했을때, 이메일을 보냅니다."
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
-msgid "Subscribers"
-msgstr "구독자"
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
+msgstr "누군가 내게 비밀메시지를 보냈을때, 이메일을 보냅니다."
 
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
-msgid "Subscription authorized"
-msgstr "구독 허가"
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "누군가 내게 비밀메시지를 보냈을때, 이메일을 보냅니다."
 
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
-msgid "Subscription rejected"
-msgstr "구독 거부"
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
+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
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
-msgid "Subscriptions"
-msgstr "구독"
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
+msgstr "이메일로 통보를 포스트 하길 원합니다."
 
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
-msgid "System error uploading file."
-msgstr "파일을 올리는데 시스템 오류 발생"
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
+msgstr "이메일 주소를 위한 MicroID의 생성"
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
-#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
-msgid "Tags"
-msgstr "태그"
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "저장"
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "문자"
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+msgstr "설정이 저장되었습니다."
 
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
-msgid "Text search"
-msgstr "문자 검색"
+#: actions/emailsettings.php:319
+msgid "No email address."
+msgstr "이메일이 추가 되지 않았습니다."
 
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
-msgstr "그 OpenID 는 귀하의 것이 아닙니다."
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
+msgstr "그 이메일 주소를 정규화 할 수 없습니다."
 
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
-msgstr "그 주소는 이미 승인되었습니다."
+#: actions/emailsettings.php:330
+msgid "Not a valid email address"
+msgstr "유효한 이메일 주소가 아닙니다."
 
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
-msgstr "그 인증 코드는 귀하의 것이 아닙니다!"
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
+msgstr "그 이메일 주소는 이미 귀하의 것입니다."
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:336
 msgid "That email address already belongs to another user."
 msgstr "그 이메일 주소는 이미 다른 사용자의 소유입니다."
 
-#: ../actions/avatar.php:80 actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
-msgstr "파일 사이즈가 너무 큽니다."
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+msgstr "확인 코드를 추가 할 수 없습니다."
 
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
-msgid "That is already your Jabber ID."
-msgstr "그 Jabber ID는 이미 귀하의 것입니다."
+#: actions/emailsettings.php:358
+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/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
-msgid "That is already your email address."
-msgstr "그 이메일 주소는 이미 귀하의 것입니다."
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
+msgstr "취소 할 대기중인 인증이 없습니다."
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
-msgid "That is already your phone number."
-msgstr "그 휴대폰 번호는 이미 귀하의 것입니다."
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "옳지 않은 메신저 계정 입니다."
 
-#: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
-msgid "That is not your Jabber ID."
-msgstr "그 Jabber ID는 귀하의 것이 아닙니다."
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "인증 취소"
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
 msgstr "그 이메일 주소는 귀하의 것이 아닙니다."
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
-msgstr "그 휴대폰 번호는 귀하의 것이 아닙니다."
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "주소가 삭제되었습니다."
 
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-#: actions/emailsettings.php:367 actions/imsettings.php:349
-msgid "That is the wrong IM address."
-msgstr "옳지 않은 메신저 계정 입니다."
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
+msgstr "이메일 주소가 없습니다."
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
-msgstr "옳지 않은 인증 번호 입니다."
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
+msgstr "사용자 기록을 업데이트 할 수 없습니다."
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-msgid "That phone number already belongs to another user."
-msgstr "그 휴대폰 번호는 이미 다른 사용자의 것입니다."
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
+msgstr "받은 이메일 계정 삭제"
 
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49 actions/twitapistatuses.php:330
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-msgid "That's too long. Max notice size is 140 chars."
-msgstr "너무 깁니다. 통지의 최대 길이는 140글자 입니다."
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
+msgstr "새로운 이메일 주소가 추가 되었습니다."
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "너무 깁니다. 통지의 최대 길이는 255글자 입니다."
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+msgid "Popular notices"
+msgstr "인기있는 게시글"
 
-#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/favorited.php:67
 #, php-format
-msgid "The address \"%s\" has been confirmed for your account."
-msgstr "\"%s\" 는 귀하의 계정으로 승인되었습니다."
+msgid "Popular notices, page %d"
+msgstr "인기있는 게시글, %d 페이지"
 
-#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274 actions/emailsettings.php:282
-#: actions/imsettings.php:258 actions/smssettings.php:282
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
-msgid "The address was removed."
-msgstr "주소가 삭제되었습니다."
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
+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:"
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
-"구독이 승인 되었습니다. 하지만 콜백 URL이 통과 되지 않았습니다. 웹사이트의 지시를 찾아 구독 승인 방법에 대하여 읽어보십시오. "
-"귀하의 구독 토큰은 : "
 
-#: ../actions/userauthorization.php:322
+#: actions/favorited.php:153
 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."
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
 msgstr ""
-"구독이 해지 되었습니다. 하지만 콜백 URL이 통과 되지 않았습니다. 웹사이트의 지시를 찾아 구독 해지 방법에 대하여 읽어보십시오."
 
-#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/favorited.php:156
 #, 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 "귀하의 통지를 받고 있는 사람"
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
+msgstr ""
 
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
 #, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr "%s님이 받고 있는 통지의 사람"
+msgid "%s's favorite notices"
+msgstr "%s 님의 좋아하는 글들"
 
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr "귀하의 통지를 받고 있는 사람"
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "%2$s에 있는 %1$s의 업데이트!"
 
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
-msgid ""
-"These people are already users and you were automatically subscribed to them:"
-msgstr "자동 구독 신청이 된 사용자:"
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "이 게시글은 이미 좋아하는 게시글입니다."
 
-#: ../actions/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
-msgstr "이 인증 코드는 오래됐습니다. 다시 발급 받아 주십시오."
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+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/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr "인기있는 회원"
 
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/featured.php:71
 #, 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 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-msgid "This method requires a POST or DELETE."
-msgstr "이 메서드는 등록 또는 삭제를 요구합니다."
+msgid "Featured users, page %d"
+msgstr "인기있는 회원, %d페이지"
 
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
-msgid "This method requires a POST."
-msgstr "이 메서드는 등록을 요구합니다."
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
+msgstr "%s의 훌륭한 회원의 일부 선택"
 
-#: ../lib/util.php:164 lib/util.php:246
-msgid "This page is not available in a media type you accept"
-msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다."
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "새로운 통지"
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
-msgid "Timezone"
-msgstr "타임존"
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "새로운 통지"
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
-msgid "Timezone not selected."
-msgstr "타임존이 설정 되지 않았습니다."
+#: actions/file.php:42
+msgid "No attachments"
+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."
+#: actions/file.php:51
+msgid "No uploaded attachments"
 msgstr ""
-"구독하려면, [로그인](%%action.login%%)하거나, 새 계정을 [등록](%%action.register%%)하십시오. 이미 "
-"계정이 [호환되는 마이크로블로깅 사이트]((%%doc.openmublog%%)에 계정이 있으면, 아래에 프로파일 URL을 입력하십시오."
 
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
-msgid "Two user ids or screen_names must be supplied."
-msgstr "두 개의 사용자 ID나 대화명을 입력해야 합니다."
+#: actions/finishremotesubscribe.php:69
+msgid "Not expecting this response!"
+msgstr "예상치 못한 반응 입니다."
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "귀하의 홈페이지, 블로그 혹은 다른 사이트의 프로필 페이지 URL"
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "살펴 보고 있는 사용자가 없습니다."
 
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-msgid "URL of your profile on another compatible microblogging service"
-msgstr "다른 마이크로블로깅 서비스의 귀하의 프로필 URL"
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+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 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-msgid "Unexpected form submission."
-msgstr "잘못된 폼 제출"
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
+msgstr "이 회원은 구독으로부터 당신을 차단해왔다."
 
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
-msgid "Unexpected password reset."
-msgstr "잘못된 비밀 번호 지정"
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "인증이 되지 않았습니다."
 
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-msgid "Unknown action"
-msgstr "알려지지 않은 행동"
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "리퀘스트 토큰을 엑세스 토큰으로 변환 할 수 없습니다."
 
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-msgid "Unknown version of OMB protocol."
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses 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/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "리모트 프로필 업데이트 오류"
 
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
-#, php-format
-msgid "Unrecognized address type %s"
-msgstr "인식되지않은 주소유형 %s"
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+msgid "No such group."
+msgstr "그러한 그룹이 없습니다."
 
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
-msgstr "구독 해제"
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "그러한 통지는 없습니다."
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-msgid "Unsupported OMB version"
-msgstr "지원되지 않는 OMB 버전"
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "파일을 잃어버렸습니다."
 
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
-msgid "Unsupported image file format."
-msgstr "지원하지 않는 그림 파일 형식입니다."
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "프로필을 지정하지 않았습니다."
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
-msgstr "SMS에 의한 업데이트"
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
-msgstr "인스턴트 메신저에 의한 업데이트"
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "회원이 당신을 차단해왔습니다."
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr "%1$s 및 %2$s에 있는 친구들의 업데이트!"
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "당신은 해당 그룹의 멤버가 아닙니다."
+
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "사용자를 차단합니다."
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/groupblock.php:162
 #, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr "%2$s에 있는 %1$s의 업데이트!"
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
 
-#: ../actions/avatar.php:68 actions/profilesettings.php:161
-#: actions/avatarsettings.php:162 actions/grouplogo.php:232
-msgid "Upload"
-msgstr "올리기"
+#: actions/groupblock.php:178
+#, fuzzy
+msgid "Do not block this user from this group"
+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."
+#: actions/groupblock.php:179
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "이 그룹의 회원리스트"
+
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
 msgstr ""
-"여기에 새 아바타이미지를 올려보세요. 업로드후에는 사진을 편집할 수 없습니다. 사이즈 영역을 늘리거나 줄일 수 있습니다. 그것은 사이트의 "
-"라이선스하에 있게됩니다. 당신의 소유이면서 공유하고 싶은 사진을 이용해보세요."
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr "새 프로필 사진 올리기"
+#: actions/groupbyid.php:74
+msgid "No ID"
+msgstr "ID가 없습니다."
+
+#: actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "그룹을 만들기 위해서는 로그인해야 합니다."
+
+#: actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "그룹"
 
-#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/groupdesignsettings.php:152
 msgid ""
-"Use this form to invite your friends and colleagues to use this service."
-msgstr "다음 양식을 이용해 친구와 동료를 이 서비스에 초대하십시오."
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+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/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "사용자를 업데이트 할 수 없습니다."
 
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
-msgid "User being listened to doesn't exist."
-msgstr "살펴 보고 있는 사용자가 없습니다."
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#, fuzzy
+msgid "Unable to save your design settings!"
+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
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-msgid "User has no profile."
-msgstr "이용자가 프로필을 가지고 있지 않습니다."
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "싱크설정이 저장되었습니다."
 
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
-msgstr "이용자 닉네임"
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
+msgstr "그룹 로고"
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr "이용자가 없습니다."
+#: actions/grouplogo.php:150
+#, fuzzy, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr "당신그룹의 로고 이미지를 업로드할 수 있습니다."
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
-msgid "What timezone are you normally in?"
-msgstr "당신이 주로 생활하는 곳이 어떤 타임존입니까?"
+#: actions/grouplogo.php:362
+#, fuzzy
+msgid "Pick a square area of the image to be the logo."
+msgstr "당신의 아바타가 될 이미지영역을 지정하세요."
 
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
-#, php-format
-msgid "What's up, %s?"
-msgstr "뭐하세요? %?"
+#: actions/grouplogo.php:396
+msgid "Logo updated."
+msgstr "로고를 업데이트했습니다."
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-#: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "당신은 어디에 삽니까? \"시, 도 (or 군,구), 나라"
+#: actions/grouplogo.php:398
+msgid "Failed updating logo."
+msgstr "로고 업데이트에 실패했습니다."
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/groupmembers.php:93 lib/groupnav.php:92
 #, php-format
-msgid "Wrong image type for '%s'"
-msgstr "%S 잘못된 그림 파일 타입입니다. "
+msgid "%s group members"
+msgstr "%s 그룹 회원"
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/groupmembers.php:96
 #, php-format
-msgid "Wrong size image at '%s'"
-msgstr "%S 잘못된 그림 파일 사이즈입니다."
+msgid "%s group members, page %d"
+msgstr "%s 그룹 회원, %d페이지"
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
-msgid "Yes"
-msgstr "네, 맞습니다."
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr "이 그룹의 회원리스트"
 
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-msgid "You already have this OpenID!"
-msgstr "당신은 이미 오픈ID를 가지고 있습니다."
+#: actions/groupmembers.php:175 lib/groupnav.php:107
+msgid "Admin"
+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/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
+msgstr "차단하기"
 
-#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
-msgstr "당신은 이미 로그인되어 있습니다."
+#: actions/groupmembers.php:441
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "관리자만 그룹을 편집할 수 있습니다."
 
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-msgid "You are already subscribed to these users:"
-msgstr "당신은 다음 사용자를 이미 구독하고 있습니다."
+#: actions/groupmembers.php:473
+#, fuzzy
+msgid "Make Admin"
+msgstr "관리자"
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
-msgid "You are not friends with the specified user."
-msgstr "당신은 지정한 회원과 친구가 아닙니다."
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
 
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr "여기서 비밀번호를 변경할 수 있습니다. 좋은 번호를 선택하세요."
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "%2$s에 있는 %1$s의 업데이트!"
 
-#: ../actions/register.php:135 actions/register.php:145
-msgid "You can create a new account to start posting notices."
-msgstr "계정을 새로 만들면 새로운 게시글을 작성할 수 있습니다."
+#: actions/groupsearch.php:52
+#, fuzzy, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"%%site.name%% 의 사람을 이름, 장소, 흥미로 검색. 검색어는 스페이스 구분한다; "
+"적어도 3글자 이상 필요."
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "당신은 %%site.name%% 로부터 이메일을 통해 SMS메시지를 받을 수 있습니다."
+#: actions/groupsearch.php:58
+msgid "Group search"
+msgstr "그룹 찾기"
 
-#: ../actions/openidsettings.php:86
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr "당신은 \"Remove\"로 표기된 버튼클릭을 통해 계정에서 오픈ID를 제거할 수 있습니다."
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "결과 없음"
 
-#: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/groupsearch.php:82
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
 msgstr ""
-"당신은 Jabber나 구글토크(%%doc.im%%)를 통해 메시지를 주고받을 수 있습니다. 아래 당신의 주소와 환경설정을 조정하세요."
 
-#: ../actions/profilesettings.php:27
+#: actions/groupsearch.php:85
+#, php-format
 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
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
-msgstr "당신은 로컬 구독을 사용할 수 있습니다."
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
-msgid "You can't register if you don't agree to the license."
-msgstr "라이선스에 동의하지 않는다면 등록할 수 없습니다."
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "그룹"
 
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
-msgid "You did not send us that profile"
-msgstr "당신은 프로필을 우리에게 전송하지 않았다."
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "그룹, %d 페이지"
 
-#: ../lib/mail.php:147
+#: actions/groups.php:90
 #, 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"
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
 msgstr ""
-"포스팅 주소는 %1$s입니다.새 메시지를 등록하려면 %2$ 주소로 이메일을 보내십시오.이메일 사용법은 %3$s 페이지를 "
-"보십시오.안녕히,%4$s"
-
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
-msgid "You may not delete another user's status."
-msgstr "당신은 다른 사용자의 상태를 삭제하지 않아도 된다."
 
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr "로그인을 해야 다른 사용자를 %s에 초대할 수 있습니다."
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "새 그룹을 만듭니다."
 
-#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
 msgstr ""
-"당신의 초대를 받은 사람들이 수락하고, 사이트에 등록할때 공지를 받을 수 있습니다. 커뮤니티를 키워주셔서 대단히 감사합니다. ^^"
 
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr "당신은 인증되었습니다. 아래 새 비밀번호를 입력하세요."
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "회원이 당신을 차단해왔습니다."
 
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
-msgid "Your OpenID URL"
-msgstr "당신의 오픈ID URL"
+#: actions/groupunblock.php:128 actions/unblock.php:108
+msgid "Error removing the block."
+msgstr "차단 제거 에러!"
 
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
-msgstr "이 서버에서 당신의 닉네임 혹은 당신의 등록된 이메일주소"
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "메신저 설정"
 
-#: ../actions/openidsettings.php:28
+#: actions/imsettings.php:70
 #, php-format
 msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
-"account.  Manage your associated OpenIDs from here."
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 msgstr ""
-"[오픈ID](%%doc.openid%%)는 당신을 동일한 계정으로 많은 사이트에 로그인할 수 있게 해줍니다. 여기에서 당신의 관련된 "
-"오픈ID를 관리하세요."
+"당신은 Jabber나 구글토크(%%doc.im%%)를 통해 메시지를 주고받을 수 있습니다. 아"
+"래 당신의 주소와 환경설정을 조정하세요."
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
-msgid "a few seconds ago"
-msgstr "몇 초 전"
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다."
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
-#, php-format
-msgid "about %d days ago"
-msgstr "%d일 전"
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "확인된 최신의 Jabber/GTalk 계정"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: actions/imsettings.php:114
 #, php-format
-msgid "about %d hours ago"
-msgstr "%d시간 전"
+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:947 lib/util.php:996 lib/util.php:949
-#, php-format
-msgid "about %d minutes ago"
-msgstr "%d분 전"
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "메신저 주소"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: actions/imsettings.php:126
 #, php-format
-msgid "about %d months ago"
-msgstr "%d달 전"
-
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
-msgid "about a day ago"
-msgstr "하루 전"
-
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
-msgid "about a minute ago"
-msgstr "1분 전"
-
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
-msgid "about a month ago"
-msgstr "1달 전"
-
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
-msgid "about a year ago"
-msgstr "1년 전"
-
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
-msgid "about an hour ago"
-msgstr "1시간 전"
-
-#: ../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 actions/noticesearch.php:187
-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 actions/noticesearch.php:194
-msgid "reply"
-msgstr "답장"
-
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-msgid "same as password above"
-msgstr "위 비밀번호와 동일하게"
+msgid ""
+"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
+"add %s to your buddy list in your IM client or on GTalk."
+msgstr ""
+"\"UserName@example.org\" 와 같은 Jabber 또는 GTalk 계정은 귀하의 메신저나 "
+"GTalk 친구목록에 반드시 %s 주소를 추가하여 주십시오."
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
-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
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-msgid "There was a problem with your session token. Try again, please."
-msgstr "세션토큰에 문제가 있습니다. 다시 시도해주세요."
+#: actions/imsettings.php:143
+msgid "Send me notices through Jabber/GTalk."
+msgstr "Jabber/GTalk 로 통지를 보내주세요."
 
-#: actions/disfavor.php:55 actions/disfavor.php:81
-msgid "This notice is not a favorite!"
-msgstr "이 메시지는 favorite이 아닙니다."
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr "Jabber/GTalk의 상태가 변경되었을 때 통지를 보냅니다."
 
-#: actions/disfavor.php:63 actions/disfavor.php:87
-msgid "Could not delete favorite."
-msgstr "favorite을 삭제할 수 없습니다."
+#: actions/imsettings.php:153
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+"내가 구독하지 않는 사람으로 부터의 답장을  Jabber/GTalk을 통해 보내주세요."
 
-#: actions/disfavor.php:72 lib/favorform.php:140
-msgid "Favor"
-msgstr "좋아합니다"
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Jabber/GTalk 계정을 위한 MicroID의 생성"
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
-msgstr "누군가 내 글을 좋아하는 게시글로 추가했을때, 이메일을 보냅니다."
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "Jabber ID가 아닙니다."
 
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-msgid "Send me email when someone sends me a private message."
-msgstr "누군가 내게 비밀메시지를 보냈을때, 이메일을 보냅니다."
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr "그 Jabbar ID를 정규화 할 수 없습니다."
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
-msgid "This notice is already a favorite!"
-msgstr "이 게시글은 이미 좋아하는 게시글입니다."
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "유효한 Jabber ID가 아닙니다."
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132 actions/favor.php:86
-#: actions/twitapifavorites.php:125 classes/Command.php:152
-msgid "Could not create favorite."
-msgstr "좋아하는 게시글을 생성할 수 없습니다."
+#: actions/imsettings.php:299
+msgid "That is already your Jabber ID."
+msgstr "그 Jabber ID는 이미 귀하의 것입니다."
 
-#: actions/favor.php:70
-msgid "Disfavor"
-msgstr "좋아하는 게시글 취소"
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr "Jabber ID가 이미 다른 사용자에 의하여 사용되고 있습니다."
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/imsettings.php:327
 #, php-format
-msgid "%s favorite notices"
-msgstr "%s 좋아하는 게시글"
+msgid ""
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr ""
+"추가한 메신저 주소로 인증 코드를 보냈습니다. %s 사용자를 허락해야 메시지를 전"
+"달할 수 있습니다."
 
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
-#, php-format
-msgid "Feed of favorite notices of %s"
-msgstr "%s의 좋아하는 게시글의 피드"
+#: actions/imsettings.php:387
+msgid "That is not your Jabber ID."
+msgstr "그 Jabber ID는 귀하의 것이 아닙니다."
 
-#: actions/inbox.php:28 actions/inbox.php:59
+#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %s - page %d"
 msgstr "%s의 받은쪽지함 - %d 페이지"
 
-#: actions/inbox.php:30 actions/inbox.php:62
+#: actions/inbox.php:62
 #, php-format
 msgid "Inbox for %s"
 msgstr "%s의 받은쪽지함"
 
-#: actions/inbox.php:53 actions/inbox.php:115
+#: actions/inbox.php:115
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr "당신의 받은 쪽지함입니다. 당신이 받은 비밀 메시지가 있습니다."
 
-#: actions/invite.php:178 actions/invite.php:213
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+#: actions/invite.php:39
+msgid "Invites have been disabled."
 msgstr ""
-"%1$s 사용자가 %2$s에 (%3$s) 초대했습니다.\n"
-"\n"
-
-#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-msgid "Automatically login in the future; "
-msgstr "앞으로 자동 로그인을 하겠습니다."
-
-#: actions/login.php:122 actions/login.php:264
-msgid "For security reasons, please re-enter your "
-msgstr "보안의 이유로, 재 입력을 해주세요."
 
-#: actions/login.php:126 actions/login.php:268
-msgid "Login with your username and password. "
-msgstr "당신의 계정과 비밀번호로 로그인하세요."
-
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
-msgid "That's too long. Max message size is 140 chars."
-msgstr "메시지가 너무 길어요. 최대로 140자까지 입력하실 수 있습니다."
-
-#: actions/newmessage.php:65 actions/newmessage.php:128
-msgid "No recipient specified."
-msgstr "수신자를 지정하지 않았습니다."
-
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206 actions/newmessage.php:131
-#: actions/newmessage.php:168 classes/Command.php:237
-msgid "You can't send a message to this user."
-msgstr "당신은 이 사용자에게 메시지를 보낼 수 없습니다."
-
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "자신에게 메시지를 보내지 마세요. 대신 조용하게 스스로에게 그것을 말하세요;;"
-
-#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
-msgid "No such user"
-msgstr "그러한 사용자가 없습니다."
-
-#: actions/newmessage.php:117 actions/newmessage.php:67
-msgid "New message"
-msgstr "새로운 메시지입니다."
-
-#: actions/noticesearch.php:95 actions/noticesearch.php:146
-msgid "Notice without matching profile"
-msgstr "프로필매칭 없이 바로 글을 씁니다."
-
-#: actions/openidsettings.php:28 actions/openidsettings.php:70
+#: actions/invite.php:41
 #, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr "[오픈ID](%%doc.openid%%) 는 당신이 많은 사이트에 로그인할 수 있게 합니다."
+msgid "You must be logged in to invite other users to use %s"
+msgstr "로그인을 해야 다른 사용자를 %s에 초대할 수 있습니다."
 
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
-msgstr "만약 당신계정에 오픈ID를 추가하길 원한다면,"
+#: actions/invite.php:72
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "옳지 않은 이메일 주소 : %s"
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr "당신의 유일한 오픈ID를 제거하면 로그인이 불가능합니다."
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
+msgstr "초대권을 보냈습니다"
 
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-msgid "You can remove an OpenID from your account "
-msgstr "당신의 계정에서 오픈ID를 삭제할 수 있습니다."
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr "새 사용자를 초대"
 
-#: actions/outbox.php:28 actions/outbox.php:58
-#, php-format
-msgid "Outbox for %s - page %d"
-msgstr "%s의 보낸쪽지함 - page %d"
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr "당신은 다음 사용자를 이미 구독하고 있습니다."
 
-#: actions/outbox.php:30 actions/outbox.php:61
+#: actions/invite.php:131 actions/invite.php:139
 #, php-format
-msgid "Outbox for %s"
-msgstr "%s의 보낸쪽지함"
-
-#: actions/outbox.php:53 actions/outbox.php:116
-msgid "This is your outbox, which lists private messages you have sent."
-msgstr "당신의 보낸 쪽지함입니다. 이곳엔 당신이 보냈던 비밀 쪽지가 있습니다."
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
-#, php-format
+#: actions/invite.php:136
 msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
-msgstr "이름, 장소, 흥미로 %%site.name%%에서 사람들을 찾아보세요."
+"These people are already users and you were automatically subscribed to them:"
+msgstr "자동 구독 신청이 된 사용자:"
 
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
-msgid "You can update your personal profile info here "
-msgstr "당신은 여기에 당신의 개인적인 프로필을 업데이트 할 수 있습니다."
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
+msgstr "다음 사람들에게 초대권을 보냈습니다:"
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
-msgid "User without matching profile"
-msgstr "프로필 매칭이 없는 사용자"
+#: actions/invite.php:150
+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:91 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
-msgstr "이 확인 코드는 너무 오래되었습니다."
+#: actions/invite.php:162
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
+msgstr "다음 양식을 이용해 친구와 동료를 이 서비스에 초대하십시오."
 
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
-msgstr "만약 당신이 잊어버리거나 잃어버린다면"
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "이메일 주소"
 
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a "
-msgstr "당신은 인증되었습니다. 입력하세요."
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr "초청할 친구들의 주소 (한 줄에 한 명씩)"
 
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-msgid "Your nickname on this server, "
-msgstr "이 서버에서 당신의 닉네임"
+#: actions/invite.php:192
+msgid "Personal message"
+msgstr "개인적인 메시지"
 
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-msgid "Instructions for recovering your password "
-msgstr "비빌번호 복구 방법 안내"
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
+msgstr "초대장에 메시지 첨부하기."
 
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
-msgid "New password successfully saved. "
-msgstr "새 비밀번호를 성공적으로 저장했습니다."
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
+msgstr "보내기"
 
-#: actions/register.php:95 actions/register.php:180
-msgid "Password must be 6 or more characters."
-msgstr "비밀번호는 6자리 이상이어야 합니다."
+#: actions/invite.php:226
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s님이 귀하를 %2$s에 초대하였습니다."
 
-#: actions/register.php:216
+#: actions/invite.php:228
 #, php-format
 msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
-msgstr "축하합니다 %s님!! %%%%site.name%%%%에 오신걸 환영합니다. 다음과 같은 일을 하실 수 있습니다..."
+"%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"
+"%1$s님이 말하기를:\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/register.php:227
-msgid "(You should receive a message by email momentarily, with "
-msgstr "(당신은 일시적으로 이메일로 메시지를 받아야 한다."
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
+msgstr "그룹가입을 위해서는 로그인이 필요합니다."
 
-#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
+#: actions/joingroup.php:90 lib/command.php:217
+msgid "You are already a member of that group"
+msgstr "당신은 이미 이 그룹의 멤버입니다."
+
+#: actions/joingroup.php:128 lib/command.php:234
 #, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr "구독하기 위해 당신은 로그인할 수 있습니다. (%%action,login%%),"
+msgid "Could not join user %s to group %s"
+msgstr "그룹 %s에 %s는 가입할 수 없습니다."
 
-#: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/joingroup.php:135 lib/command.php:239
 #, php-format
-msgid "Feed for favorites of %s"
-msgstr "%s의 좋아하는 게시글을 위한 피드"
+msgid "%s joined group %s"
+msgstr "%s 는 그룹 %s에 가입했습니다."
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-msgid "Could not retrieve favorite notices."
-msgstr "좋아하는 게시글을 복구할 수 없습니다."
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
+msgstr "그룹을 떠나기 위해서는 로그인해야 합니다."
 
-#: actions/showmessage.php:33 actions/showmessage.php:81
-msgid "No such message."
-msgstr "그러한 메시지가 없습니다."
+#: actions/leavegroup.php:90 lib/command.php:268
+msgid "You are not a member of that group."
+msgstr "당신은 해당 그룹의 멤버가 아닙니다."
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
-msgstr "오직 발송자가 수신자가 이 메시지를 읽는것이 좋습니다."
+#: actions/leavegroup.php:119 lib/command.php:278
+msgid "Could not find membership record."
+msgstr "멤버십 기록을 발견할 수 없습니다."
 
-#: actions/showmessage.php:61 actions/showmessage.php:108
+#: actions/leavegroup.php:127 lib/command.php:284
 #, php-format
-msgid "Message to %1$s on %2$s"
-msgstr "%2$s에서 %1$s까지 메시지"
+msgid "Could not remove user %s to group %s"
+msgstr "그룹 %s에서 %s 사용자를 제거할 수 없습니다."
 
-#: actions/showmessage.php:66 actions/showmessage.php:113
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
-msgid "Message from %1$s on %2$s"
-msgstr "%1$s에서 %2$s까지 메시지"
-
-#: actions/showstream.php:154
-msgid "Send a message"
-msgstr "메시지 전송하기"
+msgid "%s left group %s"
+msgstr "%s가 그룹%s를 떠났습니다."
 
-#: actions/smssettings.php:312 actions/smssettings.php:464
-#, php-format
-msgid "Mobile carrier for your phone. "
-msgstr "당신의 폰을 위한 모바일 전송"
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "이미 로그인 하셨습니다."
 
-#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
-#, php-format
-msgid "Direct messages to %s"
-msgstr "%s에게 직접 메시지"
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "옳지 않은 통지 내용"
 
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
-#, php-format
-msgid "All the direct messages sent to %s"
-msgstr "%s에게 모든 직접 메시지"
+#: actions/login.php:143
+msgid "Incorrect username or password."
+msgstr "틀린 계정 또는 비밀 번호"
 
-#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-msgid "Direct Messages You've Sent"
-msgstr "당신이 보낸 직접 메시지"
+#: actions/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
+msgstr "사용자 세팅 오류"
 
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
-#, php-format
-msgid "All the direct messages sent from %s"
-msgstr "%s에서 보낸 모든 직접 메시지"
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "로그인"
 
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-msgid "No message text!"
-msgstr "메시지 내용이 없습니다!"
+#: actions/login.php:243
+msgid "Login to site"
+msgstr "사이트에 로그인하세요."
 
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-msgid "Recipient user not found."
-msgstr "받는 사용자가 없습니다."
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "별명"
 
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr "당신의 친구가 아닌 사용자에게 직접 메시지를 보낼 수 없습니다."
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "비밀 번호"
 
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
-#, php-format
-msgid "%s / Favorites from %s"
-msgstr "%s / %s의 좋아하는 글들"
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "자동 로그인"
 
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
-#, php-format
-msgid "%s updates favorited by %s / %s."
-msgstr "%s 좋아하는 글이 업데이트 됐습니다. %S에 의해 / %s."
+#: actions/login.php:253 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
+msgstr "앞으로는 자동으로 로그인합니다. 공용 컴퓨터에서는 이용하지 마십시오!"
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
-#, php-format
-msgid "%s added your notice as a favorite"
-msgstr "%s님이 당신의 게시글을 좋아하는 글로 추가했습니다."
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "비밀 번호를 잊으셨나요?"
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
-#, php-format
+#: actions/login.php:282
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
 msgstr ""
-"%1$s 사용자가 %2$s의 귀하의 글을 좋아하는 글로 추가했습니다.\n"
-"\n"
+"보안을 위해 세팅을 저장하기 전에 계정과 비밀 번호를 다시 입력 해 주십시오."
 
-#: actions/twittersettings.php:27
+#: actions/login.php:286
+#, fuzzy, php-format
 msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
-msgstr "당신의 트위터 계정을 추가하세요. 자동적으로 당신의 메시지를 트위터에 전송합니다."
-
-#: actions/twittersettings.php:41 actions/twittersettings.php:60
-msgid "Twitter settings"
-msgstr "트위터 환경설정"
-
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-msgid "Twitter Account"
-msgstr "트위터 계정"
-
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-msgid "Current verified Twitter account."
-msgstr "현재 유효한 트위터 계정"
-
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr "트위터 사용자이름"
-
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-msgid "No spaces, please."
-msgstr "공백을 없애주세요."
-
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
-msgstr "트위터 비밀번호"
-
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-msgid "Automatically send my notices to Twitter."
-msgstr "자동으로 트위터에 게시글을 보냅니다."
-
-#: actions/twittersettings.php:75 actions/twittersettings.php:146
-msgid "Send local \"@\" replies to Twitter."
-msgstr "트위터에 로컬 \"@\"답장으로 보냅니다."
-
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-msgid "Subscribe to my Twitter friends here."
-msgstr "여기에서 내 트위터 친구들을 구독합니다."
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"귀하의 계정과 비밀 번호로 로그인 하세요. 계정이 아직 없으세요? [가입](%%"
+"action.register%%) 새 계정을 생성 또는 [OpenID](%%action.openidlogin%%)를 사"
+"용해 보세요."
 
-#: actions/twittersettings.php:122
-msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
-msgstr "사용자 이름은 단지 숫자이거나, 대소문자, 그리고 언더바(_)로 구성되어야 하고, 최대 15자 이내이어야 합니다."
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
 
-#: actions/twittersettings.php:128 actions/twittersettings.php:334
-msgid "Could not verify your Twitter credentials!"
-msgstr "트위터 자격을 증명할 수 없습니다."
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/makeadmin.php:132
 #, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr "트위터로부터 \"%s\"를 위한 계정정보를 불러올 수 없습니다."
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-msgid "Unable to save your Twitter settings!"
-msgstr "트위터 환경설정을 저장할 수 없습니다."
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
 
-#: actions/twittersettings.php:174 actions/twittersettings.php:376
-msgid "Twitter settings saved."
-msgstr "트위터 환결설정이 저장되었습니다."
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr "현재 상태가 없습니다."
 
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-msgid "That is not your Twitter account."
-msgstr "이것은 당신의 트위터 계정이 아닙니다."
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr "새로운 그룹"
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
-msgid "Couldn't remove Twitter user."
-msgstr "트위터 사용자를 제거할 수 없습니다."
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
+msgstr "새 그룹을 만들기 위해 이 양식을 사용하세요."
 
-#: actions/twittersettings.php:212 actions/twittersettings.php:407
-msgid "Twitter account removed."
-msgstr "트위터 계정이 제거되었습니다."
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr "새로운 메시지입니다."
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
-msgid "Couldn't save Twitter preferences."
-msgstr "트위터 환경설정을 저장할 수 없습니다."
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
+msgstr "당신은 이 사용자에게 메시지를 보낼 수 없습니다."
 
-#: actions/twittersettings.php:245 actions/twittersettings.php:461
-msgid "Twitter preferences saved."
-msgstr "트위터 환경설정이 저장되었습니다."
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+msgstr "내용이 없습니다!"
 
-#: actions/userauthorization.php:84 actions/userauthorization.php:86
-msgid "Please check these details to make sure "
-msgstr "이 상세설정들을 체크해주세요."
+#: actions/newmessage.php:158
+msgid "No recipient specified."
+msgstr "수신자를 지정하지 않았습니다."
 
-# FIXME: 잘못 추출된 문자열, 번역할 필요 없음.
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
-msgid "The subscription has been authorized, but no "
-msgstr "가입이 승인되었습니다."
+#: actions/newmessage.php:164 lib/command.php:370
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly instead."
+msgstr ""
+"자신에게 메시지를 보내지 마세요. 대신 조용하게 스스로에게 그것을 말하세요;;"
 
-# FIXME: 잘못 추출된 문자열, 번역할 필요 없음.
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-msgid "The subscription has been rejected, but no "
-msgstr "이 구독이 거절되었습니다."
+#: actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "메시지"
 
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-msgid "Command results"
-msgstr "실행결과"
+#: actions/newmessage.php:185 lib/command.php:375
+#, php-format
+msgid "Direct message to %s sent"
+msgstr "%s에게 보낸 직접 메시지"
 
-#: classes/Channel.php:148 classes/Channel.php:204
-msgid "Command complete"
-msgstr "실행 완료"
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
+msgstr "Ajax 에러입니다."
 
-#: classes/Channel.php:158 classes/Channel.php:215
-msgid "Command failed"
-msgstr "실행 실패"
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "새로운 통지"
 
-#: classes/Command.php:39 classes/Command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "죄송합니다. 이 명령은 아직 실행되지 않았습니다."
+#: actions/newnotice.php:199
+msgid "Notice posted"
+msgstr "게시글이 등록되었습니다."
 
-#: classes/Command.php:96 classes/Command.php:113
+#: actions/noticesearch.php:68
 #, php-format
-msgid "Subscriptions: %1$s\n"
-msgstr "구독: %1$s\n"
-
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
-msgid "User has no last notice"
-msgstr "이용자의 지속적인 게시글이 없습니다."
+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글자 이상 필요."
 
-#: classes/Command.php:146 classes/Command.php:166
-msgid "Notice marked as fave."
-msgstr "게시글이 좋아하는 글로 지정되었습니다."
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "문자 검색"
 
-#: classes/Command.php:166 classes/Command.php:189
-#, php-format
-msgid "%1$s (%2$s)"
-msgstr "%1$s (%2$s)"
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "스트림에서 \"%s\" 검색"
 
-#: classes/Command.php:169 classes/Command.php:192
+#: actions/noticesearch.php:121
 #, php-format
-msgid "Fullname: %s"
-msgstr "전체이름: %s"
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
 
-#: classes/Command.php:172 classes/Command.php:195
+#: actions/noticesearch.php:124
 #, php-format
-msgid "Location: %s"
-msgstr "위치: %s"
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
+msgstr ""
 
-#: classes/Command.php:175 classes/Command.php:198
-#, php-format
-msgid "Homepage: %s"
-msgstr "홈페이지: %s"
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "%2$s에 있는 %1$s의 업데이트!"
 
-#: classes/Command.php:178 classes/Command.php:201
-#, php-format
-msgid "About: %s"
-msgstr "자기소개: %s"
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "\"%s\" 에 일치하는 모든 업데이트"
 
-#: classes/Command.php:200 classes/Command.php:228
-#, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
-msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다."
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+"이 사용자는 nudge를 허용하지 않았고, 아직 그의 이메일을 인증하지 않았습니다."
 
-#: classes/Command.php:214 classes/Command.php:245
-#, php-format
-msgid "Direct message to %s sent"
-msgstr "%s에게 보낸 직접 메시지"
+#: actions/nudge.php:94
+msgid "Nudge sent"
+msgstr "찔러 보기를 보냈습니다."
 
-#: classes/Command.php:216 classes/Command.php:247
-msgid "Error sending direct message."
-msgstr "직접 메시지 보내기 오류."
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr "찔러 보기를 보냈습니다!"
 
-#: classes/Command.php:263 classes/Command.php:300
-msgid "Specify the name of the user to subscribe to"
-msgstr "구독하려는 사용자의 이름을 지정하십시오."
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+msgstr "통지에 프로필이 없습니다."
 
-#: classes/Command.php:270 classes/Command.php:307
+#: actions/oembed.php:86 actions/shownotice.php:180
 #, php-format
-msgid "Subscribed to %s"
-msgstr "%s에게 구독되었습니다."
+msgid "%1$s's status on %2$s"
+msgstr "%1$s의 상태 (%2$s에서)"
 
-#: classes/Command.php:288 classes/Command.php:328
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "구독을 해제하려는 사용자의 이름을 지정하십시오."
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "연결"
 
-#: classes/Command.php:295 classes/Command.php:335
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "%s에서 구독을 해제했습니다."
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
-msgid "Command not yet implemented."
-msgstr "명령이 아직 실행되지 않았습니다."
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
+msgstr "지원하는 형식의 데이터가 아닙니다."
 
-#: classes/Command.php:313 classes/Command.php:356
-msgid "Notification off."
-msgstr "알림끄기."
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "사람 찾기"
 
-#: classes/Command.php:315 classes/Command.php:358
-msgid "Can't turn off notification."
-msgstr "알림을 끌 수 없습니다."
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "통지 검색"
 
-#: classes/Command.php:333 classes/Command.php:379
-msgid "Notification on."
-msgstr "알림이 켜졌습니다."
+#: actions/othersettings.php:60
+msgid "Other Settings"
+msgstr "기타 설정"
 
-#: classes/Command.php:335 classes/Command.php:381
-msgid "Can't turn on notification."
-msgstr "알림을 켤 수 없습니다."
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr "다양한 다른 옵션관리"
 
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
-msgstr "명령: \n"
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
 
-#: classes/Message.php:53 classes/Message.php:56
-msgid "Could not insert message."
-msgstr "메시지를 삽입할 수 없습니다."
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
+msgstr ""
 
-#: classes/Message.php:63 classes/Message.php:66
-msgid "Could not update message with new URI."
-msgstr "새 URI와 함께 메시지를 업데이트할 수 없습니다."
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
+msgstr "사용할 URL 자동 줄이기 서비스"
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
-msgstr "시스템에 프로필 매칭이 없는 사용자"
+#: actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "프로필 세팅"
 
-#: lib/mail.php:147 lib/mail.php:289
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
 msgstr ""
-"당신은 %1$s에 새 포스팅 주소를 가진다. \n"
-"\n"
 
-#: lib/mail.php:249 lib/mail.php:508
-#, php-format
-msgid "New private message from %s"
-msgstr "%s로부터 새로운 비밀 메시지가 도착하였습니다."
+#: actions/othersettings.php:153
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "URL 줄이기 서비스 너무 깁니다. (최대 50글자)"
 
-#: lib/mail.php:253 lib/mail.php:512
+#: actions/outbox.php:58
 #, 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 lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "오직 해당 사용자만 자신의 메일박스를 열람할 수 있습니다."
+msgid "Outbox for %s - page %d"
+msgstr "%s의 보낸쪽지함 - page %d"
 
-#: lib/openid.php:195 lib/openid.php:203
-msgid "This form should automatically submit itself. "
-msgstr "이 양식은 자동적으로 스스로 제출됩니다."
+#: actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
+msgstr "%s의 보낸쪽지함"
 
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-msgid "Favorites"
-msgstr "좋아하는 글들"
+#: actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr "당신의 보낸 쪽지함입니다. 이곳엔 당신이 보냈던 비밀 쪽지가 있습니다."
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-#, php-format
-msgid "%s's favorite notices"
-msgstr "%s 님의 좋아하는 글들"
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "비밀번호 바꾸기"
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-msgid "User"
-msgstr "이용자"
+#: actions/passwordsettings.php:69
+msgid "Change your password."
+msgstr "비밀번호를 변경하세요."
 
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-msgid "Inbox"
-msgstr "받은 쪽지함"
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+msgid "Password change"
+msgstr "비밀번호 변경"
 
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-msgid "Your incoming messages"
-msgstr "당신의 받은 메시지들"
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "기존 비밀 번호"
 
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-msgid "Outbox"
-msgstr "보낸 쪽지함"
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "새로운 비밀 번호"
 
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-msgid "Your sent messages"
-msgstr "당신의 보낸 메시지들"
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6글자 이상"
 
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-msgid "Twitter"
-msgstr "트위터"
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "인증"
 
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
-msgstr "트위터 통합옵션"
+#: actions/passwordsettings.php:113
+msgid "same as password above"
+msgstr "위 비밀번호와 동일하게"
 
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-msgid "To"
-msgstr "에게"
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "변환"
 
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-msgid "Could not parse message."
-msgstr "메시지를 분리할 수 없습니다."
+#: actions/passwordsettings.php:154 actions/register.php:230
+msgid "Password must be 6 or more characters."
+msgstr "비밀번호는 6자리 이상이어야 합니다."
 
-#: actions/all.php:63 actions/facebookhome.php:162
-#, php-format
-msgid "%s and friends, page %d"
-msgstr "%s 와 친구들, %d 페이지"
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "비밀 번호가 일치하지 않습니다."
 
-#: actions/avatarsettings.php:76
-msgid "You can upload your personal avatar."
-msgstr "당신의 개인적인 아바타를 업로드할 수 있습니다."
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "기존 비밀 번호가 틀렸습니다"
 
-#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
-msgid "Avatar settings"
-msgstr "아바타 설정"
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "사용자 저장 오류; 무효한 사용자"
 
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-msgid "Original"
-msgstr "원래 설정"
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "새 비밀번호를 저장 할 수 없습니다."
 
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-msgid "Preview"
-msgstr "미리보기"
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "비밀 번호 저장"
 
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
-msgid "Crop"
-msgstr "자르기"
+#: actions/peoplesearch.php:52
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"%%site.name%% 의 사람을 이름, 장소, 흥미로 검색. 검색어는 스페이스 구분한다; "
+"적어도 3글자 이상 필요."
 
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-msgid "There was a problem with your session token. "
-msgstr "당신의 세션토큰에 문제가 있습니다."
-
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-msgid "Pick a square area of the image to be your avatar"
-msgstr "당신의 아바타가 될 이미지영역을 지정하세요."
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "사람 찾기"
 
-#: actions/avatarsettings.php:327 actions/grouplogo.php:384
-msgid "Lost our file data."
-msgstr "파일 데이터를 잃어버렸습니다."
+#: actions/peopletag.php:70
+#, php-format
+msgid "Not a valid people tag: %s"
+msgstr "유효한 태그가 아닙니다: %s"
 
-#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
-msgid "Lost our file."
-msgstr "파일을 잃어버렸습니다."
+#: actions/peopletag.php:144
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr "이용자 셀프 테크 %s - %d 페이지"
 
-#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
-#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
-msgid "Unknown file type"
-msgstr "알 수 없는 종류의 파일입니다"
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "옳지 않은 통지 내용"
 
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "프로필을 지정하지 않았습니다."
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
 
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "해당 ID의 프로필이 없습니다."
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "프로필 세팅"
 
-#: actions/block.php:111
-msgid "Block user"
-msgstr "사용자를 차단합니다."
+#: actions/profilesettings.php:71
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+"사람들이 당신에 대해 좀 더 잘 알 수 있도록 여기 당신의 개인 프로필을 업데이"
+"트 할 수 있습니다. "
 
-#: actions/block.php:129
-msgid "Are you sure you want to block this user? "
-msgstr "이 사용자를 차단하고 싶은 게 맞습니까?"
+#: actions/profilesettings.php:99
+msgid "Profile information"
+msgstr "프로필 정보"
 
-#: actions/block.php:162
-msgid "You have already blocked this user."
-msgstr "당신은 이미 이 사용자를 차단하고 있습니다."
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다."
 
-#: actions/block.php:167
-msgid "Failed to save block information."
-msgstr "정보차단을 저장하는데 실패했습니다."
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full name"
+msgstr "실명"
 
-# FIXME: 잘못 추출된 문자열, 번역할 필요 없음.
-#: actions/confirmaddress.php:159
-#, php-format
-msgid "The address \"%s\" has been "
-msgstr "\\\"%s\\\" 는 귀하의 계정으로 승인되었습니다."
+#: actions/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "홈페이지"
 
-#: actions/deletenotice.php:73
-msgid "You are about to permanently delete a notice. "
-msgstr "당신은 영구적으로 이 게시글을 삭제하려고 합니다."
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "귀하의 홈페이지, 블로그 혹은 다른 사이트의 프로필 페이지 URL"
 
-#: actions/disfavor.php:94
-msgid "Add to favorites"
-msgstr "좋아하는 게시글로 추가하기"
+#: actions/profilesettings.php:122 actions/register.php:460
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "140자 이내에서 자기 소개"
 
-#: actions/editgroup.php:54
-#, php-format
-msgid "Edit %s group"
-msgstr "%s 그룹 편집"
+#: actions/profilesettings.php:125 actions/register.php:463
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "당신에 대해 소개해주세요."
 
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-msgid "Inboxes must be enabled for groups to work"
-msgstr "받은쪽지함은 그룹이 일할 수 있도록 활성화되어야 한다."
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "자기소개"
 
-#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-msgid "You must be logged in to create a group."
-msgstr "그룹을 만들기 위해서는 로그인해야 합니다."
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "위치"
 
-#: actions/editgroup.php:87 actions/grouplogo.php:87
-#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
-msgid "No nickname"
-msgstr "닉네임이 없습니다"
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "당신은 어디에 삽니까? \"시, 도 (or 군,구), 나라"
 
-#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
-#: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
-msgid "No such group"
-msgstr "그러한 그룹이 없습니다."
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
+msgstr "태그"
 
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
-msgid "You must be an admin to edit the group"
-msgstr "관리자만 그룹을 편집할 수 있습니다."
+#: actions/profilesettings.php:140
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr "당신을 위한 태그, (문자,숫자,-, ., _로 구성) 콤마 혹은 공백으로 구분."
 
-#: actions/editgroup.php:157
-msgid "Use this form to edit the group."
-msgstr "다음 양식을 이용해 그룹을 편집하십시오."
+#: actions/profilesettings.php:144
+msgid "Language"
+msgstr "언어"
 
-#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
-msgid "Nickname must have only lowercase letters "
-msgstr "닉네임은 오직 영문소문자이어야 합니다."
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr "언어 설정"
 
-#: actions/editgroup.php:198 actions/newgroup.php:149
-msgid "description is too long (max 140 chars)."
-msgstr "설명이 너무 길어요. (최대 140글자)"
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr "타임존"
 
-#: actions/editgroup.php:218
-msgid "Could not update group."
-msgstr "그룹을 업데이트 할 수 없습니다."
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
+msgstr "당신이 주로 생활하는 곳이 어떤 타임존입니까?"
 
-#: actions/editgroup.php:226
-msgid "Options saved."
-msgstr "옵션들이 저장되었습니다."
+#: actions/profilesettings.php:160
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr "나에게 구독하는 사람에게 자동 구독 신청"
 
-#: actions/emailsettings.php:107 actions/imsettings.php:108
-#, php-format
-msgid "Awaiting confirmation on this address. "
-msgstr "이 주소의 확인을 기다리고 있습니다."
+#: actions/profilesettings.php:221 actions/register.php:223
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "자기소개가 너무 깁니다. (최대 140글자)"
 
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-msgid "Make a new email address for posting to; "
-msgstr "포스팅을 위해 새 이메일 주소를 만드세요."
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr "타임존이 설정 되지 않았습니다."
 
-#: actions/emailsettings.php:157
-msgid "Send me email when someone "
-msgstr "내게 이메일을 보내세요."
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr "언어가 너무 깁니다. (최대 50글자)"
 
-#: actions/emailsettings.php:168
-msgid "Allow friends to nudge me and send me an email."
-msgstr "친구들이 내게 이메일이나 쪽지를 보낼 수 있도록 허용합니다."
+#: actions/profilesettings.php:246 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "유효하지 않은태그: \"%s\""
 
-#: actions/emailsettings.php:321
-msgid "That email address already belongs "
-msgstr "해당 이메일 주소는 이미 등록되어있습니다."
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
+msgstr "자동구독에 사용자를 업데이트 할 수 없습니다."
 
-#: actions/emailsettings.php:343
-msgid "A confirmation code was sent to the email address you added. "
-msgstr "인증코드가 당신이 추가한 이메일주소로 발송되었습니다"
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+msgstr "프로필을 저장 할 수 없습니다."
 
-#: actions/facebookhome.php:110
-msgid "Server error - couldn't get user!"
-msgstr "서버에러입니다. - 사용자 정보를 불러올 수 없습니다."
+#: actions/profilesettings.php:336
+msgid "Couldn't save tags."
+msgstr "태그를 저장할 수 없습니다."
 
-#: actions/facebookhome.php:196
-#, php-format
-msgid "If you would like the %s app to automatically update "
-msgstr "만약 당신이 자동 업데이트를 위해 %s 애플리케이션을 좋아한다면"
+#: actions/profilesettings.php:344
+msgid "Settings saved."
+msgstr "설정 저장"
 
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#: actions/public.php:83
 #, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "내 페이스북 상태에 업데이트를 위해 %s를 허용합니다."
-
-#: actions/facebookhome.php:218
-msgid "Skip"
-msgstr "통과! (넘어갑니다)"
+msgid "Beyond the page limit (%s)"
+msgstr ""
 
-#: actions/facebookhome.php:235
-msgid "No notice content!"
-msgstr "게시글이 없습니다."
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
+msgstr "공개 stream을 불러올 수 없습니다."
 
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-msgid "Pagination"
-msgstr "페이지수"
+#: actions/public.php:129
+#, php-format
+msgid "Public timeline, page %d"
+msgstr "공개 타임라인, %d 페이지"
 
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-msgid "After"
-msgstr "뒷 페이지"
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr "퍼블릭 타임라인"
 
-#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
-msgid "Before"
-msgstr "앞 페이지"
+#: actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "퍼블릭 스트림 피드"
 
-#: actions/facebookinvite.php:70
-#, php-format
-msgid "Thanks for inviting your friends to use %s"
-msgstr "%s 사용을 위해 친구초대를 해주셔서 대단히 감사합니다."
+#: actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "퍼블릭 스트림 피드"
 
-#: actions/facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "초대장이 무사히 발송되었습니다."
+#: actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "퍼블릭 스트림 피드"
 
-#: actions/facebookinvite.php:96
+#: actions/public.php:179
 #, php-format
-msgid "You have been invited to %s"
-msgstr "당신은 %s에 초대되었습니다."
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
 
-#: actions/facebookinvite.php:105
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "%s 이용을 위해 당신이 친구를 초대하세요."
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
 
-#: actions/facebookinvite.php:113
+#: actions/public.php:186
 #, php-format
-msgid "Friends already using %s:"
-msgstr "친구들은 이미 %s를 사용중입니다."
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
 
-#: actions/facebookinvite.php:130
+#: actions/public.php:233
 #, php-format
-msgid "Send invitations"
-msgstr "초대장을 발송합니다."
-
-#: actions/facebookremove.php:56
-msgid "Couldn't remove Facebook user."
-msgstr "페이스북 사용자를 제거할 수 없습니다."
-
-#: actions/facebooksettings.php:65
-msgid "There was a problem saving your sync preferences!"
-msgstr "당신의 싱크 설정을 저장하는데 문제가 있습니다."
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
+msgstr ""
 
-#: actions/facebooksettings.php:67
-msgid "Sync preferences saved."
-msgstr "싱크설정이 저장되었습니다."
+#: actions/public.php:238
+#, fuzzy, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
+msgstr ""
+"%%site.name%% 는 마이크로블로깅(http://en.wikipedia.org/wiki/Micro-blogging) "
+"서비스 입니다."
 
-#: actions/facebooksettings.php:90
-msgid "Automatically update my Facebook status with my notices."
-msgstr "내 게시글과 함께 나의 페이스북 상태를 자동으로 업데이트합니다."
+#: actions/publictagcloud.php:57
+msgid "Public tag cloud"
+msgstr "공개 태그 클라우드"
 
-#: actions/facebooksettings.php:97
-msgid "Send \"@\" replies to Facebook."
-msgstr "페이스북에 \"@\"답장을 보냅니다."
+#: actions/publictagcloud.php:63
+#, php-format
+msgid "These are most popular recent tags on %s "
+msgstr "다음은 %에서 가장 인기 있는 최근 태그입니다."
 
-#: actions/facebooksettings.php:106
-msgid "Prefix"
-msgstr "미리 고치기"
+#: actions/publictagcloud.php:69
+#, php-format
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
+msgstr ""
 
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
-msgstr "공지 사항 앞에 붙일 문자열."
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
+msgstr ""
 
-#: actions/facebooksettings.php:124
+#: actions/publictagcloud.php:75
 #, php-format
-msgid "If you would like %s to automatically update "
-msgstr "만약 당신이 자동업데이트를 위해  %s를 좋아한다면"
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
 
-#: actions/facebooksettings.php:147
-msgid "Sync preferences"
-msgstr "싱크 설정"
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
+msgstr "태그 클라우드"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "좋아하는글 취소"
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "당신은 이미 로그인되어 있습니다."
 
-#: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
-msgid "Popular notices"
-msgstr "인기있는 게시글"
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "그러한 복구 코드는 없습니다."
 
-#: actions/favorited.php:67
-#, php-format
-msgid "Popular notices, page %d"
-msgstr "인기있는 게시글, %d 페이지"
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "복구 코드가 아닙니다."
 
-#: actions/favorited.php:79
-msgid "The most popular notices on the site right now."
-msgstr "사이트에서 지금 가장 인기있는 게시글"
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr "알 수 없는 취소를 위한 리커버리 코드"
 
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
-msgid "Featured users"
-msgstr "인기있는 회원"
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "확인 코드 오류"
 
-#: actions/featured.php:71
-#, php-format
-msgid "Featured users, page %d"
-msgstr "인기있는 회원, %d페이지"
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
+msgstr "이 인증 코드는 오래됐습니다. 다시 발급 받아 주십시오."
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some of the great users on %s"
-msgstr "%s의 훌륭한 회원의 일부 선택"
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
+msgstr "이 이메일 주소로 사용자를 업데이트 할 수 없습니다."
 
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
-msgstr "이 회원은 구독으로부터 당신을 차단해왔다."
+#: actions/recoverpassword.php:152
+msgid ""
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
+msgstr ""
 
-#: actions/groupbyid.php:79
-msgid "No ID"
-msgstr "ID가 없습니다."
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
+msgstr ""
 
-#: actions/grouplogo.php:138 actions/grouplogo.php:191
-msgid "Group logo"
-msgstr "그룹 로고"
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
+msgstr ""
 
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
-msgstr "당신그룹의 로고 이미지를 업로드할 수 있습니다."
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
+msgstr ""
 
-#: actions/grouplogo.php:448
-msgid "Logo updated."
-msgstr "로고를 업데이트했습니다."
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
+msgstr "이 서버에서 당신의 닉네임 혹은 당신의 등록된 이메일주소"
 
-#: actions/grouplogo.php:450
-msgid "Failed updating logo."
-msgstr "로고 업데이트에 실패했습니다."
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
+msgstr "복구"
 
-#: actions/groupmembers.php:93 lib/groupnav.php:91
-#, php-format
-msgid "%s group members"
-msgstr "%s 그룹 회원"
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "비밀 번호 초기화"
 
-#: actions/groupmembers.php:96
-#, php-format
-msgid "%s group members, page %d"
-msgstr "%s 그룹 회원, %d페이지"
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr "비밀 번호 복구"
 
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
-msgstr "이 그룹의 회원리스트"
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
+msgstr "비밀 번호 복구가 요청되었습니다."
 
-#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
-msgid "Groups"
-msgstr "그룹"
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
+msgstr "알려지지 않은 행동"
 
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "그룹, %d 페이지"
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "6글자 이상, 잊어 버리지 마십시오!"
 
-#: actions/groups.php:90
-#, php-format
-msgid "%%%%site.name%%%% groups let you find and talk with "
-msgstr "%%%%site.name%%%% 그룹은 당신에게 얘기할 사람을 찾게해줍니다."
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "위와 같은 비밀 번호"
 
-#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-msgid "Create a new group"
-msgstr "새 그룹을 만듭니다."
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "초기화"
 
-#: actions/groupsearch.php:57
-#, php-format
-msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-msgstr "이름과 위치, 상세설명으로 %%site.name%% 에서 그룹을 찾습니다."
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "별명이나 이메일 계정을 입력하십시오."
 
-#: actions/groupsearch.php:63
-msgid "Group search"
-msgstr "그룹 찾기"
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
+msgstr "그러한 이메일 주소나 계정을 가진 사용자는 없습니다."
 
-#: actions/imsettings.php:70
-msgid "You can send and receive notices through "
-msgstr "당신은 메시지를 주고 받을 수 있습니다."
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr "그 사용자는 등록된 메일주소가 없습니다."
 
-#: actions/imsettings.php:120
-#, php-format
-msgid "Jabber or GTalk address, "
-msgstr "Jabber 혹은 GTalk(구글토크) 주소"
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "주소 확인 저장 에러"
 
-#: actions/imsettings.php:147
-msgid "Send me replies through Jabber/GTalk "
-msgstr "Jabber/GTalk(구글토크)를 통해 내게 답장을 보냅니다."
+#: actions/recoverpassword.php:325
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr "가입하신 이메일로 비밀 번호 재발급에 관한 안내를 보냈습니다."
 
-#: actions/imsettings.php:321
-#, php-format
-msgid "A confirmation code was sent "
-msgstr "인증코드가 보내졌습니다."
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
+msgstr "잘못된 비밀 번호 지정"
 
-#: actions/joingroup.php:65
-msgid "You must be logged in to join a group."
-msgstr "그룹가입을 위해서는 로그인이 필요합니다."
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "비밀 번호는 6자 이상이어야 합니다."
 
-#: actions/joingroup.php:95
-msgid "You are already a member of that group"
-msgstr "당신은 이미 이 그룹의 멤버입니다."
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
+msgstr "비밀 번호가 일치하지 않습니다."
 
-#: actions/joingroup.php:128
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "그룹 %s에 %s는 가입할 수 없습니다."
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
+msgstr ""
+"새로운 비밀 번호를 성공적으로 저장했습니다. 귀하는 이제 로그인 되었습니다."
 
-#: actions/joingroup.php:135
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s 는 그룹 %s에 가입했습니다."
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
+msgstr "죄송합니다. 단지 초대된 사람들만 등록할 수 있습니다."
 
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
-msgstr "받은쪽지함은 그룹이 일하기 위해 수신가능해야 합니다."
+#: actions/register.php:92
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "확인 코드 오류"
 
-#: actions/leavegroup.php:65
-msgid "You must be logged in to leave a group."
-msgstr "그룹을 떠나기 위해서는 로그인해야 합니다."
+#: actions/register.php:112
+msgid "Registration successful"
+msgstr "회원 가입이 성공적입니다."
 
-#: actions/leavegroup.php:88
-msgid "No such group."
-msgstr "그러한 그룹이 없습니다."
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "회원가입"
 
-#: actions/leavegroup.php:95
-msgid "You are not a member of that group."
-msgstr "당신은 해당 그룹의 멤버가 아닙니다."
+#: actions/register.php:135
+msgid "Registration not allowed."
+msgstr "가입이 허용되지 않습니다."
 
-#: actions/leavegroup.php:100
-msgid "You may not leave a group while you are its administrator."
-msgstr "당신은 관리자일동안 해당 그룹을 떠나지 않는것이 좋습니다."
+#: actions/register.php:198
+msgid "You can't register if you don't agree to the license."
+msgstr "라이선스에 동의하지 않는다면 등록할 수 없습니다."
 
-#: actions/leavegroup.php:130
-msgid "Could not find membership record."
-msgstr "멤버십 기록을 발견할 수 없습니다."
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "유효한 이메일 주소가 아닙니다."
 
-#: actions/leavegroup.php:138
-#, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "그룹 %s에서 %s 사용자를 제거할 수 없습니다."
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "이메일 주소가 이미 존재 합니다."
 
-#: actions/leavegroup.php:145
-#, php-format
-msgid "%s left group %s"
-msgstr "%s가 그룹%s를 떠났습니다."
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "사용자 이름이나 비밀 번호가 틀렸습니다."
 
-#: actions/login.php:225 lib/facebookaction.php:304
-msgid "Login to site"
-msgstr "사이트에 로그인하세요."
+#: actions/register.php:342
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
 
-#: actions/microsummary.php:69
-msgid "No current status"
-msgstr "현재 상태가 없습니다."
+#: actions/register.php:424
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+"1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다. 필수 "
+"입력."
 
-#: actions/newgroup.php:53
-msgid "New group"
-msgstr "새로운 그룹"
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr "6글자 이상이 필요합니다."
 
-#: actions/newgroup.php:115
-msgid "Use this form to create a new group."
-msgstr "새 그룹을 만들기 위해 이 양식을 사용하세요."
+#: actions/register.php:433
+msgid "Same as password above. Required."
+msgstr "위와 같은 비밀 번호. 필수 사항."
 
-#: actions/newgroup.php:177
-msgid "Could not create group."
-msgstr "새 그룹을 만들 수 없습니다."
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "이메일"
 
-#: actions/newgroup.php:191
-msgid "Could not set group membership."
-msgstr "그룹 맴버십을 세팅할 수 없습니다."
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
+msgstr "업데이트나 공지, 비밀번호 찾기에 사용하세요."
 
-#: actions/newmessage.php:119 actions/newnotice.php:132
-msgid "That's too long. "
-msgstr "너무 길어요."
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
+msgstr "더욱 긴 이름을 요구합니다."
 
-#: actions/newmessage.php:134
-msgid "Don't send a message to yourself; "
-msgstr "자신에게 메시지를 전송하지 말아주세요."
+#: actions/register.php:493
+msgid "My text and files are available under "
+msgstr "나의 글과 파일의 라이선스는 다음과 같습니다 "
 
-#: actions/newnotice.php:166
-msgid "Notice posted"
-msgstr "게시글이 등록되었습니다."
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
 
-#: actions/newnotice.php:200 classes/Channel.php:163
-msgid "Ajax Error"
-msgstr "Ajax 에러입니다."
+#: actions/register.php:496
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr "다음 개인정보 제외: 비밀 번호, 메일 주소, 메신저 주소, 전화 번호"
 
-#: actions/nudge.php:85
+#: actions/register.php:537
+#, php-format
 msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
-msgstr "이 사용자는 nudge를 허용하지 않았고, 아직 그의 이메일을 인증하지 않았습니다."
+"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/nudge.php:94
-msgid "Nudge sent"
-msgstr "찔러 보기를 보냈습니다."
+#: actions/register.php:561
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+"(지금 귀하는 귀하의 이메일 주소를 확인하는 방법에 대한 지침을 메일로 받으셨습"
+"니다.)"
 
-#: actions/nudge.php:97
-msgid "Nudge sent!"
-msgstr "찔러 보기를 보냈습니다!"
+#: actions/remotesubscribe.php:98
+#, php-format
+msgid ""
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
+msgstr ""
+"구독하려면, [로그인](%%action.login%%)하거나, 새 계정을 [등록](%%action."
+"register%%)하십시오. 이미 계정이 [호환되는 마이크로블로깅 사이트]((%%doc."
+"openmublog%%)에 계정이 있으면, 아래에 프로파일 URL을 입력하십시오."
 
-#: actions/openidlogin.php:97
-msgid "OpenID login"
-msgstr "OpenID 로그인"
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr "리모트 구독 예약"
 
-#: actions/openidsettings.php:128
-msgid "Removing your only OpenID "
-msgstr "유일한 OpenID를 삭제합니다 "
+#: actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "이 회원을 구독합니다."
 
-#: actions/othersettings.php:60
-msgid "Other Settings"
-msgstr "기타 설정"
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "이용자 닉네임"
 
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "다양한 다른 옵션관리"
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr "따라가고 싶은 사용자의 별명"
 
-#: actions/othersettings.php:93
-msgid "URL Auto-shortening"
-msgstr "URL 자동 줄이기"
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "프로필 URL"
 
-#: actions/othersettings.php:112
-msgid "Service"
-msgstr "서비스"
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "다른 마이크로블로깅 서비스의 귀하의 프로필 URL"
 
-#: actions/othersettings.php:113
-msgid "Automatic shortening service to use."
-msgstr "사용할 URL 자동 줄이기 서비스"
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
+msgstr "구독"
 
-#: actions/othersettings.php:144
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "URL 줄이기 서비스 너무 깁니다. (최대 50글자)"
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr "옳지 않은 프로필 URL (나쁜 포멧)"
 
-#: actions/passwordsettings.php:69
-msgid "Change your password."
-msgstr "비밀번호를 변경하세요."
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "유효한 프로필 URL이 아닙니다. (YADIS 문서가 없습니다)"
 
-#: actions/passwordsettings.php:89
-msgid "Password change"
-msgstr "비밀번호 변경"
+#: actions/remotesubscribe.php:176
+#, fuzzy
+msgid "That’s a local profile! Login to subscribe."
+msgstr "그것은 로컬프로필입니다. 구독을 위해서는 로그인하십시오."
 
-#: actions/peopletag.php:35
-#, php-format
-msgid "Not a valid people tag: %s"
-msgstr "유효한 태그가 아닙니다: %s"
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "리퀘스트 토큰을 취득 할 수 없습니다."
 
-#: actions/peopletag.php:47
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
 #, php-format
-msgid "Users self-tagged with %s - page %d"
-msgstr "이용자 셀프 테크 %s - %d 페이지"
+msgid "Replies to %s"
+msgstr "%s에 답신"
 
-#: actions/peopletag.php:91
+#: actions/replies.php:127
 #, php-format
-msgid "These are users who have tagged themselves \"%s\" "
-msgstr "이 사람들은 그들 스스로가 \"%s\" 태그를 추가했습니다."
-
-#: actions/profilesettings.php:91
-msgid "Profile information"
-msgstr "프로필 정보"
+msgid "Replies to %s, page %d"
+msgstr "%s에 답장, %d 페이지"
 
-#: actions/profilesettings.php:124
-msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
-msgstr "당신을 위한 태그, (문자,숫자,-, ., _로 구성) 콤마 혹은 공백으로 구분."
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "%s의 통지 피드"
 
-#: actions/profilesettings.php:144
-msgid "Automatically subscribe to whoever "
-msgstr "누구에게나 자동구독"
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "%s의 통지 피드"
 
-#: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/replies.php:158
 #, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "유효하지 않은태그: \"%s\""
-
-#: actions/profilesettings.php:311
-msgid "Couldn't save tags."
-msgstr "태그를 저장할 수 없습니다."
+msgid "Replies feed for %s (Atom)"
+msgstr "%s의 통지 피드"
 
-#: actions/public.php:107
+#: actions/replies.php:198
 #, php-format
-msgid "Public timeline, page %d"
-msgstr "공개 타임라인, %d 페이지"
-
-#: actions/public.php:173
-msgid "Could not retrieve public stream."
-msgstr "공개 stream을 불러올 수 없습니다."
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
 
-#: actions/public.php:220
+#: actions/replies.php:203
 #, php-format
 msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
 msgstr ""
-"%%site.name%% 는 마이크로블로깅(http://en.wikipedia.org/wiki/Micro-blogging) 서비스 "
-"입니다."
 
-#: actions/publictagcloud.php:57
-msgid "Public tag cloud"
-msgstr "공개 태그 클라우드"
-
-#: actions/publictagcloud.php:63
+#: actions/replies.php:205
 #, php-format
-msgid "These are most popular recent tags on %s "
-msgstr "다음은 %에서 가장 인기 있는 최근 태그입니다."
-
-#: actions/publictagcloud.php:119
-msgid "Tag cloud"
-msgstr "태그 클라우드"
-
-#: actions/register.php:139 actions/register.php:349
-msgid "Sorry, only invited people can register."
-msgstr "죄송합니다. 단지 초대된 사람들만 등록할 수 있습니다."
-
-#: actions/register.php:149
-msgid "You can't register if you don't "
-msgstr "만약 당신이 아니라면, 당신은 등록할 수 없습니다."
-
-#: actions/register.php:286
-msgid "With this form you can create "
-msgstr "당신은 이 양식으로 만들 수 있습니다."
-
-#: actions/register.php:368
-msgid "1-64 lowercase letters or numbers, "
-msgstr "1-64 소문자 혹은 숫자,"
-
-#: actions/register.php:382 actions/register.php:386
-msgid "Used only for updates, announcements, "
-msgstr "업데이트, 공지를 위해 오직 사용됩니다."
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
 
-#: actions/register.php:398
-msgid "URL of your homepage, blog, "
-msgstr "당신의 홈페이지, 블로그의 URL"
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "%2$s에서 %1$s까지 메시지"
 
-#: actions/register.php:404
-msgid "Describe yourself and your "
-msgstr "당신에 대해 소개해주세요."
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "%s 좋아하는 게시글, %d 페이지"
 
-#: actions/register.php:410
-msgid "Where you are, like \"City, "
-msgstr "당신이 사는곳, \"도,시,군,구,\","
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
+msgstr "좋아하는 게시글을 복구할 수 없습니다."
 
-#: actions/register.php:432
-msgid " except this private data: password, "
-msgstr "이 비밀 데이터를 제외하세요: 비밀번호,"
+#: actions/showfavorites.php:170
+#, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "%s의 친구들을 위한 피드"
 
-#: actions/register.php:471
+#: actions/showfavorites.php:177
 #, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
-msgstr "축하합니다, %s! 그리고 %%%site.name%%%%에 오신걸 환영합니다."
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "%s의 친구들을 위한 피드"
 
-#: actions/register.php:495
-msgid "(You should receive a message by email "
-msgstr "(당신은 이메일로 메시지를 받아야 합니다."
+#: actions/showfavorites.php:184
+#, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "%s의 친구들을 위한 피드"
 
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
-msgstr "그것은 로컬프로필입니다. 구독을 위해서는 로그인하십시오."
+#: actions/showfavorites.php:205
+msgid ""
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
+msgstr ""
 
-#: actions/replies.php:118
+#: actions/showfavorites.php:207
 #, php-format
-msgid "Replies to %s, page %d"
-msgstr "%s에 답장, %d 페이지"
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
 
-#: actions/showfavorites.php:79
+#: actions/showfavorites.php:211
 #, php-format
-msgid "%s favorite notices, page %d"
-msgstr "%s 좋아하는 게시글, %d 페이지"
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:82 lib/groupnav.php:86
 #, php-format
 msgid "%s group"
 msgstr "%s 그룹"
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr "%s 그룹, %d 페이지"
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:218
 msgid "Group profile"
 msgstr "그룹 프로필"
 
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
 msgid "URL"
 msgstr "URL"
 
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
 msgid "Note"
 msgstr "설명"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:293
 msgid "Group actions"
 msgstr "그룹 행동"
 
-#: actions/showgroup.php:323
-#, php-format
-msgid "Notice feed for %s group"
+#: actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "%s 그룹을 위한 공지피드"
+
+#: actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "%s 그룹을 위한 공지피드"
+
+#: actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
 msgstr "%s 그룹을 위한 공지피드"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:345
+#, php-format
+msgid "FOAF for %s group"
+msgstr "%s의 보낸쪽지함"
+
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
 msgid "Members"
 msgstr "회원"
 
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
 #: lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(없습니다.)"
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:392
 msgid "All members"
 msgstr "모든 회원"
 
-#: actions/showgroup.php:378
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "통계"
+
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "생성"
+
+#: actions/showgroup.php:448
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
-"**%s** 는 %%%%site.name%%%% [마이크로블로깅)(http://en.wikipedia.org/wiki/Micro-"
-"blogging)의 사용자 그룹입니다. "
+
+#: actions/showgroup.php:454
+#, fuzzy, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
+msgstr ""
+"**%s** 는 %%%%site.name%%%% [마이크로블로깅)(http://en.wikipedia.org/wiki/"
+"Micro-blogging)의 사용자 그룹입니다. "
+
+#: actions/showgroup.php:482
+#, fuzzy
+msgid "Admins"
+msgstr "관리자"
+
+#: actions/showmessage.php:81
+msgid "No such message."
+msgstr "그러한 메시지가 없습니다."
 
 #: actions/showmessage.php:98
-msgid "Only the sender and recipient "
-msgstr "오직 보내는 사람과 받는 사람"
+msgid "Only the sender and recipient may read this message."
+msgstr "오직 발송자가 수신자가 이 메시지를 읽는것이 좋습니다."
+
+#: actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr "%2$s에서 %1$s까지 메시지"
+
+#: actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr "%1$s에서 %2$s까지 메시지"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "게시글이 등록되었습니다."
 
 #: actions/showstream.php:73
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "%s 태그된 통지"
+
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, %d 페이지"
 
-#: actions/showstream.php:143
-msgid "'s profile"
-msgstr "'의 프로필"
+#: actions/showstream.php:122
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "%s 그룹을 위한 공지피드"
 
-#: actions/showstream.php:236 actions/tagother.php:77
-msgid "User profile"
-msgstr "이용자 프로필"
+#: actions/showstream.php:129
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "%s의 통지 피드"
 
-#: actions/showstream.php:240 actions/tagother.php:81
-msgid "Photo"
-msgstr "사진"
+#: actions/showstream.php:136
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "%s의 통지 피드"
 
-#: actions/showstream.php:317
-msgid "User actions"
-msgstr "사용자 동작"
+#: actions/showstream.php:143
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "%s의 통지 피드"
 
-#: actions/showstream.php:342
-msgid "Send a direct message to this user"
-msgstr "이 회원에게 직접 메시지를 보냅니다."
+#: actions/showstream.php:148
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "%s의 보낸쪽지함"
 
-#: actions/showstream.php:343
-msgid "Message"
-msgstr "메시지"
+#: actions/showstream.php:191
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
 
-#: actions/showstream.php:451
-msgid "All subscribers"
-msgstr "모든 구독자"
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
 
-#: actions/showstream.php:533
-msgid "All groups"
-msgstr "모든 그룹"
+#: actions/showstream.php:198
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
 
-#: actions/showstream.php:542
+#: actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
-"**%s**는 %%%%site.name%%%% [마이크로블로깅](http://en.wikipedia.org/wiki/Micro-"
-"blogging) 서비스에 계정을 갖고 있습니다."
 
-#: actions/smssettings.php:128
-msgid "Phone number, no punctuation or spaces, "
-msgstr "폰번호, 점이나 공백없이"
+#: actions/showstream.php:239
+#, fuzzy, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
+msgstr ""
+"**%s**는 %%%%site.name%%%% [마이크로블로깅](http://en.wikipedia.org/wiki/"
+"Micro-blogging) 서비스에 계정을 갖고 있습니다."
+
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "SMS 세팅"
+
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+"당신은 %%site.name%% 로부터 이메일을 통해 SMS메시지를 받을 수 있습니다."
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다."
+
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "확인된 최신의 SMS가 가능한 휴대폰 번호"
+
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
+msgstr "이 전화 번호는 인증 대기중입니다."
+
+#: actions/smssettings.php:130
+msgid "Confirmation code"
+msgstr "인증 코드"
+
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
+msgstr "휴대폰으로 받으신 인증번호를 입력하십시오."
+
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
+msgstr "SMS 휴대폰 번호"
 
-#: actions/smssettings.php:162
-msgid "Send me notices through SMS; "
-msgstr "SMS를 통해 게시글을 내게 보냅니다."
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "지역번호와 함께 띄어쓰기 없이 번호를 적어 주세요."
+
+#: actions/smssettings.php:174
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+"통지를 SMS로 보내주세요; 물론 통신사로부터 바가지 요금을 문다는 것은 알고 있"
+"습니다."
 
-#: actions/smssettings.php:335
-msgid "A confirmation code was sent to the phone number you added. "
-msgstr "추가한 전화 번호로 인증 코드를 보냈습니다."
+#: actions/smssettings.php:306
+msgid "No phone number."
+msgstr "휴대폰 번호가 없습니다."
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:311
+msgid "No carrier selected."
+msgstr "통신회사가 선택 되지 않았습니다."
+
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
+msgstr "그 휴대폰 번호는 이미 귀하의 것입니다."
+
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
+msgstr "그 휴대폰 번호는 이미 다른 사용자의 것입니다."
+
+#: actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"추가한 휴대폰으로 인증 코드를 보냈습니다. 수신함(또는 스팸함)을 확인하셔서 코"
+"드와 사용법을 확인하여 주시기 바랍니다."
+
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
+msgstr "옳지 않은 인증 번호 입니다."
+
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
+msgstr "그 휴대폰 번호는 귀하의 것이 아닙니다."
+
+#: actions/smssettings.php:465
 msgid "Mobile carrier"
 msgstr "휴대전화 사업자"
 
+#: actions/smssettings.php:469
+msgid "Select a carrier"
+msgstr "통신 회사를 선택 하세요."
+
+#: actions/smssettings.php:476
+#, 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/smssettings.php:498
+msgid "No code entered"
+msgstr "코드가 입력 되지 않았습니다."
+
 #: actions/subedit.php:70
 msgid "You are not subscribed to that profile."
 msgstr "당신은 이 프로필에 구독되지 않고있습니다."
@@ -4157,13 +3001,31 @@ msgid "%s subscribers, page %d"
 msgstr "%s 구독자, %d 페이지"
 
 #: actions/subscribers.php:63
-msgid "These are the people who listen to "
-msgstr "듣고 있는 사람들"
+msgid "These are the people who listen to your notices."
+msgstr "귀하의 통지를 받고 있는 사람"
 
 #: actions/subscribers.php:67
 #, php-format
-msgid "These are the people who "
-msgstr "사람들"
+msgid "These are the people who listen to %s's notices."
+msgstr "%s의 통지를 받고 있는 사람"
+
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
+msgstr ""
+
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr ""
+
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
 
 #: actions/subscriptions.php:52
 #, php-format
@@ -4176,27 +3038,36 @@ msgid "%s subscriptions, page %d"
 msgstr "%s subscriptions, %d 페이지"
 
 #: actions/subscriptions.php:65
-msgid "These are the people whose notices "
-msgstr "게시글 쓰는 사람들"
+msgid "These are the people whose notices you listen to."
+msgstr "귀하의 통지를 받고 있는 사람"
 
 #: actions/subscriptions.php:69
 #, php-format
-msgid "These are the people whose "
-msgstr "하는 사람들"
+msgid "These are the people whose notices %s listens to."
+msgstr "%s님이 받고 있는 통지의 사람"
+
+#: actions/subscriptions.php:121
+#, php-format
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
+msgstr ""
+
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s 는 지금 듣고 있습니다."
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:194
 msgid "Jabber"
 msgstr "Jabber"
 
-#: actions/tag.php:43
-#, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "%s 으로 태그된 게시글, %d 페이지"
-
-#: actions/tag.php:66
-#, php-format
-msgid "Messages tagged \"%s\", most recent first"
-msgstr "가장 최근에 \"%s\" 으로 태그된 메시지들"
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
+msgstr "SMS"
 
 #: actions/tagother.php:33
 msgid "Not logged in"
@@ -4211,244 +3082,905 @@ msgstr "id 인자가 없습니다."
 msgid "Tag %s"
 msgstr "태그 %s"
 
+#: actions/tagother.php:77 lib/userprofile.php:75
+msgid "User profile"
+msgstr "이용자 프로필"
+
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
+msgstr "사진"
+
 #: actions/tagother.php:141
 msgid "Tag user"
 msgstr "태그 사용자"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
-msgstr "사용자를 위한 태그 (문자,숫자, -, . ,그리고 _), 콤마 혹은 공백으로 분리하세요."
-
-#: actions/tagother.php:164
-msgid "There was a problem with your session token."
-msgstr "당신의 세션토큰관련 문제가 있습니다."
+msgstr ""
+"사용자를 위한 태그 (문자,숫자, -, . ,그리고 _), 콤마 혹은 공백으로 분리하세"
+"요."
 
-#: actions/tagother.php:191
+#: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
-msgstr "당신이 구독하거나 당신을 구독하는 사람들에 대해서만 태그를 붙일 수 있습니다."
+msgstr ""
+"당신이 구독하거나 당신을 구독하는 사람들에 대해서만 태그를 붙일 수 있습니다."
 
-#: actions/tagother.php:198
+#: actions/tagother.php:200
 msgid "Could not save tags."
 msgstr "태그를 저장할 수 없습니다."
 
-#: actions/tagother.php:233
+#: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "당신의 구독자나 구독하는 사람에 태깅을 위해 이 양식을 사용하세요."
 
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "%s 으로 태그된 게시글, %d 페이지"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "%s의 통지 피드"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "%s의 통지 피드"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "%s의 통지 피드"
+
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "그러한 태그가 없습니다."
 
-#: actions/tagrss.php:66
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
+msgstr "API 메서드를 구성중 입니다."
+
+#: actions/unsubscribe.php:77
+msgid "No profile id in request."
+msgstr "요청한 프로필id가 없습니다."
+
+#: actions/unsubscribe.php:84
+msgid "No profile with that id."
+msgstr "해당 id의 프로필이 없습니다."
+
+#: actions/unsubscribe.php:98
+msgid "Unsubscribed"
+msgstr "구독취소 되었습니다."
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
 #, php-format
-msgid "Microblog tagged with %s"
-msgstr "마이크로블로그는  %s 으로 태그되었습니다."
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
 
-#: actions/twitapiblocks.php:47
-msgid "Block user failed."
-msgstr "사용자 차단에 실패했습니다."
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "구독을 허가"
 
-#: actions/twitapiblocks.php:69
-msgid "Unblock user failed."
-msgstr "사용자 차단 해제에 실패했습니다."
+#: actions/userauthorization.php:110
+#, fuzzy
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
+msgstr ""
+"사용자의 통지를 구독하려면 상세를 확인해 주세요. 구독하지 않는 경우는, \"취소"
+"\"를 클릭해 주세요."
 
-#: actions/twitapiusers.php:48
-msgid "Not found."
-msgstr "찾을 수가 없습니다."
+#: actions/userauthorization.php:188
+#, fuzzy
+msgid "License"
+msgstr "라이선스"
 
-#: actions/twittersettings.php:71
-msgid "Add your Twitter account to automatically send "
-msgstr "자동으로 보내려면 트위터 계정을 추가하십시오."
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "수락"
 
-#: actions/twittersettings.php:119
-msgid "Twitter user name"
-msgstr "트위터 사용자 이름"
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "이 회원을 구독합니다."
 
-#: actions/twittersettings.php:126
-msgid "Twitter password"
-msgstr "트위터 비밀번호"
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "거부"
 
-#: actions/twittersettings.php:228
-msgid "Twitter Friends"
-msgstr "트위터 친구들"
+#: actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "%s 구독"
 
-#: actions/twittersettings.php:327
-msgid "Username must have only numbers, "
-msgstr "Username은 단지 숫자를 가져야 합니다,"
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
+msgstr "허용되지 않는 요청입니다."
 
-#: actions/twittersettings.php:341
-#, php-format
-msgid "Unable to retrieve account information "
-msgstr "계정정보를 불러올 수 없습니다."
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+msgstr "구독 허가"
 
-#: actions/unblock.php:108
-msgid "Error removing the block."
-msgstr "차단 제거 에러!"
+#: actions/userauthorization.php:249
+#, fuzzy
+msgid ""
+"The subscription has been authorized, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to authorize the "
+"subscription. Your subscription token is:"
+msgstr ""
+"구독이 승인 되었습니다. 하지만 콜백 URL이 통과 되지 않았습니다. 웹사이트의 지"
+"시를 찾아 구독 승인 방법에 대하여 읽어보십시오. 귀하의 구독 토큰은 : "
 
-#: actions/unsubscribe.php:50
-msgid "No profile id in request."
-msgstr "요청한 프로필id가 없습니다."
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
+msgstr "구독 거부"
 
-#: actions/unsubscribe.php:57
-msgid "No profile with that id."
-msgstr "해당 id의 프로필이 없습니다."
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"구독이 해지 되었습니다. 하지만 콜백 URL이 통과 되지 않았습니다. 웹사이트의 지"
+"시를 찾아 구독 해지 방법에 대하여 읽어보십시오."
 
-#: actions/unsubscribe.php:71
-msgid "Unsubscribed"
-msgstr "구독취소 되었습니다."
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
 
-#: actions/usergroups.php:63
+#: actions/userauthorization.php:301
 #, php-format
-msgid "%s groups"
-msgstr "%s 그룹"
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
 
-#: actions/usergroups.php:65
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "아바타 URL '%s'을(를) 읽어낼 수 없습니다."
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "%S 잘못된 그림 파일 타입입니다. "
+
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr "id가 없습니다."
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "프로필 세팅"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "%s 그룹, %d 페이지"
 
-#: classes/Notice.php:104
+#: actions/usergroups.php:130
+#, fuzzy
+msgid "Search for more groups"
+msgstr "프로필이나 텍스트 검색"
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "당신은 해당 그룹의 멤버가 아닙니다."
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Message.php:55
+msgid "Could not insert message."
+msgstr "메시지를 삽입할 수 없습니다."
+
+#: classes/Message.php:65
+msgid "Could not update message with new URI."
+msgstr "새 URI와 함께 메시지를 업데이트할 수 없습니다."
+
+#: classes/Notice.php:164
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "해쉬테그를 추가 할 때에 데이타베이스 에러 : %s"
+
+#: classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "통지를 저장하는데 문제가 발생했습니다."
+
+#: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
 msgstr "게시글 저장문제. 알려지지않은 회원"
 
-#: classes/Notice.php:109
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
-msgstr "너무 많은 게시글이 너무 빠르게 올라옵니다. 한숨고르고 몇분후에 다시 포스트를 해보세요."
+msgstr ""
+"너무 많은 게시글이 너무 빠르게 올라옵니다. 한숨고르고 몇분후에 다시 포스트를 "
+"해보세요."
 
-#: classes/Notice.php:116
+#: classes/Notice.php:194
+#, fuzzy
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+"너무 많은 게시글이 너무 빠르게 올라옵니다. 한숨고르고 몇분후에 다시 포스트를 "
+"해보세요."
+
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr "이 사이트에 게시글 포스팅으로부터 당신은 금지되었습니다."
 
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
+msgstr "통지를 저장하는데 문제가 발생했습니다."
+
+#: classes/Notice.php:1120
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "답신을 추가 할 때에 데이타베이스 에러 : %s"
+
+#: classes/User.php:347
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "%2$s에서 %1$s까지 메시지"
+
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "프로필"
+
 #: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
+msgstr "프로필 세팅 바꾸기"
+
+#: lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "아바타를 업로드하세요."
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr "비밀번호 바꾸기"
+
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
+msgstr "이메일 처리 변경"
+
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:124
+#, fuzzy
+msgid "Design your profile"
+msgstr "이용자 프로필"
+
+#: lib/accountsettingsaction.php:128
 msgid "Other"
 msgstr "기타"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:128
 msgid "Other options"
 msgstr "다른 옵션들"
 
-#: lib/action.php:130
+#: lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: lib/action.php:145
+#: lib/action.php:159
 msgid "Untitled page"
 msgstr "제목없는 페이지"
 
-#: lib/action.php:316
+#: lib/action.php:424
 msgid "Primary site navigation"
 msgstr "주 사이트 네비게이션"
 
-#: lib/action.php:322
+#: lib/action.php:430
+msgid "Home"
+msgstr "홈"
+
+#: lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr "개인 프로필과 친구 타임라인"
 
-#: lib/action.php:325
-msgid "Search for people or text"
-msgstr "프로필이나 텍스트 검색"
-
-#: lib/action.php:328
+#: lib/action.php:432
 msgid "Account"
 msgstr "계정"
 
-#: lib/action.php:328
+#: lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr "당신의 이메일, 아바타, 비밀 번호, 프로필을 변경하세요."
 
-#: lib/action.php:330
-msgid "Connect to IM, SMS, Twitter"
-msgstr "IM, SMS, 트위터에 연결하기"
+#: lib/action.php:435
+msgid "Connect"
+msgstr "연결"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "서버에 재접속 할 수 없습니다 : %s"
+
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
+msgstr "초대"
+
+#: lib/action.php:440 lib/subgroupnav.php:106
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr "%s에 친구를 가입시키기 위해 친구와 동료를 초대합니다."
 
-#: lib/action.php:332
+#: lib/action.php:445
+msgid "Logout"
+msgstr "로그아웃"
+
+#: lib/action.php:445
 msgid "Logout from the site"
 msgstr "이 사이트로부터 로그아웃"
 
-#: lib/action.php:335
-msgid "Login to the site"
-msgstr "이 사이트 로그인"
-
-#: lib/action.php:338
+#: lib/action.php:450
 msgid "Create an account"
 msgstr "계정 만들기"
 
-#: lib/action.php:341
-msgid "Login with OpenID"
-msgstr "오픈ID로 로그인하기"
+#: lib/action.php:453
+msgid "Login to the site"
+msgstr "이 사이트 로그인"
+
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
+msgstr "도움말"
 
-#: lib/action.php:344
+#: lib/action.php:456
 msgid "Help me!"
 msgstr "도움이 필요해!"
 
-#: lib/action.php:362
+#: lib/action.php:459
+msgid "Search"
+msgstr "검색"
+
+#: lib/action.php:459
+msgid "Search for people or text"
+msgstr "프로필이나 텍스트 검색"
+
+#: lib/action.php:480
 msgid "Site notice"
 msgstr "사이트 공지"
 
-#: lib/action.php:417
+#: lib/action.php:546
 msgid "Local views"
 msgstr "로컬 뷰"
 
-#: lib/action.php:472
+#: lib/action.php:612
 msgid "Page notice"
 msgstr "페이지 공지"
 
-#: lib/action.php:562
+#: lib/action.php:714
 msgid "Secondary site navigation"
 msgstr "보조 사이트 네비게이션"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:721
+msgid "About"
+msgstr "정보"
+
+#: lib/action.php:723
+msgid "FAQ"
+msgstr "자주 묻는 질문"
+
+#: lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/action.php:730
+msgid "Privacy"
+msgstr "개인정보 취급방침"
+
+#: lib/action.php:732
+msgid "Source"
+msgstr "소스 코드"
+
+#: lib/action.php:734
+msgid "Contact"
+msgstr "연락하기"
+
+#: lib/action.php:736
+#, fuzzy
+msgid "Badge"
+msgstr "찔러 보기"
+
+#: lib/action.php:764
 msgid "StatusNet software license"
 msgstr "라코니카 소프트웨어 라이선스"
 
-#: lib/action.php:630
+#: lib/action.php:767
+#, 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/action.php:769
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** 는 마이크로블로깅서비스입니다."
+
+#: lib/action.php:771
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+"이 사이트는 [StatusNet](http://status.net/) 마이크로블로깅 소프트웨어 %s 버전"
+"을 사용합니다. StatusNet는 [GNU Affero General Public License](http://www."
+"fsf.org/licensing/licenses/agpl-3.0.html) 라이선스에 따라 사용할 수 있습니다."
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "라코니카 소프트웨어 라이선스"
+
+#: lib/action.php:794
 msgid "All "
 msgstr "모든 것"
 
-#: lib/action.php:635
+#: lib/action.php:799
 msgid "license."
 msgstr "라이선스"
 
-#: lib/blockform.php:123 lib/blockform.php:153
-msgid "Block this user"
-msgstr "이 사용자 차단하기"
+#: lib/action.php:1052
+msgid "Pagination"
+msgstr "페이지수"
 
-#: lib/blockform.php:153
-msgid "Block"
-msgstr "차단하기"
+#: lib/action.php:1061
+msgid "After"
+msgstr "뒷 페이지"
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
-msgid "Disfavor this notice"
-msgstr "이 게시글 좋아하기 취소"
+#: lib/action.php:1069
+msgid "Before"
+msgstr "앞 페이지"
+
+#: lib/action.php:1117
+msgid "There was a problem with your session token."
+msgstr "당신의 세션토큰관련 문제가 있습니다."
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "프로필"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
+msgstr "실행결과"
+
+#: lib/channel.php:210
+msgid "Command complete"
+msgstr "실행 완료"
+
+#: lib/channel.php:221
+msgid "Command failed"
+msgstr "실행 실패"
+
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr "죄송합니다. 이 명령은 아직 실행되지 않았습니다."
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "이 이메일 주소로 사용자를 업데이트 할 수 없습니다."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "찔러 보기를 보냈습니다."
+
+#: lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
+msgstr "이용자의 지속적인 게시글이 없습니다."
+
+#: lib/command.php:190
+msgid "Notice marked as fave."
+msgstr "게시글이 좋아하는 글로 지정되었습니다."
+
+#: lib/command.php:315
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#: lib/command.php:318
+#, php-format
+msgid "Fullname: %s"
+msgstr "전체이름: %s"
 
-#: lib/facebookaction.php:268
+#: lib/command.php:321
 #, php-format
-msgid "To use the %s Facebook Application you need to login "
-msgstr "당신이 필요한 페이스북 어플리케이션 %s의 사용을 위해서 로그인하세요."
+msgid "Location: %s"
+msgstr "위치: %s"
+
+#: lib/command.php:324
+#, php-format
+msgid "Homepage: %s"
+msgstr "홈페이지: %s"
+
+#: lib/command.php:327
+#, php-format
+msgid "About: %s"
+msgstr "자기소개: %s"
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다."
+
+#: lib/command.php:377
+msgid "Error sending direct message."
+msgstr "직접 메시지 보내기 오류."
+
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다."
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "이 게시글에 대해 답장하기"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "통지를 저장하는데 문제가 발생했습니다."
+
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
+msgstr "구독하려는 사용자의 이름을 지정하십시오."
+
+#: lib/command.php:502
+#, php-format
+msgid "Subscribed to %s"
+msgstr "%s에게 구독되었습니다."
+
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
+msgstr "구독을 해제하려는 사용자의 이름을 지정하십시오."
+
+#: lib/command.php:530
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr "%s에서 구독을 해제했습니다."
+
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
+msgstr "명령이 아직 실행되지 않았습니다."
+
+#: lib/command.php:551
+msgid "Notification off."
+msgstr "알림끄기."
+
+#: lib/command.php:553
+msgid "Can't turn off notification."
+msgstr "알림을 끌 수 없습니다."
+
+#: lib/command.php:574
+msgid "Notification on."
+msgstr "알림이 켜졌습니다."
+
+#: lib/command.php:576
+msgid "Can't turn on notification."
+msgstr "알림을 켤 수 없습니다."
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "OpenID를 작성 할 수 없습니다 : %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "당신은 이 프로필에 구독되지 않고있습니다."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "당신은 이 프로필에 구독되지 않고있습니다."
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "다른 사람을 구독 하실 수 없습니다."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "%s에 의해 구독되는 사람들"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "당신은 해당 그룹의 멤버가 아닙니다."
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "당신은 해당 그룹의 멤버가 아닙니다."
+
+#: lib/command.php:670
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+
+#: lib/common.php:192
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "확인 코드가 없습니다."
+
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:195
+#, fuzzy
+msgid "Go to the installer."
+msgstr "이 사이트 로그인"
+
+#: lib/connectsettingsaction.php:110
+msgid "IM"
+msgstr "메신저"
+
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "인스턴트 메신저에 의한 업데이트"
+
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
+msgstr "SMS에 의한 업데이트"
+
+#: lib/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "올리기"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
 
-#: lib/facebookaction.php:271
-msgid " a new account."
-msgstr "새로운 계정"
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "비밀번호 바꾸기"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
 
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-msgid "Published"
-msgstr "발행되었습니다."
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "연결"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "검색"
+
+#: lib/designsettings.php:217
+msgid "Text"
+msgstr "문자"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "로그인"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
+msgstr "이 게시글 좋아하기 취소"
 
 #: lib/favorform.php:114 lib/favorform.php:140
 msgid "Favor this notice"
 msgstr "이 게시글을 좋아합니다."
 
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr "좋아합니다"
+
 #: lib/feedlist.php:64
 msgid "Export data"
 msgstr "데이터 내보내기"
 
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr ""
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr ""
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr ""
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "태그 필터링하기"
@@ -4457,57 +3989,84 @@ msgstr "태그 필터링하기"
 msgid "All"
 msgstr "모든 것"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "통신 회사를 선택 하세요."
+
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "태그"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "좁은 리스트에서 태그 선택하기"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "Go "
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "그룹 혹은 토픽의 홈페이지나 블로그 URL"
 
-#: lib/groupeditform.php:151
-msgid "Description"
-msgstr "설명"
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "140글자로 그룹이나 토픽 설명하기"
 
-#: lib/groupeditform.php:153
-msgid "Describe the group or topic in 140 chars"
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
 msgstr "140글자로 그룹이나 토픽 설명하기"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:172
+msgid "Description"
+msgstr "설명"
+
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr "그룹의 위치, \"시/군/구, 도, 나라\""
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
 msgid "Group"
 msgstr "그룹"
 
-#: lib/groupnav.php:100
-msgid "Admin"
-msgstr "관리자"
-
 #: lib/groupnav.php:101
+#, fuzzy
+msgid "Blocked"
+msgstr "차단하기"
+
+#: lib/groupnav.php:102
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "사용자를 차단합니다."
+
+#: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
 msgstr "%s 그룹 속성 편집"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:113
 msgid "Logo"
 msgstr "로고"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:114
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "%s logo 추가 혹은 수정"
 
+#: lib/groupnav.php:120
+#, fuzzy, php-format
+msgid "Add or edit %s design"
+msgstr "%s logo 추가 혹은 수정"
+
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "가장 많은 회원수를 가진 그룹들"
@@ -4521,11 +4080,44 @@ msgstr "가장 많은 게시글이 있는 그룹들"
 msgid "Tags in %s group's notices"
 msgstr "%s 그룹 게시글의 태그"
 
-# FIXME: 잘못 추출된 문자열, 번역할 필요 없음.
 #: lib/htmloutputter.php:104
-msgid "This page is not available in a "
+msgid "This page is not available in a media type you accept"
 msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다."
 
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "당신그룹의 로고 이미지를 업로드할 수 있습니다."
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr "불완전한 업로드."
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr "파일을 올리는데 시스템 오류 발생"
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr "그림 파일이 아니거나 손상된 파일 입니다."
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr "지원하지 않는 그림 파일 형식입니다."
+
+#: lib/imagefile.php:118
+msgid "Lost our file."
+msgstr "파일을 잃어버렸습니다."
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr "알 수 없는 종류의 파일입니다"
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr ""
+
 #: lib/joinform.php:114
 msgid "Join"
 msgstr "가입"
@@ -4534,43 +4126,85 @@ msgstr "가입"
 msgid "Leave"
 msgstr "떠나기"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr "사용자 이름과 비밀번호로 로그인"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr "새 계정을 위한 회원가입"
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
-msgstr "오픈ID로 로그인 혹은 회원가입"
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "오직 해당 사용자만 자신의 메일박스를 열람할 수 있습니다."
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
 
-#: lib/mail.php:175
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr "다음에서:"
+
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "이메일 주소 확인서"
+
+#: lib/mail.php:174
 #, php-format
 msgid ""
 "Hey, %s.\n"
 "\n"
-msgstr ""
-"안녕, %s. \n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%s\n"
 "\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
+msgstr ""
 
-#: lib/mail.php:236
+#: lib/mail.php:235
 #, php-format
-msgid "%1$s is now listening to "
-msgstr "%1$s 는 지금 듣고 있습니다."
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr "%1$s님이 귀하의 알림 메시지를 %2$s에서 듣고 있습니다."
+
+#: lib/mail.php:240
+#, fuzzy, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
+"%1$s님이 귀하의 알림 메시지를 %2$s에서 듣고 있습니다.\n"
+"\t%3$s\n"
+"\n"
+"그럼 이만,%4$s.\n"
 
-#: lib/mail.php:254
+#: lib/mail.php:253
 #, php-format
 msgid "Location: %s\n"
 msgstr "위치: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:255
 #, php-format
 msgid "Homepage: %s\n"
 msgstr "홈페이지: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
@@ -4579,59 +4213,220 @@ msgstr ""
 "소개: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:285
+#, php-format
+msgid "New email address for posting to %s"
+msgstr "%s에 포스팅 할 새로운 이메일 주소"
+
+#: lib/mail.php:288
+#, 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입니다.새 메시지를 등록하려면 %2$ 주소로 이메일을 보내십시"
+"오.이메일 사용법은 %3$s 페이지를 보십시오.안녕히,%4$s"
+
+#: lib/mail.php:412
+#, php-format
+msgid "%s status"
+msgstr "%s 상태"
+
+#: lib/mail.php:438
+msgid "SMS confirmation"
+msgstr "SMS 인증"
+
+#: lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "%s 사용자가 찔러 봤습니다."
 
-# FIXME: 잘못 추출된 문자열, 번역할 필요 없음.
-#: lib/mail.php:465
+#: lib/mail.php:466
 #, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
-msgstr "%1$s (%2$s) 사용자가 요즘에 무엇을 하는지 궁금해 하고, "
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
+msgstr ""
 
-# FIXME: 잘못 추출된 문자열, 번역할 필요 없음.
-#: lib/mail.php:555
+#: lib/mail.php:509
 #, php-format
-msgid "%1$s just added your notice from %2$s"
-msgstr "%1$s 사용자가 %2$s의 귀하의 글을 추가했습니다."
+msgid "New private message from %s"
+msgstr "%s로부터 새로운 비밀 메시지가 도착하였습니다."
+
+#: lib/mail.php:513
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%5$s\n"
+msgstr ""
+
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s님이 당신의 게시글을 좋아하는 글로 추가했습니다."
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
-msgid "From"
-msgstr "로 부터"
+#: lib/mail.php:613
+#, php-format
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+msgstr ""
+
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
 
-#: lib/messageform.php:110
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+msgid "Could not determine file's mime-type!"
+msgstr "공개 stream을 불러올 수 없습니다."
+
+#: lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "직접 메시지 보내기"
 
-#: lib/noticeform.php:125
-msgid "Send a notice"
-msgstr "게시글 보내기"
+#: lib/messageform.php:146
+msgid "To"
+msgstr "에게"
 
-#: lib/noticeform.php:152
+#: lib/messageform.php:162 lib/noticeform.php:173
 msgid "Available characters"
 msgstr "사용 가능한 글자"
 
-#: lib/noticelist.php:426
-msgid "in reply to"
-msgstr "이 게시글에 대한 답장"
+#: lib/noticeform.php:145
+msgid "Send a notice"
+msgstr "게시글 보내기"
+
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
+msgstr "뭐하세요? %?"
+
+#: lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "내용이 없습니다!"
+
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr "이 게시글에 대해 답장하기"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "답장하기"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
-msgid "Delete this notice"
-msgstr "이 게시글 삭제하기"
-
-#: lib/noticelist.php:474
-msgid "Delete"
-msgstr "삭제"
-
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "이 사용자 찔러 보기"
@@ -4644,39 +4439,139 @@ msgstr "찔러 보기"
 msgid "Send a nudge to this user"
 msgstr "이 사용자에게 찔러 보기 메시지 보내기"
 
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "새 프로필 추가 오류"
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "아바타 추가 오류"
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "리모트 프로필 추가 오류"
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "통지 삭제"
+
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
+msgstr "예약 구독을 추가 할 수 없습니다."
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "개인적인"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "답신"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr "좋아하는 글들"
+
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr "이용자"
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr "받은 쪽지함"
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr "당신의 받은 메시지들"
+
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr "보낸 쪽지함"
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr "당신의 보낸 메시지들"
+
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "%s의 게시글의 태그"
 
-#: lib/profilelist.php:182
-msgid "(none)"
-msgstr "(없습니다)"
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "구독"
+
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "모든 예약 구독"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "구독자"
+
+#: lib/profileaction.php:157
+msgid "All subscribers"
+msgstr "모든 구독자"
+
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "이용자"
 
-#: lib/publicgroupnav.php:76
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "가입한 때"
+
+#: lib/profileaction.php:235
+msgid "All groups"
+msgstr "모든 그룹"
+
+#: lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "공개"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "사용자 그룹"
 
-#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "최근 태그"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "피쳐링됨"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "인기있는"
 
+#: lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "검색"
+
+#: lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "검색"
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "사람들"
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr "이 사이트에 있는 사람 찾기"
+
 #: lib/searchgroupnav.php:82
 msgid "Notice"
 msgstr "게시글"
 
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr "통지들의 내용 찾기"
+
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "이 사이트에서 그룹 찾기"
@@ -4685,33 +4580,63 @@ msgstr "이 사이트에서 그룹 찾기"
 msgid "Untitled section"
 msgstr "제목없는 섹션"
 
-#: lib/subgroupnav.php:81
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr "%s 사람들은 구독합니다."
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:91
 #, php-format
 msgid "People subscribed to %s"
 msgstr "%s에 의해 구독되는 사람들"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "%s 그룹들은  의 멤버입니다."
 
-#: lib/subgroupnav.php:104
-#, php-format
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "%s에 친구를 가입시키기 위해 친구와 동료를 초대합니다."
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(없습니다)"
+
+#: lib/subs.php:48
+msgid "Already subscribed!"
+msgstr ""
 
-#: lib/subs.php:53
+#: lib/subs.php:52
 msgid "User has blocked you."
 msgstr "회원이 당신을 차단해왔습니다."
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "이 회원을 구독합니다."
+#: lib/subs.php:56
+msgid "Could not subscribe."
+msgstr "구독 하실 수 없습니다."
+
+#: lib/subs.php:75
+msgid "Could not subscribe other to you."
+msgstr "다른 사람을 구독 하실 수 없습니다."
+
+#: lib/subs.php:124
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "구독하고 있지 않습니다!"
+
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
+msgstr "예약 구독을 삭제 할 수 없습니다."
 
 #: lib/tagcloudsection.php:56
 msgid "None"
@@ -4721,17 +4646,106 @@ msgstr "없음"
 msgid "Top posters"
 msgstr "상위 게시글 등록자"
 
-#: lib/unblockform.php:120 lib/unblockform.php:150
-msgid "Unblock this user"
-msgstr "이 사용자를 차단해제합니다."
-
-#: lib/unblockform.php:150
-msgid "Unblock"
-msgstr "차단해제"
-
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "이 사용자로부터 구독취소합니다."
 
-#~ msgid "Email address"
-#~ msgstr "이메일 주소"
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "구독 해제"
+
+#: lib/userprofile.php:116
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "아바타"
+
+#: lib/userprofile.php:236
+msgid "User actions"
+msgstr "사용자 동작"
+
+#: lib/userprofile.php:248
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "프로필 세팅"
+
+#: lib/userprofile.php:249
+msgid "Edit"
+msgstr ""
+
+#: lib/userprofile.php:272
+msgid "Send a direct message to this user"
+msgstr "이 회원에게 직접 메시지를 보냅니다."
+
+#: lib/userprofile.php:273
+msgid "Message"
+msgstr "메시지"
+
+#: lib/util.php:821
+msgid "a few seconds ago"
+msgstr "몇 초 전"
+
+#: lib/util.php:823
+msgid "about a minute ago"
+msgstr "1분 전"
+
+#: lib/util.php:825
+#, php-format
+msgid "about %d minutes ago"
+msgstr "%d분 전"
+
+#: lib/util.php:827
+msgid "about an hour ago"
+msgstr "1시간 전"
+
+#: lib/util.php:829
+#, php-format
+msgid "about %d hours ago"
+msgstr "%d시간 전"
+
+#: lib/util.php:831
+msgid "about a day ago"
+msgstr "하루 전"
+
+#: lib/util.php:833
+#, php-format
+msgid "about %d days ago"
+msgstr "%d일 전"
+
+#: lib/util.php:835
+msgid "about a month ago"
+msgstr "1달 전"
+
+#: lib/util.php:837
+#, php-format
+msgid "about %d months ago"
+msgstr "%d달 전"
+
+#: lib/util.php:839
+msgid "about a year ago"
+msgstr "1년 전"
+
+#: lib/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "홈페이지 주소형식이 올바르지 않습니다."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr "메시지를 분리할 수 없습니다."
+
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr "가입된 사용자가 아닙니다."
+
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr "죄송합니다. 귀하의 이메일이 아닙니다."
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr "죄송합니다. 이메일이 허용되지 않습니다."
diff --git a/locale/mk/LC_MESSAGES/statusnet.mo b/locale/mk/LC_MESSAGES/statusnet.mo
index 5dec309dd..6b2713593 100644
--- a/locale/mk/LC_MESSAGES/statusnet.mo
+++ b/locale/mk/LC_MESSAGES/statusnet.mo
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 0e91f0522..d011d7379 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -1,4554 +1,3960 @@
-# #-#-#-#-#  statusnet.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.
+# Translation of StatusNet to Macedonian
 #
-# #-#-#-#-#  statusnet.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
+# Author@translatewiki.net: Bjankuloski06
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:48+0000\n"
+"Language-Team: Macedonian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  statusnet.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"#-#-#-#-#  statusnet.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: mk\n"
+"X-Message-Group: out-statusnet\n"
 
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
-#, php-format
-msgid " Search Stream for \"%s\""
-msgstr "Пребарувај го потокот за „%s“"
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "Нема такво известување."
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-#: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
-msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr ""
-"освен следниве лични податоци: лозинка, адреса за е-пошта, адреса за ИМ, "
-"телефонски број."
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
+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/all.php:84
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s и пријателите"
 
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
+msgid "%s and friends"
+msgstr "%s и пријателите"
 
-#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
+#: actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Канал со пријатели на %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 ""
+#: actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Канал со пријатели на %S"
 
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s сега ги следи вашите забелешки за %2$s."
+#: actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Канал со пријатели на %S"
 
-#: ../lib/mail.php:126
+#: actions/all.php:127
 #, 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"
+"This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
-"%1$s сега ги следи вашите забелешки на %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Искрено ваш,\n"
-"%4$s.\n"
 
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/all.php:132
 #, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
 msgstr ""
 
-#: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/all.php:134
 #, 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 actions/invite.php:123 actions/invite.php:131
-#, php-format
-msgid "%s (%s)"
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
 #, php-format
-msgid "%s Public Stream"
-msgstr "Јавниот поток на %s"
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+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
-#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
-#, php-format
-msgid "%s and friends"
+#: actions/all.php:165
+#, fuzzy
+msgid "You and friends"
 msgstr "%s и пријателите"
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
 #, php-format
-msgid "%s public timeline"
-msgstr ""
-
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
-#, php-format
-msgid "%s status"
+msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
-#, php-format
-msgid "%s timeline"
-msgstr ""
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
+msgstr "Кодот за потврда не е пронајден."
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
-#, php-format
-msgid "%s updates from everyone!"
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
 msgstr ""
 
-#: ../actions/register.php:213
+#: actions/apiaccountupdatedeliverydevice.php:105
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
 msgstr ""
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Корисникот не може да се освежи/"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
 msgstr ""
-"**%%site.name%%** е сервис за микроблогирање што ви го овозможува [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
-#, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** е сервис за микроблогирање."
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
+msgstr ""
 
-#: ../lib/util.php:274 lib/util.php:290
-msgid ". Contributors should be attributed by full name or nickname."
-msgstr ". Придонесувачите треба да бидат наведени со цело име или прекар."
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Корисникот не може да се освежи/"
 
-#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
-#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 мали букви или бројки. Без интерпукциски знаци и празни места."
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Корисникот нема профил."
 
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Профилот не може да се сними."
 
-#: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr "6 или повеќе знаци"
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
+msgstr ""
 
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
-msgid "6 or more characters, and don't forget it!"
-msgstr "6 или повеќе знаци и не ја заборавајте!"
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
+msgstr ""
 
-#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
-msgid "6 or more characters. Required."
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
 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."
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Ова е предолго. Максималната должина е 140 знаци."
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
 msgstr ""
-"Испративме код за потврда на IM адресата што ја додадовте. Мора да го "
-"одобрите %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."
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
 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 actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
-msgid "API method not found!"
+#: actions/apidirectmessage.php:89
+#, php-format
+msgid "Direct messages from %s"
 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 actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
-msgid "API method under construction."
+#: actions/apidirectmessage.php:93
+#, php-format
+msgid "All the direct messages sent from %s"
 msgstr ""
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
-msgid "About"
-msgstr "За"
+#: actions/apidirectmessage.php:101
+#, php-format
+msgid "Direct messages to %s"
+msgstr ""
 
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
-msgid "Accept"
-msgstr "Прифати"
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
+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 actions/emailsettings.php:120
-#: actions/imsettings.php:127 actions/openidsettings.php:111
-#: actions/smssettings.php:133 actions/twittersettings.php:163
-msgid "Add"
-msgstr "Додај"
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr ""
 
-#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
-msgstr "Додај OpenID"
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
+msgstr ""
 
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-msgid "Add or remove OpenIDs"
+#: actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
 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
-#: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
-msgstr "Адреса"
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+msgstr ""
 
-#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-msgid "Addresses of friends to invite (one per line)"
+#: actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
 msgstr ""
 
-#: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
-msgid "All subscriptions"
-msgstr "Сите претплати"
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr ""
 
-#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
-#, php-format
-msgid "All updates for %s"
-msgstr "Сите новини од %s"
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
+msgstr ""
 
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/apifriendshipscreate.php:118
 #, php-format
-msgid "All updates matching search term \"%s\""
-msgstr "Сите новини кои се еднакви со бараниот термин „%s“"
+msgid "Could not follow user: %s is already on your list."
+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
-#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
-msgid "Already logged in."
-msgstr "Веќе сте најавени."
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "Не може да се пренасочи кон серверот: %s"
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
-msgid "Already subscribed!."
-msgstr "Веќе сте претплатени!"
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
 
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
-msgid "Are you sure you want to delete this notice?"
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
-msgid "Authorize subscription"
-msgstr "Одобрете ја претплатата"
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+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/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Корисникот не може да се освежи/"
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr ""
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
+#, fuzzy
+msgid "Could not create group."
+msgstr "Информациите за аватарот не може да се снимат"
 
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34 actions/avatarsettings.php:65
-#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
-msgid "Avatar"
-msgstr "Аватар"
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Информациите за аватарот не може да се снимат"
 
-#: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
-msgid "Avatar updated."
-msgstr "Аватарот е ажуриран."
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+#, fuzzy
+msgid "Could not set group membership."
+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/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+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/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr "Тој прекар е во употреба. Одберете друг."
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "Неправилен прекар."
 
-#: ../lib/util.php:1318 lib/util.php:1452
-#, fuzzy
-msgid "Before »"
-msgstr "Предходни »"
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "Домашната страница не е правилно URL."
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
-#: actions/profilesettings.php:82 actions/register.php:184
-#: actions/profilesettings.php:112 actions/register.php:402
-msgid "Bio"
-msgstr "Био"
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "Целото име е предолго (максимум 255 знаци)"
 
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
-#: actions/register.php:89 actions/updateprofile.php:104
-#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
-msgid "Bio is too long (max 140 chars)."
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
 msgstr "Биографијата е предолга (максимумот е 140 знаци)."
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
-msgid "Can't delete this notice."
-msgstr ""
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "Локацијата е предолга (максимумот е 255 знаци)."
 
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
 #, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr "Не може да се прочита URL-то на аватарот: '%s'"
+msgid "Too many aliases! Maximum %d."
+msgstr ""
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404 actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-msgid "Can't save new password."
-msgstr "Новата лозинка не може да се сними"
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Невалидна домашна страница: '%s'"
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62 actions/emailsettings.php:58
-#: actions/imsettings.php:59 actions/smssettings.php:62
-#: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
-msgstr "Откажи"
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Тој прекар е во употреба. Одберете друг."
 
-#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Не е возможно да се инстанцира OpenID објект за потрошувачка."
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
 
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
-msgstr "Ова JabberID не може да се нормализира."
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Веќе сте пријавени!"
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
-msgid "Cannot normalize that email address"
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
 msgstr ""
 
-#: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
-msgstr "Промени"
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Не може да се пренасочи кон серверот: %s"
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
-msgstr ""
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Не ни го испративте тој профил."
 
-#: ../actions/password.php:32 actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr "Промени ја лозинката"
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "OpenID формуларот не може да се креира:%s"
 
-#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
-msgid "Change your password"
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
 msgstr ""
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-msgid "Change your profile settings"
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
 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
-#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
-#: actions/register.php:376 actions/smssettings.php:122
-msgid "Confirm"
-msgstr "Потврди"
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "Профил"
 
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "Потврди ја адресата"
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+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
-#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
-msgid "Confirmation cancelled."
-msgstr "Потврдата е откажана"
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
+msgstr ""
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
-msgid "Confirmation code"
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
 msgstr ""
 
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-msgid "Confirmation code not found."
-msgstr "Кодот за потврда не е пронајден."
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+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."
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
-msgid "Connect"
-msgstr "Поврзи се"
-
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
-msgid "Connect existing account"
-msgstr "Поврзи се со постоечка сметка"
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "Ова е предолго. Максималната должина е 140 знаци."
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
-msgid "Contact"
-msgstr "Контакт"
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
+msgstr ""
 
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
 #, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "OpenID формуларот не може да се креира:%s"
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Неподдржан фомрат на слики."
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/apitimelinefavorites.php:107
 #, php-format
-msgid "Could not follow user: %s is already on your list."
+msgid "%s / Favorites from %s"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
-msgid "Could not follow user: User not found."
+#: actions/apitimelinefavorites.php:119
+#, php-format
+msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Не може да се пренасочи кон серверот: %s"
+msgid "%s timeline"
+msgstr ""
 
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
-msgid "Could not save avatar info"
-msgstr "Информациите за аватарот не може да се снимат"
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
 
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
-msgid "Could not save new profile info"
-msgstr "Информациите за новиот профил не може да се снимат"
+#: actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s статус на %2$s"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
-msgid "Could not subscribe other to you."
+#: actions/apitimelinementions.php:126
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
-msgid "Could not subscribe."
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#, php-format
+msgid "%s public timeline"
 msgstr ""
 
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#, php-format
+msgid "%s updates from everyone!"
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-msgid "Couldn't convert request tokens to access tokens."
-msgstr "Белезите за барање не може да се конвертираат во белези за пристап."
+#: actions/apitimelinetag.php:101 actions/tag.php:66
+#, php-format
+msgid "Notices tagged with %s"
+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
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-msgid "Couldn't delete email confirmation."
-msgstr "Не може да се креира потврда за е-пошта."
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Микроблог на %s"
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
-msgid "Couldn't delete subscription."
-msgstr "Претплата не може да се избрише."
+#: actions/apiusershow.php:96
+#, fuzzy
+msgid "Not found."
+msgstr "Не е пронаједено барање."
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
-msgid "Couldn't find any statuses."
-msgstr ""
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "Нема таков документ."
 
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-msgid "Couldn't get a request token."
-msgstr "Не може да се земе белег за барање."
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+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
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
-msgid "Couldn't insert confirmation code."
-msgstr "Кодот за потврда не може да се внесе."
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "Нема големина."
 
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
-msgstr "Не може да се внесе нова претплата."
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "Погрешна големина."
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-msgid "Couldn't save profile."
-msgstr "Профилот не може да се сними."
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "Аватар"
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
-msgid "Couldn't update user record."
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
 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
-#: actions/confirmaddress.php:114 actions/emailsettings.php:280
-#: actions/emailsettings.php:411 actions/imsettings.php:252
-#: actions/imsettings.php:395 actions/othersettings.php:162
-#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
-msgid "Couldn't update user."
-msgstr "Корисникот не може да се освежи/"
-
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
-msgid "Create"
-msgstr "Креирај"
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+#, fuzzy
+msgid "Avatar settings"
+msgstr "Поставки"
 
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
-msgid "Create a new user with this nickname."
-msgstr "Креирај нов корисник со овој прекар."
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
-msgid "Create new account"
-msgstr "Креирај нова сметка"
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
-msgid "Creating new account for OpenID that already has a user."
-msgstr "Креирање на нова сметка за OpenID што веќе има корисник."
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+msgid "Delete"
+msgstr ""
 
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "Моментално потврдена Jabber/GTalk адреса."
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+msgstr "Товари"
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
 msgstr ""
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-msgid "Current confirmed email address."
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
-msgstr "Моментално"
+#: actions/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Неочекувано испраќање на формулар."
 
-#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
-#, php-format
-msgid "DB error inserting hashtag: %s"
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Одговор од внесот во базата: %s"
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
-msgid "Delete notice"
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
 msgstr ""
 
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "Опишете се себе си и сопствените интереси во 140 знаци."
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+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 actions/register.php:381
-#: actions/register.php:385 lib/accountsettingsaction.php:113
-msgid "Email"
-msgstr "Е-пошта"
+#: actions/avatarsettings.php:363
+msgid "Failed updating avatar."
+msgstr "Товарањето на аватарот не успеа."
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-msgid "Email Address"
-msgstr ""
+#: actions/avatarsettings.php:387
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Аватарот е ажуриран."
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
-msgstr ""
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+msgid "No nickname"
+msgstr "Нема прекар"
 
-#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-msgid "Email address already exists."
-msgstr "Адресата веќе постои."
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+#, fuzzy
+msgid "No such group"
+msgstr "Нема такво известување."
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
-msgid "Email address confirmation"
-msgstr "Потврдување на адресата"
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "Корисникот нема профил."
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s и пријателите"
+
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
 msgstr ""
 
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-msgid "Email addresses"
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Нема таков корисник."
+
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
 msgstr ""
 
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
-msgid "Enter a nickname or email address."
-msgstr "Внесете прекар или е-пошта"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+#, fuzzy
+msgid "Unblock this user"
+msgstr "Нема таков корисник."
 
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Не сте пријавени."
+
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
 msgstr ""
 
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
-msgid "Error authorizing token"
-msgstr "Грешка во проверувањето на белегот"
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
-msgid "Error connecting user to OpenID."
-msgstr "Грешка во поврзувањето на корисникот со OpenID"
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#, fuzzy
+msgid "Block user"
+msgstr "Нема таков корисник."
 
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
-msgstr "Грешка во поврзувањето на корисникот."
+#: actions/block.php:136
+msgid ""
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
-msgstr "Грешка во внесувањето на аватарот"
+#: actions/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
+msgid "No"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
-msgstr "Грешка во внесувањето на новиот профил"
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Нема таков корисник."
 
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
-msgstr "Грешка во внесувањето на оддалечениот профил"
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
+msgstr ""
 
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
-msgid "Error saving address confirmation."
-msgstr "Грешка во снимањето на потвдата за адресата."
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "Нема таков корисник."
 
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
-msgid "Error saving remote profile"
-msgstr "Грешка во снимањето на оддалечениот профил"
+#: actions/block.php:165
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "Веќе сте пријавени!"
 
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-msgid "Error saving the profile."
-msgstr "Грешка во снимањето на профилот."
+#: actions/block.php:170
+msgid "Failed to save block information."
+msgstr ""
 
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-msgid "Error saving the user."
-msgstr "Грешка во снимањето на корисникот."
+#: actions/bookmarklet.php:50
+msgid "Post to "
+msgstr ""
 
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
-msgid "Error saving user; invalid."
-msgstr "Грешка во снимањето на корисникот; неправилен."
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+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 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-msgid "Error setting user."
-msgstr "Грешка во поставувањето на корисникот."
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "Кодот за потврда не е пронајден."
 
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr "Грешка во освежувањето на профилот"
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "Овој код за потврда не е за Вас!"
 
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
-msgstr "Грешка во освежувањето на оддалечениот профил"
+#: actions/confirmaddress.php:90
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr "Непознат тип на адреса %s"
 
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr "Грешка со кодот за потврдување."
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr "Оваа адреса веќе е потврдена."
 
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
-msgid "Existing nickname"
-msgstr "Постоечки прекар"
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "Корисникот не може да се освежи/"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
-msgid "FAQ"
-msgstr "ЧПП"
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr "Не може да се креира потврда за е-пошта."
 
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
-msgid "Failed updating avatar."
-msgstr "Товарањето на аватарот не успеа."
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "Потврди ја адресата"
 
-#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/confirmaddress.php:159
 #, php-format
-msgid "Feed for friends of %s"
-msgstr "Канал со пријатели на %S"
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "Адресата  \"%s\" е потврдена за Вашата сметка."
 
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
-#, php-format
-msgid "Feed for replies to %s"
-msgstr "Канал со одговори на %s"
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Локација"
 
-#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
-#, php-format
-msgid "Feed for tag %s"
-msgstr ""
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
+msgstr "Известувања"
 
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
-msgstr ""
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
+msgstr "Нема такво известување."
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
 msgstr ""
 
-#: ../actions/login.php:122
+#: actions/deletenotice.php:103
 msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
 msgstr ""
-"Поради безбедносни причини треба повторно да го внесете Вашето корисничко "
-"име и лозинка пред да ги смените Вашите поставки."
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
-#: actions/profilesettings.php:77 actions/register.php:178
-#: actions/profilesettings.php:103 actions/register.php:391
-#: actions/showgroup.php:235 actions/showstream.php:262
-#: actions/tagother.php:105 lib/groupeditform.php:142
-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
-#: actions/editgroup.php:195 actions/newgroup.php:146
-#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
-msgid "Full name is too long (max 255 chars)."
-msgstr "Целото име е предолго (максимум 255 знаци)"
-
-#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
-msgid "Help"
-msgstr "Помош"
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr ""
 
-#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
-msgid "Home"
-msgstr "Дома"
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
-msgid "Homepage"
-msgstr "Домашна страница"
+#: actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "Нема такво известување."
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
-msgid "Homepage is not a valid URL."
-msgstr "Домашната страница не е правилно URL."
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+msgid "Delete this notice"
+msgstr ""
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
-msgid "I want to post notices by email."
+#: actions/deletenotice.php:157
+msgid "There was a problem with your session token.  Try again, please."
 msgstr ""
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
 msgstr ""
 
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
-msgstr "IM адреса"
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr ""
 
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
-msgstr "Поставки за IM"
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "Нема таков документ."
 
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
+#: actions/editgroup.php:56
+#, php-format
+msgid "Edit %s group"
 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\"."
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
 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."
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+msgid "You must be an admin to edit the group"
 msgstr ""
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-#: actions/emailsettings.php:127 actions/smssettings.php:140
-msgid "Incoming email"
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
 msgstr ""
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
-msgid "Incoming email address removed."
-msgstr ""
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Биографијата е предолга (максимумот е 140 знаци)."
 
-#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
-msgid "Incorrect old password"
-msgstr "Неточна стара лозинка"
+#: actions/editgroup.php:253
+#, fuzzy
+msgid "Could not update group."
+msgstr "Корисникот не може да се освежи/"
 
-#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
-msgid "Incorrect username or password."
-msgstr "Неточно корисничко име или лозинка"
+#: actions/editgroup.php:269
+#, fuzzy
+msgid "Options saved."
+msgstr "Поставките се снимени."
 
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
+#: actions/emailsettings.php:60
+msgid "Email Settings"
 msgstr ""
-"Упатството за пронаоѓање на Вашата лозинка е испратено до адресата за е-"
-"пошта што е регистрирана со Вашата сметка."
-
-#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "Неправилно URL за аватар: '%s'"
 
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/emailsettings.php:71
 #, php-format
-msgid "Invalid email address: %s"
+msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
-#, php-format
-msgid "Invalid homepage '%s'"
-msgstr "Невалидна домашна страница: '%s'"
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "Адреса"
 
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
-#, php-format
-msgid "Invalid license URL '%s'"
-msgstr "Неправилно URL за лиценца: '%s'"
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr ""
 
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
-msgstr "Неправилна содржина за известување"
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "Отстрани"
 
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
-msgstr "Неправилно uri на известување"
+#: actions/emailsettings.php:113
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
 
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
-msgstr "Неправилно url на известување"
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "Откажи"
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "Неправилно URL на профил: '%s'"
+#: actions/emailsettings.php:121
+msgid "Email Address"
+msgstr ""
 
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
-msgstr "Неправилно URL на профил (лош формат)"
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
-msgstr "Неправилно URL на профил вратено од серверот"
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "Додај"
 
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
-#: actions/avatarbynickname.php:69
-msgid "Invalid size."
-msgstr "Погрешна големина."
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+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
-#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
-msgid "Invalid username or password."
-msgstr "Погрешно име или лозинка."
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
+msgstr ""
 
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-msgid "Invitation(s) sent"
+#: actions/emailsettings.php:145 actions/smssettings.php:162
+msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-msgid "Invitation(s) sent to the following people:"
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
 msgstr ""
 
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
-msgid "Invite"
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
+msgstr "Преференции"
+
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-msgid "Invite new users"
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
-#, php-format
-msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
 msgstr ""
-"Работи на [StatusNet](http://status.net/) софтверот за микроблогирање, верзија "
-"%s, достапен пд [GNU Affero General Public License](http://www.fsf.org/"
-"licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
-msgstr "Ова Jabber ID му припаќа на друг корисник."
+#: actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
+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."
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
 msgstr ""
-"Jabber или GTalk адреса како „ime@example.org“. Но прво додајте го %s во "
-"Вашата контакт листа во Вашиот IM клиент или GTalk."
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
-msgid "Language"
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
 msgstr ""
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
-msgid "Language is too long (max 50 chars)."
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
 msgstr ""
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
-msgid "Location"
-msgstr "Локација"
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+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
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
-msgid "Location is too long (max 255 chars)."
-msgstr "Локацијата е предолга (максимумот е 255 знаци)."
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+msgstr "Преференциите се снимени."
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
-#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
-#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
-#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
-#, php-format
-msgid "Login"
-msgstr "Пријави се"
+#: actions/emailsettings.php:319
+msgid "No email address."
+msgstr ""
 
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Пријавете се со [OpenID](%%doc.openid%%) сметка."
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
+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%"
-"%). "
+#: actions/emailsettings.php:330
+msgid "Not a valid email address"
 msgstr ""
-"Пријавете се со корисничко име и лозинка. Немате? [Регистрирајте](%%action."
-"register%%) нова сметка или пробајте [OpenID](%%action.openidlogin%%). "
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
-msgid "Logout"
-msgstr "Одјави се"
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
+msgstr ""
 
-#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
-msgid "Longer name, preferably your \"real\" name"
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another user."
 msgstr ""
 
-#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
-msgid "Lost or forgotten password?"
-msgstr "Загубена или заборавена лозинка?"
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+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."
+#: actions/emailsettings.php:358
+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/emailsettings.php:27 actions/emailsettings.php:27
-#: actions/emailsettings.php:71
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr ""
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
+msgstr "Нема потврди кои може да се откажат."
 
-#: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
-msgid "Member since"
-msgstr "Член од"
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "Ова е погрешната IM адреса."
 
-#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
-#, php-format
-msgid "Microblog by %s"
-msgstr "Микроблог на %s"
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+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."
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-msgid "My text and files are available under "
-msgstr "Мојот текст и датотеки се достапни под"
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "Адресата е отстранета."
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#: actions/emailsettings.php:142 actions/smssettings.php:152
-msgid "New"
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
 msgstr ""
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
-#, php-format
-msgid "New email address for posting to %s"
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
 msgstr ""
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
-msgid "New incoming email address added."
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
-msgid "New nickname"
-msgstr "Нов прекар"
-
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
-msgstr "Ново известување"
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
+msgstr ""
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-msgid "New password"
-msgstr "Нова лозинка"
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+#, fuzzy
+msgid "Popular notices"
+msgstr "Нема такво известување."
 
-#: ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
-msgstr "Новата лозинка успешно е снимена. Сега сте пријавени."
+#: actions/favorited.php:67
+#, fuzzy, php-format
+msgid "Popular notices, page %d"
+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
-#: actions/login.php:228 actions/profilesettings.php:98
-#: actions/register.php:367 actions/showgroup.php:224
-#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
-msgid "Nickname"
-msgstr "Прекар"
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
+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
-#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
-msgid "Nickname already in use. Try another one."
-msgstr "Тој прекар е во употреба. Одберете друг."
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+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
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "Прекарот мора да има само мали букви и бројки и да нема празни места."
+#: actions/favorited.php:153
+msgid ""
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
-msgid "Nickname not allowed."
-msgstr "Тој прекар не е дозволен."
+#: actions/favorited.php:156
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
+msgstr ""
 
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
-msgstr "Прекар на корисникот што сакате да го следите."
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
 
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
-msgid "Nickname or email"
-msgstr "Прекар или е-пошта"
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Микроблог на %s"
 
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
-msgid "No"
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
 msgstr ""
 
-#: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
-msgstr "Нема JabberID."
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr ""
 
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
-msgid "No authorization request!"
-msgstr "Нема барање за проверка!"
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr ""
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
-msgid "No carrier selected."
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
 msgstr ""
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
-#: actions/confirmaddress.php:75
-msgid "No confirmation code."
-msgstr "Нема код за потврда."
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "Ново известување"
 
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
-#: actions/newnotice.php:126 classes/Command.php:223
-msgid "No content!"
-msgstr "Нема содржина!"
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Ново известување"
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
-msgid "No email address."
+#: actions/file.php:42
+msgid "No attachments"
 msgstr ""
 
-#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
-msgid "No id."
-msgstr "Нема id."
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
-msgid "No incoming email address."
+#: actions/file.php:51
+msgid "No uploaded attachments"
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr "Серверот не достави прекар."
+#: actions/finishremotesubscribe.php:69
+msgid "Not expecting this response!"
+msgstr "Овој одговор не беше очекуван!"
 
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
-msgid "No nickname."
-msgstr "Нема прекар."
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+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
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
-msgid "No pending confirmation to cancel."
-msgstr "Нема потврди кои може да се откажат."
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+msgstr "Може да ја користите локалната претплата."
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
-msgstr "Серверот не достави URL за профилот."
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "Не е одобрено."
 
-#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
-msgid "No registered email address for that user."
-msgstr "Нема регистрирана адреса за е-пошта за тој корисник."
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "Белезите за барање не може да се конвертираат во белези за пристап."
 
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr "Не е пронаједено барање."
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Непозната верзија на протоколот OMB."
 
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
-msgid "No results"
-msgstr "Нема резултати"
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "Грешка во освежувањето на оддалечениот профил"
 
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
-msgstr "Нема големина."
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+#, fuzzy
+msgid "No such group."
+msgstr "Нема такво известување."
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
-msgid "No status found with that ID."
-msgstr ""
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "Нема такво известување."
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
-msgid "No status with that ID found."
-msgstr ""
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Нема такво известување."
 
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
-msgstr "Нема таков OpenID."
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
+msgstr ""
 
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
-msgid "No such document."
-msgstr "Нема таков документ."
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+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 actions/shownotice.php:87
-#: lib/deleteaction.php:51
-msgid "No such notice."
-msgstr "Нема такво известување."
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "Корисникот нема профил."
 
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr "Нема таков код за спасување."
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "Не ни го испративте тој профил."
 
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-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 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
-msgid "No such user."
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
 msgstr "Нема таков корисник."
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-msgid "No user with that email address or username."
+#: actions/groupblock.php:162
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
 msgstr ""
 
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
-msgstr "Нема никој!"
+#: actions/groupblock.php:178
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "Не може да се пренасочи кон серверот: %s"
 
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr "Ова не е код за спасување."
+#: actions/groupblock.php:179
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "Нема таков корисник."
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
 msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
-msgid "Not a supported data format."
+#: actions/groupbyid.php:74
+msgid "No ID"
 msgstr ""
 
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
-msgstr "Неправилен JabberID"
-
-#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-msgid "Not a valid OpenID."
-msgstr "Неправилен OpenID."
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
-msgid "Not a valid email address"
+#: actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
 msgstr ""
 
-#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-msgid "Not a valid email address."
-msgstr "Неправилна адреса за е-пошта."
-
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-#: actions/editgroup.php:186 actions/newgroup.php:137
-#: actions/profilesettings.php:195 actions/register.php:161
-msgid "Not a valid nickname."
-msgstr "Неправилен прекар."
+#: actions/groupdesignsettings.php:141
+msgid "Group design"
+msgstr ""
 
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
-msgstr "Неправилно URL на профил (неточен сервис)."
+#: actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
 
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr "Неправилно URL на профил (нема дефиниран XRDS)."
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Корисникот не може да се освежи/"
 
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr "Неправилно URL на профил (нема YADIS документ)."
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+msgid "Unable to save your design settings!"
+msgstr ""
 
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
-msgid "Not an image or corrupt file."
-msgstr "Не е слика или датотеката е корумпирана."
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Преференциите се снимени."
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
-msgid "Not authorized."
-msgstr "Не е одобрено."
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
-msgid "Not expecting this response!"
-msgstr "Овој одговор не беше очекуван!"
+#: actions/grouplogo.php:150
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
-msgid "Not found"
+#: actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
 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 actions/block.php:59 actions/disfavor.php:61
-#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
-#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
-#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
-#: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Не сте пријавени."
+#: actions/grouplogo.php:396
+#, fuzzy
+msgid "Logo updated."
+msgstr "Аватарот е ажуриран."
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
-msgid "Not subscribed!."
-msgstr "Не сте претплатени!"
+#: actions/grouplogo.php:398
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "Товарањето на аватарот не успеа."
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
+#: actions/groupmembers.php:93 lib/groupnav.php:92
+#, php-format
+msgid "%s group members"
 msgstr ""
 
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
+#: actions/groupmembers.php:96
 #, php-format
-msgid "Notice feed for %s"
-msgstr "Канал со известувања на %s"
-
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
-msgstr "Известувањето нема профил"
-
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
-msgid "Notices"
-msgstr "Известувања"
+msgid "%s group members, page %d"
+msgstr ""
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
-#, php-format
-msgid "Notices tagged with %s"
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
 msgstr ""
 
-#: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
-msgstr "Стара лозинка"
+#: actions/groupmembers.php:175 lib/groupnav.php:107
+msgid "Admin"
+msgstr ""
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
-msgid "OpenID"
-msgstr "OpenID"
-
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
-msgid "OpenID Account Setup"
-msgstr "Поставување на сметка за OpenID"
-
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-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
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-msgid "OpenID Login"
-msgstr "Пријавување со OpenID"
-
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-#: actions/openidlogin.php:102 actions/openidsettings.php:101
-msgid "OpenID URL"
-msgstr "OpenID URL"
-
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
-msgid "OpenID authentication cancelled."
-msgstr "Проверката на OpenID е откажана."
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr "Проверката на OpenID не успеа: %s"
-
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "Неуспех на OpenID: %s"
-
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr "OpenID-то е отстрането"
-
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
-msgstr "Поставки за OpenID"
-
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-msgid "Optionally add a personal message to the invitation."
+#: actions/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
 msgstr ""
 
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
-msgid "Partial upload."
-msgstr "Парцијално товарање"
+#: actions/groupmembers.php:441
+msgid "Make user an admin of the group"
+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 actions/finishopenidlogin.php:118
-#: actions/login.php:231 actions/register.php:372
-#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-msgid "Password"
-msgstr "Лозинка"
+#: actions/groupmembers.php:473
+msgid "Make Admin"
+msgstr ""
 
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
-msgid "Password and confirmation do not match."
-msgstr "Двете лозинки не се совпаѓаат."
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
 
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
-msgid "Password must be 6 chars or more."
-msgstr "Лозинката мора да биде од најмалку 6 знаци."
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Микроблог на %s"
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-msgid "Password recovery requested"
-msgstr "Побарано е пронаоѓање на лозинката"
+#: actions/groupsearch.php:52
+#, fuzzy, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"Барајте луѓе на %%site.name%% според нивното име, локација или интереси. "
+"Термините одделете ги со празни места. Најмала должина е 3 знаци."
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-msgid "Password saved."
-msgstr "Лозинката е снимена."
+#: actions/groupsearch.php:58
+#, fuzzy
+msgid "Group search"
+msgstr "Пребарување на луѓе"
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-msgid "Passwords don't match."
-msgstr "Лозинките не се совпаѓаат."
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "Нема резултати"
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
+#: actions/groupsearch.php:82
+#, php-format
+msgid ""
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
 msgstr ""
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
 msgstr ""
 
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
-msgstr "Пребарување на луѓе"
-
-#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
-msgid "Personal"
-msgstr "Личен"
-
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-msgid "Personal message"
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
 msgstr ""
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
 msgstr ""
 
-#: ../actions/userauthorization.php:78
+#: actions/groups.php:90
+#, php-format
 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\"."
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
 msgstr ""
-"Проверете ги овие детали ако сакате да се претплатите на известувањата на "
-"овој корисник. Ако не сакате да се претплатите, кликнете на „Откажи“."
 
-#: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
-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 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
-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
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
-msgid "Preferences saved."
-msgstr "Преференциите се снимени."
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+#, fuzzy
+msgid "Create a new group"
+msgstr "Креирај нова сметка"
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
-msgid "Preferred language"
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
 msgstr ""
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
-msgid "Privacy"
-msgstr "Приватност"
-
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-msgid "Problem saving notice."
-msgstr "Проблем во снимањето на известувањето."
-
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
-msgid "Profile"
-msgstr "Профил"
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "Корисникот нема профил."
 
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
-msgstr "URL на профилот"
+#: actions/groupunblock.php:128 actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Грешка во снимањето на корисникот."
 
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
-msgstr "Поставки на профилот"
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "Поставки за IM"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-msgid "Profile unknown"
-msgstr "Непознат профил"
+#: actions/imsettings.php:70
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+"Можете да примате и праќате известувања преку Jabber/GTalk [брзи пораки](%%"
+"doc.im%%). Подолу "
 
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
-msgid "Public Stream Feed"
-msgstr "Јавен канал"
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Оваа страница не е достапна во форматот кој Вие го прифаќате."
 
-#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
-msgid "Public timeline"
-msgstr "Јавна историја"
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Моментално потврдена Jabber/GTalk адреса."
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#: actions/imsettings.php:114
+#, 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:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
-msgid "Publish a MicroID for my email address."
-msgstr ""
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "IM адреса"
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
+#: actions/imsettings.php:126
+#, 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/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
-msgid "Recover"
-msgstr "Пронајди"
-
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
-msgid "Recover password"
-msgstr "Пронаоѓање на лозинка"
-
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-msgid "Recovery code for unknown user."
-msgstr "Код за пронаоѓање за непознат корисник."
+#: actions/imsettings.php:143
+msgid "Send me notices through Jabber/GTalk."
+msgstr "Испраќај ми известувања преку Jabber/GTalk."
 
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
-#: actions/register.php:152 actions/register.php:207 lib/util.php:328
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-msgid "Register"
-msgstr "Регистрирај се"
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr "Испрати известување кога мојот статус на Jabber/GTalk ќе се смени."
 
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
-msgid "Registration not allowed."
+#: actions/imsettings.php:153
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
-msgid "Registration successful"
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
-msgid "Reject"
-msgstr "Одбиј"
-
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
-msgid "Remember me"
-msgstr "Запамети ме"
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "Нема JabberID."
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
-msgid "Remote profile with no matching profile"
-msgstr "Оддалечениот профил нема одговарачки профил"
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr "Ова JabberID не може да се нормализира."
 
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
-msgstr "Оддалечена претплата"
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "Неправилен JabberID"
 
-#: ../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 actions/emailsettings.php:101
-#: actions/emailsettings.php:134 actions/imsettings.php:102
-#: actions/openidsettings.php:166 actions/smssettings.php:103
-#: actions/smssettings.php:146 actions/twittersettings.php:115
-msgid "Remove"
-msgstr "Отстрани"
+#: actions/imsettings.php:299
+msgid "That is already your Jabber ID."
+msgstr "Ова веќе е Вашиот Jabber ID."
 
-#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
-msgstr "Отстрани го OpenID-то"
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr "Ова Jabber ID му припаќа на друг корисник."
 
-#: ../actions/openidsettings.php:73
+#: actions/imsettings.php:327
+#, php-format
 msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
 msgstr ""
-"Ако го остраните Вашето единствено OpenID, тогаш нема да можете да се "
-"пријавите. Ако треба да го отстраните, прво додајте друг OpenID."
+"Испративме код за потврда на IM адресата што ја додадовте. Мора да го "
+"одобрите %S за да ви испраќа пораки."
 
-#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
-msgid "Replies"
-msgstr "Одговори"
+#: actions/imsettings.php:387
+msgid "That is not your Jabber ID."
+msgstr "Ова не е Вашиот Jabber ID."
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
-#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
-#: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: actions/inbox.php:59
 #, php-format
-msgid "Replies to %s"
-msgstr "Одговори испратени до %s"
+msgid "Inbox for %s - page %d"
+msgstr ""
 
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
-msgid "Reset"
-msgstr "Ресетирај"
+#: actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
 
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
-msgid "Reset password"
-msgstr "Рестетирај ја лозинката"
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-msgid "SMS"
+#: actions/invite.php:39
+msgid "Invites have been disabled."
 msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
-msgid "SMS Phone number"
+#: actions/invite.php:41
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
 msgstr ""
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
+#: actions/invite.php:72
+#, php-format
+msgid "Invalid email address: %s"
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
-msgid "SMS confirmation"
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
 msgstr ""
 
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
-msgid "Same as password above"
-msgstr "Исто како лозинката погоре"
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr ""
 
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
-msgid "Same as password above. Required."
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
 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 actions/emailsettings.php:182
-#: actions/facebooksettings.php:114 actions/imsettings.php:157
-#: actions/othersettings.php:117 actions/profilesettings.php:150
-#: actions/smssettings.php:169 actions/subscriptions.php:124
-#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
-msgid "Save"
-msgstr "Сними"
+#: actions/invite.php:131 actions/invite.php:139
+#, php-format
+msgid "%s (%s)"
+msgstr ""
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
-msgid "Search"
-msgstr "Барај"
+#: actions/invite.php:136
+msgid ""
+"These people are already users and you were automatically subscribed to them:"
+msgstr ""
 
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
-msgstr "Барај во каналот"
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
-#, php-format
+#: actions/invite.php:150
 msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 msgstr ""
-"Барајте известувања на %%site.name%% според нивната содржина. Термините "
-"одделете ги со празни места. Најмала должина е 3 знаци."
 
-#: ../actions/peoplesearch.php:28
-#, php-format
+#: actions/invite.php:162
 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."
+"Use this form to invite your friends and colleagues to use this service."
 msgstr ""
-"Барајте луѓе на %%site.name%% според нивното име, локација или интереси. "
-"Термините одделете ги со празни места. Најмала должина е 3 знаци."
 
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
-msgid "Select a carrier"
+#: actions/invite.php:187
+msgid "Email addresses"
 msgstr ""
 
-#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
-#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
-msgid "Send"
-msgstr "Испрати"
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
+#: actions/invite.php:192
+msgid "Personal message"
 msgstr ""
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
-msgid "Send me notices through Jabber/GTalk."
-msgstr "Испраќај ми известувања преку Jabber/GTalk."
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
+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."
+#: actions/invite.php:226
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#: actions/invite.php:228
+#, 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/util.php:304 lib/util.php:320 lib/facebookaction.php:215
-msgid "Settings"
-msgstr "Поставки"
-
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
-msgid "Settings saved."
-msgstr "Поставките се снимени."
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
 msgstr ""
 
-#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:114
-msgid "Someone else already has this OpenID."
-msgstr "Некој друг веќе го користи ова OpenID."
+#: actions/joingroup.php:90 lib/command.php:217
+#, fuzzy
+msgid "You are already a member of that group"
+msgstr "Веќе сте пријавени!"
 
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
-msgstr "Нешто чудно се случи."
+#: actions/joingroup.php:128 lib/command.php:234
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s"
+msgstr "Не може да се пренасочи кон серверот: %s"
 
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
+#: actions/joingroup.php:135 lib/command.php:239
+#, php-format
+msgid "%s joined group %s"
 msgstr ""
 
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
-msgid "Source"
-msgstr "Изворен код"
-
-#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
-msgid "Statistics"
-msgstr "Статистика"
+#: actions/leavegroup.php:90 lib/command.php:268
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "Не ни го испративте тој профил."
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-msgid "Stored OpenID not found."
-msgstr "Зачуваниот OpenID не е пронајден."
+#: actions/leavegroup.php:119 lib/command.php:278
+msgid "Could not find membership record."
+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
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
-msgid "Subscribe"
-msgstr "Претплати се"
+#: actions/leavegroup.php:127 lib/command.php:284
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "OpenID формуларот не може да се креира:%s"
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
-msgid "Subscribers"
-msgstr "Претплатници"
+#: actions/leavegroup.php:134 lib/command.php:289
+#, php-format
+msgid "%s left group %s"
+msgstr ""
 
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
-msgid "Subscription authorized"
-msgstr "Претплатата е одобрена"
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "Веќе сте најавени."
 
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
-msgid "Subscription rejected"
-msgstr "Претплатата е одбиена"
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+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
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
-msgid "Subscriptions"
-msgstr "Претплати"
+#: actions/login.php:143
+msgid "Incorrect username or password."
+msgstr "Неточно корисничко име или лозинка"
 
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
-msgid "System error uploading file."
-msgstr "Системска грешка при товарањето на датотеката."
+#: actions/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
+msgstr "Грешка во поставувањето на корисникот."
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
-#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
-msgid "Tags"
-msgstr ""
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "Пријави се"
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
+#: actions/login.php:243
+msgid "Login to site"
 msgstr ""
 
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
-msgid "Text search"
-msgstr "Текстуално пребарување"
-
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
-msgstr "Овој OpenID не Ви припаѓа Вам."
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Прекар"
 
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
-msgstr "Оваа адреса веќе е потврдена."
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Лозинка"
 
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
-msgstr "Овој код за потврда не е за Вас!"
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "Запамети ме"
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
+#: actions/login.php:253 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
+"Следниот пат најавете се автоматски; не за компјутери кои ги делите со други!"
 
-#: ../actions/avatar.php:80 actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
-msgstr "Датотеката е преголема."
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "Загубена или заборавена лозинка?"
 
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
-msgid "That is already your Jabber ID."
-msgstr "Ова веќе е Вашиот Jabber ID."
+#: actions/login.php:282
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr ""
+"Поради безбедносни причини треба повторно да го внесете Вашето корисничко "
+"име и лозинка пред да ги смените Вашите поставки."
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
-msgid "That is already your email address."
+#: actions/login.php:286
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
 msgstr ""
+"Пријавете се со корисничко име и лозинка. Немате? [Регистрирајте](%%action."
+"register%%) нова сметка или пробајте [OpenID](%%action.openidlogin%%). "
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
-msgid "That is already your phone number."
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
 msgstr ""
 
-#: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
-msgid "That is not your Jabber ID."
-msgstr "Ова не е Вашиот Jabber ID."
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
-msgid "That is not your email address."
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
 msgstr ""
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
 msgstr ""
 
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-#: actions/emailsettings.php:367 actions/imsettings.php:349
-msgid "That is the wrong IM address."
-msgstr "Ова е погрешната IM адреса."
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr ""
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
+#: actions/newgroup.php:53
+msgid "New group"
 msgstr ""
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-msgid "That phone number already belongs to another user."
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
 msgstr ""
 
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49 actions/twitapistatuses.php:330
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-msgid "That's too long. Max notice size is 140 chars."
-msgstr "Ова е предолго. Максималната должина е 140 знаци."
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr ""
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
-msgid "That's too long. Max notice size is 255 chars."
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
 msgstr ""
 
-#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
-#, php-format
-msgid "The address \"%s\" has been confirmed for your account."
-msgstr "Адресата  \"%s\" е потврдена за Вашата сметка."
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+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
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
-msgid "The address was removed."
-msgstr "Адресата е отстранета."
+#: actions/newmessage.php:158
+msgid "No recipient specified."
+msgstr ""
 
-#: ../actions/userauthorization.php:312
+#: actions/newmessage.php:164 lib/command.php:370
 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:"
+"Don't send a message to yourself; just say it to yourself quietly instead."
 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."
+#: actions/newmessage.php:181
+msgid "Message sent"
 msgstr ""
-"Претплатата е одбиена, но нема вратено URL. Проверете ги инструкциите за "
-"местото за да видите како целосно да ја одбиете претплатата."
 
-#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/newmessage.php:185 lib/command.php:375
 #, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr "Ова се луѓето што ги следат известувањата на %s."
+msgid "Direct message to %s sent"
+msgstr ""
 
-#: ../actions/subscribers.php:33 actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr "Ова се луѓето што ги следат Вашите известувања."
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
+msgstr ""
 
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
-#, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr "Ова се луѓето чии известувања ги следи %s."
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "Ново известување"
 
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr "Ова се луѓето чии известувања ги следите."
+#: actions/newnotice.php:199
+#, fuzzy
+msgid "Notice posted"
+msgstr "Известувања"
 
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/noticesearch.php:68
+#, php-format
 msgid ""
-"These people are already users and you were automatically subscribed to them:"
+"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/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
-msgstr "Овој код за потврда е премногу стар. Почнете од почеток."
+#: actions/noticesearch.php:78
+msgid "Text search"
+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/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "Пребарувај го потокот за „%s“"
 
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/noticesearch.php:121
 #, 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 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-msgid "This method requires a POST or DELETE."
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 msgstr ""
 
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
-msgid "This method requires a POST."
+#: actions/noticesearch.php:124
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#: ../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
-#: actions/profilesettings.php:138
-msgid "Timezone"
-msgstr ""
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Микроблог на %s"
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
-msgid "Timezone not selected."
-msgstr ""
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Сите новини кои се еднакви со бараниот термин „%s“"
 
-#: ../actions/remotesubscribe.php:43
-#, php-format
+#: actions/nudge.php:85
 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."
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
-"За да се претплатите, може да се [пријавите](%%action.login%%) или  да се "
-"[регистрирате](%%action.register%%). Ако имате сметка на [компатибилно место "
-"за микро блогирање](%%doc.openmublog%%), внесете го URL-то на Вашиот профил "
-"подолу."
 
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
-msgid "Two user ids or screen_names must be supplied."
+#: actions/nudge.php:94
+msgid "Nudge sent"
 msgstr ""
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL на Вашата домашна страница, блог или профил на друго место."
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr ""
 
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-msgid "URL of your profile on another compatible microblogging service"
-msgstr "URL на Вашиот профил на друго компатибилно место за микроблогирање."
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+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 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-msgid "Unexpected form submission."
-msgstr "Неочекувано испраќање на формулар."
+#: actions/oembed.php:86 actions/shownotice.php:180
+#, php-format
+msgid "%1$s's status on %2$s"
+msgstr "%1$s статус на %2$s"
 
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
-msgid "Unexpected password reset."
-msgstr "Неочекувано ресетирање на лозинка."
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Поврзи се"
 
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-msgid "Unknown action"
+#: actions/oembed.php:160
+msgid "Only "
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-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 "
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
 msgstr ""
-"Освен ако не е поинаку назначено, содржината на ова место е авторско право "
-"на придонесувачите и е достапна под"
 
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
-#, php-format
-msgid "Unrecognized address type %s"
-msgstr "Непознат тип на адреса %s"
-
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
-msgstr "Откажи ја претплатата"
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr ""
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-msgid "Unsupported OMB version"
-msgstr "Неподдржнана верзија на ОМВ"
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr ""
 
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
-msgid "Unsupported image file format."
-msgstr "Неподдржан фомрат на слики."
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "Поставки"
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
+#: actions/othersettings.php:71
+msgid "Manage various other options."
 msgstr ""
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
+#: actions/othersettings.php:108
+msgid " (free service)"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
-#, php-format
-msgid "Updates from %1$s on %2$s!"
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
 msgstr ""
 
-#: ../actions/avatar.php:68 actions/profilesettings.php:161
-#: actions/avatarsettings.php:162 actions/grouplogo.php:232
-msgid "Upload"
-msgstr "Товари"
+#: actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+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."
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
 msgstr ""
-"Тука можете да поставите нов „аватар“ (косиничка слика). Не можете да ја "
-"менувате сликата откако ќе ја товарите, па затоа погрижете се да личи на "
-"квадрат. Сликата мора да биде под истата лиценца како ова место. Користете "
-"слика која е Ваша и која сакате да ја споделите."
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
+#: actions/othersettings.php:153
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Локацијата е предолга (максимумот е 255 знаци)."
+
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %s - page %d"
 msgstr ""
 
-#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
+#: actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
 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/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
-msgid "User being listened to doesn't exist."
-msgstr "Корисникот кој го следите не постои."
+#: actions/passwordsettings.php:58
+msgid "Change password"
+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
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-msgid "User has no profile."
-msgstr "Корисникот нема профил."
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "Промени ја лозинката"
 
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
-msgstr "Прекар на корисникот"
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#, fuzzy
+msgid "Password change"
+msgstr "Лозинката е снимена."
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr ""
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "Стара лозинка"
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
-msgid "What timezone are you normally in?"
-msgstr ""
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "Нова лозинка"
 
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
-#, php-format
-msgid "What's up, %s?"
-msgstr "Што има %s?"
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6 или повеќе знаци"
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-#: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Каде се наоѓате, на пр. „Град, Држава“."
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "Потврди"
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
-#, php-format
-msgid "Wrong image type for '%s'"
-msgstr "Погрешен тип на слика за '%s'"
+#: actions/passwordsettings.php:113
+msgid "same as password above"
+msgstr "исто како лозинката погоре"
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
-#, php-format
-msgid "Wrong size image at '%s'"
-msgstr "Погрешна големина на слика на '%s'"
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "Промени"
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
-msgid "Yes"
+#: actions/passwordsettings.php:154 actions/register.php:230
+msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-msgid "You already have this OpenID!"
-msgstr "Веќе го имате овој OpenID!"
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+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/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "Неточна стара лозинка"
 
-#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
-msgstr "Веќе сте пријавени!"
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "Грешка во снимањето на корисникот; неправилен."
 
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-msgid "You are already subscribed to these users:"
-msgstr ""
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "Новата лозинка не може да се сними"
+
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "Лозинката е снимена."
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
-msgid "You are not friends with the specified user."
+#: actions/peoplesearch.php:52
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+"Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
+"Барајте луѓе на %%site.name%% според нивното име, локација или интереси. "
+"Термините одделете ги со празни места. Најмала должина е 3 знаци."
 
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr "Овде можете да ја промените лозинката. Одберете добра лозинка!"
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "Пребарување на луѓе"
 
-#: ../actions/register.php:135 actions/register.php:145
-msgid "You can create a new account to start posting notices."
-msgstr "Можете да креирате нова сметка за да испраќате известувања."
+#: actions/peopletag.php:70
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Неправилна адреса за е-пошта."
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
+#: actions/peopletag.php:144
 #, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
+msgid "Users self-tagged with %s - page %d"
 msgstr ""
 
-#: ../actions/openidsettings.php:86
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr ""
-"Можте да отстраните OpenID од Вашата сметка со кликање на копчето „Отстрани“."
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "Неправилна содржина за известување"
 
-#: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/postnotice.php:90
 #, php-format
-msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
-"Можете да примате и праќате известувања преку Jabber/GTalk [брзи пораки](%%"
-"doc.im%%). Подолу "
 
-#: ../actions/profilesettings.php:27
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "Поставки на профилот"
+
+#: actions/profilesettings.php:71
 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
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
-msgstr "Може да ја користите локалната претплата."
+#: actions/profilesettings.php:99
+#, fuzzy
+msgid "Profile information"
+msgstr "Непознат профил"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
-msgid "You can't register if you don't agree to the license."
-msgstr "Не може да се регистрирате ако не ја прифаќате лиценцата."
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64 мали букви или бројки. Без интерпукциски знаци и празни места."
 
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
-msgid "You did not send us that profile"
-msgstr "Не ни го испративте тој профил."
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full 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/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "Домашна страница"
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
-msgid "You may not delete another user's status."
-msgstr ""
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "URL на Вашата домашна страница, блог или профил на друго место."
 
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr ""
+#: actions/profilesettings.php:122 actions/register.php:460
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Опишете се себе си и сопствените интереси во 140 знаци."
 
-#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
+#: actions/profilesettings.php:125 actions/register.php:463
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Опишете се себе си и сопствените интереси во 140 знаци."
 
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr "Идентификувани сте. Подолу можете да внесете нова лозинка."
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "Био"
 
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
-msgid "Your OpenID URL"
-msgstr "Вашето URL за OpenID"
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "Локација"
 
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "Каде се наоѓате, на пр. „Град, Држава“."
+
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
 msgstr ""
-"Вашиот прекар на овој сервер или адресата за е-пошта со која се "
-"регистриравте."
 
-#: ../actions/openidsettings.php:28
-#, php-format
+#: actions/profilesettings.php:140
 msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
-"account.  Manage your associated OpenIDs from here."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
-"[OpenID](%%doc.openid%%) Ви овозможува да се пријавувате на многу места со "
-"истата корисничка сметка. Овде можете да ги уредите Вашите поврзани OpenID-"
-"ја."
-
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
-msgid "a few seconds ago"
-msgstr "пред неколку секунди"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
-#, php-format
-msgid "about %d days ago"
-msgstr "пред %d денови"
+#: actions/profilesettings.php:144
+msgid "Language"
+msgstr ""
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
-#, php-format
-msgid "about %d hours ago"
-msgstr "пред %d часа"
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr ""
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
-#, php-format
-msgid "about %d minutes ago"
-msgstr "пред %d минути"
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr ""
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
-#, php-format
-msgid "about %d months ago"
-msgstr "пред %d месеци"
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
+msgstr ""
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
-msgid "about a day ago"
-msgstr "пред еден ден"
+#: actions/profilesettings.php:160
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
-msgid "about a minute ago"
-msgstr "пред една минута"
+#: actions/profilesettings.php:221 actions/register.php:223
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Биографијата е предолга (максимумот е 140 знаци)."
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
-msgid "about a month ago"
-msgstr "пред еден месец"
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr ""
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
-msgid "about a year ago"
-msgstr "пред една година"
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr ""
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
-msgid "about an hour ago"
-msgstr "пред еден час"
+#: actions/profilesettings.php:246 actions/tagother.php:178
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Невалидна домашна страница: '%s'"
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
 msgstr ""
 
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117 actions/noticesearch.php:136
-#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
-msgid "in reply to..."
-msgstr "во одговор на..."
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+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 actions/noticesearch.php:194
-msgid "reply"
-msgstr "одговор"
+#: actions/profilesettings.php:336
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Профилот не може да се сними."
 
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-msgid "same as password above"
-msgstr "исто како лозинката погоре"
+#: actions/profilesettings.php:344
+msgid "Settings saved."
+msgstr "Поставките се снимени."
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
-msgid "unsupported file type"
+#: actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
 msgstr ""
 
-#: ../lib/util.php:1309 lib/util.php:1443
-#, fuzzy
-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
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-msgid "There was a problem with your session token. Try again, please."
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
 msgstr ""
 
-#: actions/disfavor.php:55 actions/disfavor.php:81
-msgid "This notice is not a favorite!"
-msgstr ""
+#: actions/public.php:129
+#, fuzzy, php-format
+msgid "Public timeline, page %d"
+msgstr "Јавна историја"
 
-#: actions/disfavor.php:63 actions/disfavor.php:87
-msgid "Could not delete favorite."
-msgstr ""
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr "Јавна историја"
 
-#: actions/disfavor.php:72 lib/favorform.php:140
-msgid "Favor"
-msgstr ""
+#: actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Јавен канал"
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
-msgstr ""
+#: actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Јавен канал"
 
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-msgid "Send me email when someone sends me a private message."
-msgstr ""
+#: actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Јавен канал"
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
-msgid "This notice is already a favorite!"
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
 msgstr ""
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132 actions/favor.php:86
-#: actions/twitapifavorites.php:125 classes/Command.php:152
-msgid "Could not create favorite."
+#: actions/public.php:182
+msgid "Be the first to post!"
 msgstr ""
 
-#: actions/favor.php:70
-msgid "Disfavor"
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/public.php:233
 #, php-format
-msgid "%s favorite notices"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/public.php:238
 #, php-format
-msgid "Feed of favorite notices of %s"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
 msgstr ""
 
-#: actions/inbox.php:28 actions/inbox.php:59
+#: actions/publictagcloud.php:57
+#, fuzzy
+msgid "Public tag cloud"
+msgstr "Јавен канал"
+
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "Inbox for %s - page %d"
+msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/inbox.php:30 actions/inbox.php:62
+#: actions/publictagcloud.php:69
 #, php-format
-msgid "Inbox for %s"
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
 
-#: actions/inbox.php:53 actions/inbox.php:115
-msgid "This is your inbox, which lists your incoming private messages."
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
 msgstr ""
 
-#: actions/invite.php:178 actions/invite.php:213
+#: actions/publictagcloud.php:75
 #, php-format
 msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
 msgstr ""
 
-#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-msgid "Automatically login in the future; "
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
 msgstr ""
 
-#: actions/login.php:122 actions/login.php:264
-msgid "For security reasons, please re-enter your "
-msgstr ""
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "Веќе сте пријавени!"
 
-#: actions/login.php:126 actions/login.php:268
-msgid "Login with your username and password. "
-msgstr ""
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "Нема таков код за спасување."
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
-msgid "That's too long. Max message size is 140 chars."
-msgstr ""
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "Ова не е код за спасување."
 
-#: actions/newmessage.php:65 actions/newmessage.php:128
-msgid "No recipient specified."
-msgstr ""
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr "Код за пронаоѓање за непознат корисник."
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206 actions/newmessage.php:131
-#: actions/newmessage.php:168 classes/Command.php:237
-msgid "You can't send a message to this user."
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "Грешка со кодот за потврдување."
+
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
+msgstr "Овој код за потврда е премногу стар. Почнете од почеток."
+
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
 msgstr ""
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: actions/recoverpassword.php:152
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
 msgstr ""
 
-#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
-msgid "No such user"
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
-#: actions/newmessage.php:117 actions/newmessage.php:67
-msgid "New message"
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
 msgstr ""
 
-#: actions/noticesearch.php:95 actions/noticesearch.php:146
-msgid "Notice without matching profile"
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
 msgstr ""
 
-#: actions/openidsettings.php:28 actions/openidsettings.php:70
-#, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
 msgstr ""
+"Вашиот прекар на овој сервер или адресата за е-пошта со која се "
+"регистриравте."
 
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
-msgstr ""
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
+msgstr "Пронајди"
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr ""
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "Рестетирај ја лозинката"
 
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-msgid "You can remove an OpenID from your account "
-msgstr ""
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr "Пронаоѓање на лозинка"
 
-#: actions/outbox.php:28 actions/outbox.php:58
-#, php-format
-msgid "Outbox for %s - page %d"
-msgstr ""
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
+msgstr "Побарано е пронаоѓање на лозинката"
 
-#: actions/outbox.php:30 actions/outbox.php:61
-#, php-format
-msgid "Outbox for %s"
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
 msgstr ""
 
-#: actions/outbox.php:53 actions/outbox.php:116
-msgid "This is your outbox, which lists private messages you have sent."
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 или повеќе знаци и не ја заборавајте!"
+
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Исто како лозинката погоре"
+
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "Ресетирај"
+
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "Внесете прекар или е-пошта"
+
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
 msgstr ""
 
-#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
-#, php-format
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr "Нема регистрирана адреса за е-пошта за тој корисник."
+
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "Грешка во снимањето на потвдата за адресата."
+
+#: actions/recoverpassword.php:325
 msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
 msgstr ""
+"Упатството за пронаоѓање на Вашата лозинка е испратено до адресата за е-"
+"пошта што е регистрирана со Вашата сметка."
 
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
-msgid "You can update your personal profile info here "
-msgstr ""
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
+msgstr "Неочекувано ресетирање на лозинка."
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
-msgid "User without matching profile"
-msgstr ""
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "Лозинката мора да биде од најмалку 6 знаци."
 
-#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
-msgstr ""
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
+msgstr "Двете лозинки не се совпаѓаат."
 
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
-msgstr ""
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
+msgstr "Новата лозинка успешно е снимена. Сега сте пријавени."
 
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a "
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-msgid "Your nickname on this server, "
-msgstr ""
+#: actions/register.php:92
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "Грешка со кодот за потврдување."
 
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-msgid "Instructions for recovering your password "
+#: actions/register.php:112
+msgid "Registration successful"
 msgstr ""
 
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
-msgid "New password successfully saved. "
-msgstr ""
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "Регистрирај се"
 
-#: actions/register.php:95 actions/register.php:180
-msgid "Password must be 6 or more characters."
+#: actions/register.php:135
+msgid "Registration not allowed."
 msgstr ""
 
-#: actions/register.php:216
-#, php-format
+#: actions/register.php:198
+msgid "You can't register if you don't agree to the license."
+msgstr "Не може да се регистрирате ако не ја прифаќате лиценцата."
+
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "Неправилна адреса за е-пошта."
+
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "Адресата веќе постои."
+
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "Погрешно име или лозинка."
+
+#: actions/register.php:342
 msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
 msgstr ""
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
+#: actions/register.php:424
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 
-#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
-#, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
+#: actions/register.php:429
+msgid "6 or more characters. Required."
 msgstr ""
 
-#: actions/showfavorites.php:61 actions/showfavorites.php:145
-#, php-format
-msgid "Feed for favorites of %s"
+#: actions/register.php:433
+msgid "Same as password above. Required."
 msgstr ""
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-msgid "Could not retrieve favorite notices."
-msgstr ""
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "Е-пошта"
 
-#: actions/showmessage.php:33 actions/showmessage.php:81
-msgid "No such message."
-msgstr ""
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
+msgstr "Се користи само за надградби, објави и пронаоѓање на лозинка."
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
-#: actions/showmessage.php:61 actions/showmessage.php:108
-#, php-format
-msgid "Message to %1$s on %2$s"
-msgstr ""
+#: actions/register.php:493
+msgid "My text and files are available under "
+msgstr "Мојот текст и датотеки се достапни под"
 
-#: actions/showmessage.php:66 actions/showmessage.php:113
-#, php-format
-msgid "Message from %1$s on %2$s"
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
-#: actions/showstream.php:154
-msgid "Send a message"
+#: actions/register.php:496
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
 msgstr ""
+"освен следниве лични податоци: лозинка, адреса за е-пошта, адреса за ИМ, "
+"телефонски број."
 
-#: actions/smssettings.php:312 actions/smssettings.php:464
+#: actions/register.php:537
 #, php-format
-msgid "Mobile carrier for your phone. "
+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/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
-#, php-format
-msgid "Direct messages to %s"
+#: actions/register.php:561
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/remotesubscribe.php:98
 #, php-format
-msgid "All the direct messages sent to %s"
+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/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-msgid "Direct Messages You've Sent"
-msgstr ""
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr "Оддалечена претплата"
 
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
-#, php-format
-msgid "All the direct messages sent from %s"
-msgstr ""
+#: actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Претплатата е одобрена"
 
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-msgid "No message text!"
-msgstr ""
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "Прекар на корисникот"
 
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-msgid "Recipient user not found."
-msgstr ""
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr "Прекар на корисникот што сакате да го следите."
 
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "URL на профилот"
 
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
-#, php-format
-msgid "%s / Favorites from %s"
-msgstr ""
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "URL на Вашиот профил на друго компатибилно место за микроблогирање."
 
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
-#, php-format
-msgid "%s updates favorited by %s / %s."
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
+msgstr "Претплати се"
+
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr "Неправилно URL на профил (лош формат)"
+
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "Неправилно URL на профил (нема YADIS документ)."
+
+#: actions/remotesubscribe.php:176
+msgid "That’s a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "Не може да се земе белег за барање."
+
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
 #, php-format
-msgid "%s added your notice as a favorite"
-msgstr ""
+msgid "Replies to %s"
+msgstr "Одговори испратени до %s"
+
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %s, page %d"
+msgstr "Одговори испратени до %s"
+
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Канал со известувања на %s"
+
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Канал со известувања на %s"
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Канал со известувања на %s"
+
+#: actions/replies.php:198
 #, php-format
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/replies.php:203
+#, php-format
 msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
-msgstr ""
-
-#: actions/twittersettings.php:41 actions/twittersettings.php:60
-msgid "Twitter settings"
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
 msgstr ""
 
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-msgid "Twitter Account"
-msgstr ""
-
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-msgid "Current verified Twitter account."
+#: actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr ""
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Одговори испратени до %s"
 
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-msgid "No spaces, please."
-msgstr ""
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "Нема такво известување."
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
 msgstr ""
 
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-msgid "Automatically send my notices to Twitter."
-msgstr ""
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Канал со пријатели на %S"
 
-#: actions/twittersettings.php:75 actions/twittersettings.php:146
-msgid "Send local \"@\" replies to Twitter."
-msgstr ""
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Канал со пријатели на %S"
 
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-msgid "Subscribe to my Twitter friends here."
-msgstr ""
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Канал со пријатели на %S"
 
-#: actions/twittersettings.php:122
+#: actions/showfavorites.php:205
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""
 
-#: actions/twittersettings.php:128 actions/twittersettings.php:334
-msgid "Could not verify your Twitter credentials!"
+#: actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/showfavorites.php:211
 #, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
 msgstr ""
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-msgid "Unable to save your Twitter settings!"
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
 msgstr ""
 
-#: actions/twittersettings.php:174 actions/twittersettings.php:376
-msgid "Twitter settings saved."
+#: actions/showgroup.php:82 lib/groupnav.php:86
+#, php-format
+msgid "%s group"
 msgstr ""
 
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-msgid "That is not your Twitter account."
+#: actions/showgroup.php:84
+#, php-format
+msgid "%s group, page %d"
 msgstr ""
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
-msgid "Couldn't remove Twitter user."
-msgstr ""
+#: actions/showgroup.php:218
+#, fuzzy
+msgid "Group profile"
+msgstr "Нема такво известување."
 
-#: actions/twittersettings.php:212 actions/twittersettings.php:407
-msgid "Twitter account removed."
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
+msgid "URL"
 msgstr ""
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
-msgid "Couldn't save Twitter preferences."
-msgstr ""
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
+#, fuzzy
+msgid "Note"
+msgstr "Известувања"
 
-#: actions/twittersettings.php:245 actions/twittersettings.php:461
-msgid "Twitter preferences saved."
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
 msgstr ""
 
-#: actions/userauthorization.php:84 actions/userauthorization.php:86
-msgid "Please check these details to make sure "
+#: actions/showgroup.php:293
+msgid "Group actions"
 msgstr ""
 
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
-msgid "The subscription has been authorized, but no "
-msgstr ""
+#: actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Канал со известувања на %s"
 
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-msgid "The subscription has been rejected, but no "
-msgstr ""
+#: actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Канал со известувања на %s"
 
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-msgid "Command results"
-msgstr ""
+#: actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Канал со известувања на %s"
 
-#: classes/Channel.php:148 classes/Channel.php:204
-msgid "Command complete"
-msgstr ""
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "Канал со известувања на %s"
 
-#: classes/Channel.php:158 classes/Channel.php:215
-msgid "Command failed"
-msgstr ""
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
+#, fuzzy
+msgid "Members"
+msgstr "Член од"
 
-#: classes/Command.php:39 classes/Command.php:44
-msgid "Sorry, this command is not yet implemented."
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/tagcloudsection.php:71
+msgid "(None)"
 msgstr ""
 
-#: classes/Command.php:96 classes/Command.php:113
-#, php-format
-msgid "Subscriptions: %1$s\n"
+#: actions/showgroup.php:392
+msgid "All members"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
-msgid "User has no last notice"
-msgstr ""
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "Статистика"
 
-#: classes/Command.php:146 classes/Command.php:166
-msgid "Notice marked as fave."
-msgstr ""
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Креирај"
 
-#: classes/Command.php:166 classes/Command.php:189
+#: actions/showgroup.php:448
 #, php-format
-msgid "%1$s (%2$s)"
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: classes/Command.php:169 classes/Command.php:192
+#: actions/showgroup.php:454
 #, php-format
-msgid "Fullname: %s"
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
 msgstr ""
 
-#: classes/Command.php:172 classes/Command.php:195
-#, php-format
-msgid "Location: %s"
+#: actions/showgroup.php:482
+msgid "Admins"
 msgstr ""
 
-#: classes/Command.php:175 classes/Command.php:198
-#, php-format
-msgid "Homepage: %s"
+#: actions/showmessage.php:81
+msgid "No such message."
 msgstr ""
 
-#: classes/Command.php:178 classes/Command.php:201
-#, php-format
-msgid "About: %s"
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: classes/Command.php:200 classes/Command.php:228
+#: actions/showmessage.php:108
 #, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
+msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: classes/Command.php:214 classes/Command.php:245
+#: actions/showmessage.php:113
 #, php-format
-msgid "Direct message to %s sent"
-msgstr ""
-
-#: classes/Command.php:216 classes/Command.php:247
-msgid "Error sending direct message."
+msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: classes/Command.php:263 classes/Command.php:300
-msgid "Specify the name of the user to subscribe to"
-msgstr ""
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Известувања"
 
-#: classes/Command.php:270 classes/Command.php:307
+#: actions/showstream.php:73
 #, php-format
-msgid "Subscribed to %s"
+msgid " tagged %s"
 msgstr ""
 
-#: classes/Command.php:288 classes/Command.php:328
-msgid "Specify the name of the user to unsubscribe from"
-msgstr ""
-
-#: classes/Command.php:295 classes/Command.php:335
+#: actions/showstream.php:79
 #, php-format
-msgid "Unsubscribed from %s"
-msgstr ""
-
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
-msgid "Command not yet implemented."
-msgstr ""
-
-#: classes/Command.php:313 classes/Command.php:356
-msgid "Notification off."
+msgid "%s, page %d"
 msgstr ""
 
-#: classes/Command.php:315 classes/Command.php:358
-msgid "Can't turn off notification."
-msgstr ""
+#: actions/showstream.php:122
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Канал со известувања на %s"
 
-#: classes/Command.php:333 classes/Command.php:379
-msgid "Notification on."
-msgstr ""
+#: actions/showstream.php:129
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Канал со известувања на %s"
 
-#: classes/Command.php:335 classes/Command.php:381
-msgid "Can't turn on notification."
-msgstr ""
+#: actions/showstream.php:136
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Канал со известувања на %s"
 
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
-msgstr ""
+#: actions/showstream.php:143
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Канал со известувања на %s"
 
-#: classes/Message.php:53 classes/Message.php:56
-msgid "Could not insert message."
+#: actions/showstream.php:148
+#, php-format
+msgid "FOAF for %s"
 msgstr ""
 
-#: classes/Message.php:63 classes/Message.php:66
-msgid "Could not update message with new URI."
+#: actions/showstream.php:191
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
 msgstr ""
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
 msgstr ""
 
-#: lib/mail.php:147 lib/mail.php:289
+#: actions/showstream.php:198
 #, php-format
 msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: lib/mail.php:249 lib/mail.php:508
+#: actions/showstream.php:234
 #, php-format
-msgid "New private message from %s"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: lib/mail.php:253 lib/mail.php:512
+#: actions/showstream.php:239
 #, php-format
 msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
 msgstr ""
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
+#: actions/smssettings.php:58
+msgid "SMS Settings"
 msgstr ""
 
-#: lib/openid.php:195 lib/openid.php:203
-msgid "This form should automatically submit itself. "
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-msgid "Favorites"
-msgstr ""
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Оваа страница не е достапна во форматот кој Вие го прифаќате."
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-#, php-format
-msgid "%s's favorite notices"
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-msgid "User"
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-msgid "Inbox"
+#: actions/smssettings.php:130
+msgid "Confirmation code"
 msgstr ""
 
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-msgid "Your incoming messages"
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
 msgstr ""
 
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-msgid "Outbox"
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
 msgstr ""
 
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-msgid "Your sent messages"
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-msgid "Twitter"
+#: actions/smssettings.php:174
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
 msgstr ""
 
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
+#: actions/smssettings.php:306
+msgid "No phone number."
 msgstr ""
 
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-msgid "To"
+#: actions/smssettings.php:311
+msgid "No carrier selected."
 msgstr ""
 
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-msgid "Could not parse message."
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
 msgstr ""
 
-#: actions/all.php:63 actions/facebookhome.php:162
-#, fuzzy, php-format
-msgid "%s and friends, page %d"
-msgstr "%s и пријателите"
-
-#: actions/avatarsettings.php:76
-msgid "You can upload your personal avatar."
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
 msgstr ""
 
-#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/smssettings.php:347
 #, fuzzy
-msgid "Avatar settings"
-msgstr "Поставки"
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr "Овој код за потврда не е за Вас!"
 
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-msgid "Original"
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
 msgstr ""
 
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-msgid "Preview"
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
 msgstr ""
 
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
-msgid "Crop"
+#: actions/smssettings.php:465
+msgid "Mobile carrier"
 msgstr ""
 
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-msgid "There was a problem with your session token. "
+#: actions/smssettings.php:469
+msgid "Select a carrier"
 msgstr ""
 
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-msgid "Pick a square area of the image to be your avatar"
+#: actions/smssettings.php:476
+#, 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/avatarsettings.php:327 actions/grouplogo.php:384
-msgid "Lost our file data."
+#: actions/smssettings.php:498
+msgid "No code entered"
 msgstr ""
 
-#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: actions/subedit.php:70
 #, fuzzy
-msgid "Lost our file."
-msgstr "Нема такво известување."
-
-#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
-#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
-msgid "Unknown file type"
-msgstr ""
-
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr ""
+msgid "You are not subscribed to that profile."
+msgstr "Не ни го испративте тој профил."
 
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr ""
+#: actions/subedit.php:83
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "Не може да се креира претплатата"
 
-#: actions/block.php:111
+#: actions/subscribe.php:55
 #, fuzzy
-msgid "Block user"
+msgid "Not a local user."
 msgstr "Нема таков корисник."
 
-#: actions/block.php:129
-msgid "Are you sure you want to block this user? "
-msgstr ""
-
-#: actions/block.php:162
+#: actions/subscribe.php:69
 #, fuzzy
-msgid "You have already blocked this user."
-msgstr "Веќе сте пријавени!"
-
-#: actions/block.php:167
-msgid "Failed to save block information."
-msgstr ""
+msgid "Subscribed"
+msgstr "Претплати се"
 
-#: actions/confirmaddress.php:159
+#: actions/subscribers.php:50
 #, fuzzy, php-format
-msgid "The address \"%s\" has been "
-msgstr "Адресата е отстранета."
+msgid "%s subscribers"
+msgstr "Претплатници"
 
-#: actions/deletenotice.php:73
-msgid "You are about to permanently delete a notice. "
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %d"
 msgstr ""
 
-#: actions/disfavor.php:94
-msgid "Add to favorites"
-msgstr ""
+#: actions/subscribers.php:63
+msgid "These are the people who listen to your notices."
+msgstr "Ова се луѓето што ги следат Вашите известувања."
 
-#: actions/editgroup.php:54
+#: actions/subscribers.php:67
 #, php-format
-msgid "Edit %s group"
+msgid "These are the people who listen to %s's notices."
+msgstr "Ова се луѓето што ги следат известувањата на %s."
+
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
 msgstr ""
 
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-msgid "Inboxes must be enabled for groups to work"
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
 
-#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-msgid "You must be logged in to create a group."
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
 msgstr ""
 
-#: actions/editgroup.php:87 actions/grouplogo.php:87
-#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
-#, fuzzy
-msgid "No nickname"
-msgstr "Нема прекар."
+#: actions/subscriptions.php:52
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "Сите претплати"
 
-#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
-#: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
-#, fuzzy
-msgid "No such group"
-msgstr "Нема такво известување."
+#: actions/subscriptions.php:54
+#, fuzzy, php-format
+msgid "%s subscriptions, page %d"
+msgstr "Сите претплати"
 
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
-msgid "You must be an admin to edit the group"
-msgstr ""
+#: actions/subscriptions.php:65
+msgid "These are the people whose notices you listen to."
+msgstr "Ова се луѓето чии известувања ги следите."
 
-#: actions/editgroup.php:157
-msgid "Use this form to edit the group."
+#: actions/subscriptions.php:69
+#, php-format
+msgid "These are the people whose notices %s listens to."
+msgstr "Ова се луѓето чии известувања ги следи %s."
+
+#: actions/subscriptions.php:121
+#, php-format
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
 msgstr ""
 
-#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s сега ги следи вашите забелешки за %2$s."
+
+#: actions/subscriptions.php:194
 #, fuzzy
-msgid "Nickname must have only lowercase letters "
-msgstr "Прекарот мора да има само мали букви и бројки и да нема празни места."
+msgid "Jabber"
+msgstr "Нема JabberID."
+
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
+msgstr ""
 
-#: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/tagother.php:33
 #, fuzzy
-msgid "description is too long (max 140 chars)."
-msgstr "Биографијата е предолга (максимумот е 140 знаци)."
+msgid "Not logged in"
+msgstr "Не сте пријавени."
 
-#: actions/editgroup.php:218
+#: actions/tagother.php:39
 #, fuzzy
-msgid "Could not update group."
-msgstr "Корисникот не може да се освежи/"
+msgid "No id argument."
+msgstr "Нема таков документ."
 
-#: actions/editgroup.php:226
+#: actions/tagother.php:65
+#, php-format
+msgid "Tag %s"
+msgstr ""
+
+#: actions/tagother.php:77 lib/userprofile.php:75
 #, fuzzy
-msgid "Options saved."
-msgstr "Поставките се снимени."
+msgid "User profile"
+msgstr "Корисникот нема профил."
 
-#: actions/emailsettings.php:107 actions/imsettings.php:108
-#, fuzzy, php-format
-msgid "Awaiting confirmation on this address. "
-msgstr "Грешка со кодот за потврдување."
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
+msgstr ""
 
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-msgid "Make a new email address for posting to; "
+#: actions/tagother.php:141
+msgid "Tag user"
 msgstr ""
 
-#: actions/emailsettings.php:157
-msgid "Send me email when someone "
+#: actions/tagother.php:151
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
 msgstr ""
 
-#: actions/emailsettings.php:168
-msgid "Allow friends to nudge me and send me an email."
+#: actions/tagother.php:193
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/emailsettings.php:321
+#: actions/tagother.php:200
 #, fuzzy
-msgid "That email address already belongs "
-msgstr "Адресата веќе постои."
+msgid "Could not save tags."
+msgstr "Информациите за аватарот не може да се снимат"
 
-#: actions/emailsettings.php:343
-#, fuzzy
-msgid "A confirmation code was sent to the email address you added. "
+#: actions/tagother.php:236
+msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
-"Испративме код за потврда на IM адресата што ја додадовте. Мора да го "
-"одобрите %S за да ви испраќа пораки."
 
-#: actions/facebookhome.php:110
-msgid "Server error - couldn't get user!"
-msgstr ""
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Микроблог на %s"
 
-#: actions/facebookhome.php:196
-#, php-format
-msgid "If you would like the %s app to automatically update "
-msgstr ""
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Канал со известувања на %s"
 
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr ""
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Канал со известувања на %s"
 
-#: actions/facebookhome.php:218
-msgid "Skip"
-msgstr ""
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Канал со известувања на %s"
 
-#: actions/facebookhome.php:235
+#: actions/tagrss.php:35
 #, fuzzy
-msgid "No notice content!"
-msgstr "Нема содржина!"
+msgid "No such tag."
+msgstr "Нема такво известување."
 
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-msgid "Pagination"
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
 msgstr ""
 
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/unsubscribe.php:77
 #, fuzzy
-msgid "After"
-msgstr "« Следни"
+msgid "No profile id in request."
+msgstr "Серверот не достави URL за профилот."
 
-#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/unsubscribe.php:84
 #, fuzzy
-msgid "Before"
-msgstr "Предходни »"
-
-#: actions/facebookinvite.php:70
-#, php-format
-msgid "Thanks for inviting your friends to use %s"
-msgstr ""
+msgid "No profile with that id."
+msgstr "Оддалечениот профил нема одговарачки профил"
 
-#: actions/facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr ""
+#: actions/unsubscribe.php:98
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Откажи ја претплатата"
 
-#: actions/facebookinvite.php:96
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
 #, php-format
-msgid "You have been invited to %s"
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
-#: actions/facebookinvite.php:105
-#, fuzzy, php-format
-msgid "Invite your friends to use %s"
-msgstr "Канал со пријатели на %S"
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "Одобрете ја претплатата"
 
-#: actions/facebookinvite.php:113
-#, php-format
-msgid "Friends already using %s:"
+#: actions/userauthorization.php:110
+#, fuzzy
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
 msgstr ""
+"Проверете ги овие детали ако сакате да се претплатите на известувањата на "
+"овој корисник. Ако не сакате да се претплатите, кликнете на „Откажи“."
 
-#: actions/facebookinvite.php:130
-#, php-format
-msgid "Send invitations"
+#: actions/userauthorization.php:188
+msgid "License"
 msgstr ""
 
-#: actions/facebookremove.php:56
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "Прифати"
+
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
 #, fuzzy
-msgid "Couldn't remove Facebook user."
-msgstr "Корисникот не може да се освежи/"
+msgid "Subscribe to this user"
+msgstr "Претплатата е одобрена"
 
-#: actions/facebooksettings.php:65
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "Одбиј"
 
-#: actions/facebooksettings.php:67
+#: actions/userauthorization.php:212
 #, fuzzy
-msgid "Sync preferences saved."
-msgstr "Преференциите се снимени."
+msgid "Reject this subscription"
+msgstr "Сите претплати"
 
-#: actions/facebooksettings.php:90
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
+msgstr "Нема барање за проверка!"
 
-#: actions/facebooksettings.php:97
-msgid "Send \"@\" replies to Facebook."
-msgstr ""
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+msgstr "Претплатата е одобрена"
 
-#: actions/facebooksettings.php:106
+#: actions/userauthorization.php:249
 #, fuzzy
-msgid "Prefix"
-msgstr "Профил"
-
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
+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/facebooksettings.php:124
-#, php-format
-msgid "If you would like %s to automatically update "
-msgstr ""
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
+msgstr "Претплатата е одбиена"
 
-#: actions/facebooksettings.php:147
+#: actions/userauthorization.php:261
 #, fuzzy
-msgid "Sync preferences"
-msgstr "Преференции"
-
-#: actions/favor.php:94 lib/disfavorform.php:140
-msgid "Disfavor favorite"
+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/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
-#, fuzzy
-msgid "Popular notices"
-msgstr "Нема такво известување."
-
-#: actions/favorited.php:67
-#, fuzzy, php-format
-msgid "Popular notices, page %d"
-msgstr "Нема такво известување."
-
-#: actions/favorited.php:79
-msgid "The most popular notices on the site right now."
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
 msgstr ""
 
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
-msgid "Featured users"
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
 msgstr ""
 
-#: actions/featured.php:71
+#: actions/userauthorization.php:307
 #, php-format
-msgid "Featured users, page %d"
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr ""
 
-#: actions/featured.php:99
+#: actions/userauthorization.php:322
 #, php-format
-msgid "A selection of some of the great users on %s"
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr ""
 
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr ""
 
-#: actions/groupbyid.php:79
-msgid "No ID"
-msgstr ""
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Не може да се прочита URL-то на аватарот: '%s'"
 
-#: actions/grouplogo.php:138 actions/grouplogo.php:191
-msgid "Group logo"
-msgstr ""
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Погрешен тип на слика за '%s'"
 
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
-msgstr ""
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr "Нема id."
 
-#: actions/grouplogo.php:448
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
 #, fuzzy
-msgid "Logo updated."
-msgstr "Аватарот е ажуриран."
+msgid "Profile design"
+msgstr "Поставки на профилот"
 
-#: actions/grouplogo.php:450
-#, fuzzy
-msgid "Failed updating logo."
-msgstr "Товарањето на аватарот не успеа."
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
 
-#: actions/groupmembers.php:93 lib/groupnav.php:91
-#, php-format
-msgid "%s group members"
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
 msgstr ""
 
-#: actions/groupmembers.php:96
+#: actions/usergroups.php:64
 #, php-format
-msgid "%s group members, page %d"
+msgid "%s groups, page %d"
 msgstr ""
 
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
+#: actions/usergroups.php:130
+msgid "Search for more groups"
 msgstr ""
 
-#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
-msgid "Groups"
-msgstr ""
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "Не ни го испративте тој профил."
 
-#: actions/groups.php:64
+#: actions/usergroups.php:158
 #, php-format
-msgid "Groups, page %d"
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
 
-#: actions/groups.php:90
+#: classes/File.php:137
 #, php-format
-msgid "%%%%site.name%%%% groups let you find and talk with "
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
 msgstr ""
 
-#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-#, fuzzy
-msgid "Create a new group"
-msgstr "Креирај нова сметка"
+#: classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
 
-#: actions/groupsearch.php:57
-#, fuzzy, php-format
-msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
+#: classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
-"Барајте луѓе на %%site.name%% според нивното име, локација или интереси. "
-"Термините одделете ги со празни места. Најмала должина е 3 знаци."
 
-#: actions/groupsearch.php:63
-#, fuzzy
-msgid "Group search"
-msgstr "Пребарување на луѓе"
+#: classes/Message.php:55
+msgid "Could not insert message."
+msgstr ""
 
-#: actions/imsettings.php:70
-msgid "You can send and receive notices through "
+#: classes/Message.php:65
+msgid "Could not update message with new URI."
 msgstr ""
 
-#: actions/imsettings.php:120
+#: classes/Notice.php:164
 #, php-format
-msgid "Jabber or GTalk address, "
+msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: actions/imsettings.php:147
+#: classes/Notice.php:179
 #, fuzzy
-msgid "Send me replies through Jabber/GTalk "
-msgstr "Испраќај ми известувања преку Jabber/GTalk."
+msgid "Problem saving notice. Too long."
+msgstr "Проблем во снимањето на известувањето."
 
-#: actions/imsettings.php:321
-#, fuzzy, php-format
-msgid "A confirmation code was sent "
-msgstr "Нема код за потврда."
+#: classes/Notice.php:183
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Проблем во снимањето на известувањето."
 
-#: actions/joingroup.php:65
-msgid "You must be logged in to join a group."
+#: classes/Notice.php:188
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: actions/joingroup.php:95
-#, fuzzy
-msgid "You are already a member of that group"
-msgstr "Веќе сте пријавени!"
+#: classes/Notice.php:194
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
 
-#: actions/joingroup.php:128
-#, fuzzy, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Не може да се пренасочи кон серверот: %s"
+#: classes/Notice.php:202
+msgid "You are banned from posting notices on this site."
+msgstr ""
 
-#: actions/joingroup.php:135
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
+msgstr "Проблем во снимањето на известувањето."
+
+#: classes/Notice.php:1120
 #, php-format
-msgid "%s joined group %s"
-msgstr ""
+msgid "DB error inserting reply: %s"
+msgstr "Одговор од внесот во базата: %s"
 
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 
-#: actions/leavegroup.php:65
-msgid "You must be logged in to leave a group."
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Профил"
+
+#: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
 msgstr ""
 
-#: actions/leavegroup.php:88
+#: lib/accountsettingsaction.php:112
 #, fuzzy
-msgid "No such group."
-msgstr "Нема такво известување."
+msgid "Upload an avatar"
+msgstr "Товарањето на аватарот не успеа."
 
-#: actions/leavegroup.php:95
-#, fuzzy
-msgid "You are not a member of that group."
-msgstr "Не ни го испративте тој профил."
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr ""
 
-#: actions/leavegroup.php:100
-msgid "You may not leave a group while you are its administrator."
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
 msgstr ""
 
-#: actions/leavegroup.php:130
-msgid "Could not find membership record."
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
 msgstr ""
 
-#: actions/leavegroup.php:138
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "OpenID формуларот не може да се креира:%s"
+#: lib/accountsettingsaction.php:124
+#, fuzzy
+msgid "Design your profile"
+msgstr "Корисникот нема профил."
 
-#: actions/leavegroup.php:145
-#, php-format
-msgid "%s left group %s"
+#: lib/accountsettingsaction.php:128
+msgid "Other"
 msgstr ""
 
-#: actions/login.php:225 lib/facebookaction.php:304
-msgid "Login to site"
+#: lib/accountsettingsaction.php:128
+msgid "Other options"
 msgstr ""
 
-#: actions/microsummary.php:69
-msgid "No current status"
+#: lib/action.php:144
+#, php-format
+msgid "%s - %s"
 msgstr ""
 
-#: actions/newgroup.php:53
-msgid "New group"
+#: lib/action.php:159
+msgid "Untitled page"
 msgstr ""
 
-#: actions/newgroup.php:115
-msgid "Use this form to create a new group."
+#: lib/action.php:424
+msgid "Primary site navigation"
 msgstr ""
 
-#: actions/newgroup.php:177
-#, fuzzy
-msgid "Could not create group."
-msgstr "Информациите за аватарот не може да се снимат"
+#: lib/action.php:430
+msgid "Home"
+msgstr "Дома"
 
-#: actions/newgroup.php:191
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "Не може да се креира претплатата"
+#: lib/action.php:430
+msgid "Personal profile and friends timeline"
+msgstr ""
 
-#: actions/newmessage.php:119 actions/newnotice.php:132
+#: lib/action.php:432
 #, fuzzy
-msgid "That's too long. "
-msgstr "Датотеката е преголема."
+msgid "Account"
+msgstr "За"
 
-#: actions/newmessage.php:134
-msgid "Don't send a message to yourself; "
+#: lib/action.php:432
+msgid "Change your email, avatar, password, profile"
 msgstr ""
 
-#: actions/newnotice.php:166
+#: lib/action.php:435
+msgid "Connect"
+msgstr "Поврзи се"
+
+#: lib/action.php:435
 #, fuzzy
-msgid "Notice posted"
-msgstr "Известувања"
+msgid "Connect to services"
+msgstr "Не може да се пренасочи кон серверот: %s"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
-msgid "Ajax Error"
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
 msgstr ""
 
-#: actions/nudge.php:85
-msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+#: lib/action.php:440 lib/subgroupnav.php:106
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: actions/nudge.php:94
-msgid "Nudge sent"
-msgstr ""
+#: lib/action.php:445
+msgid "Logout"
+msgstr "Одјави се"
 
-#: actions/nudge.php:97
-msgid "Nudge sent!"
+#: lib/action.php:445
+msgid "Logout from the site"
 msgstr ""
 
-#: actions/openidlogin.php:97
+#: lib/action.php:450
 #, fuzzy
-msgid "OpenID login"
-msgstr "Пријавување со OpenID"
+msgid "Create an account"
+msgstr "Креирај нова сметка"
 
-#: actions/openidsettings.php:128
-#, fuzzy
-msgid "Removing your only OpenID "
-msgstr "Отстрани го OpenID-то"
+#: lib/action.php:453
+msgid "Login to the site"
+msgstr ""
 
-#: actions/othersettings.php:60
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
+msgstr "Помош"
+
+#: lib/action.php:456
 #, fuzzy
-msgid "Other Settings"
-msgstr "Поставки"
+msgid "Help me!"
+msgstr "Помош"
 
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr ""
+#: lib/action.php:459
+msgid "Search"
+msgstr "Барај"
 
-#: actions/othersettings.php:93
-msgid "URL Auto-shortening"
+#: lib/action.php:459
+msgid "Search for people or text"
 msgstr ""
 
-#: actions/othersettings.php:112
+#: lib/action.php:480
 #, fuzzy
-msgid "Service"
-msgstr "Барај"
+msgid "Site notice"
+msgstr "Ново известување"
 
-#: actions/othersettings.php:113
-msgid "Automatic shortening service to use."
+#: lib/action.php:546
+msgid "Local views"
 msgstr ""
 
-#: actions/othersettings.php:144
+#: lib/action.php:612
 #, fuzzy
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "Локацијата е предолга (максимумот е 255 знаци)."
+msgid "Page notice"
+msgstr "Ново известување"
 
-#: actions/passwordsettings.php:69
+#: lib/action.php:714
 #, fuzzy
-msgid "Change your password."
-msgstr "Промени ја лозинката"
+msgid "Secondary site navigation"
+msgstr "Претплати"
 
-#: actions/passwordsettings.php:89
-#, fuzzy
-msgid "Password change"
-msgstr "Лозинката е снимена."
+#: lib/action.php:721
+msgid "About"
+msgstr "За"
 
-#: actions/peopletag.php:35
-#, fuzzy, php-format
-msgid "Not a valid people tag: %s"
-msgstr "Неправилна адреса за е-пошта."
+#: lib/action.php:723
+msgid "FAQ"
+msgstr "ЧПП"
 
-#: actions/peopletag.php:47
-#, php-format
-msgid "Users self-tagged with %s - page %d"
+#: lib/action.php:727
+msgid "TOS"
 msgstr ""
 
-#: actions/peopletag.php:91
-#, php-format
-msgid "These are users who have tagged themselves \"%s\" "
-msgstr ""
+#: lib/action.php:730
+msgid "Privacy"
+msgstr "Приватност"
 
-#: actions/profilesettings.php:91
-#, fuzzy
-msgid "Profile information"
-msgstr "Непознат профил"
+#: lib/action.php:732
+msgid "Source"
+msgstr "Изворен код"
 
-#: actions/profilesettings.php:124
-msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
-msgstr ""
+#: lib/action.php:734
+msgid "Contact"
+msgstr "Контакт"
 
-#: actions/profilesettings.php:144
-msgid "Automatically subscribe to whoever "
+#: lib/action.php:736
+msgid "Badge"
 msgstr ""
 
-#: actions/profilesettings.php:229 actions/tagother.php:176
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Невалидна домашна страница: '%s'"
-
-#: actions/profilesettings.php:311
-#, fuzzy
-msgid "Couldn't save tags."
-msgstr "Профилот не може да се сними."
-
-#: actions/public.php:107
-#, fuzzy, php-format
-msgid "Public timeline, page %d"
-msgstr "Јавна историја"
-
-#: actions/public.php:173
-msgid "Could not retrieve public stream."
+#: lib/action.php:764
+msgid "StatusNet software license"
 msgstr ""
 
-#: actions/public.php:220
+#: lib/action.php:767
 #, php-format
 msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
+"**%%site.name%%** е сервис за микроблогирање што ви го овозможува [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
 
-#: actions/publictagcloud.php:57
-#, fuzzy
-msgid "Public tag cloud"
-msgstr "Јавен канал"
-
-#: actions/publictagcloud.php:63
+#: lib/action.php:769
 #, php-format
-msgid "These are most popular recent tags on %s "
-msgstr ""
-
-#: actions/publictagcloud.php:119
-msgid "Tag cloud"
-msgstr ""
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** е сервис за микроблогирање."
 
-#: actions/register.php:139 actions/register.php:349
-msgid "Sorry, only invited people can register."
+#: lib/action.php:771
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
+"Работи на [StatusNet](http://status.net/) софтверот за микроблогирање, "
+"верзија %s, достапен пд [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 
-#: actions/register.php:149
+#: lib/action.php:785
 #, fuzzy
-msgid "You can't register if you don't "
-msgstr "Не може да се регистрирате ако не ја прифаќате лиценцата."
+msgid "Site content license"
+msgstr "Ново известување"
 
-#: actions/register.php:286
-msgid "With this form you can create "
+#: lib/action.php:794
+msgid "All "
 msgstr ""
 
-#: actions/register.php:368
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, "
-msgstr "1-64 мали букви или бројки. Без интерпукциски знаци и празни места."
-
-#: actions/register.php:382 actions/register.php:386
-#, fuzzy
-msgid "Used only for updates, announcements, "
-msgstr "Се користи само за надградби, објави и пронаоѓање на лозинка."
-
-#: actions/register.php:398
-#, fuzzy
-msgid "URL of your homepage, blog, "
-msgstr "URL на Вашата домашна страница, блог или профил на друго место."
+#: lib/action.php:799
+msgid "license."
+msgstr ""
 
-#: actions/register.php:404
-#, fuzzy
-msgid "Describe yourself and your "
-msgstr "Опишете се себе си и сопствените интереси во 140 знаци."
+#: lib/action.php:1052
+msgid "Pagination"
+msgstr ""
 
-#: actions/register.php:410
+#: lib/action.php:1061
 #, fuzzy
-msgid "Where you are, like \"City, "
-msgstr "Каде се наоѓате, на пр. „Град, Држава“."
+msgid "After"
+msgstr "« Следни"
 
-#: actions/register.php:432
+#: lib/action.php:1069
 #, fuzzy
-msgid " except this private data: password, "
-msgstr ""
-"освен следниве лични податоци: лозинка, адреса за е-пошта, адреса за ИМ, "
-"телефонски број."
+msgid "Before"
+msgstr "Предходни »"
 
-#: actions/register.php:471
-#, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
+#: lib/action.php:1117
+msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/register.php:495
-msgid "(You should receive a message by email "
+#: lib/attachmentlist.php:87
+msgid "Attachments"
 msgstr ""
 
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
+#: lib/attachmentlist.php:265
+msgid "Author"
 msgstr ""
 
-#: actions/replies.php:118
-#, fuzzy, php-format
-msgid "Replies to %s, page %d"
-msgstr "Одговори испратени до %s"
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "Профил"
 
-#: actions/showfavorites.php:79
-#, php-format
-msgid "%s favorite notices, page %d"
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
 msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
-#, php-format
-msgid "%s group"
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
 msgstr ""
 
-#: actions/showgroup.php:79
-#, php-format
-msgid "%s group, page %d"
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
 msgstr ""
 
-#: actions/showgroup.php:206
-#, fuzzy
-msgid "Group profile"
-msgstr "Нема такво известување."
-
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
-msgid "URL"
+#: lib/channel.php:210
+msgid "Command complete"
 msgstr ""
 
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
-#, fuzzy
-msgid "Note"
-msgstr "Известувања"
-
-#: actions/showgroup.php:270
-msgid "Group actions"
+#: lib/channel.php:221
+msgid "Command failed"
 msgstr ""
 
-#: actions/showgroup.php:323
-#, fuzzy, php-format
-msgid "Notice feed for %s group"
-msgstr "Канал со известувања на %s"
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
-#, fuzzy
-msgid "Members"
-msgstr "Член од"
+#: lib/command.php:88
+#, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Корисникот не може да се освежи/"
 
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
-msgid "(None)"
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: actions/showgroup.php:370
-msgid "All members"
+#: lib/command.php:99
+#, php-format
+msgid "Nudge sent to %s"
 msgstr ""
 
-#: actions/showgroup.php:378
+#: lib/command.php:126
 #, php-format
 msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
 msgstr ""
 
-#: actions/showmessage.php:98
-msgid "Only the sender and recipient "
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
 msgstr ""
 
-#: actions/showstream.php:73
-#, php-format
-msgid "%s, page %d"
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
 msgstr ""
 
-#: actions/showstream.php:143
-#, fuzzy
-msgid "'s profile"
-msgstr "Профил"
-
-#: actions/showstream.php:236 actions/tagother.php:77
-#, fuzzy
-msgid "User profile"
-msgstr "Корисникот нема профил."
-
-#: actions/showstream.php:240 actions/tagother.php:81
-msgid "Photo"
+#: lib/command.php:190
+msgid "Notice marked as fave."
 msgstr ""
 
-#: actions/showstream.php:317
-msgid "User actions"
+#: lib/command.php:315
+#, php-format
+msgid "%1$s (%2$s)"
 msgstr ""
 
-#: actions/showstream.php:342
-msgid "Send a direct message to this user"
+#: lib/command.php:318
+#, php-format
+msgid "Fullname: %s"
 msgstr ""
 
-#: actions/showstream.php:343
-msgid "Message"
+#: lib/command.php:321
+#, php-format
+msgid "Location: %s"
 msgstr ""
 
-#: actions/showstream.php:451
-#, fuzzy
-msgid "All subscribers"
-msgstr "Претплатници"
-
-#: actions/showstream.php:533
-msgid "All groups"
+#: lib/command.php:324
+#, php-format
+msgid "Homepage: %s"
 msgstr ""
 
-#: actions/showstream.php:542
+#: lib/command.php:327
 #, php-format
-msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+msgid "About: %s"
 msgstr ""
 
-#: actions/smssettings.php:128
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, "
-msgstr "1-64 мали букви или бројки. Без интерпукциски знаци и празни места."
-
-#: actions/smssettings.php:162
-#, fuzzy
-msgid "Send me notices through SMS; "
-msgstr "Испраќај ми известувања преку Jabber/GTalk."
-
-#: actions/smssettings.php:335
-#, fuzzy
-msgid "A confirmation code was sent to the phone number you added. "
-msgstr "Овој код за потврда не е за Вас!"
-
-#: actions/smssettings.php:453
-msgid "Mobile carrier"
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: actions/subedit.php:70
-#, fuzzy
-msgid "You are not subscribed to that profile."
-msgstr "Не ни го испративте тој профил."
-
-#: actions/subedit.php:83
-#, fuzzy
-msgid "Could not save subscription."
-msgstr "Не може да се креира претплатата"
-
-#: actions/subscribe.php:55
-#, fuzzy
-msgid "Not a local user."
-msgstr "Нема таков корисник."
-
-#: actions/subscribe.php:69
-#, fuzzy
-msgid "Subscribed"
-msgstr "Претплати се"
-
-#: actions/subscribers.php:50
-#, fuzzy, php-format
-msgid "%s subscribers"
-msgstr "Претплатници"
+#: lib/command.php:377
+msgid "Error sending direct message."
+msgstr ""
 
-#: actions/subscribers.php:52
+#: lib/command.php:431
 #, php-format
-msgid "%s subscribers, page %d"
+msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: actions/subscribers.php:63
-#, fuzzy
-msgid "These are the people who listen to "
-msgstr "Ова се луѓето што ги следат известувањата на %s."
-
-#: actions/subscribers.php:67
-#, fuzzy, php-format
-msgid "These are the people who "
-msgstr "Ова се луѓето што ги следат известувањата на %s."
-
-#: actions/subscriptions.php:52
-#, fuzzy, php-format
-msgid "%s subscriptions"
-msgstr "Сите претплати"
-
-#: actions/subscriptions.php:54
+#: lib/command.php:439
 #, fuzzy, php-format
-msgid "%s subscriptions, page %d"
-msgstr "Сите претплати"
-
-#: actions/subscriptions.php:65
-#, fuzzy
-msgid "These are the people whose notices "
-msgstr "Ова се луѓето чии известувања ги следи %s."
-
-#: actions/subscriptions.php:69
-#, fuzzy, php-format
-msgid "These are the people whose "
-msgstr "Ова се луѓето што ги следат известувањата на %s."
+msgid "Reply to %s sent"
+msgstr "Одговори испратени до %s"
 
-#: actions/subscriptions.php:122
+#: lib/command.php:441
 #, fuzzy
-msgid "Jabber"
-msgstr "Нема JabberID."
-
-#: actions/tag.php:43
-#, fuzzy, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Микроблог на %s"
+msgid "Error saving notice."
+msgstr "Проблем во снимањето на известувањето."
 
-#: actions/tag.php:66
-#, php-format
-msgid "Messages tagged \"%s\", most recent first"
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: actions/tagother.php:33
-#, fuzzy
-msgid "Not logged in"
-msgstr "Не сте пријавени."
-
-#: actions/tagother.php:39
-#, fuzzy
-msgid "No id argument."
-msgstr "Нема таков документ."
-
-#: actions/tagother.php:65
+#: lib/command.php:502
 #, php-format
-msgid "Tag %s"
+msgid "Subscribed to %s"
 msgstr ""
 
-#: actions/tagother.php:141
-msgid "Tag user"
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: actions/tagother.php:149
-msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+#: lib/command.php:530
+#, php-format
+msgid "Unsubscribed from %s"
 msgstr ""
 
-#: actions/tagother.php:164
-msgid "There was a problem with your session token."
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
 msgstr ""
 
-#: actions/tagother.php:191
-msgid ""
-"You can only tag people you are subscribed to or who are subscribed to you."
+#: lib/command.php:551
+msgid "Notification off."
 msgstr ""
 
-#: actions/tagother.php:198
-#, fuzzy
-msgid "Could not save tags."
-msgstr "Информациите за аватарот не може да се снимат"
-
-#: actions/tagother.php:233
-msgid "Use this form to add tags to your subscribers or subscriptions."
+#: lib/command.php:553
+msgid "Can't turn off notification."
 msgstr ""
 
-#: actions/tagrss.php:35
-#, fuzzy
-msgid "No such tag."
-msgstr "Нема такво известување."
-
-#: actions/tagrss.php:66
-#, fuzzy, php-format
-msgid "Microblog tagged with %s"
-msgstr "Микроблог на %s"
-
-#: actions/twitapiblocks.php:47
-msgid "Block user failed."
+#: lib/command.php:574
+msgid "Notification on."
 msgstr ""
 
-#: actions/twitapiblocks.php:69
-msgid "Unblock user failed."
+#: lib/command.php:576
+msgid "Can't turn on notification."
 msgstr ""
 
-#: actions/twitapiusers.php:48
-#, fuzzy
-msgid "Not found."
-msgstr "Не е пронаједено барање."
-
-#: actions/twittersettings.php:71
-msgid "Add your Twitter account to automatically send "
-msgstr ""
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "OpenID формуларот не може да се креира:%s"
 
-#: actions/twittersettings.php:119
-msgid "Twitter user name"
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: actions/twittersettings.php:126
+#: lib/command.php:618
 #, fuzzy
-msgid "Twitter password"
-msgstr "Нова лозинка"
-
-#: actions/twittersettings.php:228
-msgid "Twitter Friends"
-msgstr ""
-
-#: actions/twittersettings.php:327
-msgid "Username must have only numbers, "
-msgstr ""
-
-#: actions/twittersettings.php:341
-#, fuzzy, php-format
-msgid "Unable to retrieve account information "
-msgstr "Не може да се креира потврда за е-пошта."
+msgid "You are not subscribed to anyone."
+msgstr "Не ни го испративте тој профил."
 
-#: actions/unblock.php:108
+#: lib/command.php:620
 #, fuzzy
-msgid "Error removing the block."
-msgstr "Грешка во снимањето на корисникот."
+msgid "You are subscribed to these people: "
+msgstr "Не ни го испративте тој профил."
 
-#: actions/unsubscribe.php:50
+#: lib/command.php:637
 #, fuzzy
-msgid "No profile id in request."
-msgstr "Серверот не достави URL за профилот."
+msgid "No one is subscribed to you."
+msgstr "Оддалечена претплата"
 
-#: actions/unsubscribe.php:57
+#: lib/command.php:639
 #, fuzzy
-msgid "No profile with that id."
-msgstr "Оддалечениот профил нема одговарачки профил"
+msgid "These people are subscribed to you: "
+msgstr "Оддалечена претплата"
 
-#: actions/unsubscribe.php:71
+#: lib/command.php:656
 #, fuzzy
-msgid "Unsubscribed"
-msgstr "Откажи ја претплатата"
-
-#: actions/usergroups.php:63
-#, php-format
-msgid "%s groups"
-msgstr ""
-
-#: actions/usergroups.php:65
-#, php-format
-msgid "%s groups, page %d"
-msgstr ""
+msgid "You are not a member of any groups."
+msgstr "Не ни го испративте тој профил."
 
-#: classes/Notice.php:104
+#: lib/command.php:658
 #, fuzzy
-msgid "Problem saving notice. Unknown user."
-msgstr "Проблем во снимањето на известувањето."
+msgid "You are a member of these groups: "
+msgstr "Не ни го испративте тој профил."
 
-#: classes/Notice.php:109
+#: lib/command.php:670
 msgid ""
-"Too many notices too fast; take a breather and post again in a few minutes."
-msgstr ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+
+#: lib/common.php:192
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Нема код за потврда."
 
-#: classes/Notice.php:116
-msgid "You are banned from posting notices on this site."
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/accountsettingsaction.php:108
-#, fuzzy
-msgid "Upload an avatar"
-msgstr "Товарањето на аватарот не успеа."
-
-#: lib/accountsettingsaction.php:119
-msgid "Other"
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/accountsettingsaction.php:120
-msgid "Other options"
+#: lib/common.php:195
+msgid "Go to the installer."
 msgstr ""
 
-#: lib/action.php:130
-#, php-format
-msgid "%s - %s"
+#: lib/connectsettingsaction.php:110
+msgid "IM"
 msgstr ""
 
-#: lib/action.php:145
-msgid "Untitled page"
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
 msgstr ""
 
-#: lib/action.php:316
-msgid "Primary site navigation"
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
 msgstr ""
 
-#: lib/action.php:322
-msgid "Personal profile and friends timeline"
+#: lib/dberroraction.php:60
+msgid "Database error"
 msgstr ""
 
-#: lib/action.php:325
-msgid "Search for people or text"
+#: lib/designsettings.php:101
+msgid "Change background image"
 msgstr ""
 
-#: lib/action.php:328
+#: lib/designsettings.php:105
 #, fuzzy
-msgid "Account"
-msgstr "За"
+msgid "Upload file"
+msgstr "Товари"
 
-#: lib/action.php:328
-msgid "Change your email, avatar, password, profile"
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 
-#: lib/action.php:330
-msgid "Connect to IM, SMS, Twitter"
+#: lib/designsettings.php:139
+msgid "On"
 msgstr ""
 
-#: lib/action.php:332
-msgid "Logout from the site"
+#: lib/designsettings.php:155
+msgid "Off"
 msgstr ""
 
-#: lib/action.php:335
-msgid "Login to the site"
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
 msgstr ""
 
-#: lib/action.php:338
-#, fuzzy
-msgid "Create an account"
-msgstr "Креирај нова сметка"
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
 
-#: lib/action.php:341
+#: lib/designsettings.php:170
 #, fuzzy
-msgid "Login with OpenID"
-msgstr "Нема таков OpenID."
+msgid "Change colours"
+msgstr "Промени ја лозинката"
 
-#: lib/action.php:344
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
 #, fuzzy
-msgid "Help me!"
-msgstr "Помош"
+msgid "Content"
+msgstr "Поврзи се"
 
-#: lib/action.php:362
+#: lib/designsettings.php:204
 #, fuzzy
-msgid "Site notice"
-msgstr "Ново известување"
+msgid "Sidebar"
+msgstr "Барај"
 
-#: lib/action.php:417
-msgid "Local views"
+#: lib/designsettings.php:217
+msgid "Text"
 msgstr ""
 
-#: lib/action.php:472
+#: lib/designsettings.php:230
 #, fuzzy
-msgid "Page notice"
-msgstr "Ново известување"
+msgid "Links"
+msgstr "Пријави се"
 
-#: lib/action.php:562
-#, fuzzy
-msgid "Secondary site navigation"
-msgstr "Претплати"
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
 
-#: lib/action.php:602 lib/action.php:623
-msgid "StatusNet software license"
+#: lib/designsettings.php:248
+msgid "Restore default designs"
 msgstr ""
 
-#: lib/action.php:630
-msgid "All "
+#: lib/designsettings.php:254
+msgid "Reset back to default"
 msgstr ""
 
-#: lib/action.php:635
-msgid "license."
+#: lib/designsettings.php:257
+msgid "Save design"
 msgstr ""
 
-#: lib/blockform.php:123 lib/blockform.php:153
-#, fuzzy
-msgid "Block this user"
-msgstr "Нема таков корисник."
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
+msgstr ""
 
-#: lib/blockform.php:153
-msgid "Block"
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
 msgstr ""
 
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr ""
 
-#: lib/facebookaction.php:268
-#, php-format
-msgid "To use the %s Facebook Application you need to login "
-msgstr ""
-
-#: lib/facebookaction.php:271
-#, fuzzy
-msgid " a new account."
-msgstr "Креирај нова сметка"
-
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-#, fuzzy
-msgid "Published"
-msgstr "Јавен"
-
 #: lib/favorform.php:114 lib/favorform.php:140
 #, fuzzy
 msgid "Favor this notice"
 msgstr "Нема такво известување."
 
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr ""
+
 #: lib/feedlist.php:64
 msgid "Export data"
 msgstr ""
 
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr ""
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr ""
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr ""
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr ""
@@ -4557,62 +3963,87 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
+msgstr ""
+
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr ""
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr ""
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:163
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "URL на Вашата домашна страница, блог или профил на друго место."
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:168
 #, fuzzy
-msgid "Description"
-msgstr "Претплати"
+msgid "Describe the group or topic"
+msgstr "Опишете се себе си и сопствените интереси во 140 знаци."
 
-#: lib/groupeditform.php:153
-#, fuzzy
-msgid "Describe the group or topic in 140 chars"
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
 msgstr "Опишете се себе си и сопствените интереси во 140 знаци."
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:172
+#, fuzzy
+msgid "Description"
+msgstr "Претплати"
+
+#: lib/groupeditform.php:179
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr "Каде се наоѓате, на пр. „Град, Држава“."
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
-msgid "Group"
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:100
-msgid "Admin"
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+msgid "Group"
 msgstr ""
 
 #: lib/groupnav.php:101
+#, fuzzy
+msgid "Blocked"
+msgstr "Нема таков корисник."
+
+#: lib/groupnav.php:102
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Нема таков корисник."
+
+#: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
 msgstr ""
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:113
 #, fuzzy
 msgid "Logo"
 msgstr "Одјави се"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:114
 #, php-format
 msgid "Add or edit %s logo"
 msgstr ""
 
+#: lib/groupnav.php:120
+#, php-format
+msgid "Add or edit %s design"
+msgstr ""
+
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr ""
@@ -4627,10 +4058,44 @@ msgid "Tags in %s group's notices"
 msgstr ""
 
 #: lib/htmloutputter.php:104
-#, fuzzy
-msgid "This page is not available in a "
+msgid "This page is not available in a media type you accept"
 msgstr "Оваа страница не е достапна во форматот кој Вие го прифаќате."
 
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Ова е предолго. Максималната должина е 140 знаци."
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr "Парцијално товарање"
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr "Системска грешка при товарањето на датотеката."
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr "Не е слика или датотеката е корумпирана."
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr "Неподдржан фомрат на слики."
+
+#: lib/imagefile.php:118
+#, fuzzy
+msgid "Lost our file."
+msgstr "Нема такво известување."
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr ""
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr ""
+
 #: lib/joinform.php:114
 #, fuzzy
 msgid "Join"
@@ -4641,103 +4106,309 @@ msgstr "Пријави се"
 msgid "Leave"
 msgstr "Сними"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:80
 #, fuzzy
 msgid "Login with a username and password"
 msgstr "Погрешно име или лозинка."
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:86
 #, fuzzy
 msgid "Sign up for a new account"
 msgstr "Креирај нова сметка"
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mail.php:175
+#: lib/mailbox.php:227 lib/noticelist.php:424
+msgid "from"
+msgstr ""
+
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "Потврдување на адресата"
+
+#: lib/mail.php:174
 #, php-format
 msgid ""
 "Hey, %s.\n"
 "\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%s\n"
+"\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
 msgstr ""
 
-#: lib/mail.php:236
-#, fuzzy, php-format
-msgid "%1$s is now listening to "
+#: lib/mail.php:235
+#, php-format
+msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s сега ги следи вашите забелешки за %2$s."
 
-#: lib/mail.php:254
+#: lib/mail.php:240
 #, fuzzy, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
+"%1$s сега ги следи вашите забелешки на %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Искрено ваш,\n"
+"%4$s.\n"
+
+#: lib/mail.php:253
+#, php-format
 msgid "Location: %s\n"
 msgstr ""
 
-#: lib/mail.php:256
-#, fuzzy, php-format
+#: lib/mail.php:255
+#, php-format
 msgid "Homepage: %s\n"
 msgstr ""
 
-#: lib/mail.php:258
+#: lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:461
+#: lib/mail.php:285
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: lib/mail.php:288
+#, 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 ""
+
+#: lib/mail.php:412
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: lib/mail.php:438
+msgid "SMS confirmation"
+msgstr ""
+
+#: lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr ""
 
-#: lib/mail.php:465
+#: lib/mail.php:466
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
+msgstr ""
+
+#: lib/mail.php:509
 #, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:513
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%5$s\n"
 msgstr ""
 
-#: lib/mail.php:555
+#: lib/mail.php:554
 #, fuzzy, php-format
-msgid "%1$s just added your notice from %2$s"
+msgid "%s (@%s) added your notice as a favorite"
 msgstr "%1$s сега ги следи вашите забелешки за %2$s."
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
-msgid "From"
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
 msgstr ""
 
-#: lib/messageform.php:110
-msgid "Send a direct notice"
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, php-format
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+msgstr ""
+
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
 msgstr ""
 
-#: lib/noticeform.php:125
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
 #, fuzzy
-msgid "Send a notice"
-msgstr "Ново известување"
+msgid "Could not determine file's mime-type!"
+msgstr "Корисникот не може да се освежи/"
 
-#: lib/noticeform.php:152
+#: lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: lib/messageform.php:120
+msgid "Send a direct notice"
+msgstr ""
+
+#: lib/messageform.php:146
+msgid "To"
+msgstr ""
+
+#: lib/messageform.php:162 lib/noticeform.php:173
 #, fuzzy
 msgid "Available characters"
 msgstr "6 или повеќе знаци"
 
-#: lib/noticelist.php:426
+#: lib/noticeform.php:145
 #, fuzzy
-msgid "in reply to"
-msgstr "во одговор на..."
+msgid "Send a notice"
+msgstr "Ново известување"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
-msgid "Reply to this notice"
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
+msgstr "Што има %s?"
+
+#: lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:184
+msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:478
 #, fuzzy
-msgid "Reply"
-msgstr "одговор"
+msgid "in context"
+msgstr "Нема содржина!"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
-msgid "Delete this notice"
+#: lib/noticelist.php:498
+msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:474
-msgid "Delete"
-msgstr ""
+#: lib/noticelist.php:499
+#, fuzzy
+msgid "Reply"
+msgstr "одговор"
 
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
@@ -4751,41 +4422,140 @@ msgstr ""
 msgid "Send a nudge to this user"
 msgstr ""
 
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "Грешка во внесувањето на новиот профил"
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "Грешка во внесувањето на аватарот"
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "Грешка во внесувањето на оддалечениот профил"
+
+#: lib/oauthstore.php:345
+msgid "Duplicate notice"
+msgstr "Дуплирано известување"
+
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
+msgstr "Не може да се внесе нова претплата."
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "Личен"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "Одговори"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr ""
+
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr ""
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr ""
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr ""
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr ""
+
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/profilelist.php:182
-msgid "(none)"
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "Претплати"
+
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "Сите претплати"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "Претплатници"
+
+#: lib/profileaction.php:157
+#, fuzzy
+msgid "All subscribers"
+msgstr "Претплатници"
+
+#: lib/profileaction.php:177
+msgid "User ID"
+msgstr ""
+
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "Член од"
+
+#: lib/profileaction.php:235
+msgid "All groups"
 msgstr ""
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Јавен"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr ""
 
-#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr ""
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr ""
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:92
 #, fuzzy
 msgid "Popular"
 msgstr "Пребарување на луѓе"
 
+#: lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Барај"
+
+#: lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Барај"
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr ""
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr ""
+
 #: lib/searchgroupnav.php:82
 #, fuzzy
 msgid "Notice"
 msgstr "Известувања"
 
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr ""
+
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr ""
@@ -4794,35 +4564,64 @@ msgstr ""
 msgid "Untitled section"
 msgstr ""
 
-#: lib/subgroupnav.php:81
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: lib/subgroupnav.php:83
 #, fuzzy, php-format
 msgid "People %s subscribes to"
 msgstr "Оддалечена претплата"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:91
 #, fuzzy, php-format
 msgid "People subscribed to %s"
 msgstr "Оддалечена претплата"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:104
-#, php-format
-msgid "Invite friends and colleagues to join you on %s"
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
 msgstr ""
 
-#: lib/subs.php:53
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr ""
+
+#: lib/subs.php:48
+msgid "Already subscribed!"
+msgstr ""
+
+#: lib/subs.php:52
 #, fuzzy
 msgid "User has blocked you."
 msgstr "Корисникот нема профил."
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: lib/subs.php:56
+msgid "Could not subscribe."
+msgstr ""
+
+#: lib/subs.php:75
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: lib/subs.php:124
 #, fuzzy
-msgid "Subscribe to this user"
-msgstr "Претплатата е одобрена"
+msgid "Not subscribed!"
+msgstr "Не сте претплатени!"
+
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
+msgstr "Претплата не може да се избрише."
 
 #: lib/tagcloudsection.php:56
 msgid "None"
@@ -4832,35 +4631,106 @@ msgstr ""
 msgid "Top posters"
 msgstr ""
 
-#: lib/unblockform.php:120 lib/unblockform.php:150
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+msgid "Unsubscribe from this user"
+msgstr ""
+
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "Откажи ја претплатата"
+
+#: lib/userprofile.php:116
 #, fuzzy
-msgid "Unblock this user"
-msgstr "Нема таков корисник."
+msgid "Edit Avatar"
+msgstr "Аватар"
 
-#: lib/unblockform.php:150
-msgid "Unblock"
+#: lib/userprofile.php:236
+msgid "User actions"
 msgstr ""
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
-msgid "Unsubscribe from this user"
+#: lib/userprofile.php:248
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Поставки на профилот"
+
+#: lib/userprofile.php:249
+msgid "Edit"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "Креирај нова сметка"
+#: lib/userprofile.php:272
+msgid "Send a direct message to this user"
+msgstr ""
+
+#: lib/userprofile.php:273
+msgid "Message"
+msgstr ""
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "Адресата за е-пошта неможе да се потврди."
+#: lib/util.php:821
+msgid "a few seconds ago"
+msgstr "пред неколку секунди"
+
+#: lib/util.php:823
+msgid "about a minute ago"
+msgstr "пред една минута"
 
-#~ msgid "Email address"
-#~ msgstr "Адреса за е-пошта"
+#: lib/util.php:825
+#, php-format
+msgid "about %d minutes ago"
+msgstr "пред %d минути"
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Грешка во внесувањето на известувањето"
+#: lib/util.php:827
+msgid "about an hour ago"
+msgstr "пред еден час"
 
-#~ 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 ""
-#~ "Ако сте ја заборавиле или загубиле лозинката, можете да добиете нова на "
-#~ "адресата што ја внесовте во Вашата сметка."
+#: lib/util.php:829
+#, php-format
+msgid "about %d hours ago"
+msgstr "пред %d часа"
+
+#: lib/util.php:831
+msgid "about a day ago"
+msgstr "пред еден ден"
+
+#: lib/util.php:833
+#, php-format
+msgid "about %d days ago"
+msgstr "пред %d денови"
+
+#: lib/util.php:835
+msgid "about a month ago"
+msgstr "пред еден месец"
+
+#: lib/util.php:837
+#, php-format
+msgid "about %d months ago"
+msgstr "пред %d месеци"
+
+#: lib/util.php:839
+msgid "about a year ago"
+msgstr "пред една година"
+
+#: lib/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "Домашната страница не е правилно URL."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr ""
+
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr ""
+
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr ""
diff --git a/locale/nb/LC_MESSAGES/statusnet.mo b/locale/nb/LC_MESSAGES/statusnet.mo
index ee3bad415..ee9dea03a 100644
--- a/locale/nb/LC_MESSAGES/statusnet.mo
+++ b/locale/nb/LC_MESSAGES/statusnet.mo
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 5e2d6613c..0ced02905 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -1,3 +1,6 @@
+# Translation of StatusNet to Norwegian (bokmål)‬
+#
+# --
 # #-#-#-#-#  statusnet.new.pot (PACKAGE VERSION)  #-#-#-#-#
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -6,4488 +9,3913 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-09-26 22:45+0000\n"
-"Last-Translator: Eivind Uggedal <eivind@uggedal.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:51+0000\n"
+"Language-Team: Norwegian (bokmål)‬\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
-"X-Poedit-Language: Norwegian Bokmal\n"
-"X-Poedit-Country: NORWAY\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: no\n"
+"X-Message-Group: out-statusnet\n"
 
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
-#, php-format
-msgid " Search Stream for \"%s\""
-msgstr "Søkestrøm for «%s»"
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "Klarte ikke å lagre profil."
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-#: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
-msgid ""
-" except this private data: password, email address, IM address, phone number."
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
 msgstr ""
-"utenom disse private dataene: passord, epost, adresse, lynmeldingsadresse og "
-"telefonnummer."
 
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr "fra"
+#: actions/all.php:84
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s og venner"
 
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr "%1$s / Oppdateringer som svarer til %2$s"
+msgid "%s and friends"
+msgstr "%s og venner"
 
-#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s har invitert deg til %2$s"
+#: actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Feed for %s sine venner"
 
-#: ../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 ""
-"%$1s har invitert deg til %2$s (%3$s).\n"
-"\n"
-"%$2s er en mikrobloggingteneste som lar deg holde deg oppdatert på folk du "
-"kjenner og/eller som interesserer deg.\n"
-"\n"
-"Du kan også dele nyheter om deg sjelv, dine tanker eller livet ditt på "
-"nettet med folk som kjenner til deg. Det er supert for å møte nye folk med "
-"like interesser.\n"
-"\n"
-"%1$s sa:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Du kan se profilsiden til %1$s på %2$s her:\n"
-"\n"
-"%5$s\n"
-"\n"
-"Hvis du vil prøva tjenesten, klikk på lenken nedenfor for å akseptere "
-"invitasjonen.\n"
-"\n"
-"Vennlig hilsen, %2$s\n"
+#: actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Feed for %s sine venner"
 
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s lytter nå til dine notiser på %2$s."
+#: actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Feed for %s sine venner"
 
-#: ../lib/mail.php:126
+#: actions/all.php:127
 #, 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"
+"This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
-"%1$s lytter nå til dine notiser på %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Vennlig hilsen,\n"
-"%4$s.\n"
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "%1$s oppdateringer som svarer på oppdateringer fra %2$s / %3$s."
 
-#: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/all.php:132
 #, php-format
-msgid "%1$s's status on %2$s"
-msgstr "%1$s sin status på %2$s"
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
 
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/all.php:134
 #, php-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
 
-#: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
 #, php-format
-msgid "%s Public Stream"
-msgstr "%s offentlig strøm"
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+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
-#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
-#, php-format
-msgid "%s and friends"
+#: actions/all.php:165
+#, fuzzy
+msgid "You and friends"
 msgstr "%s og venner"
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
-#, php-format
-msgid "%s public timeline"
-msgstr "%s offentlig tidslinje"
-
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
 #, php-format
-msgid "%s status"
-msgstr "%s status"
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
 
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
-#, php-format
-msgid "%s timeline"
-msgstr "%s tidslinje"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
+msgstr "API-metode ikke funnet!"
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
-#, php-format
-msgid "%s updates from everyone!"
-msgstr "%s oppdateringer fra alle sammen!"
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
+msgstr ""
 
-#: ../actions/register.php:213
+#: actions/apiaccountupdatedeliverydevice.php:105
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
 msgstr ""
-"(Du vil straks motta en epost med instruksjoner om hvordan du kan bekrefte "
-"din epostadresse)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Klarte ikke å oppdatere bruker."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
 msgstr ""
-"**%%site.name%%** er en mikrobloggingtjeneste av "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
-
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
-#, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** er en mikrobloggingtjeneste. "
-
-#: ../lib/util.php:274 lib/util.php:290
-msgid ". Contributors should be attributed by full name or nickname."
-msgstr ". Bidragsytere burde være etterfulgt av fullt navn eller kallenavn."
-
-#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
-#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 små bokstaver eller nummer, ingen punktum eller mellomrom"
 
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
 msgstr ""
-"1-64 små bokstaver eller nummer, ingen punktum eller mellomrom. Påkrevd."
 
-#: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr "6 eller flere tegn"
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Klarte ikke å oppdatere bruker."
 
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
-msgid "6 or more characters, and don't forget it!"
-msgstr "6 eller flere tegn. Og ikke glem det!"
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr ""
 
-#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
-msgid "6 or more characters. Required."
-msgstr "6 eller flere tegn. Påkrevd."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Klarte ikke å lagre profil."
 
-#: ../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."
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
 msgstr ""
-"En bekreftelseskode ble sendt til lynmeldingsadressen du la til. Du må "
-"godkjenne %s for å sende meldinger til deg."
 
-#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
 msgstr ""
-"En bekreftelseskode ble sendt til epostadressen du la til. Sjekk innboksen "
-"din (og søppelboksen) for koden, og hvordan du skal bruke 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."
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
 msgstr ""
-"En bekreftelseskode ble sendt til telefonnummeret du la til. Sjekk innboksen "
-"din for koden, og hvordan du skal bruke 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 actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
-msgid "API method not found!"
-msgstr "API-metode ikke funnet!"
-
-#: ../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 actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
-msgid "API method under construction."
-msgstr "API-metode under utvikling."
-
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
-msgid "About"
-msgstr "Om"
-
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
-msgid "Accept"
-msgstr "Godta"
-
-#: ../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 actions/emailsettings.php:120
-#: actions/imsettings.php:127 actions/openidsettings.php:111
-#: actions/smssettings.php:133 actions/twittersettings.php:163
-msgid "Add"
-msgstr "Legg til"
 
-#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
-msgstr "Legg til OpenID"
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-msgid "Add or remove OpenIDs"
-msgstr "Legg til eller fjern OpenID-er"
-
-#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39 actions/emailsettings.php:39
-#: actions/imsettings.php:40 actions/smssettings.php:39
-#: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
-msgstr "Adresse"
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr ""
 
-#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-msgid "Addresses of friends to invite (one per line)"
-msgstr "Adresser til venner som skal inviteres (én per linje)"
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr ""
 
-#: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
-msgid "All subscriptions"
-msgstr "Alle abonnementer"
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
 
-#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/apidirectmessage.php:89
 #, php-format
-msgid "All updates for %s"
-msgstr "Alle oppdateringer for %s"
+msgid "Direct messages from %s"
+msgstr ""
 
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/apidirectmessage.php:93
 #, php-format
-msgid "All updates matching search term \"%s\""
-msgstr "Alle oppdateringer for søket: «%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
-#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
-msgid "Already logged in."
-msgstr "Allerede innlogget."
+msgid "All the direct messages sent from %s"
+msgstr ""
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
-msgid "Already subscribed!."
-msgstr "Allerede abonnert!"
+#: actions/apidirectmessage.php:101
+#, php-format
+msgid "Direct messages to %s"
+msgstr ""
 
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
-msgid "Are you sure you want to delete this notice?"
-msgstr "Er du sikker på at du vil slette denne notisen?"
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
 
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
-msgid "Authorize subscription"
-msgstr "Autoriser abonnementet"
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "API-metode ikke funnet!"
 
-#: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
-msgid "Automatically login in the future; not for shared computers!"
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
 msgstr ""
-"Logg inn automatisk i framtiden. Ikke for datamaskiner du deler med andre!"
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr "Abonner automatisk på de som abonnerer på meg (best for ikke-mennesker)"
+#: actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+msgstr "Det er allerede din e-postadresse."
 
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34 actions/avatarsettings.php:65
-#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
-msgid "Avatar"
-msgstr "Brukerbilde"
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+msgstr ""
 
-#: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
-msgid "Avatar updated."
-msgstr "Brukerbildet har blitt oppdatert."
+#: actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
+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?)"
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
 msgstr ""
-"Venter på godkjenning. Sjekk din Jabber/GTalk-konto for en melding med "
-"instruksjoner (la du %s til vennelisten din?)"
 
-#: ../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."
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
 msgstr ""
-"Venter på bekreftelse av adressen. Sjekk innboksen din (og søppelboksen) for "
-"melding med videre veiledning."
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
-msgid "Awaiting confirmation on this phone number."
-msgstr "Venter på bekreftelse for dette telefonnummeret."
+#: actions/apifriendshipscreate.php:118
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr ""
 
-#: ../lib/util.php:1318 lib/util.php:1452
+#: actions/apifriendshipsdestroy.php:109
 #, fuzzy
-msgid "Before »"
-msgstr "Tidligere »"
+msgid "Could not unfollow user: User not found."
+msgstr "Klarte ikke å oppdatere bruker."
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
-#: actions/profilesettings.php:82 actions/register.php:184
-#: actions/profilesettings.php:112 actions/register.php:402
-msgid "Bio"
-msgstr "Om meg"
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+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
-#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
-msgid "Bio is too long (max 140 chars)."
-msgstr "«Om meg» er for lang (maks 140 tegn)."
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
+msgstr ""
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
-msgid "Can't delete this notice."
-msgstr "Kan ikke slette notisen."
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Klarte ikke å oppdatere bruker."
 
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
-#, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr "Kan ikke lese brukerbilde-URL «%s»"
+#: actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Klarte ikke å oppdatere bruker."
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404 actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-msgid "Can't save new password."
-msgstr "Klarer ikke å lagre nytt passord."
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
+#, fuzzy
+msgid "Could not create group."
+msgstr "Klarte ikke å lagre avatar-informasjonen"
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62 actions/emailsettings.php:58
-#: actions/imsettings.php:59 actions/smssettings.php:62
-#: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
-msgstr "Avbryt"
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Klarte ikke å lagre avatar-informasjonen"
 
-#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Klarer ikke instansiere OpenID-objekt."
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Klarte ikke å lagre avatar-informasjonen"
 
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
-msgstr "Klarer ikke normalisere Jabber-IDen"
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
-msgid "Cannot normalize that email address"
-msgstr "Klarer ikke normalisere epostadressen"
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr "Det nicket er allerede i bruk. Prøv et annet."
 
-#: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
-msgstr "Endre"
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "Ugyldig nick."
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
-msgstr "Endre eposthåndtering"
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr ""
 
-#: ../actions/password.php:32 actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr "Endre passord"
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "Beklager, navnet er for langt (max 250 tegn)."
 
-#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
-msgid "Change your password"
-msgstr "Endre passordet ditt"
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "Bioen er for lang (max 140 tegn)"
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-msgid "Change your profile settings"
-msgstr "Endre profilinnstillingene dine"
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+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
-#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
-#: actions/register.php:376 actions/smssettings.php:122
-msgid "Confirm"
-msgstr "Bekreft"
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
 
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "Bekreft adresse"
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Ugyldig hjemmeside '%s'"
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245 actions/emailsettings.php:256
-#: actions/imsettings.php:230 actions/smssettings.php:253
-#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
-msgid "Confirmation cancelled."
-msgstr "Bekreftelse avbrutt."
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Det nicket er allerede i bruk. Prøv et annet."
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
-msgid "Confirmation code"
-msgstr "Bekreftelseskode"
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
 
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-msgid "Confirmation code not found."
-msgstr "Fant ikke bekreftelseskode."
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Du er allerede logget inn!"
 
-#: ../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."
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
 msgstr ""
-"Gratulerer, %s! Og velkommen til %%%%site.name%%%%. Herfra vil du kanskje...\n"
-"\n"
-"* Gå til [din profil](%s) og sende din første notis.\n"
-"* Legge til en [Jabber/GTalk addresse](%%%%action.imsettings%%%%) så du kan "
-"sende notiser fra lynmeldinger.\n"
-"* [Søke etter brukere](%%%%action.peoplesearch%%%%) that you may know or "
-"that share your interests. \n"
-"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
-"others more about you. \n"
-"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
-"missed. \n"
-"\n"
-"Thanks for signing up and we hope you enjoy using this service."
 
-#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
-msgid "Connect"
-msgstr "Koble til"
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Klarte ikke å oppdatere bruker."
 
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
-msgid "Connect existing account"
-msgstr "Koble til eksisterende konto"
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Du er allerede logget inn!"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
-msgid "Contact"
-msgstr "Kontakt"
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Klarte ikke å oppdatere bruker."
 
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
 #, php-format
-msgid "Could not create OpenID form: %s"
+msgid "%s groups"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/apigrouplistall.php:94
 #, php-format
-msgid "Could not follow user: %s is already on your list."
+msgid "groups on %s"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
-msgid "Could not follow user: User not found."
+#: actions/apigrouplist.php:95
+#, php-format
+msgid "%s's groups"
 msgstr ""
 
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: actions/apigrouplist.php:103
 #, php-format
-msgid "Could not redirect to server: %s"
+msgid "Groups %s is a member of on %s."
 msgstr ""
 
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
-msgid "Could not save avatar info"
-msgstr "Klarte ikke å lagre brukerbilde-informasjonen"
-
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
-msgid "Could not save new profile info"
-msgstr "Klarte ikke å lagre den nye profil-informasjonen"
-
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
-msgid "Could not subscribe other to you."
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
 msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
-msgid "Could not subscribe."
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
 msgstr ""
 
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
-msgstr "Klarte ikke å oppdatere bruker med bekreftet e-post."
-
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-msgid "Couldn't convert request tokens to access tokens."
+#: actions/apistatusesshow.php:138
+msgid "Status deleted."
 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
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-msgid "Couldn't delete email confirmation."
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
 msgstr ""
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
-msgid "Couldn't delete subscription."
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, php-format
+msgid "That's too long. Max notice size is %d chars."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
-msgid "Couldn't find any statuses."
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-msgid "Couldn't get a request token."
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
 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
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
-msgid "Couldn't insert confirmation code."
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+msgid "Unsupported format."
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
+#: actions/apitimelinefavorites.php:107
+#, php-format
+msgid "%s / Favorites from %s"
 msgstr ""
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-msgid "Couldn't save profile."
-msgstr "Klarte ikke å lagre profil."
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
+#: actions/apitimelinefavorites.php:119
+#, php-format
+msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
-msgid "Couldn't update user record."
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
+#, php-format
+msgid "%s timeline"
+msgstr "%s tidslinje"
+
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
+#, php-format
+msgid "Updates from %1$s on %2$s!"
 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
-#: actions/confirmaddress.php:114 actions/emailsettings.php:280
-#: actions/emailsettings.php:411 actions/imsettings.php:252
-#: actions/imsettings.php:395 actions/othersettings.php:162
-#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
-msgid "Couldn't update user."
-msgstr "Klarte ikke å oppdatere bruker."
+#: actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Oppdateringer som svarer til %2$s"
 
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
-msgid "Create"
-msgstr "Opprett"
+#: actions/apitimelinementions.php:126
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr "%1$s oppdateringer som svarer på oppdateringer fra %2$s / %3$s."
 
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
-msgid "Create a new user with this nickname."
-msgstr "Lag en ny bruker med dette nicket."
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#, php-format
+msgid "%s public timeline"
+msgstr "%s offentlig tidslinje"
 
-#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
-msgid "Create new account"
-msgstr "Opprett en ny konto"
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#, php-format
+msgid "%s updates from everyone!"
+msgstr "%s oppdateringer fra alle sammen!"
 
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
-msgid "Creating new account for OpenID that already has a user."
+#: actions/apitimelinetag.php:101 actions/tag.php:66
+#, php-format
+msgid "Notices tagged with %s"
 msgstr ""
 
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "Nåværende bekreftede Jabber/GTak-adresse."
-
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "Nåværende bekreftede telefonnummer med mulighet for å motta SMS."
-
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-msgid "Current confirmed email address."
-msgstr "Nåværende bekreftede e-postadresse"
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Mikroblogg av %s"
 
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
-msgstr ""
+#: actions/apiusershow.php:96
+#, fuzzy
+msgid "Not found."
+msgstr "Ingen id."
 
-#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
-#, php-format
-msgid "DB error inserting hashtag: %s"
+#: actions/attachment.php:73
+msgid "No such attachment."
 msgstr ""
 
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
-#, php-format
-msgid "DB error inserting reply: %s"
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
 msgstr ""
 
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
-msgid "Delete notice"
+#: actions/avatarbynickname.php:64
+msgid "No size."
 msgstr ""
 
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "Beskriv degselv og dine interesser med 140 tegn"
-
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87 actions/register.php:172
-#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
-#: actions/register.php:385 lib/accountsettingsaction.php:113
-msgid "Email"
-msgstr "E-post"
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-msgid "Email Address"
-msgstr "E-postadresse"
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "Ugyldig størrelse"
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
-msgstr "Innstillinger for e-post"
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "Brukerbilde"
 
-#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-msgid "Email address already exists."
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
-msgid "Email address confirmation"
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
 msgstr ""
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+#, fuzzy
+msgid "Avatar settings"
+msgstr "Innstillinger for IM"
 
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-msgid "Email addresses"
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
 msgstr ""
 
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
-msgid "Enter a nickname or email address."
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
 msgstr ""
 
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
-msgstr ""
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#, fuzzy
+msgid "Delete"
+msgstr "slett"
 
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
-msgid "Error authorizing token"
-msgstr ""
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+msgstr "Last opp"
 
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
-msgid "Error connecting user to OpenID."
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
 msgstr ""
 
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
+#: actions/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
 msgstr ""
 
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
-msgid "Error saving address confirmation."
-msgstr ""
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+msgstr "Brukerbildet har blitt oppdatert."
 
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
-msgid "Error saving remote profile"
+#: actions/avatarsettings.php:363
+msgid "Failed updating avatar."
 msgstr ""
 
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-msgid "Error saving the profile."
-msgstr ""
+#: actions/avatarsettings.php:387
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Brukerbildet har blitt oppdatert."
 
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-msgid "Error saving the user."
-msgstr ""
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+#, fuzzy
+msgid "No nickname"
+msgstr "Nytt nick"
 
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
-msgid "Error saving user; invalid."
-msgstr ""
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+#, fuzzy
+msgid "No such group"
+msgstr "Klarte ikke å lagre profil."
 
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
-#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
-#: actions/register.php:108 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-msgid "Error setting user."
-msgstr ""
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "Klarte ikke å lagre profil."
 
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr ""
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s og venner"
 
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
 msgstr ""
 
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
+#: actions/blockedfromgroup.php:281
+msgid "Unblock user from group"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
-msgid "Existing nickname"
-msgstr "Eksisterende nick"
-
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
-msgid "FAQ"
-msgstr "OSS/FAQ"
-
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
-msgid "Failed updating avatar."
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
 msgstr ""
 
-#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
-#, php-format
-msgid "Feed for friends of %s"
-msgstr "Feed for %s sine venner"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+msgid "Unblock this user"
+msgstr ""
 
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
-#, php-format
-msgid "Feed for replies to %s"
-msgstr "Feed for svar til %s"
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Ikke logget inn."
 
-#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
-#, php-format
-msgid "Feed for tag %s"
-msgstr "Feed for taggen %s"
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
+msgstr ""
 
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
 msgstr ""
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+msgid "Block user"
 msgstr ""
 
-#: ../actions/login.php:122
+#: actions/block.php:136
 msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
 msgstr ""
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
-#: actions/profilesettings.php:77 actions/register.php:178
-#: actions/profilesettings.php:103 actions/register.php:391
-#: actions/showgroup.php:235 actions/showstream.php:262
-#: actions/tagother.php:105 lib/groupeditform.php:142
-msgid "Full name"
-msgstr "Fullt navn"
-
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
-#: actions/register.php:86 actions/updateprofile.php:94
-#: actions/editgroup.php:195 actions/newgroup.php:146
-#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
-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:338 lib/action.php:344 lib/action.php:566
-msgid "Help"
-msgstr "Hjelp"
-
-#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
-msgid "Home"
-msgstr "Hjem"
-
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
-msgid "Homepage"
-msgstr "Hjemmesiden"
-
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
-msgid "Homepage is not a valid URL."
+#: actions/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
+msgid "No"
 msgstr ""
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
-msgid "I want to post notices by email."
-msgstr ""
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Kan ikke slette notisen."
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
-msgstr ""
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
+msgstr "Ja"
 
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
-msgstr "IM-adresse"
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+msgid "Block this user"
+msgstr ""
 
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
-msgstr "Innstillinger for IM"
+#: actions/block.php:165
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "Du er allerede logget inn!"
 
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
+#: actions/block.php:170
+msgid "Failed to save block information."
 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\"."
+#: actions/bookmarklet.php:50
+msgid "Post to "
 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."
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
 msgstr ""
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-#: actions/emailsettings.php:127 actions/smssettings.php:140
-msgid "Incoming email"
-msgstr "innkommende e-post"
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "Fant ikke bekreftelseskode."
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
-msgid "Incoming email address removed."
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
 msgstr ""
 
-#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
-msgid "Incorrect old password"
-msgstr "Feil gammelt passord"
-
-#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
-msgid "Incorrect username or password."
-msgstr "Feil brukernavn eller passord"
+#: actions/confirmaddress.php:90
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr ""
 
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
 msgstr ""
-"Instruksjoner om hvordan du kan gjenopprette ditt passord har blitt sendt "
-"til din registrerte e-postadresse."
 
-#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "Ugyldig avatar-URL '%s'"
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "Klarte ikke å oppdatere bruker."
 
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
-#, php-format
-msgid "Invalid email address: %s"
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
 msgstr ""
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
-#, php-format
-msgid "Invalid homepage '%s'"
-msgstr "Ugyldig hjemmeside '%s'"
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "Bekreft adresse"
 
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/confirmaddress.php:159
 #, php-format
-msgid "Invalid license URL '%s'"
+msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
 
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
-msgstr ""
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Bekreftelseskode"
 
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
 msgstr ""
 
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
 msgstr ""
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "Ugyldig profil-URL '%s'"
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "Kan ikke slette notisen."
 
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
+#: actions/deletenotice.php:103
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
 msgstr ""
 
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
-#: actions/avatarbynickname.php:69
-msgid "Invalid size."
-msgstr "Ugyldig størrelse"
-
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111 actions/finishopenidlogin.php:241
-#: actions/register.php:103 actions/register.php:121
-#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
-msgid "Invalid username or password."
-msgstr "Ugyldig brukernavn eller passord"
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr "Er du sikker på at du vil slette denne notisen?"
 
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-msgid "Invitation(s) sent"
-msgstr ""
+#: actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "Kan ikke slette notisen."
 
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-msgid "Invitation(s) sent to the following people:"
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+msgid "Delete this notice"
 msgstr ""
 
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
-msgid "Invite"
+#: actions/deletenotice.php:157
+msgid "There was a problem with your session token.  Try again, please."
 msgstr ""
 
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-msgid "Invite new users"
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
 msgstr ""
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
-#, php-format
-msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
+#: actions/disfavor.php:94
+msgid "Add to favorites"
 msgstr ""
 
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
+#: actions/doc.php:69
+msgid "No such document."
 msgstr ""
 
-#: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/editgroup.php:56
 #, 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."
+msgid "Edit %s group"
 msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
-msgid "Language"
-msgstr "Språk"
-
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
-msgid "Language is too long (max 50 chars)."
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
 msgstr ""
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
-msgid "Location"
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+msgid "You must be an admin to edit the group"
 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
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
-msgid "Location is too long (max 255 chars)."
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
 msgstr ""
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
-#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
-#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
-#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
-#, php-format
-msgid "Login"
-msgstr "Logg inn"
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Bioen er for lang (max 140 tegn)"
 
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Logg inn med en [OpenID](%%doc.openid%%)-konto."
+#: actions/editgroup.php:253
+#, fuzzy
+msgid "Could not update group."
+msgstr "Klarte ikke å oppdatere bruker."
 
-#: ../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%"
-"%). "
+#: actions/editgroup.php:269
+msgid "Options saved."
 msgstr ""
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
-msgid "Logout"
-msgstr "Logg ut"
-
-#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
-msgid "Longer name, preferably your \"real\" name"
-msgstr "Lengre navn, helst ditt \"ekte\" navn"
-
-#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
-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:60
+msgid "Email Settings"
+msgstr "Innstillinger for e-post"
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
 #: actions/emailsettings.php:71
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
-#: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
-msgid "Member since"
-msgstr "Medlem siden"
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "Adresse"
 
-#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
-#, php-format
-msgid "Microblog by %s"
-msgstr "Mikroblogg av %s"
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr "Nåværende bekreftede e-postadresse"
 
-#: ../actions/smssettings.php:304
-#, php-format
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "Fjern"
+
+#: actions/emailsettings.php:113
 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."
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
 msgstr ""
+"Venter på bekreftelse av adressen. Sjekk innboksen din (og søppelboksen) for "
+"melding med videre veiledning."
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-msgid "My text and files are available under "
-msgstr ""
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "Avbryt"
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#: actions/emailsettings.php:142 actions/smssettings.php:152
-msgid "New"
-msgstr "Ny"
+#: actions/emailsettings.php:121
+msgid "Email Address"
+msgstr "E-postadresse"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
-#, php-format
-msgid "New email address for posting to %s"
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
-msgid "New incoming email address added."
-msgstr ""
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "Legg til"
 
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
-msgid "New nickname"
-msgstr "Nytt nick"
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+msgstr "innkommende e-post"
 
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
 msgstr ""
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-msgid "New password"
-msgstr "Nytt passord"
-
-#: ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
+#: actions/emailsettings.php:145 actions/smssettings.php:162
+msgid "Make a new email address for posting to; cancels the old one."
 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
-#: actions/login.php:228 actions/profilesettings.php:98
-#: actions/register.php:367 actions/showgroup.php:224
-#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
-msgid "Nickname"
-msgstr "Nick"
-
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69 actions/finishopenidlogin.php:181
-#: actions/profilesettings.php:225 actions/register.php:76
-#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
-msgid "Nickname already in use. Try another one."
-msgstr "Det nicket er allerede i bruk. Prøv et annet."
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
+msgstr "Ny"
 
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:67 ../actions/updateprofile.php:77
-#: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
-#: actions/register.php:74 actions/updateprofile.php:78
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
-msgid "Nickname not allowed."
-msgstr "Dette nicket er ikke tillatt"
-
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
-msgid "Nickname or email"
-msgstr "Nick eller e-postadresse"
-
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
-msgid "No"
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
-#: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
-msgstr "Ingen Jabber ID."
-
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
-msgid "No authorization request!"
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
-msgid "No carrier selected."
+#: actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
-#: actions/confirmaddress.php:75
-msgid "No confirmation code."
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
 msgstr ""
 
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
-#: actions/newnotice.php:126 classes/Command.php:223
-msgid "No content!"
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
+msgstr "Publiser en MicroID for min e-postadresse."
+
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Lagre"
+
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
 msgstr ""
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr "Ingen e-postadresse."
 
-#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
-msgid "No id."
-msgstr "Ingen id."
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
+msgstr "Klarer ikke normalisere epostadressen"
 
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
-msgid "No incoming email address."
-msgstr ""
+#: actions/emailsettings.php:330
+msgid "Not a valid email address"
+msgstr "Ugyldig e-postadresse"
 
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr ""
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
+msgstr "Det er allerede din e-postadresse."
 
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
-msgid "No nickname."
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another user."
 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
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
-msgid "No pending confirmation to cancel."
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
 msgstr ""
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
+#: actions/emailsettings.php:358
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
+"En bekreftelseskode ble sendt til epostadressen du la til. Sjekk innboksen "
+"din (og søppelboksen) for koden, og hvordan du skal bruke den."
 
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
 msgstr ""
 
-#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
-msgid "No registered email address for that user."
-msgstr ""
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "Det er feil IM-adresse."
 
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr ""
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "Bekreftelse avbrutt."
 
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
-msgid "No results"
-msgstr ""
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
+msgstr "Det er ikke din e-postadresse."
 
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
-msgid "No status found with that ID."
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
-msgid "No status with that ID found."
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
 msgstr ""
 
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
 msgstr ""
 
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
-msgid "No such document."
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
 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 actions/shownotice.php:87
-#: lib/deleteaction.php:51
-msgid "No such notice."
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+msgid "Popular notices"
 msgstr ""
 
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
+#: actions/favorited.php:67
+#, php-format
+msgid "Popular notices, page %d"
 msgstr ""
 
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-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 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
-msgid "No such user."
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
 msgstr ""
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-msgid "No user with that email address or username."
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
+#: actions/favorited.php:153
+msgid ""
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
 msgstr ""
 
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
+#: actions/favorited.php:156
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
 msgstr ""
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
 msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
-msgid "Not a supported data format."
+#: actions/favoritesrss.php:115
+#, php-format
+msgid "Updates favored by %1$s on %2$s!"
 msgstr ""
 
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
-msgstr "Ugyldig Jabber ID"
-
-#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-msgid "Not a valid OpenID."
-msgstr "Ugyldig OpenID"
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
-msgid "Not a valid email address"
-msgstr "Ugyldig e-postadresse"
-
-#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-msgid "Not a valid email address."
-msgstr "Ugyldig e-postadresse."
-
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-#: actions/editgroup.php:186 actions/newgroup.php:137
-#: actions/profilesettings.php:195 actions/register.php:161
-msgid "Not a valid nickname."
-msgstr "Ugyldig nick."
-
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
 msgstr ""
 
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
-msgid "Not an image or corrupt file."
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
-msgid "Not authorized."
-msgstr "Ikke autorisert."
-
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
-msgid "Not expecting this response!"
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
-msgid "Not found"
-msgstr ""
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "Nytt nick"
 
-#: ../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 actions/block.php:59 actions/disfavor.php:61
-#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
-#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
-#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
-#: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Ikke logget inn."
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Nytt nick"
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
-msgid "Not subscribed!."
+#: actions/file.php:42
+msgid "No attachments"
 msgstr ""
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
+#: actions/file.php:51
+msgid "No uploaded attachments"
 msgstr ""
 
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
-#, php-format
-msgid "Notice feed for %s"
+#: actions/finishremotesubscribe.php:69
+msgid "Not expecting this response!"
 msgstr ""
 
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
+#: actions/finishremotesubscribe.php:80
+msgid "User being listened to does not exist."
 msgstr ""
 
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
-msgid "Notices"
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
 msgstr ""
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
-#, php-format
-msgid "Notices tagged with %s"
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
-msgstr "Gammelt passord"
-
-#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
-msgid "OpenID"
-msgstr "OpenID"
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "Ikke autorisert."
 
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
-msgid "OpenID Account Setup"
+#: actions/finishremotesubscribe.php:109
+msgid "Could not convert request token to access token."
 msgstr ""
 
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-msgid "OpenID Auto-Submit"
+#: actions/finishremotesubscribe.php:114
+msgid "Remote service uses unknown version of OMB protocol."
 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
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-msgid "OpenID Login"
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
 msgstr ""
 
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-#: actions/openidlogin.php:102 actions/openidsettings.php:101
-msgid "OpenID URL"
-msgstr "OpenID-URL"
-
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
 #, fuzzy
-msgid "OpenID authentication cancelled."
-msgstr "OpenID-autentifisering avbrutt."
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr ""
-
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
-#, php-format
-msgid "OpenID failure: %s"
-msgstr ""
+msgid "No such group."
+msgstr "Klarte ikke å lagre profil."
 
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr "OpenID fjernet"
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "Klarte ikke å lagre profil."
 
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
-msgstr "Innstillinger for OpenID"
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Klarte ikke å lagre profil."
 
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-msgid "Optionally add a personal message to the invitation."
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
 msgstr ""
 
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
-msgid "Partial upload."
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
 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 actions/finishopenidlogin.php:118
-#: actions/login.php:231 actions/register.php:372
-#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-msgid "Password"
-msgstr "Passord"
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "Du er allerede logget inn!"
 
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
-msgid "Password and confirmation do not match."
+#: actions/groupblock.php:100
+msgid "User is not a member of group."
 msgstr ""
 
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
-msgid "Password must be 6 chars or more."
-msgstr "Passordet må bestå av 6 eller flere tegn."
-
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-msgid "Password recovery requested"
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+msgid "Block user from group"
 msgstr ""
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-msgid "Password saved."
-msgstr "Passordet ble lagret"
-
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-msgid "Passwords don't match."
+#: actions/groupblock.php:162
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
 msgstr ""
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
+#: actions/groupblock.php:178
+msgid "Do not block this user from this group"
 msgstr ""
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
+#: actions/groupblock.php:179
+msgid "Block this user from this group"
 msgstr ""
 
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
 msgstr ""
 
-#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
-msgid "Personal"
-msgstr "Personlig"
+#: actions/groupbyid.php:74
+msgid "No ID"
+msgstr ""
 
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-msgid "Personal message"
+#: actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
 msgstr ""
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
+#: actions/groupdesignsettings.php:141
+msgid "Group design"
 msgstr ""
 
-#: ../actions/userauthorization.php:78
+#: actions/groupdesignsettings.php:152
 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\"."
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
 msgstr ""
 
-#: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr ""
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Klarte ikke å oppdatere bruker."
 
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94 actions/emailsettings.php:86
-#: actions/imsettings.php:68 actions/smssettings.php:94
-#: actions/twittersettings.php:70 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
-msgid "Preferences"
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+msgid "Unable to save your design settings!"
 msgstr ""
 
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163 actions/emailsettings.php:180
-#: actions/imsettings.php:152 actions/smssettings.php:171
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
-msgid "Preferences saved."
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+msgid "Design preferences saved."
 msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
-msgid "Preferred language"
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
 msgstr ""
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
-msgid "Privacy"
+#: actions/grouplogo.php:150
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
 msgstr ""
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-msgid "Problem saving notice."
+#: actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
-msgid "Profile"
-msgstr "Profil"
+#: actions/grouplogo.php:396
+#, fuzzy
+msgid "Logo updated."
+msgstr "Avataren har blitt oppdatert."
 
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
+#: actions/grouplogo.php:398
+msgid "Failed updating logo."
 msgstr ""
 
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
+#: actions/groupmembers.php:93 lib/groupnav.php:92
+#, php-format
+msgid "%s group members"
 msgstr ""
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-msgid "Profile unknown"
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
 msgstr ""
 
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
-msgid "Public Stream Feed"
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
 msgstr ""
 
-#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
-msgid "Public timeline"
+#: actions/groupmembers.php:175 lib/groupnav.php:107
+msgid "Admin"
 msgstr ""
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Publiser en MicroID for min Jabber/Gtalk-adresse."
-
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
-msgid "Publish a MicroID for my email address."
-msgstr "Publiser en MicroID for min e-postadresse."
-
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr "Nyeste Tagger"
-
-#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
-msgid "Recover"
-msgstr "Gjenopprett"
-
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
-msgid "Recover password"
+#: actions/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
 msgstr ""
 
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-msgid "Recovery code for unknown user."
+#: actions/groupmembers.php:441
+msgid "Make user an admin of the group"
 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
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-msgid "Register"
+#: actions/groupmembers.php:473
+msgid "Make Admin"
 msgstr ""
 
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
-msgid "Registration not allowed."
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
 msgstr ""
 
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
-msgid "Registration successful"
+#: actions/grouprss.php:133
+#, php-format
+msgid "Updates from members of %1$s on %2$s!"
 msgstr ""
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
-msgid "Reject"
+#: actions/groupsearch.php:52
+#, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
-msgid "Remember me"
-msgstr "Husk meg"
+#: actions/groupsearch.php:58
+#, fuzzy
+msgid "Group search"
+msgstr "Tekst-søk"
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
-msgid "Remote profile with no matching profile"
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+msgid "No results."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
+#: actions/groupsearch.php:82
+#, php-format
+msgid ""
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
 msgstr ""
 
-#: ../actions/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 actions/emailsettings.php:101
-#: actions/emailsettings.php:134 actions/imsettings.php:102
-#: actions/openidsettings.php:166 actions/smssettings.php:103
-#: actions/smssettings.php:146 actions/twittersettings.php:115
-msgid "Remove"
-msgstr "Fjern"
-
-#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
-msgstr "Fjern OpenID"
-
-#: ../actions/openidsettings.php:73
+#: actions/groupsearch.php:85
+#, php-format
 msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
 msgstr ""
 
-#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
-msgid "Replies"
-msgstr "Svar"
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
+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
-#: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: actions/groups.php:64
 #, php-format
-msgid "Replies to %s"
-msgstr "Svar til %s"
-
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
-msgid "Reset"
-msgstr "Nullstill"
-
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
-msgid "Reset password"
+msgid "Groups, page %d"
 msgstr ""
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-msgid "SMS"
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
 msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
-msgid "SMS Phone number"
-msgstr "Telefonnummer for SMS"
-
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
-msgstr "Innstillinger for SMS"
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+#, fuzzy
+msgid "Create a new group"
+msgstr "Opprett en ny konto"
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
-msgid "SMS confirmation"
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
 msgstr ""
 
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
-msgid "Same as password above"
+#: actions/groupunblock.php:95
+msgid "User is not blocked from group."
 msgstr ""
 
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
-msgid "Same as password above. Required."
+#: actions/groupunblock.php:128 actions/unblock.php:108
+msgid "Error removing the block."
 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 actions/emailsettings.php:182
-#: actions/facebooksettings.php:114 actions/imsettings.php:157
-#: actions/othersettings.php:117 actions/profilesettings.php:150
-#: actions/smssettings.php:169 actions/subscriptions.php:124
-#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
-msgid "Save"
-msgstr "Lagre"
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "Innstillinger for IM"
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
-msgid "Search"
-msgstr "Søk"
+#: actions/imsettings.php:70
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
 
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
+#: actions/imsettings.php:89
+msgid "IM is not available."
 msgstr ""
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Nåværende bekreftede Jabber/GTak-adresse."
+
+#: actions/imsettings.php:114
 #, php-format
 msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
+"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 ""
+"Venter på godkjenning. Sjekk din Jabber/GTalk-konto for en melding med "
+"instruksjoner (la du %s til vennelisten din?)"
 
-#: ../actions/peoplesearch.php:28
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "IM-adresse"
+
+#: actions/imsettings.php:126
 #, 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."
+"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/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
-msgid "Select a carrier"
+#: actions/imsettings.php:143
+msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
-#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
-#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
-msgid "Send"
-msgstr "Send"
-
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
+#: actions/imsettings.php:153
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
-msgid "Send me notices through Jabber/GTalk."
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Publiser en MicroID for min Jabber/Gtalk-adresse."
+
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "Ingen Jabber ID."
+
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr "Klarer ikke normalisere Jabber-IDen"
+
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "Ugyldig Jabber ID"
+
+#: actions/imsettings.php:299
+msgid "That is already your Jabber ID."
+msgstr "Det er allerede din Jabber ID."
+
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
 msgstr ""
 
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/imsettings.php:327
+#, php-format
 msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
 msgstr ""
+"En bekreftelseskode ble sendt til lynmeldingsadressen du la til. Du må "
+"godkjenne %s for å sende meldinger til deg."
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#: actions/imsettings.php:387
+msgid "That is not your Jabber ID."
+msgstr "Det er ikke din Jabber ID."
+
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
 msgstr ""
 
-#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
-msgid "Settings"
+#: actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
 msgstr ""
 
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
-msgid "Settings saved."
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
+#: actions/invite.php:39
+msgid "Invites have been disabled."
 msgstr ""
 
-#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:114
-msgid "Someone else already has this OpenID."
+#: actions/invite.php:41
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
+#: actions/invite.php:72
+#, php-format
+msgid "Invalid email address: %s"
 msgstr ""
 
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
 msgstr ""
 
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
+#: actions/invite.php:112
+msgid "Invite new users"
 msgstr ""
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
-msgid "Source"
-msgstr "Kilde"
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr ""
 
-#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
-msgid "Statistics"
-msgstr "Statistikk"
+#: actions/invite.php:131 actions/invite.php:139
+#, php-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-msgid "Stored OpenID not found."
+#: actions/invite.php:136
+msgid ""
+"These people are already users and you were automatically subscribed to them:"
 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
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
-msgid "Subscribe"
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
 msgstr ""
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
-msgid "Subscribers"
+#: actions/invite.php:150
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 msgstr ""
 
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
-msgid "Subscription authorized"
+#: actions/invite.php:162
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
-msgid "Subscription rejected"
+#: actions/invite.php:187
+msgid "Email addresses"
 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
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
-msgid "Subscriptions"
-msgstr ""
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr "Adresser til venner som skal inviteres (én per linje)"
 
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
-msgid "System error uploading file."
+#: actions/invite.php:192
+msgid "Personal message"
 msgstr ""
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
-#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
-msgid "Tags"
-msgstr "Tagger"
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "Tekst"
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
+msgstr "Send"
 
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
-msgid "Text search"
-msgstr "Tekst-søk"
+#: actions/invite.php:226
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s har invitert deg til %2$s"
 
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
+#: actions/invite.php:228
+#, 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 ""
+"%$1s har invitert deg til %2$s (%3$s).\n"
+"\n"
+"%$2s er en mikrobloggingteneste som lar deg holde deg oppdatert på folk du "
+"kjenner og/eller som interesserer deg.\n"
+"\n"
+"Du kan også dele nyheter om deg sjelv, dine tanker eller livet ditt på "
+"nettet med folk som kjenner til deg. Det er supert for å møte nye folk med "
+"like interesser.\n"
+"\n"
+"%1$s sa:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Du kan se profilsiden til %1$s på %2$s her:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Hvis du vil prøva tjenesten, klikk på lenken nedenfor for å akseptere "
+"invitasjonen.\n"
+"\n"
+"Vennlig hilsen, %2$s\n"
 
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
 msgstr ""
 
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
+#: actions/joingroup.php:90 lib/command.php:217
+#, fuzzy
+msgid "You are already a member of that group"
+msgstr "Du er allerede logget inn!"
+
+#: actions/joingroup.php:128 lib/command.php:234
+#, php-format
+msgid "Could not join user %s to group %s"
 msgstr ""
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
+#: actions/joingroup.php:135 lib/command.php:239
+#, php-format
+msgid "%s joined group %s"
 msgstr ""
 
-#: ../actions/avatar.php:80 actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
-msgstr "Den filen er for stor."
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
+msgstr ""
 
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
-msgid "That is already your Jabber ID."
-msgstr "Det er allerede din Jabber ID."
+#: actions/leavegroup.php:90 lib/command.php:268
+msgid "You are not a member of that group."
+msgstr ""
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
-msgid "That is already your email address."
-msgstr "Det er allerede din e-postadresse."
+#: actions/leavegroup.php:119 lib/command.php:278
+msgid "Could not find membership record."
+msgstr ""
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
-msgid "That is already your phone number."
-msgstr "Det er allerede din ditt telefonnummer."
+#: actions/leavegroup.php:127 lib/command.php:284
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "Klarte ikke å oppdatere bruker."
 
-#: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
-msgid "That is not your Jabber ID."
-msgstr "Det er ikke din Jabber ID."
+#: actions/leavegroup.php:134 lib/command.php:289
+#, php-format
+msgid "%s left group %s"
+msgstr ""
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
-msgid "That is not your email address."
-msgstr "Det er ikke din e-postadresse."
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "Allerede innlogget."
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
-msgstr "Det er ikke ditt telefonnummer."
+#: actions/login.php:110 actions/login.php:120
+msgid "Invalid or expired token."
+msgstr ""
 
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-#: actions/emailsettings.php:367 actions/imsettings.php:349
-msgid "That is the wrong IM address."
-msgstr "Det er feil IM-adresse."
+#: actions/login.php:143
+msgid "Incorrect username or password."
+msgstr "Feil brukernavn eller passord"
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
+#: actions/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
 msgstr ""
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-msgid "That phone number already belongs to another user."
-msgstr ""
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "Logg inn"
 
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49 actions/twitapistatuses.php:330
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-msgid "That's too long. Max notice size is 140 chars."
+#: actions/login.php:243
+msgid "Login to site"
 msgstr ""
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
-msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Nick"
 
-#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
-#, php-format
-msgid "The address \"%s\" has been confirmed for your account."
-msgstr ""
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Passord"
 
-#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274 actions/emailsettings.php:282
-#: actions/imsettings.php:258 actions/smssettings.php:282
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
-msgid "The address was removed."
-msgstr ""
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "Husk meg"
 
-#: ../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:"
+#: actions/login.php:253 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
+"Logg inn automatisk i framtiden. Ikke for datamaskiner du deler med andre!"
+
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "Mistet eller glemt passordet?"
 
-#: ../actions/userauthorization.php:322
+#: actions/login.php:282
 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."
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
 msgstr ""
 
-#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/login.php:286
 #, php-format
-msgid "These are the people who listen to %s's notices."
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
 msgstr ""
 
-#: ../actions/subscribers.php:33 actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
 msgstr ""
 
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/makeadmin.php:95
 #, php-format
-msgid "These are the people whose notices %s listens to."
+msgid "%s is already an admin for group \"%s\"."
 msgstr ""
 
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
 msgstr ""
 
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
-msgid ""
-"These people are already users and you were automatically subscribed to them:"
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
 msgstr ""
 
-#: ../actions/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
+#: actions/microsummary.php:69
+msgid "No current status"
 msgstr ""
 
-#: ../lib/openid.php:195
-msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
+#: actions/newgroup.php:53
+msgid "New group"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
-#, 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."
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
 msgstr ""
 
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-msgid "This method requires a POST or DELETE."
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
 msgstr ""
 
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
-msgid "This method requires a POST."
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
 msgstr ""
 
-#: ../lib/util.php:164 lib/util.php:246
-msgid "This page is not available in a media type you accept"
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
 msgstr ""
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
-msgid "Timezone"
-msgstr "Tidssone"
-
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
-msgid "Timezone not selected."
+#: actions/newmessage.php:158
+msgid "No recipient specified."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:43
-#, php-format
+#: actions/newmessage.php:164 lib/command.php:370
 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."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
-msgid "Two user ids or screen_names must be supplied."
+#: actions/newmessage.php:181
+msgid "Message sent"
 msgstr ""
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside."
-
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-msgid "URL of your profile on another compatible microblogging service"
+#: actions/newmessage.php:185 lib/command.php:375
+#, php-format
+msgid "Direct message to %s sent"
 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 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-msgid "Unexpected form submission."
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
 msgstr ""
 
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
-msgid "Unexpected password reset."
+#: actions/newnotice.php:69
+msgid "New notice"
 msgstr ""
 
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-msgid "Unknown action"
+#: actions/newnotice.php:199
+msgid "Notice posted"
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-msgid "Unknown version of OMB protocol."
+#: actions/noticesearch.php:68
+#, php-format
+msgid ""
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
 msgstr ""
 
-#: ../lib/util.php:269 lib/util.php:285
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "Tekst-søk"
+
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "Søkestrøm for «%s»"
+
+#: actions/noticesearch.php:121
+#, php-format
 msgid ""
-"Unless otherwise specified, contents of this site are copyright by the "
-"contributors and available under the "
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 msgstr ""
 
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
+#: actions/noticesearch.php:124
 #, php-format
-msgid "Unrecognized address type %s"
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
+#: actions/noticesearchrss.php:89
+#, php-format
+msgid "Updates with \"%s\""
 msgstr ""
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-msgid "Unsupported OMB version"
-msgstr ""
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Alle oppdateringer for søket: «%s»"
 
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
-msgid "Unsupported image file format."
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
+#: actions/nudge.php:94
+msgid "Nudge sent"
 msgstr ""
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
+#: actions/nudge.php:97
+msgid "Nudge sent!"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/oembed.php:86 actions/shownotice.php:180
 #, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
+msgid "%1$s's status on %2$s"
+msgstr "%1$s sin status på %2$s"
 
-#: ../actions/avatar.php:68 actions/profilesettings.php:161
-#: actions/avatarsettings.php:162 actions/grouplogo.php:232
-msgid "Upload"
-msgstr "Last opp"
+#: actions/oembed.php:157
+msgid "content type "
+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."
+#: actions/oembed.php:160
+msgid "Only "
 msgstr ""
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
 msgstr ""
 
-#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
+#: actions/opensearch.php:64
+msgid "People Search"
 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"
+#: actions/opensearch.php:67
+msgid "Notice Search"
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
-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
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-msgid "User has no profile."
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "Innstillinger for IM"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
+#: actions/othersettings.php:108
+msgid " (free service)"
 msgstr ""
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
 msgstr ""
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
-msgid "What timezone are you normally in?"
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
 msgstr ""
 
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
-#, php-format
-msgid "What's up, %s?"
+#: actions/othersettings.php:122
+msgid "View profile designs"
 msgstr ""
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-#: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
-msgid "Where you are, like \"City, State (or Region), Country\""
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
 msgstr ""
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/othersettings.php:153
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Bioen er for lang (max 140 tegn)"
+
+#: actions/outbox.php:58
 #, php-format
-msgid "Wrong image type for '%s'"
+msgid "Outbox for %s - page %d"
 msgstr ""
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/outbox.php:61
 #, php-format
-msgid "Wrong size image at '%s'"
+msgid "Outbox for %s"
 msgstr ""
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
-msgid "Yes"
-msgstr "Ja"
-
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-msgid "You already have this OpenID!"
+#: actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
 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/passwordsettings.php:58
+msgid "Change password"
+msgstr "Endre passord"
 
-#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
-msgstr "Du er allerede logget inn!"
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "Endre passord"
 
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-msgid "You are already subscribed to these users:"
-msgstr ""
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#, fuzzy
+msgid "Password change"
+msgstr "Passordet ble lagret"
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
-msgid "You are not friends with the specified user."
-msgstr ""
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "Gammelt passord"
 
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr ""
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "Nytt passord"
 
-#: ../actions/register.php:135 actions/register.php:145
-msgid "You can create a new account to start posting notices."
-msgstr ""
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6 eller flere tegn"
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "Bekreft"
 
-#: ../actions/openidsettings.php:86
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
+#: actions/passwordsettings.php:113
+msgid "same as password above"
 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/passwordsettings.php:117
+msgid "Change"
+msgstr "Endre"
 
-#: ../actions/profilesettings.php:27
-msgid ""
-"You can update your personal profile info here so people know more about you."
+#: actions/passwordsettings.php:154 actions/register.php:230
+msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
-msgid "You can't register if you don't agree to the license."
-msgstr ""
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "Feil gammelt passord"
 
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
-msgid "You did not send us that profile"
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
 msgstr ""
 
-#: ../lib/mail.php:147
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "Klarer ikke å lagre nytt passord."
+
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "Passordet ble lagret"
+
+#: actions/peoplesearch.php:52
 #, 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"
+"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/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
-msgid "You may not delete another user's status."
+#: actions/peoplesearch.php:58
+msgid "People search"
 msgstr ""
 
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr ""
+#: actions/peopletag.php:70
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Ugyldig e-postadresse"
 
-#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+#: actions/peopletag.php:144
+#, php-format
+msgid "Users self-tagged with %s - page %d"
 msgstr ""
 
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
 msgstr ""
 
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
-msgid "Your OpenID URL"
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
+#: actions/profilesettings.php:60
+msgid "Profile settings"
 msgstr ""
 
-#: ../actions/openidsettings.php:28
-#, php-format
+#: actions/profilesettings.php:71
 msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
-"account.  Manage your associated OpenIDs from here."
+"You can update your personal profile info here so people know more about you."
 msgstr ""
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
-msgid "a few seconds ago"
-msgstr "noen få sekunder siden"
+#: actions/profilesettings.php:99
+msgid "Profile information"
+msgstr ""
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
-#, php-format
-msgid "about %d days ago"
-msgstr "omtrent %d dager siden"
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64 små bokstaver eller nummer, ingen punktum eller mellomrom"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
-#, php-format
-msgid "about %d hours ago"
-msgstr "omtrent %d timer siden"
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full name"
+msgstr "Fullt navn"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
-#, php-format
-msgid "about %d minutes ago"
-msgstr "omtrent %d minutter siden"
+#: actions/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "Hjemmesiden"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
-#, php-format
-msgid "about %d months ago"
-msgstr "omtrent %d måneder siden"
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside."
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
-msgid "about a day ago"
-msgstr "omtrent én dag siden"
+#: actions/profilesettings.php:122 actions/register.php:460
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Beskriv degselv og dine interesser med 140 tegn"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
-msgid "about a minute ago"
-msgstr "omtrent ett minutt siden"
+#: actions/profilesettings.php:125 actions/register.php:463
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Beskriv degselv og dine interesser med 140 tegn"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
-msgid "about a month ago"
-msgstr "omtrent én måned siden"
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "Om meg"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
-msgid "about a year ago"
-msgstr "omtrent ett år siden"
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr ""
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
-msgid "about an hour ago"
-msgstr "omtrent én time siden"
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr ""
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
-msgstr "slett"
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
+msgstr "Tagger"
 
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117 actions/noticesearch.php:136
-#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
-msgid "in reply to..."
+#: actions/profilesettings.php:140
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 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 actions/noticesearch.php:194
-msgid "reply"
-msgstr "svar"
+#: actions/profilesettings.php:144
+msgid "Language"
+msgstr "Språk"
 
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-msgid "same as password above"
+#: actions/profilesettings.php:145
+msgid "Preferred language"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
-msgid "unsupported file type"
-msgstr ""
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr "Tidssone"
 
-#: ../lib/util.php:1309 lib/util.php:1443
-msgid "« After"
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
 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
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-msgid "There was a problem with your session token. Try again, please."
+#: actions/profilesettings.php:160
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
+"Abonner automatisk på de som abonnerer på meg (best for ikke-mennesker)"
 
-#: actions/disfavor.php:55 actions/disfavor.php:81
-msgid "This notice is not a favorite!"
-msgstr ""
+#: actions/profilesettings.php:221 actions/register.php:223
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "«Om meg» er for lang (maks 140 tegn)."
 
-#: actions/disfavor.php:63 actions/disfavor.php:87
-msgid "Could not delete favorite."
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
 msgstr ""
 
-#: actions/disfavor.php:72 lib/favorform.php:140
-msgid "Favor"
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
 msgstr ""
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
-msgstr ""
+#: actions/profilesettings.php:246 actions/tagother.php:178
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Ugyldig hjemmeside '%s'"
 
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-msgid "Send me email when someone sends me a private message."
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
-msgid "This notice is already a favorite!"
-msgstr ""
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+msgstr "Klarte ikke å lagre profil."
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132 actions/favor.php:86
-#: actions/twitapifavorites.php:125 classes/Command.php:152
-msgid "Could not create favorite."
-msgstr ""
+#: actions/profilesettings.php:336
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Klarte ikke å lagre profil."
 
-#: actions/favor.php:70
-msgid "Disfavor"
+#: actions/profilesettings.php:344
+msgid "Settings saved."
 msgstr ""
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/public.php:83
 #, php-format
-msgid "%s favorite notices"
+msgid "Beyond the page limit (%s)"
 msgstr ""
 
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
-#, php-format
-msgid "Feed of favorite notices of %s"
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
 msgstr ""
 
-#: actions/inbox.php:28 actions/inbox.php:59
+#: actions/public.php:129
 #, php-format
-msgid "Inbox for %s - page %d"
+msgid "Public timeline, page %d"
 msgstr ""
 
-#: actions/inbox.php:30 actions/inbox.php:62
-#, php-format
-msgid "Inbox for %s"
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
 msgstr ""
 
-#: actions/inbox.php:53 actions/inbox.php:115
-msgid "This is your inbox, which lists your incoming private messages."
+#: actions/public.php:151
+msgid "Public Stream Feed (RSS 1.0)"
 msgstr ""
 
-#: actions/invite.php:178 actions/invite.php:213
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+#: actions/public.php:155
+msgid "Public Stream Feed (RSS 2.0)"
 msgstr ""
 
-#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-msgid "Automatically login in the future; "
-msgstr ""
+#: actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "%s offentlig strøm"
 
-#: actions/login.php:122 actions/login.php:264
-msgid "For security reasons, please re-enter your "
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
 msgstr ""
 
-#: actions/login.php:126 actions/login.php:268
-msgid "Login with your username and password. "
+#: actions/public.php:182
+msgid "Be the first to post!"
 msgstr ""
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
-msgid "That's too long. Max message size is 140 chars."
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
-#: actions/newmessage.php:65 actions/newmessage.php:128
-msgid "No recipient specified."
+#: actions/public.php:233
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206 actions/newmessage.php:131
-#: actions/newmessage.php:168 classes/Command.php:237
-msgid "You can't send a message to this user."
+#: actions/public.php:238
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
 msgstr ""
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
+#: actions/publictagcloud.php:57
+msgid "Public tag cloud"
 msgstr ""
 
-#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
-msgid "No such user"
+#: actions/publictagcloud.php:63
+#, php-format
+msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/newmessage.php:117 actions/newmessage.php:67
-msgid "New message"
+#: actions/publictagcloud.php:69
+#, php-format
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
 
-#: actions/noticesearch.php:95 actions/noticesearch.php:146
-msgid "Notice without matching profile"
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
 msgstr ""
 
-#: actions/openidsettings.php:28 actions/openidsettings.php:70
+#: actions/publictagcloud.php:75
 #, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
 msgstr ""
 
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
 msgstr ""
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr ""
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "Du er allerede logget inn!"
 
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-msgid "You can remove an OpenID from your account "
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
 msgstr ""
 
-#: actions/outbox.php:28 actions/outbox.php:58
-#, php-format
-msgid "Outbox for %s - page %d"
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
 msgstr ""
 
-#: actions/outbox.php:30 actions/outbox.php:61
-#, php-format
-msgid "Outbox for %s"
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
 msgstr ""
 
-#: actions/outbox.php:53 actions/outbox.php:116
-msgid "This is your outbox, which lists private messages you have sent."
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
 msgstr ""
 
-#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
-#, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
 msgstr ""
 
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
-msgid "You can update your personal profile info here "
-msgstr ""
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
+msgstr "Klarte ikke å oppdatere bruker med bekreftet e-post."
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
-msgid "User without matching profile"
+#: actions/recoverpassword.php:152
+msgid ""
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
 msgstr ""
 
-#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
 msgstr ""
 
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a "
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
 msgstr ""
 
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-msgid "Your nickname on this server, "
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-msgid "Instructions for recovering your password "
-msgstr ""
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
+msgstr "Gjenopprett"
 
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
-msgid "New password successfully saved. "
+#: actions/recoverpassword.php:208
+msgid "Reset password"
 msgstr ""
 
-#: actions/register.php:95 actions/register.php:180
-msgid "Password must be 6 or more characters."
+#: actions/recoverpassword.php:209
+msgid "Recover password"
 msgstr ""
 
-#: actions/register.php:216
-#, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
 msgstr ""
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
 msgstr ""
 
-#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
-#, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr ""
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 eller flere tegn. Og ikke glem det!"
 
-#: actions/showfavorites.php:61 actions/showfavorites.php:145
-#, php-format
-msgid "Feed for favorites of %s"
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
 msgstr ""
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-msgid "Could not retrieve favorite notices."
-msgstr ""
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "Nullstill"
 
-#: actions/showmessage.php:33 actions/showmessage.php:81
-msgid "No such message."
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
 msgstr ""
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
 msgstr ""
 
-#: actions/showmessage.php:61 actions/showmessage.php:108
-#, php-format
-msgid "Message to %1$s on %2$s"
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
 msgstr ""
 
-#: actions/showmessage.php:66 actions/showmessage.php:113
-#, php-format
-msgid "Message from %1$s on %2$s"
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
 msgstr ""
 
-#: actions/showstream.php:154
-msgid "Send a message"
+#: actions/recoverpassword.php:325
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
 msgstr ""
+"Instruksjoner om hvordan du kan gjenopprette ditt passord har blitt sendt "
+"til din registrerte e-postadresse."
 
-#: actions/smssettings.php:312 actions/smssettings.php:464
-#, php-format
-msgid "Mobile carrier for your phone. "
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
-#, php-format
-msgid "Direct messages to %s"
-msgstr ""
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "Passordet må bestå av 6 eller flere tegn."
 
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
-#, php-format
-msgid "All the direct messages sent to %s"
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-msgid "Direct Messages You've Sent"
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
-#, php-format
-msgid "All the direct messages sent from %s"
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-msgid "No message text!"
+#: actions/register.php:92
+msgid "Sorry, invalid invitation code."
 msgstr ""
 
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-msgid "Recipient user not found."
+#: actions/register.php:112
+msgid "Registration successful"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-msgid "Can't send direct messages to users who aren't your friend."
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
 msgstr ""
 
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
-#, php-format
-msgid "%s / Favorites from %s"
+#: actions/register.php:135
+msgid "Registration not allowed."
 msgstr ""
 
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
-#, php-format
-msgid "%s updates favorited by %s / %s."
+#: actions/register.php:198
+msgid "You can't register if you don't agree to the license."
 msgstr ""
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
-#, php-format
-msgid "%s added your notice as a favorite"
-msgstr ""
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "Ugyldig e-postadresse."
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
-#, php-format
-msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+#: actions/register.php:212
+msgid "Email address already exists."
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "Ugyldig brukernavn eller passord"
+
+#: actions/register.php:342
 msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
 msgstr ""
 
-#: actions/twittersettings.php:41 actions/twittersettings.php:60
-msgid "Twitter settings"
+#: actions/register.php:424
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
+"1-64 små bokstaver eller nummer, ingen punktum eller mellomrom. Påkrevd."
 
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-msgid "Twitter Account"
-msgstr ""
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr "6 eller flere tegn. Påkrevd."
 
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-msgid "Current verified Twitter account."
+#: actions/register.php:433
+msgid "Same as password above. Required."
 msgstr ""
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr ""
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "E-post"
 
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-msgid "No spaces, please."
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
-msgstr ""
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
+msgstr "Lengre navn, helst ditt \"ekte\" navn"
 
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-msgid "Automatically send my notices to Twitter."
+#: actions/register.php:493
+msgid "My text and files are available under "
 msgstr ""
 
-#: actions/twittersettings.php:75 actions/twittersettings.php:146
-msgid "Send local \"@\" replies to Twitter."
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-msgid "Subscribe to my Twitter friends here."
+#: actions/register.php:496
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
 msgstr ""
+"utenom disse private dataene: passord, epost, adresse, lynmeldingsadresse og "
+"telefonnummer."
 
-#: actions/twittersettings.php:122
+#: actions/register.php:537
+#, php-format
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+"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 ""
+"Gratulerer, %s! Og velkommen til %%%%site.name%%%%. Herfra vil du "
+"kanskje...\n"
+"\n"
+"* Gå til [din profil](%s) og sende din første notis.\n"
+"* Legge til en [Jabber/GTalk addresse](%%%%action.imsettings%%%%) så du kan "
+"sende notiser fra lynmeldinger.\n"
+"* [Søke etter brukere](%%%%action.peoplesearch%%%%) that you may know or "
+"that share your interests. \n"
+"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
+"others more about you. \n"
+"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
+"missed. \n"
+"\n"
+"Thanks for signing up and we hope you enjoy using this service."
 
-#: actions/twittersettings.php:128 actions/twittersettings.php:334
-msgid "Could not verify your Twitter credentials!"
+#: actions/register.php:561
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
 msgstr ""
+"(Du vil straks motta en epost med instruksjoner om hvordan du kan bekrefte "
+"din epostadresse)"
 
-#: actions/twittersettings.php:137
+#: actions/remotesubscribe.php:98
 #, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr ""
-
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-msgid "Unable to save your Twitter settings!"
+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/twittersettings.php:174 actions/twittersettings.php:376
-msgid "Twitter settings saved."
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
 msgstr ""
 
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-msgid "That is not your Twitter account."
+#: actions/remotesubscribe.php:124
+msgid "Subscribe to a remote user"
 msgstr ""
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
-msgid "Couldn't remove Twitter user."
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
 msgstr ""
 
-#: actions/twittersettings.php:212 actions/twittersettings.php:407
-msgid "Twitter account removed."
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
 msgstr ""
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
-msgid "Couldn't save Twitter preferences."
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
 msgstr ""
 
-#: actions/twittersettings.php:245 actions/twittersettings.php:461
-msgid "Twitter preferences saved."
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
-#: actions/userauthorization.php:84 actions/userauthorization.php:86
-msgid "Please check these details to make sure "
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
 msgstr ""
 
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
-msgid "The subscription has been authorized, but no "
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
 msgstr ""
 
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-msgid "The subscription has been rejected, but no "
+#: actions/remotesubscribe.php:168
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
 msgstr ""
 
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-msgid "Command results"
+#: actions/remotesubscribe.php:176
+msgid "That’s a local profile! Login to subscribe."
 msgstr ""
 
-#: classes/Channel.php:148 classes/Channel.php:204
-msgid "Command complete"
+#: actions/remotesubscribe.php:183
+msgid "Couldn’t get a request token."
 msgstr ""
 
-#: classes/Channel.php:158 classes/Channel.php:215
-msgid "Command failed"
-msgstr ""
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
+#, php-format
+msgid "Replies to %s"
+msgstr "Svar til %s"
 
-#: classes/Command.php:39 classes/Command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr ""
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %s, page %d"
+msgstr "Svar til %s"
 
-#: classes/Command.php:96 classes/Command.php:113
+#: actions/replies.php:144
 #, php-format
-msgid "Subscriptions: %1$s\n"
+msgid "Replies feed for %s (RSS 1.0)"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
-msgid "User has no last notice"
+#: actions/replies.php:151
+#, php-format
+msgid "Replies feed for %s (RSS 2.0)"
 msgstr ""
 
-#: classes/Command.php:146 classes/Command.php:166
-msgid "Notice marked as fave."
-msgstr ""
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Svar til %s"
 
-#: classes/Command.php:166 classes/Command.php:189
+#: actions/replies.php:198
 #, php-format
-msgid "%1$s (%2$s)"
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
 msgstr ""
 
-#: classes/Command.php:169 classes/Command.php:192
+#: actions/replies.php:203
 #, php-format
-msgid "Fullname: %s"
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
 msgstr ""
 
-#: classes/Command.php:172 classes/Command.php:195
+#: actions/replies.php:205
 #, php-format
-msgid "Location: %s"
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: classes/Command.php:175 classes/Command.php:198
-#, php-format
-msgid "Homepage: %s"
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Svar til %s"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "%s og venner"
+
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
 msgstr ""
 
-#: classes/Command.php:178 classes/Command.php:201
-#, php-format
-msgid "About: %s"
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Feed for %s sine venner"
+
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Feed for %s sine venner"
+
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Feed for %s sine venner"
+
+#: actions/showfavorites.php:205
+msgid ""
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""
 
-#: classes/Command.php:200 classes/Command.php:228
+#: actions/showfavorites.php:207
 #, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
 msgstr ""
 
-#: classes/Command.php:214 classes/Command.php:245
+#: actions/showfavorites.php:211
 #, php-format
-msgid "Direct message to %s sent"
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
 msgstr ""
 
-#: classes/Command.php:216 classes/Command.php:247
-msgid "Error sending direct message."
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
 msgstr ""
 
-#: classes/Command.php:263 classes/Command.php:300
-msgid "Specify the name of the user to subscribe to"
+#: actions/showgroup.php:82 lib/groupnav.php:86
+#, php-format
+msgid "%s group"
 msgstr ""
 
-#: classes/Command.php:270 classes/Command.php:307
+#: actions/showgroup.php:84
 #, php-format
-msgid "Subscribed to %s"
+msgid "%s group, page %d"
 msgstr ""
 
-#: classes/Command.php:288 classes/Command.php:328
-msgid "Specify the name of the user to unsubscribe from"
-msgstr ""
+#: actions/showgroup.php:218
+#, fuzzy
+msgid "Group profile"
+msgstr "Klarte ikke å lagre profil."
 
-#: classes/Command.php:295 classes/Command.php:335
-#, php-format
-msgid "Unsubscribed from %s"
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
+msgid "URL"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
-msgid "Command not yet implemented."
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
+msgid "Note"
 msgstr ""
 
-#: classes/Command.php:313 classes/Command.php:356
-msgid "Notification off."
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
 msgstr ""
 
-#: classes/Command.php:315 classes/Command.php:358
-msgid "Can't turn off notification."
+#: actions/showgroup.php:293
+msgid "Group actions"
 msgstr ""
 
-#: classes/Command.php:333 classes/Command.php:379
-msgid "Notification on."
+#: actions/showgroup.php:328
+#, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
 msgstr ""
 
-#: classes/Command.php:335 classes/Command.php:381
-msgid "Can't turn on notification."
+#: actions/showgroup.php:334
+#, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
 msgstr ""
 
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
+#: actions/showgroup.php:340
+#, php-format
+msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
-#: classes/Message.php:53 classes/Message.php:56
-msgid "Could not insert message."
-msgstr ""
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "Klarte ikke å lagre profil."
 
-#: classes/Message.php:63 classes/Message.php:66
-msgid "Could not update message with new URI."
-msgstr ""
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
+#, fuzzy
+msgid "Members"
+msgstr "Medlem siden"
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/tagcloudsection.php:71
+msgid "(None)"
 msgstr ""
 
-#: lib/mail.php:147 lib/mail.php:289
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+#: actions/showgroup.php:392
+msgid "All members"
 msgstr ""
 
-#: lib/mail.php:249 lib/mail.php:508
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "Statistikk"
+
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Opprett"
+
+#: actions/showgroup.php:448
 #, php-format
-msgid "New private message from %s"
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: lib/mail.php:253 lib/mail.php:512
+#: actions/showgroup.php:454
 #, php-format
 msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
 msgstr ""
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
+#: actions/showgroup.php:482
+msgid "Admins"
 msgstr ""
 
-#: lib/openid.php:195 lib/openid.php:203
-msgid "This form should automatically submit itself. "
+#: actions/showmessage.php:81
+msgid "No such message."
 msgstr ""
 
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-msgid "Favorites"
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/showmessage.php:108
 #, php-format
-msgid "%s's favorite notices"
-msgstr ""
-
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-msgid "User"
+msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-msgid "Inbox"
+#: actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-msgid "Your incoming messages"
+#: actions/shownotice.php:90
+msgid "Notice deleted."
 msgstr ""
 
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-msgid "Outbox"
-msgstr ""
+#: actions/showstream.php:73
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "Tagger"
 
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-msgid "Your sent messages"
+#: actions/showstream.php:79
+#, php-format
+msgid "%s, page %d"
 msgstr ""
 
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-msgid "Twitter"
+#: actions/showstream.php:122
+#, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
 msgstr ""
 
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
+#: actions/showstream.php:129
+#, php-format
+msgid "Notice feed for %s (RSS 1.0)"
 msgstr ""
 
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-msgid "To"
+#: actions/showstream.php:136
+#, php-format
+msgid "Notice feed for %s (RSS 2.0)"
 msgstr ""
 
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-msgid "Could not parse message."
+#: actions/showstream.php:143
+#, php-format
+msgid "Notice feed for %s (Atom)"
 msgstr ""
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/showstream.php:148
 #, fuzzy, php-format
-msgid "%s and friends, page %d"
-msgstr "%s og venner"
+msgid "FOAF for %s"
+msgstr "Feed for taggen %s"
 
-#: actions/avatarsettings.php:76
-msgid "You can upload your personal avatar."
+#: actions/showstream.php:191
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
 msgstr ""
 
-#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
-#, fuzzy
-msgid "Avatar settings"
-msgstr "Innstillinger for IM"
-
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-msgid "Original"
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
 msgstr ""
 
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-msgid "Preview"
+#: actions/showstream.php:198
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
-msgid "Crop"
+#: actions/showstream.php:234
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-msgid "There was a problem with your session token. "
+#: actions/showstream.php:239
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
 msgstr ""
 
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-msgid "Pick a square area of the image to be your avatar"
-msgstr ""
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "Innstillinger for SMS"
 
-#: actions/avatarsettings.php:327 actions/grouplogo.php:384
-msgid "Lost our file data."
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
-#, fuzzy
-msgid "Lost our file."
-msgstr "Klarte ikke å lagre profil."
-
-#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
-#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
-msgid "Unknown file type"
+#: actions/smssettings.php:91
+msgid "SMS is not available."
 msgstr ""
 
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr ""
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Nåværende bekreftede telefonnummer med mulighet for å motta SMS."
 
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr ""
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
+msgstr "Venter på bekreftelse for dette telefonnummeret."
 
-#: actions/block.php:111
-msgid "Block user"
-msgstr ""
+#: actions/smssettings.php:130
+msgid "Confirmation code"
+msgstr "Bekreftelseskode"
 
-#: actions/block.php:129
-msgid "Are you sure you want to block this user? "
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
 msgstr ""
 
-#: actions/block.php:162
-#, fuzzy
-msgid "You have already blocked this user."
-msgstr "Du er allerede logget inn!"
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
+msgstr "Telefonnummer for SMS"
 
-#: actions/block.php:167
-msgid "Failed to save block information."
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
-#: actions/confirmaddress.php:159
-#, php-format
-msgid "The address \"%s\" has been "
+#: actions/smssettings.php:174
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
 msgstr ""
 
-#: actions/deletenotice.php:73
-msgid "You are about to permanently delete a notice. "
+#: actions/smssettings.php:306
+msgid "No phone number."
 msgstr ""
 
-#: actions/disfavor.php:94
-msgid "Add to favorites"
+#: actions/smssettings.php:311
+msgid "No carrier selected."
 msgstr ""
 
-#: actions/editgroup.php:54
-#, php-format
-msgid "Edit %s group"
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
+msgstr "Det er allerede din ditt telefonnummer."
+
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
 msgstr ""
 
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-msgid "Inboxes must be enabled for groups to work"
+#: actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
 msgstr ""
+"En bekreftelseskode ble sendt til telefonnummeret du la til. Sjekk innboksen "
+"din for koden, og hvordan du skal bruke den."
 
-#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-msgid "You must be logged in to create a group."
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
 msgstr ""
 
-#: actions/editgroup.php:87 actions/grouplogo.php:87
-#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
-#, fuzzy
-msgid "No nickname"
-msgstr "Nytt nick"
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
+msgstr "Det er ikke ditt telefonnummer."
 
-#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
-#: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
-#, fuzzy
-msgid "No such group"
-msgstr "Klarte ikke å lagre profil."
+#: actions/smssettings.php:465
+msgid "Mobile carrier"
+msgstr ""
 
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
-msgid "You must be an admin to edit the group"
+#: actions/smssettings.php:469
+msgid "Select a carrier"
 msgstr ""
 
-#: actions/editgroup.php:157
-msgid "Use this form to edit the group."
+#: actions/smssettings.php:476
+#, 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/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
-msgid "Nickname must have only lowercase letters "
+#: actions/smssettings.php:498
+msgid "No code entered"
 msgstr ""
 
-#: actions/editgroup.php:198 actions/newgroup.php:149
-#, fuzzy
-msgid "description is too long (max 140 chars)."
-msgstr "Bioen er for lang (max 140 tegn)"
+#: actions/subedit.php:70
+msgid "You are not subscribed to that profile."
+msgstr ""
 
-#: actions/editgroup.php:218
+#: actions/subedit.php:83
 #, fuzzy
-msgid "Could not update group."
-msgstr "Klarte ikke å oppdatere bruker."
-
-#: actions/editgroup.php:226
-msgid "Options saved."
-msgstr ""
+msgid "Could not save subscription."
+msgstr "Klarte ikke å lagre avatar-informasjonen"
 
-#: actions/emailsettings.php:107 actions/imsettings.php:108
-#, fuzzy, php-format
-msgid "Awaiting confirmation on this address. "
-msgstr "Venter på bekreftelse på dette telefonnummeret"
+#: actions/subscribe.php:55
+#, fuzzy
+msgid "Not a local user."
+msgstr "Ugyldig OpenID"
 
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-msgid "Make a new email address for posting to; "
+#: actions/subscribe.php:69
+msgid "Subscribed"
 msgstr ""
 
-#: actions/emailsettings.php:157
-msgid "Send me email when someone "
+#: actions/subscribers.php:50
+#, php-format
+msgid "%s subscribers"
 msgstr ""
 
-#: actions/emailsettings.php:168
-msgid "Allow friends to nudge me and send me an email."
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %d"
 msgstr ""
 
-#: actions/emailsettings.php:321
-msgid "That email address already belongs "
+#: actions/subscribers.php:63
+msgid "These are the people who listen to your notices."
 msgstr ""
 
-#: actions/emailsettings.php:343
-msgid "A confirmation code was sent to the email address you added. "
+#: actions/subscribers.php:67
+#, php-format
+msgid "These are the people who listen to %s's notices."
 msgstr ""
 
-#: actions/facebookhome.php:110
-msgid "Server error - couldn't get user!"
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
 msgstr ""
 
-#: actions/facebookhome.php:196
+#: actions/subscribers.php:110
 #, php-format
-msgid "If you would like the %s app to automatically update "
+msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
 
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#: actions/subscribers.php:114
 #, php-format
-msgid "Allow %s to update my Facebook status"
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
 msgstr ""
 
-#: actions/facebookhome.php:218
-msgid "Skip"
-msgstr ""
+#: actions/subscriptions.php:52
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "Alle abonnementer"
+
+#: actions/subscriptions.php:54
+#, fuzzy, php-format
+msgid "%s subscriptions, page %d"
+msgstr "Alle abonnementer"
 
-#: actions/facebookhome.php:235
-msgid "No notice content!"
+#: actions/subscriptions.php:65
+msgid "These are the people whose notices you listen to."
 msgstr ""
 
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-msgid "Pagination"
+#: actions/subscriptions.php:69
+#, php-format
+msgid "These are the people whose notices %s listens to."
 msgstr ""
 
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-msgid "After"
+#: actions/subscriptions.php:121
+#, php-format
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
 msgstr ""
 
-#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s lytter nå til dine notiser på %2$s."
+
+#: actions/subscriptions.php:194
 #, fuzzy
-msgid "Before"
-msgstr "Tidligere »"
+msgid "Jabber"
+msgstr "Ingen Jabber ID."
 
-#: actions/facebookinvite.php:70
-#, php-format
-msgid "Thanks for inviting your friends to use %s"
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
 msgstr ""
 
-#: actions/facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr ""
+#: actions/tagother.php:33
+#, fuzzy
+msgid "Not logged in"
+msgstr "Ikke logget inn."
 
-#: actions/facebookinvite.php:96
-#, php-format
-msgid "You have been invited to %s"
+#: actions/tagother.php:39
+msgid "No id argument."
 msgstr ""
 
-#: actions/facebookinvite.php:105
+#: actions/tagother.php:65
 #, fuzzy, php-format
-msgid "Invite your friends to use %s"
-msgstr "Feed for %s sine venner"
+msgid "Tag %s"
+msgstr "Tagger"
 
-#: actions/facebookinvite.php:113
-#, php-format
-msgid "Friends already using %s:"
-msgstr ""
+#: actions/tagother.php:77 lib/userprofile.php:75
+#, fuzzy
+msgid "User profile"
+msgstr "Klarte ikke å lagre profil."
 
-#: actions/facebookinvite.php:130
-#, php-format
-msgid "Send invitations"
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
 msgstr ""
 
-#: actions/facebookremove.php:56
+#: actions/tagother.php:141
 #, fuzzy
-msgid "Couldn't remove Facebook user."
-msgstr "Klarte ikke å oppdatere bruker."
+msgid "Tag user"
+msgstr "Tagger"
 
-#: actions/facebooksettings.php:65
-msgid "There was a problem saving your sync preferences!"
+#: actions/tagother.php:151
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
 msgstr ""
 
-#: actions/facebooksettings.php:67
-msgid "Sync preferences saved."
+#: actions/tagother.php:193
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/facebooksettings.php:90
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
+#: actions/tagother.php:200
+#, fuzzy
+msgid "Could not save tags."
+msgstr "Klarte ikke å lagre avatar-informasjonen"
 
-#: actions/facebooksettings.php:97
-msgid "Send \"@\" replies to Facebook."
+#: actions/tagother.php:236
+msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/facebooksettings.php:106
-#, fuzzy
-msgid "Prefix"
-msgstr "Profil"
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Mikroblogg av %s"
 
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
+#: actions/tag.php:86
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr ""
 
-#: actions/facebooksettings.php:124
+#: actions/tag.php:92
 #, php-format
-msgid "If you would like %s to automatically update "
+msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr ""
 
-#: actions/facebooksettings.php:147
-msgid "Sync preferences"
-msgstr ""
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Feed for taggen %s"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
-msgid "Disfavor favorite"
+#: actions/tagrss.php:35
+msgid "No such tag."
 msgstr ""
 
-#: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
-msgid "Popular notices"
-msgstr ""
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
+msgstr "API-metode under utvikling."
 
-#: actions/favorited.php:67
-#, php-format
-msgid "Popular notices, page %d"
+#: actions/unsubscribe.php:77
+msgid "No profile id in request."
 msgstr ""
 
-#: actions/favorited.php:79
-msgid "The most popular notices on the site right now."
+#: actions/unsubscribe.php:84
+msgid "No profile with that id."
 msgstr ""
 
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
-msgid "Featured users"
+#: actions/unsubscribe.php:98
+msgid "Unsubscribed"
 msgstr ""
 
-#: actions/featured.php:71
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
 #, php-format
-msgid "Featured users, page %d"
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some of the great users on %s"
-msgstr ""
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "Autoriser abonnementet"
 
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
+#: actions/userauthorization.php:110
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
 msgstr ""
 
-#: actions/groupbyid.php:79
-msgid "No ID"
+#: actions/userauthorization.php:188
+msgid "License"
 msgstr ""
 
-#: actions/grouplogo.php:138 actions/grouplogo.php:191
-msgid "Group logo"
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "Godta"
+
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
 msgstr ""
 
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
+#: actions/userauthorization.php:211
+msgid "Reject"
 msgstr ""
 
-#: actions/grouplogo.php:448
+#: actions/userauthorization.php:212
 #, fuzzy
-msgid "Logo updated."
-msgstr "Avataren har blitt oppdatert."
+msgid "Reject this subscription"
+msgstr "Alle abonnementer"
 
-#: actions/grouplogo.php:450
-msgid "Failed updating logo."
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
 msgstr ""
 
-#: actions/groupmembers.php:93 lib/groupnav.php:91
-#, php-format
-msgid "%s group members"
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
 msgstr ""
 
-#: actions/groupmembers.php:96
-#, php-format
-msgid "%s group members, page %d"
+#: actions/userauthorization.php:249
+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/groupmembers.php:111
-msgid "A list of the users in this group."
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
 msgstr ""
 
-#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
-msgid "Groups"
+#: actions/userauthorization.php:261
+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/groups.php:64
+#: actions/userauthorization.php:296
 #, php-format
-msgid "Groups, page %d"
+msgid "Listener URI ‘%s’ not found here"
 msgstr ""
 
-#: actions/groups.php:90
+#: actions/userauthorization.php:301
 #, php-format
-msgid "%%%%site.name%%%% groups let you find and talk with "
+msgid "Listenee URI ‘%s’ is too long."
 msgstr ""
 
-#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-#, fuzzy
-msgid "Create a new group"
-msgstr "Opprett en ny konto"
-
-#: actions/groupsearch.php:57
+#: actions/userauthorization.php:307
 #, php-format
-msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-msgstr ""
-
-#: actions/groupsearch.php:63
-#, fuzzy
-msgid "Group search"
-msgstr "Tekst-søk"
-
-#: actions/imsettings.php:70
-msgid "You can send and receive notices through "
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr ""
 
-#: actions/imsettings.php:120
+#: actions/userauthorization.php:322
 #, php-format
-msgid "Jabber or GTalk address, "
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr ""
 
-#: actions/imsettings.php:147
-msgid "Send me replies through Jabber/GTalk "
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr ""
 
-#: actions/imsettings.php:321
+#: actions/userauthorization.php:343
 #, fuzzy, php-format
-msgid "A confirmation code was sent "
-msgstr "Bekreftelseskode"
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Kan ikke lese brukerbilde-URL «%s»"
 
-#: actions/joingroup.php:65
-msgid "You must be logged in to join a group."
+#: actions/userauthorization.php:348
+#, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr ""
 
-#: actions/joingroup.php:95
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr "Ingen id."
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
 #, fuzzy
-msgid "You are already a member of that group"
-msgstr "Du er allerede logget inn!"
+msgid "Profile design"
+msgstr "Profil"
 
-#: actions/joingroup.php:128
-#, php-format
-msgid "Could not join user %s to group %s"
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
 msgstr ""
 
-#: actions/joingroup.php:135
-#, php-format
-msgid "%s joined group %s"
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
 msgstr ""
 
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
+#: actions/usergroups.php:64
+#, php-format
+msgid "%s groups, page %d"
 msgstr ""
 
-#: actions/leavegroup.php:65
-msgid "You must be logged in to leave a group."
+#: actions/usergroups.php:130
+msgid "Search for more groups"
 msgstr ""
 
-#: actions/leavegroup.php:88
-#, fuzzy
-msgid "No such group."
-msgstr "Klarte ikke å lagre profil."
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "Du er allerede logget inn!"
 
-#: actions/leavegroup.php:95
-msgid "You are not a member of that group."
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
 
-#: actions/leavegroup.php:100
-msgid "You may not leave a group while you are its administrator."
+#: classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
 msgstr ""
 
-#: actions/leavegroup.php:130
-msgid "Could not find membership record."
+#: classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
 msgstr ""
 
-#: actions/leavegroup.php:138
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "Klarte ikke å oppdatere bruker."
-
-#: actions/leavegroup.php:145
+#: classes/File.php:154
 #, php-format
-msgid "%s left group %s"
+msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
-#: actions/login.php:225 lib/facebookaction.php:304
-msgid "Login to site"
+#: classes/Message.php:55
+msgid "Could not insert message."
 msgstr ""
 
-#: actions/microsummary.php:69
-msgid "No current status"
+#: classes/Message.php:65
+msgid "Could not update message with new URI."
 msgstr ""
 
-#: actions/newgroup.php:53
-msgid "New group"
+#: classes/Notice.php:164
+#, php-format
+msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: actions/newgroup.php:115
-msgid "Use this form to create a new group."
+#: classes/Notice.php:179
+msgid "Problem saving notice. Too long."
 msgstr ""
 
-#: actions/newgroup.php:177
-#, fuzzy
-msgid "Could not create group."
-msgstr "Klarte ikke å lagre avatar-informasjonen"
-
-#: actions/newgroup.php:191
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "Klarte ikke å lagre avatar-informasjonen"
-
-#: actions/newmessage.php:119 actions/newnotice.php:132
-#, fuzzy
-msgid "That's too long. "
-msgstr "Den filen er for stor."
-
-#: actions/newmessage.php:134
-msgid "Don't send a message to yourself; "
+#: classes/Notice.php:183
+msgid "Problem saving notice. Unknown user."
 msgstr ""
 
-#: actions/newnotice.php:166
-msgid "Notice posted"
+#: classes/Notice.php:188
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: actions/newnotice.php:200 classes/Channel.php:163
-msgid "Ajax Error"
+#: classes/Notice.php:194
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
 msgstr ""
 
-#: actions/nudge.php:85
-msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+#: classes/Notice.php:202
+msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: actions/nudge.php:94
-msgid "Nudge sent"
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
 msgstr ""
 
-#: actions/nudge.php:97
-msgid "Nudge sent!"
+#: classes/Notice.php:1120
+#, php-format
+msgid "DB error inserting reply: %s"
 msgstr ""
 
-#: actions/openidlogin.php:97
-#, fuzzy
-msgid "OpenID login"
-msgstr "OpenID"
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr ""
 
-#: actions/openidsettings.php:128
-#, fuzzy
-msgid "Removing your only OpenID "
-msgstr "Fjern OpenID"
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Profil"
 
-#: actions/othersettings.php:60
-#, fuzzy
-msgid "Other Settings"
-msgstr "Innstillinger for IM"
+#: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
+msgstr "Endre profilinnstillingene dine"
 
-#: actions/othersettings.php:71
-msgid "Manage various other options."
+#: lib/accountsettingsaction.php:112
+msgid "Upload an avatar"
 msgstr ""
 
-#: actions/othersettings.php:93
-msgid "URL Auto-shortening"
-msgstr ""
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr "Endre passordet ditt"
 
-#: actions/othersettings.php:112
-#, fuzzy
-msgid "Service"
-msgstr "Søk"
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
+msgstr "Endre eposthåndtering"
 
-#: actions/othersettings.php:113
-msgid "Automatic shortening service to use."
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
 msgstr ""
 
-#: actions/othersettings.php:144
-#, fuzzy
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "Bioen er for lang (max 140 tegn)"
-
-#: actions/passwordsettings.php:69
-#, fuzzy
-msgid "Change your password."
-msgstr "Endre passord"
-
-#: actions/passwordsettings.php:89
+#: lib/accountsettingsaction.php:124
 #, fuzzy
-msgid "Password change"
-msgstr "Passordet ble lagret"
+msgid "Design your profile"
+msgstr "Klarte ikke å lagre profil."
 
-#: actions/peopletag.php:35
-#, fuzzy, php-format
-msgid "Not a valid people tag: %s"
-msgstr "Ugyldig e-postadresse"
+#: lib/accountsettingsaction.php:128
+msgid "Other"
+msgstr ""
 
-#: actions/peopletag.php:47
-#, php-format
-msgid "Users self-tagged with %s - page %d"
+#: lib/accountsettingsaction.php:128
+msgid "Other options"
 msgstr ""
 
-#: actions/peopletag.php:91
+#: lib/action.php:144
 #, php-format
-msgid "These are users who have tagged themselves \"%s\" "
+msgid "%s - %s"
 msgstr ""
 
-#: actions/profilesettings.php:91
-msgid "Profile information"
+#: lib/action.php:159
+msgid "Untitled page"
 msgstr ""
 
-#: actions/profilesettings.php:124
-msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+#: lib/action.php:424
+msgid "Primary site navigation"
 msgstr ""
 
-#: actions/profilesettings.php:144
-#, fuzzy
-msgid "Automatically subscribe to whoever "
-msgstr "Abonner "
+#: lib/action.php:430
+msgid "Home"
+msgstr "Hjem"
 
-#: actions/profilesettings.php:229 actions/tagother.php:176
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Ugyldig hjemmeside '%s'"
+#: lib/action.php:430
+msgid "Personal profile and friends timeline"
+msgstr ""
 
-#: actions/profilesettings.php:311
+#: lib/action.php:432
 #, fuzzy
-msgid "Couldn't save tags."
-msgstr "Klarte ikke å lagre profil."
+msgid "Account"
+msgstr "Om"
 
-#: actions/public.php:107
-#, php-format
-msgid "Public timeline, page %d"
+#: lib/action.php:432
+msgid "Change your email, avatar, password, profile"
 msgstr ""
 
-#: actions/public.php:173
-msgid "Could not retrieve public stream."
-msgstr ""
+#: lib/action.php:435
+msgid "Connect"
+msgstr "Koble til"
 
-#: actions/public.php:220
-#, php-format
-msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
+#: lib/action.php:435
+msgid "Connect to services"
 msgstr ""
 
-#: actions/publictagcloud.php:57
-msgid "Public tag cloud"
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
 msgstr ""
 
-#: actions/publictagcloud.php:63
+#: lib/action.php:440 lib/subgroupnav.php:106
 #, php-format
-msgid "These are most popular recent tags on %s "
-msgstr ""
-
-#: actions/publictagcloud.php:119
-msgid "Tag cloud"
+msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: actions/register.php:139 actions/register.php:349
-msgid "Sorry, only invited people can register."
-msgstr ""
+#: lib/action.php:445
+msgid "Logout"
+msgstr "Logg ut"
 
-#: actions/register.php:149
-msgid "You can't register if you don't "
+#: lib/action.php:445
+msgid "Logout from the site"
 msgstr ""
 
-#: actions/register.php:286
-msgid "With this form you can create "
-msgstr ""
+#: lib/action.php:450
+#, fuzzy
+msgid "Create an account"
+msgstr "Opprett en ny konto"
 
-#: actions/register.php:368
-msgid "1-64 lowercase letters or numbers, "
+#: lib/action.php:453
+msgid "Login to the site"
 msgstr ""
 
-#: actions/register.php:382 actions/register.php:386
-msgid "Used only for updates, announcements, "
-msgstr ""
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
+msgstr "Hjelp"
 
-#: actions/register.php:398
+#: lib/action.php:456
 #, fuzzy
-msgid "URL of your homepage, blog, "
-msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside."
+msgid "Help me!"
+msgstr "Hjelp"
 
-#: actions/register.php:404
-#, fuzzy
-msgid "Describe yourself and your "
-msgstr "Beskriv degselv og dine interesser med 140 tegn"
+#: lib/action.php:459
+msgid "Search"
+msgstr "Søk"
 
-#: actions/register.php:410
-msgid "Where you are, like \"City, "
+#: lib/action.php:459
+msgid "Search for people or text"
 msgstr ""
 
-#: actions/register.php:432
-msgid " except this private data: password, "
+#: lib/action.php:480
+msgid "Site notice"
 msgstr ""
 
-#: actions/register.php:471
-#, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
+#: lib/action.php:546
+msgid "Local views"
 msgstr ""
 
-#: actions/register.php:495
-msgid "(You should receive a message by email "
+#: lib/action.php:612
+msgid "Page notice"
 msgstr ""
 
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
+#: lib/action.php:714
+msgid "Secondary site navigation"
 msgstr ""
 
-#: actions/replies.php:118
-#, fuzzy, php-format
-msgid "Replies to %s, page %d"
-msgstr "Svar til %s"
+#: lib/action.php:721
+msgid "About"
+msgstr "Om"
 
-#: actions/showfavorites.php:79
-#, php-format
-msgid "%s favorite notices, page %d"
-msgstr ""
+#: lib/action.php:723
+msgid "FAQ"
+msgstr "OSS/FAQ"
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
-#, php-format
-msgid "%s group"
+#: lib/action.php:727
+msgid "TOS"
 msgstr ""
 
-#: actions/showgroup.php:79
-#, php-format
-msgid "%s group, page %d"
+#: lib/action.php:730
+msgid "Privacy"
 msgstr ""
 
-#: actions/showgroup.php:206
-#, fuzzy
-msgid "Group profile"
-msgstr "Klarte ikke å lagre profil."
+#: lib/action.php:732
+msgid "Source"
+msgstr "Kilde"
 
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
-msgid "URL"
-msgstr ""
+#: lib/action.php:734
+msgid "Contact"
+msgstr "Kontakt"
 
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
-msgid "Note"
+#: lib/action.php:736
+msgid "Badge"
 msgstr ""
 
-#: actions/showgroup.php:270
-msgid "Group actions"
+#: lib/action.php:764
+msgid "StatusNet software license"
 msgstr ""
 
-#: actions/showgroup.php:323
+#: lib/action.php:767
 #, php-format
-msgid "Notice feed for %s group"
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
+"**%%site.name%%** er en mikrobloggingtjeneste av [%%site.broughtby%%](%%site."
+"broughtbyurl%%). "
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
-#, fuzzy
-msgid "Members"
-msgstr "Medlem siden"
+#: lib/action.php:769
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** er en mikrobloggingtjeneste. "
 
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
-msgid "(None)"
+#: lib/action.php:771
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 
-#: actions/showgroup.php:370
-msgid "All members"
+#: lib/action.php:785
+msgid "Site content license"
 msgstr ""
 
-#: actions/showgroup.php:378
-#, php-format
-msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+#: lib/action.php:794
+msgid "All "
 msgstr ""
 
-#: actions/showmessage.php:98
-msgid "Only the sender and recipient "
+#: lib/action.php:799
+msgid "license."
 msgstr ""
 
-#: actions/showstream.php:73
-#, php-format
-msgid "%s, page %d"
+#: lib/action.php:1052
+msgid "Pagination"
 msgstr ""
 
-#: actions/showstream.php:143
-#, fuzzy
-msgid "'s profile"
-msgstr "Profil"
+#: lib/action.php:1061
+msgid "After"
+msgstr ""
 
-#: actions/showstream.php:236 actions/tagother.php:77
+#: lib/action.php:1069
 #, fuzzy
-msgid "User profile"
-msgstr "Klarte ikke å lagre profil."
-
-#: actions/showstream.php:240 actions/tagother.php:81
-msgid "Photo"
-msgstr ""
+msgid "Before"
+msgstr "Tidligere »"
 
-#: actions/showstream.php:317
-msgid "User actions"
+#: lib/action.php:1117
+msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/showstream.php:342
-msgid "Send a direct message to this user"
+#: lib/attachmentlist.php:87
+msgid "Attachments"
 msgstr ""
 
-#: actions/showstream.php:343
-msgid "Message"
+#: lib/attachmentlist.php:265
+msgid "Author"
 msgstr ""
 
-#: actions/showstream.php:451
+#: lib/attachmentlist.php:278
 #, fuzzy
-msgid "All subscribers"
-msgstr "Alle abonnementer"
+msgid "Provider"
+msgstr "Profil"
 
-#: actions/showstream.php:533
-msgid "All groups"
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
 msgstr ""
 
-#: actions/showstream.php:542
-#, php-format
-msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
 msgstr ""
 
-#: actions/smssettings.php:128
-msgid "Phone number, no punctuation or spaces, "
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
 msgstr ""
 
-#: actions/smssettings.php:162
-msgid "Send me notices through SMS; "
+#: lib/channel.php:210
+msgid "Command complete"
 msgstr ""
 
-#: actions/smssettings.php:335
-#, fuzzy
-msgid "A confirmation code was sent to the phone number you added. "
-msgstr "Venter på bekreftelse på dette telefonnummeret"
-
-#: actions/smssettings.php:453
-msgid "Mobile carrier"
+#: lib/channel.php:221
+msgid "Command failed"
 msgstr ""
 
-#: actions/subedit.php:70
-msgid "You are not subscribed to that profile."
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: actions/subedit.php:83
-#, fuzzy
-msgid "Could not save subscription."
-msgstr "Klarte ikke å lagre avatar-informasjonen"
-
-#: actions/subscribe.php:55
-#, fuzzy
-msgid "Not a local user."
-msgstr "Ugyldig OpenID"
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Klarte ikke å oppdatere bruker med bekreftet e-post."
 
-#: actions/subscribe.php:69
-msgid "Subscribed"
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: actions/subscribers.php:50
+#: lib/command.php:99
 #, php-format
-msgid "%s subscribers"
+msgid "Nudge sent to %s"
 msgstr ""
 
-#: actions/subscribers.php:52
+#: lib/command.php:126
 #, php-format
-msgid "%s subscribers, page %d"
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
 msgstr ""
 
-#: actions/subscribers.php:63
-msgid "These are the people who listen to "
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
 msgstr ""
 
-#: actions/subscribers.php:67
-#, php-format
-msgid "These are the people who "
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
 msgstr ""
 
-#: actions/subscriptions.php:52
-#, fuzzy, php-format
-msgid "%s subscriptions"
-msgstr "Alle abonnementer"
-
-#: actions/subscriptions.php:54
-#, fuzzy, php-format
-msgid "%s subscriptions, page %d"
-msgstr "Alle abonnementer"
-
-#: actions/subscriptions.php:65
-msgid "These are the people whose notices "
+#: lib/command.php:190
+msgid "Notice marked as fave."
 msgstr ""
 
-#: actions/subscriptions.php:69
+#: lib/command.php:315
 #, php-format
-msgid "These are the people whose "
+msgid "%1$s (%2$s)"
 msgstr ""
 
-#: actions/subscriptions.php:122
-#, fuzzy
-msgid "Jabber"
-msgstr "Ingen Jabber ID."
-
-#: actions/tag.php:43
-#, fuzzy, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Mikroblogg av %s"
-
-#: actions/tag.php:66
+#: lib/command.php:318
 #, php-format
-msgid "Messages tagged \"%s\", most recent first"
+msgid "Fullname: %s"
 msgstr ""
 
-#: actions/tagother.php:33
-#, fuzzy
-msgid "Not logged in"
-msgstr "Ikke logget inn."
-
-#: actions/tagother.php:39
-msgid "No id argument."
+#: lib/command.php:321
+#, php-format
+msgid "Location: %s"
 msgstr ""
 
-#: actions/tagother.php:65
-#, fuzzy, php-format
-msgid "Tag %s"
-msgstr "Tagger"
-
-#: actions/tagother.php:141
-#, fuzzy
-msgid "Tag user"
-msgstr "Tagger"
-
-#: actions/tagother.php:149
-msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+#: lib/command.php:324
+#, php-format
+msgid "Homepage: %s"
 msgstr ""
 
-#: actions/tagother.php:164
-msgid "There was a problem with your session token."
+#: lib/command.php:327
+#, php-format
+msgid "About: %s"
 msgstr ""
 
-#: actions/tagother.php:191
-msgid ""
-"You can only tag people you are subscribed to or who are subscribed to you."
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: actions/tagother.php:198
-#, fuzzy
-msgid "Could not save tags."
-msgstr "Klarte ikke å lagre avatar-informasjonen"
-
-#: actions/tagother.php:233
-msgid "Use this form to add tags to your subscribers or subscriptions."
+#: lib/command.php:377
+msgid "Error sending direct message."
 msgstr ""
 
-#: actions/tagrss.php:35
-msgid "No such tag."
+#: lib/command.php:431
+#, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: actions/tagrss.php:66
+#: lib/command.php:439
 #, fuzzy, php-format
-msgid "Microblog tagged with %s"
-msgstr "Mikroblogg av %s"
+msgid "Reply to %s sent"
+msgstr "Svar til %s"
 
-#: actions/twitapiblocks.php:47
-msgid "Block user failed."
+#: lib/command.php:441
+msgid "Error saving notice."
 msgstr ""
 
-#: actions/twitapiblocks.php:69
-msgid "Unblock user failed."
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: actions/twitapiusers.php:48
-#, fuzzy
-msgid "Not found."
-msgstr "Ingen id."
-
-#: actions/twittersettings.php:71
-msgid "Add your Twitter account to automatically send "
+#: lib/command.php:502
+#, php-format
+msgid "Subscribed to %s"
 msgstr ""
 
-#: actions/twittersettings.php:119
-msgid "Twitter user name"
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: actions/twittersettings.php:126
-#, fuzzy
-msgid "Twitter password"
-msgstr "Nytt passord"
-
-#: actions/twittersettings.php:228
-msgid "Twitter Friends"
+#: lib/command.php:530
+#, php-format
+msgid "Unsubscribed from %s"
 msgstr ""
 
-#: actions/twittersettings.php:327
-msgid "Username must have only numbers, "
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
 msgstr ""
 
-#: actions/twittersettings.php:341
-#, php-format
-msgid "Unable to retrieve account information "
+#: lib/command.php:551
+msgid "Notification off."
 msgstr ""
 
-#: actions/unblock.php:108
-msgid "Error removing the block."
+#: lib/command.php:553
+msgid "Can't turn off notification."
 msgstr ""
 
-#: actions/unsubscribe.php:50
-msgid "No profile id in request."
+#: lib/command.php:574
+msgid "Notification on."
 msgstr ""
 
-#: actions/unsubscribe.php:57
-msgid "No profile with that id."
+#: lib/command.php:576
+msgid "Can't turn on notification."
 msgstr ""
 
-#: actions/unsubscribe.php:71
-msgid "Unsubscribed"
-msgstr ""
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Klarte ikke å lagre avatar-informasjonen"
 
-#: actions/usergroups.php:63
+#: lib/command.php:602
 #, php-format
-msgid "%s groups"
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: actions/usergroups.php:65
-#, php-format
-msgid "%s groups, page %d"
-msgstr ""
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Ikke autorisert."
 
-#: classes/Notice.php:104
-msgid "Problem saving notice. Unknown user."
-msgstr ""
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Svar til %s"
 
-#: classes/Notice.php:109
-msgid ""
-"Too many notices too fast; take a breather and post again in a few minutes."
-msgstr ""
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Svar til %s"
 
-#: classes/Notice.php:116
-msgid "You are banned from posting notices on this site."
-msgstr ""
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Svar til %s"
 
-#: lib/accountsettingsaction.php:108
-msgid "Upload an avatar"
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Du er allerede logget inn!"
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "Du er allerede logget inn!"
+
+#: lib/command.php:670
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+
+#: lib/common.php:192
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Fant ikke bekreftelseskode."
+
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/accountsettingsaction.php:119
-msgid "Other"
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/accountsettingsaction.php:120
-msgid "Other options"
+#: lib/common.php:195
+msgid "Go to the installer."
 msgstr ""
 
-#: lib/action.php:130
-#, php-format
-msgid "%s - %s"
+#: lib/connectsettingsaction.php:110
+msgid "IM"
 msgstr ""
 
-#: lib/action.php:145
-msgid "Untitled page"
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
 msgstr ""
 
-#: lib/action.php:316
-msgid "Primary site navigation"
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
 msgstr ""
 
-#: lib/action.php:322
-msgid "Personal profile and friends timeline"
+#: lib/dberroraction.php:60
+msgid "Database error"
 msgstr ""
 
-#: lib/action.php:325
-msgid "Search for people or text"
+#: lib/designsettings.php:101
+msgid "Change background image"
 msgstr ""
 
-#: lib/action.php:328
+#: lib/designsettings.php:105
 #, fuzzy
-msgid "Account"
-msgstr "Om"
+msgid "Upload file"
+msgstr "Last opp"
 
-#: lib/action.php:328
-msgid "Change your email, avatar, password, profile"
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 
-#: lib/action.php:330
-msgid "Connect to IM, SMS, Twitter"
+#: lib/designsettings.php:139
+msgid "On"
 msgstr ""
 
-#: lib/action.php:332
-msgid "Logout from the site"
+#: lib/designsettings.php:155
+msgid "Off"
 msgstr ""
 
-#: lib/action.php:335
-msgid "Login to the site"
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
 msgstr ""
 
-#: lib/action.php:338
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
 #, fuzzy
-msgid "Create an account"
-msgstr "Opprett en ny konto"
+msgid "Change colours"
+msgstr "Endre passordet ditt"
 
-#: lib/action.php:341
-msgid "Login with OpenID"
+#: lib/designsettings.php:178
+msgid "Background"
 msgstr ""
 
-#: lib/action.php:344
+#: lib/designsettings.php:191
 #, fuzzy
-msgid "Help me!"
-msgstr "Hjelp"
+msgid "Content"
+msgstr "Koble til"
 
-#: lib/action.php:362
-msgid "Site notice"
-msgstr ""
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Søk"
 
-#: lib/action.php:417
-msgid "Local views"
-msgstr ""
+#: lib/designsettings.php:217
+msgid "Text"
+msgstr "Tekst"
 
-#: lib/action.php:472
-msgid "Page notice"
-msgstr ""
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Logg inn"
 
-#: lib/action.php:562
-msgid "Secondary site navigation"
+#: lib/designsettings.php:247
+msgid "Use defaults"
 msgstr ""
 
-#: lib/action.php:602 lib/action.php:623
-msgid "StatusNet software license"
+#: lib/designsettings.php:248
+msgid "Restore default designs"
 msgstr ""
 
-#: lib/action.php:630
-msgid "All "
+#: lib/designsettings.php:254
+msgid "Reset back to default"
 msgstr ""
 
-#: lib/action.php:635
-msgid "license."
+#: lib/designsettings.php:257
+msgid "Save design"
 msgstr ""
 
-#: lib/blockform.php:123 lib/blockform.php:153
-msgid "Block this user"
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
 msgstr ""
 
-#: lib/blockform.php:153
-msgid "Block"
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
 msgstr ""
 
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr ""
 
-#: lib/facebookaction.php:268
-#, php-format
-msgid "To use the %s Facebook Application you need to login "
-msgstr ""
-
-#: lib/facebookaction.php:271
-#, fuzzy
-msgid " a new account."
-msgstr "Opprett en ny konto"
-
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-#, fuzzy
-msgid "Published"
-msgstr "Offentlig"
-
 #: lib/favorform.php:114 lib/favorform.php:140
 msgid "Favor this notice"
 msgstr ""
 
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr ""
+
 #: lib/feedlist.php:64
 msgid "Export data"
 msgstr ""
 
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr ""
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr ""
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr ""
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr ""
+
 #: lib/galleryaction.php:121
 #, fuzzy
 msgid "Filter tags"
@@ -4497,62 +3925,86 @@ msgstr "Feed for taggen %s"
 msgid "All"
 msgstr ""
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
+msgstr ""
+
+#: lib/galleryaction.php:140
 #, fuzzy
 msgid "Tag"
 msgstr "Tagger"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr ""
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:163
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside."
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:168
 #, fuzzy
-msgid "Description"
-msgstr "Alle abonnementer"
+msgid "Describe the group or topic"
+msgstr "Beskriv degselv og dine interesser med 140 tegn"
 
-#: lib/groupeditform.php:153
-#, fuzzy
-msgid "Describe the group or topic in 140 chars"
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
 msgstr "Beskriv degselv og dine interesser med 140 tegn"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:172
+#, fuzzy
+msgid "Description"
+msgstr "Alle abonnementer"
+
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr ""
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
-msgid "Group"
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:100
-msgid "Admin"
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+msgid "Group"
 msgstr ""
 
 #: lib/groupnav.php:101
+msgid "Blocked"
+msgstr ""
+
+#: lib/groupnav.php:102
+#, php-format
+msgid "%s blocked users"
+msgstr ""
+
+#: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
 msgstr ""
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:113
 #, fuzzy
 msgid "Logo"
 msgstr "Logg ut"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:114
 #, php-format
 msgid "Add or edit %s logo"
 msgstr ""
 
+#: lib/groupnav.php:120
+#, php-format
+msgid "Add or edit %s design"
+msgstr ""
+
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr ""
@@ -4567,7 +4019,42 @@ msgid "Tags in %s group's notices"
 msgstr ""
 
 #: lib/htmloutputter.php:104
-msgid "This page is not available in a "
+msgid "This page is not available in a media type you accept"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr ""
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr ""
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr ""
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr ""
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr ""
+
+#: lib/imagefile.php:118
+#, fuzzy
+msgid "Lost our file."
+msgstr "Klarte ikke å lagre profil."
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr ""
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
 msgstr ""
 
 #: lib/joinform.php:114
@@ -4580,103 +4067,307 @@ msgstr "Logg inn"
 msgid "Leave"
 msgstr "Lagre"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:80
 #, fuzzy
 msgid "Login with a username and password"
 msgstr "Ugyldig brukernavn eller passord"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:86
 #, fuzzy
 msgid "Sign up for a new account"
 msgstr "Opprett en ny konto"
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr "fra"
+
+#: lib/mail.php:172
+msgid "Email address confirmation"
 msgstr ""
 
-#: lib/mail.php:175
+#: lib/mail.php:174
 #, php-format
 msgid ""
 "Hey, %s.\n"
 "\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%s\n"
+"\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
 msgstr ""
 
-#: lib/mail.php:236
+#: lib/mail.php:235
 #, php-format
-msgid "%1$s is now listening to "
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr "%1$s lytter nå til dine notiser på %2$s."
+
+#: lib/mail.php:240
+#, fuzzy, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
 msgstr ""
+"%1$s lytter nå til dine notiser på %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Vennlig hilsen,\n"
+"%4$s.\n"
 
-#: lib/mail.php:254
+#: lib/mail.php:253
 #, php-format
 msgid "Location: %s\n"
 msgstr ""
 
-#: lib/mail.php:256
+#: lib/mail.php:255
 #, fuzzy, php-format
 msgid "Homepage: %s\n"
 msgstr "Hjemmesiden: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:461
+#: lib/mail.php:285
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: lib/mail.php:288
+#, 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 ""
+
+#: lib/mail.php:412
+#, php-format
+msgid "%s status"
+msgstr "%s status"
+
+#: lib/mail.php:438
+msgid "SMS confirmation"
+msgstr ""
+
+#: lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr ""
 
-#: lib/mail.php:465
+#: lib/mail.php:466
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
+msgstr ""
+
+#: lib/mail.php:509
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:513
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%5$s\n"
+msgstr ""
+
+#: lib/mail.php:554
+#, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr ""
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
 #, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+msgstr ""
+
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
 msgstr ""
 
-#: lib/mail.php:555
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+msgid "Could not determine file's mime-type!"
+msgstr ""
+
+#: lib/mediafile.php:270
 #, php-format
-msgid "%1$s just added your notice from %2$s"
+msgid " Try using another %s format."
 msgstr ""
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
-msgid "From"
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
 msgstr ""
 
-#: lib/messageform.php:110
+#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr ""
 
-#: lib/noticeform.php:125
-msgid "Send a notice"
+#: lib/messageform.php:146
+msgid "To"
 msgstr ""
 
-#: lib/noticeform.php:152
+#: lib/messageform.php:162 lib/noticeform.php:173
 #, fuzzy
 msgid "Available characters"
 msgstr "6 eller flere tegn"
 
-#: lib/noticelist.php:426
-#, fuzzy
-msgid "in reply to"
-msgstr "svar"
+#: lib/noticeform.php:145
+msgid "Send a notice"
+msgstr ""
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
-msgid "Reply to this notice"
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
 msgstr ""
 
-#: lib/noticelist.php:451
-#, fuzzy
-msgid "Reply"
-msgstr "svar"
+#: lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
-msgid "Delete this notice"
+#: lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:478
+msgid "in context"
+msgstr ""
+
+#: lib/noticelist.php:498
+msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:474
+#: lib/noticelist.php:499
 #, fuzzy
-msgid "Delete"
-msgstr "slett"
+msgid "Reply"
+msgstr "svar"
 
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
@@ -4690,41 +4381,140 @@ msgstr ""
 msgid "Send a nudge to this user"
 msgstr ""
 
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr ""
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr ""
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr ""
+
+#: lib/oauthstore.php:345
+msgid "Duplicate notice"
+msgstr ""
+
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
+msgstr ""
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "Personlig"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "Svar"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr ""
+
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr ""
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr ""
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr ""
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr ""
+
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/profilelist.php:182
-msgid "(none)"
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr ""
+
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "Alle abonnementer"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr ""
+
+#: lib/profileaction.php:157
+#, fuzzy
+msgid "All subscribers"
+msgstr "Alle abonnementer"
+
+#: lib/profileaction.php:177
+msgid "User ID"
+msgstr ""
+
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "Medlem siden"
+
+#: lib/profileaction.php:235
+msgid "All groups"
 msgstr ""
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:78
 #, fuzzy
 msgid "Public"
 msgstr "Offentlig"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr ""
 
-#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 #, fuzzy
 msgid "Recent tags"
 msgstr "Nyeste Tagger"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr ""
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr ""
 
+#: lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Søk"
+
+#: lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Søk"
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr ""
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr ""
+
 #: lib/searchgroupnav.php:82
 msgid "Notice"
 msgstr ""
 
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr ""
+
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr ""
@@ -4733,32 +4523,62 @@ msgstr ""
 msgid "Untitled section"
 msgstr ""
 
-#: lib/subgroupnav.php:81
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr ""
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:91
 #, fuzzy, php-format
 msgid "People subscribed to %s"
 msgstr "Svar til %s"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:104
-#, php-format
-msgid "Invite friends and colleagues to join you on %s"
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
 msgstr ""
 
-#: lib/subs.php:53
+#: lib/subs.php:48
+msgid "Already subscribed!"
+msgstr ""
+
+#: lib/subs.php:52
 msgid "User has blocked you."
 msgstr ""
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
+#: lib/subs.php:56
+msgid "Could not subscribe."
+msgstr ""
+
+#: lib/subs.php:75
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: lib/subs.php:124
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Alle abonnementer"
+
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
 msgstr ""
 
 #: lib/tagcloudsection.php:56
@@ -4769,21 +4589,106 @@ msgstr ""
 msgid "Top posters"
 msgstr ""
 
-#: lib/unblockform.php:120 lib/unblockform.php:150
-msgid "Unblock this user"
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+msgid "Unsubscribe from this user"
 msgstr ""
 
-#: lib/unblockform.php:150
-msgid "Unblock"
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
 msgstr ""
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
-msgid "Unsubscribe from this user"
+#: lib/userprofile.php:116
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "Brukerbilde"
+
+#: lib/userprofile.php:236
+msgid "User actions"
 msgstr ""
 
+#: lib/userprofile.php:248
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "Opprett en ny konto"
+msgid "Edit profile settings"
+msgstr "Endre profilinnstillingene dine"
+
+#: lib/userprofile.php:249
+msgid "Edit"
+msgstr ""
+
+#: lib/userprofile.php:272
+msgid "Send a direct message to this user"
+msgstr ""
+
+#: lib/userprofile.php:273
+msgid "Message"
+msgstr ""
+
+#: lib/util.php:821
+msgid "a few seconds ago"
+msgstr "noen få sekunder siden"
+
+#: lib/util.php:823
+msgid "about a minute ago"
+msgstr "omtrent ett minutt siden"
 
-#~ msgid " by "
-#~ msgstr "av"
+#: lib/util.php:825
+#, php-format
+msgid "about %d minutes ago"
+msgstr "omtrent %d minutter siden"
+
+#: lib/util.php:827
+msgid "about an hour ago"
+msgstr "omtrent én time siden"
+
+#: lib/util.php:829
+#, php-format
+msgid "about %d hours ago"
+msgstr "omtrent %d timer siden"
+
+#: lib/util.php:831
+msgid "about a day ago"
+msgstr "omtrent én dag siden"
+
+#: lib/util.php:833
+#, php-format
+msgid "about %d days ago"
+msgstr "omtrent %d dager siden"
+
+#: lib/util.php:835
+msgid "about a month ago"
+msgstr "omtrent én måned siden"
+
+#: lib/util.php:837
+#, php-format
+msgid "about %d months ago"
+msgstr "omtrent %d måneder siden"
+
+#: lib/util.php:839
+msgid "about a year ago"
+msgstr "omtrent ett år siden"
+
+#: lib/webcolor.php:82
+#, php-format
+msgid "%s is not a valid color!"
+msgstr ""
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr ""
+
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr ""
+
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr ""
diff --git a/locale/nl/LC_MESSAGES/statusnet.mo b/locale/nl/LC_MESSAGES/statusnet.mo
index 122a49285..ff15e5ade 100644
--- a/locale/nl/LC_MESSAGES/statusnet.mo
+++ b/locale/nl/LC_MESSAGES/statusnet.mo
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index 6cc0a52c4..2f3944f4e 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -1,4891 +1,4864 @@
-# 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.
+# Translation of StatusNet to Dutch
 #
+# Author@translatewiki.net: McDutchie
+# Author@translatewiki.net: Siebrand
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-07-11 00:23+0000\n"
-"Last-Translator: Ben van Es van Conkelenberghe <ben@ikhier.be>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:59+0000\n"
+"Language-Team: Dutch\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: nl\n"
+"X-Message-Group: out-statusnet\n"
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+msgid "No such page"
+msgstr "Deze pagina bestaat niet"
+
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
+msgstr "Onbekende gebruiker."
 
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/all.php:84
 #, php-format
-msgid " Search Stream for \"%s\""
-msgstr "Doorzoek de stroom naar \"%s\""
-
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-#: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
-msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr ""
-" behalve de volgende privégegevens: wachtwoord, e-mailadres, IM-adres, "
-"telefoonnummer."
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr " van "
+msgid "%s and friends, page %d"
+msgstr "%s en vrienden, pagina %d"
 
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr "%1$s / Updates antwoordend op %2$s"
+msgid "%s and friends"
+msgstr "%s en vrienden"
 
-#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/all.php:99
 #, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s heeft je uitgenodigd voor %2$s"
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Feed voor vrienden van %s (RSS 1.0)"
 
-#: ../actions/invite.php:170
+#: actions/all.php:107
 #, 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 heeft je uitgenodigd voor %2$s (%3$s).\n"
-"\n"
-"%2$s is een micro-blog service waarmee je mensen op de hoogte kunt houden "
-"van wat jou interesseerd en bezig houdt.\n"
-"\n"
-"Je kunt ook nieuws over jezelf of jouw hersenspinsels met anderen delen. Het "
-"is ook de ideale plek om mensen te ontmoeten met dezelfde interesses als "
-"jij.\n"
-"\n"
-"%1$s zei:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Je kunt %1$s's profiel pagina op %2$s hier bekijken:\n"
-"\n"
-"%5$s\n"
-"\n"
-"Als je het wilt proberen, klik dan op de link hieronder om de uitnodiging te "
-"accepteren.\n"
-"\n"
-"%6$s\n"
-"\n"
-"Als je geen interesse hebt, kun je dit bericht gewoon negeren. Bedankt voor "
-"je geduld.\n"
-"\n"
-"Met vriendelijke groet, %2$s\n"
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Feed voor vrienden van %s (RSS 2.0)"
 
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: actions/all.php:115
 #, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s volgt nu je berichten %2$s."
+msgid "Feed for friends of %s (Atom)"
+msgstr "Feed voor vrienden van %s (Atom)"
 
-#: ../lib/mail.php:126
+#: actions/all.php:127
 #, 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 volgt nu je berichten op %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Met vriendelijke groet,\n"
-"%4$s.\n"
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "%1$s updates die een reactie zijn op updates van %2$s / %3$s."
-
-#: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr "%1$s's status op %2$s"
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
-#, php-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
-
-#: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
-#, php-format
-msgid "%s Public Stream"
-msgstr "%s rss"
-
-#: ../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
-#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
-#, php-format
-msgid "%s and friends"
-msgstr "%s en vrienden"
-
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
-#, php-format
-msgid "%s public timeline"
+"This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
+"Dit is de tijdlijn voor %s en vrienden, maar niemand heeft nog mededelingen "
+"doen uitgaan."
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: actions/all.php:132
 #, php-format
-msgid "%s status"
-msgstr "%s status"
-
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
-#, php-format
-msgid "%s timeline"
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
 msgstr ""
+"Probeer te abonneren op meer gebruikers, [word lid van een groep](%%action."
+"groups%%)  of plaats zelf berichten."
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/all.php:134
 #, php-format
-msgid "%s updates from everyone!"
-msgstr "%s updates van iedereen"
-
-#: ../actions/register.php:213
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
-"(U ontvangt een bericht per e-mail  met instructies over: hoe te bevestigen "
-"dat uw e-mailadres.)"
+"U kunt proberen [%s te porren](../%s)  op de eigen profielpagina of [een "
+"bericht voor die gebruiker plaatsen](%%%%action.newnotice%%%%?"
+"status_textarea=%s)."
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
 msgstr ""
-"**%%site.name%%** is een microbloggingdienst van [%%site.broughtby%%](%%site."
-"broughtbyurl%%). "
+"U kunt een [gebruiker registeren](%%%%action.register%%%%) en %s dan porren "
+"of een een bericht voor die gebruiker plaatsen."
+
+#: actions/all.php:165
+msgid "You and friends"
+msgstr "U en vrienden"
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
 #, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** is een microbloggingdienst. "
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr "Updates van %1$s en vrienden op %2$s."
+
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+msgid "API method not found."
+msgstr "De API-functie is niet aangetroffen."
+
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
+msgstr "Deze methode heeft een POST nodig."
 
-#: ../lib/util.php:274 lib/util.php:290
-msgid ". Contributors should be attributed by full name or nickname."
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
 msgstr ""
-". Van de oorspronkelijke auteurs dient de volledige naam of gebruikersnaam "
-"te worden vermeld."
-
-#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
-#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties"
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties. Verplicht."
-
-#: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr "6 of meer tekens"
+"U moet een parameter met de naam \"device\" opgeven met een waarde uit de "
+"volgende lijst: sms, im, none"
 
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
-msgid "6 or more characters, and don't forget it!"
-msgstr "6 of meer tekens, en vergeet het niet!"
-
-#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
-msgid "6 or more characters. Required."
-msgstr "6 of meer tekens. Verplicht"
+#: actions/apiaccountupdatedeliverydevice.php:132
+msgid "Could not update user."
+msgstr "Het was niet mogelijk de gebruiker te actualiseren."
 
-#: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
 #, php-format
 msgid ""
-"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 "
-"akkoord gaan dat %s boodschappen aan jou stuurt."
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+"De server was niet in staat zoveel POST-gegevens af te handelen (%s bytes) "
+"vanwege de huidige instellingen."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
+msgstr "Het was niet mogelijk om uw ontwerpinstellingen op te slaan."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+msgid "Could not update your design."
+msgstr "Het was niet mogelijk uw ontwerp bij te werken."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Deze gebruiker heeft geen profiel."
 
-#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
-msgstr ""
-"Een bevestigingscode is verzonden naar het e-mailadres dat u hebt "
-"toegevoegd. Controleer uw inbox (en spam box!) Voor de code en instructies "
-"hoe het te gebruiken."
+#: actions/apiaccountupdateprofile.php:147
+msgid "Could not save profile."
+msgstr "Het was niet mogelijk het profiel op te slaan."
 
-#: ../actions/smssettings.php:216 actions/smssettings.php:224
-msgid ""
-"A confirmation code was sent to the phone number you added. Check your inbox "
-"(and spam box!) for the code and instructions on how to use it."
-msgstr ""
-"Een bevestigingscode is verzonden naar het telefoonnummer dat u hebt "
-"toegevoegd. Controleer uw inbox (en spam box!) Voor de code en instructies "
-"hoe het te gebruiken."
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
+msgstr "Het blokkeren van de gebruiker is mislukt."
 
-#: ../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 actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
-msgid "API method not found!"
-msgstr "API functie niet gevonden"
-
-#: ../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 actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
-msgid "API method under construction."
-msgstr "API functie in bewerking"
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
+msgstr "Het deblokkeren van de gebruiker is mislukt."
 
-#  This would be appropriate for the footer menu link (actual context isn't clear!)
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
-msgid "About"
-msgstr "Over"
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "Het bericht bevat geen inhoud!"
 
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
-msgid "Accept"
-msgstr "Accepteer"
-
-#: ../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 actions/emailsettings.php:120
-#: actions/imsettings.php:127 actions/openidsettings.php:111
-#: actions/smssettings.php:133 actions/twittersettings.php:163
-msgid "Add"
-msgstr "Voeg toe"
-
-#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
-msgstr "Voeg OpenID toe"
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-msgid "Add or remove OpenIDs"
-msgstr "Toevoegen en verwijderen van je OpenIDs"
-
-#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39 actions/emailsettings.php:39
-#: actions/imsettings.php:40 actions/smssettings.php:39
-#: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
-msgstr "Adres"
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Dat is te lang. De maximale berichtlengte is %d tekens."
 
-#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-msgid "Addresses of friends to invite (one per line)"
-msgstr "Adressen van je vrienden om uit te nodigen (1 per regel)"
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "De ontvanger is niet aangetroffen."
 
-#: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
-msgid "All subscriptions"
-msgstr "Alle abonnementen"
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+"U kunt geen directe berichten sturen aan gebruikers die niet op uw "
+"vriendenlijst staan."
 
-#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/apidirectmessage.php:89
 #, php-format
-msgid "All updates for %s"
-msgstr "Alle updates voor %s"
+msgid "Direct messages from %s"
+msgstr "Directe berichten van %s"
 
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/apidirectmessage.php:93
 #, php-format
-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:31
-#: actions/openidlogin.php:29 actions/register.php:30
-#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
-msgid "Already logged in."
-msgstr "Al ingelogd."
-
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
-msgid "Already subscribed!."
-msgstr "Al geabonneerd!"
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
-msgid "Are you sure you want to delete this notice?"
-msgstr "Weet u zeker dat u  deze aankondiging wilt verwijderen?"
-
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
-msgid "Authorize subscription"
-msgstr "Sta abonnement toe"
-
-#: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
-msgid "Automatically login in the future; not for shared computers!"
-msgstr "Voortaan automatisch inloggen; niet voor gemeenschappelijke computers!"
-
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr ""
-"Automatisch een abonnement op wie abonneerd op mij (beste voor niet-mensen)"
-
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34 actions/avatarsettings.php:65
-#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
-msgid "Avatar"
-msgstr "Avatar"
+msgid "All the direct messages sent from %s"
+msgstr "Alle directe berichten door %s verzonden"
 
-#: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
-msgid "Avatar updated."
-msgstr "Avatar geactualiseerd."
+#: actions/apidirectmessage.php:101
+#, php-format
+msgid "Direct messages to %s"
+msgstr "Directe beichten aan %s"
 
-#: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/apidirectmessage.php:105
 #, 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 ""
-"Wacht op bevestiging van dit adres. Controleer je Jabber/GTalk account op "
-"een boodschap met nadere instructies. (Heb je %s aan je contactenlijst "
-"toegevoegd?)"
+msgid "All the direct messages sent to %s"
+msgstr "Alle directe berichten verzonden aan %s"
+
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "De API-functie is niet aangetroffen!"
 
-#: ../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 ""
-"Wacht op bevestiging van dit adres. Controleer je mailbox en ook je spambox "
-"voor een bericht met verdere instructies. "
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
+msgstr "Er is geen status gevonden met dit ID."
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
-msgid "Awaiting confirmation on this phone number."
-msgstr "Afwachtend op bevestiging van dit telefoonnummer"
+#: actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
+msgstr "Deze status is al toegevoegd aan de favorieten."
 
-#: ../lib/util.php:1318 lib/util.php:1452
-msgid "Before »"
-msgstr "Eerder »"
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+msgstr "Het was niet mogelijk een favoriet aan te maken."
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
-#: actions/profilesettings.php:82 actions/register.php:184
-#: actions/profilesettings.php:112 actions/register.php:402
-msgid "Bio"
-msgstr "Biografie"
+#: actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
+msgstr "Deze status staat niet in de favorieten."
 
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
-#: actions/register.php:89 actions/updateprofile.php:104
-#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
-msgid "Bio is too long (max 140 chars)."
-msgstr "Biografie is te lang (maximaal 140 tekens)"
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr ""
+"Het was niet mogelijk dit bericht van uw favorietenlijst te verwijderen."
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
-msgid "Can't delete this notice."
-msgstr "Kan dit bericht niet verwijderen."
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
+msgstr "U kunt de gebruiker %s niet volgen, omdat deze gebruiker niet bestaat."
 
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/apifriendshipscreate.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/profilesettings.php:404 actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-msgid "Can't save new password."
-msgstr "Kan nieuw wachtwoord niet opslaan."
+msgid "Could not follow user: %s is already on your list."
+msgstr "U kunt de gebruiker %s niet volgen, omdat deze al op uw lijst staat."
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62 actions/emailsettings.php:58
-#: actions/imsettings.php:59 actions/smssettings.php:62
-#: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
-msgstr "Annuleer"
+#: actions/apifriendshipsdestroy.php:109
+msgid "Could not unfollow user: User not found."
+msgstr ""
+"Het is niet mogelijk deze gebruiker niet langer te volgende: de gebruiker is "
+"niet aangetroffen."
 
-#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Kan OpenID-consumerobject niet instantiëren."
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr "U kunt het abonnement op uzelf niet opzeggen."
 
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
-msgstr "Kan die Jabber-ID niet normaliseren"
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
+msgstr "Er moeten twee gebruikersnamen opgegeven worden."
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
-msgid "Cannot normalize that email address"
-msgstr "Kan het emailadres niet normaliseren"
+#: actions/apifriendshipsshow.php:135
+msgid "Could not determine source user."
+msgstr "Het was niet mogelijk de brongebruiker te bepalen."
 
-#: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
-msgstr "Wijzig"
+#: actions/apifriendshipsshow.php:143
+msgid "Could not find target user."
+msgstr "Het was niet mogelijk de doelgebruiker te vinden."
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
-msgstr "Wijzigen e-mail afhandeling"
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
+msgid "Could not create group."
+msgstr "Het was niet mogelijk de groep aan te maken."
 
-#: ../actions/password.php:32 actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr "Wijzig wachtwoord"
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
+msgid "Could not create aliases."
+msgstr "Het was niet mogelijk de aliassen aan te maken."
 
-#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
-msgid "Change your password"
-msgstr "Wijzig jouw wachtwoord"
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+msgid "Could not set group membership."
+msgstr "Het was niet mogelijk het groepslidmaatschap in te stellen."
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-msgid "Change your profile settings"
-msgstr "Wijzig jouw profiel gegevens"
-
-#: ../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
-#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
-#: actions/register.php:376 actions/smssettings.php:122
-msgid "Confirm"
-msgstr "Bevestig"
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"De gebruikersnaam moet alleen bestaan uit kleine letters en cijfers, en mag "
+"geen spaties bevatten."
 
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "Bevestig adres"
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr ""
+"De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam."
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245 actions/emailsettings.php:256
-#: actions/imsettings.php:230 actions/smssettings.php:253
-#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
-msgid "Confirmation cancelled."
-msgstr "Bevestiging geannuleerd."
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "Geen geldige gebruikersnaam."
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
-msgid "Confirmation code"
-msgstr "Bevestigingscode"
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "De thuispagina is geen geldige URL."
 
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-msgid "Confirmation code not found."
-msgstr "Bevestigingscode niet gevonden."
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "De volledige naam is te lang (maximaal 255 tekens)."
 
-#: ../actions/register.php:202
+#: actions/apigroupcreate.php:261
 #, 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 ""
-"Gefeliciteerd, %s! Welkom op de site:  %%%%site.name%%%%. Vanaf hier je zult "
-"misschien....\n"
-"\n"
-"* Naar je [profiel](%s) gaan en je eerste bericht posten.\n"
-"* een adres [Jabber/GTalk](%%%%action.imsettings%%%%) toevoegen zodat je "
-"vandaaruit berichten kan verzenden.\n"
-"* [Op zoek naar mensen](%%%%action.peoplesearch%%%%) die je misschien kent "
-"en / of dezelfde interesse hebben of uit dezelfde plaats komen. \n"
-"* Bijwerken van [je profiel](%%%%action.profilesettings%%%%) om andere meer "
-"van jezelf te vertellen en een leuke foto te uploaden. \n"
-"* Lees ook even de [online documenten](%%%%doc.help%%%%) met alle "
-"mogelijkheden en hulp \n"
-"\n"
-"Dank je wel voor het inschrijven op onze site en we hoen dat je een hele "
-"leuke tijd hebt met deze service."
-
-#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
-msgid "Connect"
-msgstr "Koppel"
-
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
-msgid "Connect existing account"
-msgstr "Koppel bestaand account"
+msgid "Description is too long (max %d chars)."
+msgstr "De beschrijving is te lang. Gebruik maximaal %d tekens."
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
-msgid "Contact"
-msgstr "Contact"
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "Locatie is te lang (maximaal 255 tekens)."
 
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
 #, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "Kan geen OpenID aanmaken van: %s"
+msgid "Too many aliases! Maximum %d."
+msgstr "Te veel aliasen! Het maximale aantal is %d."
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
 #, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr "je kan deze persoon %s niet volgen omdat deze al je vriend is"
+msgid "Invalid alias: \"%s\""
+msgstr "Ongeldig alias: \"%s\""
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
-msgid "Could not follow user: User not found."
-msgstr "Je kan de gebruiker niet volgen, we hebben deze gebruiker niet gevonden"
-
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
 #, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Kon niet omleiden naar service: %s"
-
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
-msgid "Could not save avatar info"
-msgstr "Kon avatar informatie niet opslaan"
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "De alias \"%s\" wordt al gebruikt. Geef een ander alias op."
 
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
-msgid "Could not save new profile info"
-msgstr "Kon de nieuwe profiel informatie niet opslaan"
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr "Een alias kan niet hetzelfde zijn als de gebruikersnaam."
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
-msgid "Could not subscribe other to you."
-msgstr "Kan geen abonnee toewijzen aan je"
-
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
-msgid "Could not subscribe."
-msgstr "Kan niet abonneren "
+#: actions/apigroupjoin.php:110
+msgid "You are already a member of that group."
+msgstr "U bent al lid van die groep."
 
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
-msgstr "Kan de gebruiker niet aan het bevestigde mailadres bijwerken"
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr "Een beheerder heeft ingesteld dat u geen lid mag worden can die groep."
 
-# tokens zou vervangen moeten worden dus
-# tokens need to be replaced
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-#, fuzzy
-msgid "Couldn't convert request tokens to access tokens."
-msgstr ""
-"Kan niet converteren verzoek om tokens om toegang te krijgen tot de tokens"
+#: actions/apigroupjoin.php:138
+#, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Het was niet mogelijk gebruiker %s toe te voegen aan de groep %s."
 
-#: ../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
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-msgid "Couldn't delete email confirmation."
-msgstr "Kon e-mailbevestiging niet verwijderen."
+#: actions/apigroupleave.php:114
+msgid "You are not a member of this group."
+msgstr "U bent geen lid van deze groep."
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
-msgid "Couldn't delete subscription."
-msgstr "Kon abonnement niet verwijderen."
+#: actions/apigroupleave.php:124
+#, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Het was niet mogelijk gebruiker %s uit de group %s te verwijderen."
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
-msgid "Couldn't find any statuses."
-msgstr "Kan geen ene status vinden"
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "%s groepen"
 
-# Token need to be replaced
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-#, fuzzy
-msgid "Couldn't get a request token."
-msgstr "Kan geen verzoek om token krijgen"
-
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206 actions/emailsettings.php:223
-#: actions/imsettings.php:195 actions/smssettings.php:214
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
-msgid "Couldn't insert confirmation code."
-msgstr "Kon bevestigingscode niet toevoegen"
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr "groepen op %s"
 
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
-msgstr "Kon nieuw abonnement niet toevoegen."
+#: actions/apigrouplist.php:95
+#, php-format
+msgid "%s's groups"
+msgstr "Groepen van %s"
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-msgid "Couldn't save profile."
-msgstr "Kon profiel niet opslaan."
+#: actions/apigrouplist.php:103
+#, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Groepen waarvan %s lid is op %s."
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
-msgstr "kan de automatische inschrijving niet verwerken"
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
+msgstr "Deze methode heeft een POST of DELETE nodig."
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
-msgid "Couldn't update user record."
-msgstr "Kan de gebruikersgegevens niet vernieuwen"
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
+msgstr "U kunt de status van een andere gebruiker niet verwijderen."
 
-#: ../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
-#: actions/confirmaddress.php:114 actions/emailsettings.php:280
-#: actions/emailsettings.php:411 actions/imsettings.php:252
-#: actions/imsettings.php:395 actions/othersettings.php:162
-#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
-msgid "Couldn't update user."
-msgstr "Kon gebruiker niet actualiseren."
+#: actions/apistatusesshow.php:138
+msgid "Status deleted."
+msgstr "De status is verwijderd."
 
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
-msgid "Create"
-msgstr "Aanmaken"
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
+msgstr "Er is geen status gevonden met dit ID."
 
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
-msgid "Create a new user with this nickname."
-msgstr "Maak een nieuwe gebruiker aan met deze gebruikersnaam."
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "Dat is te lang. De maximale mededelingslengte is 140 tekens."
 
-#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
-msgid "Create new account"
-msgstr "Maak een nieuw account aan"
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
+msgstr "Niet gevonden"
 
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
-msgid "Creating new account for OpenID that already has a user."
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
-"Bezig nieuw account aan te maken voor OpenID waarvoor al een "
-"gebruikersaccount bestaat."
-
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "Huidig bevestigd Jabber/GTalk adres."
+"De maximale mededelingenlengte is %d tekens, inclusief de URL voor de "
+"bijlage."
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "Huidig bevestigd SMS-ingevoerd telefoonnummer."
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+msgid "Unsupported format."
+msgstr "Niet-ondersteund bestandsformaat."
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-msgid "Current confirmed email address."
-msgstr "Huidig bevestigd emailadres"
+#: actions/apitimelinefavorites.php:107
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr "%s / Favorieten van %s"
 
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
-msgstr "Op dit moment"
+#: actions/apitimelinefavorites.php:119
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr "%s updates op de favorietenlijst geplaatst door %s / %s"
 
-#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "Database fout van de invoer hashtag: %s"
+msgid "%s timeline"
+msgstr "%s tijdlijn"
 
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Database-fout bij toevoegen antwoord: %s"
+msgid "Updates from %1$s on %2$s!"
+msgstr "Updates van %1$s op %2$s."
 
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
-msgid "Delete notice"
-msgstr "Verwijderd bericht"
-
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "Beschrijf jezelf en je interesses in 140 tekens"
-
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87 actions/register.php:172
-#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
-#: actions/register.php:385 lib/accountsettingsaction.php:113
-msgid "Email"
-msgstr "E-mail"
+#: actions/apitimelinementions.php:116
+#, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Updates over %2$s"
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-msgid "Email Address"
-msgstr "Email adres"
+#: actions/apitimelinementions.php:126
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr "%1$s updates die een reactie zijn op updates van %2$s / %3$s."
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
-msgstr "Email instellingen"
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#, php-format
+msgid "%s public timeline"
+msgstr "%s publieke tijdlijn"
 
-#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-msgid "Email address already exists."
-msgstr "E-mailadres bestaat al."
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#, php-format
+msgid "%s updates from everyone!"
+msgstr "%s updates van iedereen"
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
-msgid "Email address confirmation"
-msgstr "Bevestiging e-mailadres"
+#: actions/apitimelinetag.php:101 actions/tag.php:66
+#, php-format
+msgid "Notices tagged with %s"
+msgstr "Mededelingen met het label %s"
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
-msgstr "Email adres, zoals \"gebruikersnaam@voorbeeld.net\""
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Updates met het label %1$s op %2$s!"
 
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-msgid "Email addresses"
-msgstr "Email adressen"
+#: actions/apiusershow.php:96
+msgid "Not found."
+msgstr "Niet aangetroffen."
 
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
-msgid "Enter a nickname or email address."
-msgstr "Voer een gebruikersnaam of e-mailadres in"
+#: actions/attachment.php:73
+msgid "No such attachment."
+msgstr "Dat document bestaat niet."
 
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
-msgstr "Voer de code in die je kreeg via je telefoon"
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+msgstr "Geen gebruikersnaam."
 
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
-msgid "Error authorizing token"
-msgstr "Fout bij autoriseren token"
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "Geen afmeting."
 
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
-msgid "Error connecting user to OpenID."
-msgstr "Fout bij koppelen gebruiker aan OpenID."
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "Ongeldige afmetingen."
 
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
-msgstr "Fout bij koppelen gebruiker."
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "Avatar"
 
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
-msgstr "Fout bij toevoegen avatar"
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr ""
+"U kunt een persoonlijke avatar uploaden. De maximale bestandsgrootte is %s."
 
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
-msgstr "Fout bij toevoegen nieuw profiel"
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
+msgstr "Gebruiker zonder bijbehorend profiel"
 
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
-msgstr "Fout bij toevoegen profiel op afstand"
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+msgid "Avatar settings"
+msgstr "Avatarinstellingen"
 
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
-msgid "Error saving address confirmation."
-msgstr "Fout bij opslaan adresbevestiging."
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr "Origineel"
 
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
-msgid "Error saving remote profile"
-msgstr "Fout bij opslaan profiel op afstand"
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr "Voorvertoning"
 
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-msgid "Error saving the profile."
-msgstr "Fout bij opslaan van het profiel."
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+msgid "Delete"
+msgstr "Verwijderen"
 
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-msgid "Error saving the user."
-msgstr "Fout bij opslaan van de gebruiker."
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+msgstr "Uploaden"
 
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
-msgid "Error saving user; invalid."
-msgstr "Fout bij opslaan gebruiker; ongeldig."
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
+msgstr "Uitsnijden"
+
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Er is een probleem ontstaan met uw sessie. Probeer het nog een keer, "
+"alstublieft."
 
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
-#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
-#: actions/register.php:108 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-msgid "Error setting user."
-msgstr "Fout bij instellingen gebruiker."
+#: actions/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Het formulier is onverwacht ingezonden."
 
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr "Fout bij actualiseren profiel"
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
+msgstr "Selecteer een vierkant de afbeelding om als uw avatar in te stellen"
 
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
-msgstr "Fout bij actualiseren profiel op afstand"
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
+msgstr "Ons databestand is verloren gegaan."
 
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr "Fout bij bevestigingscode."
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+msgstr "De avatar is bijgewerkt."
 
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
-msgid "Existing nickname"
-msgstr "Gebruikersnaam bestaat al"
+#: actions/avatarsettings.php:363
+msgid "Failed updating avatar."
+msgstr "Het bijwerken van de avatar is mislukt."
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
-msgid "FAQ"
-msgstr "Veelgestelde vragen"
+#: actions/avatarsettings.php:387
+msgid "Avatar deleted."
+msgstr "De avatar is verwijderd."
 
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
-msgid "Failed updating avatar."
-msgstr "Actualiseren avatar niet gelukt."
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+msgid "No nickname"
+msgstr "Geen gebruikersnaam"
 
-#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
-#, php-format
-msgid "Feed for friends of %s"
-msgstr "Feed voor vrienden van %s"
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
+msgstr "Deze groep bestaat niet"
 
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/blockedfromgroup.php:90
 #, php-format
-msgid "Feed for replies to %s"
-msgstr "Feed voor antwoorden aan %s"
+msgid "%s blocked profiles"
+msgstr "%s geblokkeerde profielen"
 
-#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/blockedfromgroup.php:93
 #, php-format
-msgid "Feed for tag %s"
-msgstr "Feed voor tag %s"
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
-msgstr "Vind de inhoud van een bericht"
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
-msgstr "Vind mensen op deze site"
-
-#: ../actions/login.php:122
-msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
-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:77 actions/register.php:178
-#: actions/profilesettings.php:103 actions/register.php:391
-#: actions/showgroup.php:235 actions/showstream.php:262
-#: actions/tagother.php:105 lib/groupeditform.php:142
-msgid "Full name"
-msgstr "Volledige naam"
-
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
-#: actions/register.php:86 actions/updateprofile.php:94
-#: actions/editgroup.php:195 actions/newgroup.php:146
-#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
-msgid "Full name is too long (max 255 chars)."
-msgstr "Volledige naam is te lang (maximaal 255 tekens)"
+msgid "%s blocked profiles, page %d"
+msgstr "%s geblokkeerde profielen, pagina %d"
 
-#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
-msgid "Help"
-msgstr "Help"
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr "Een lijst met voor deze groep geblokkeerde gebruikers."
 
-#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
-msgid "Home"
-msgstr "Home"
+#: actions/blockedfromgroup.php:281
+msgid "Unblock user from group"
+msgstr "Deze gebruiker weer toegang geven tot de groep"
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
-msgid "Homepage"
-msgstr "Homepage"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
+msgstr "Deblokkeer"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
-msgid "Homepage is not a valid URL."
-msgstr "Homepage is geen geldige URL"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+msgid "Unblock this user"
+msgstr "Deblokkeer deze gebruiker."
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
-msgid "I want to post notices by email."
-msgstr "Ik wil een bericht posten per email"
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Niet aangemeld."
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
-msgstr "IM"
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
+msgstr "Er is geen profiel opgegeven."
 
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
-msgstr "IM-adres"
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
+msgstr "Er is geen profiel met dat ID."
 
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
-msgstr "IM-instellingen"
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Gebruiker blokkeren"
 
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/block.php:136
 msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
 msgstr ""
-"Als je al een account hebt, log dan in met je gebruikersnaam en wachtwoord "
-"om het aan je OpenID te koppelen."
+"Weet u zeker dat u deze gebruiker wilt blokkeren? Na deze handeling wordt "
+"het abonnement van de gebruiker op u opgezegd en kan deze gebruiker in de "
+"toekomst niet op u abonneren. U wordt niet op de hoogte gesteld van \"@\"-"
+"antwoorden van de gebruiker."
 
-#: ../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 ""
-"Als je een OpenID aan je account wilt toevoegen, vul het dan in het veld "
-"hieronder in en klik op \"Voeg toe\"."
+#: actions/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
+msgid "No"
+msgstr "Nee"
 
-#: ../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 ""
-"Als je je paswoord vergeten of verloren bent, kan je hier een nieuwe "
-"aanvragen naar het mailadres dat bij ons _ _ opgeslagen is in je account."
+#: actions/block.php:149
+msgid "Do not block this user"
+msgstr "Gebruiker deblokkeren"
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-#: actions/emailsettings.php:127 actions/smssettings.php:140
-msgid "Incoming email"
-msgstr "Binnenkomende mail"
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
+msgstr "Ja"
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
-msgid "Incoming email address removed."
-msgstr "Binnenkomende mailadres is verwijderd"
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+msgid "Block this user"
+msgstr "Deze gebruiker blokkeren"
 
-#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
-msgid "Incorrect old password"
-msgstr "Incorrect oud wachtwoord"
+#: actions/block.php:165
+msgid "You have already blocked this user."
+msgstr "U hebt deze gebruiker reeds geblokkeerd."
 
-#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
-msgid "Incorrect username or password."
-msgstr "Incorrecte gebruikersnaam of wachtwoord."
+#: actions/block.php:170
+msgid "Failed to save block information."
+msgstr "Het was niet mogelijk om de blokkadeinformatie op te slaan."
 
-#: ../actions/recoverpassword.php:265
-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."
+#: actions/bookmarklet.php:50
+msgid "Post to "
+msgstr "Verzenden naar "
 
-#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "Ongeldige avatar-URL '%s'"
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+msgstr "Geen bevestigingscode."
 
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
-#, php-format
-msgid "Invalid email address: %s"
-msgstr "Ongeldig Email adres: %s"
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "De bevestigingscode niet gevonden."
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
-#, php-format
-msgid "Invalid homepage '%s'"
-msgstr "Ongeldige homepage '%s'"
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "Dit is niet uw bevestigingscode!"
 
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/confirmaddress.php:90
 #, php-format
-msgid "Invalid license URL '%s'"
-msgstr "Ongeldige licentie-URL '%s'"
+msgid "Unrecognized address type %s"
+msgstr "Onbekend adrestype %s"
 
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
-msgstr "Ongeldige berichtinhoud"
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr "Dit adres is al bevestigd."
 
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
-msgstr "Ongeldige bericht-URI"
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "Kon gebruiker niet actualiseren."
 
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
-msgstr "Ongeldige bericht-URL"
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr "De e-mailbevestiging kon niet verwijderd worden."
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "Ongeldige profiel-URL '%s'."
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "Adres bevestigen"
 
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
-msgstr "Ongeldige profiel-URL (foutieve syntax)"
+#: actions/confirmaddress.php:159
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "Het adres \"%s\" is voor uw gebruiker bevestigd."
 
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
-msgstr "Ongeldige profiel-URL teruggestuurd door de server."
+#: actions/conversation.php:99
+msgid "Conversation"
+msgstr "Dialoog"
 
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
-#: actions/avatarbynickname.php:69
-msgid "Invalid size."
-msgstr "Ongeldige afmeting."
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
+msgstr "Mededelingen"
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111 actions/finishopenidlogin.php:241
-#: actions/register.php:103 actions/register.php:121
-#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
-msgid "Invalid username or password."
-msgstr "Ongeldige gebruikersnaam of wachtwoord."
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
+msgstr "De mededeling bestaat niet."
 
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-msgid "Invitation(s) sent"
-msgstr "Uitnodiging(en) verzonden"
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "Deze mededeling kan niet verwijderd worden."
 
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-msgid "Invitation(s) sent to the following people:"
-msgstr "Uitnodiging(en) verzonden an de volgende mensen:"
+#: actions/deletenotice.php:103
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+"U staat op het punt een mededeling permanent te verwijderen. Als dit "
+"uitgevoerd is, kan het niet ongedaan gemaakt worden."
 
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
-msgid "Invite"
-msgstr "Uitnodigen"
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr "Mededeling verwijderen"
 
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-msgid "Invite new users"
-msgstr "Nodig nieuwe gebruikers uit"
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr "Weet u zeker dat u deze aankondiging wilt verwijderen?"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
-#, php-format
-msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
-msgstr ""
-"Het draait op de [StatusNet](http://status.net/) microbloggingsoftware versie "
-"%s, beschikbaar onder de [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+#: actions/deletenotice.php:145
+msgid "Do not delete this notice"
+msgstr "Deze mededeling niet verwijderen"
 
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
-msgstr "Jabber-ID al in gebruik bij een andere gebruiker"
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+msgid "Delete this notice"
+msgstr "Deze mededeling verwijderen"
 
-#: ../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."
+#: actions/deletenotice.php:157
+msgid "There was a problem with your session token.  Try again, please."
 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."
+"Er is een probleem ontstaan met uw sessietoken. Probeer het nog een keer."
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
-msgid "Language"
-msgstr "Taal"
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr "Deze mededeling staats niet op uw favorietenlijst."
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
-msgid "Language is too long (max 50 chars)."
-msgstr "Taal is te lang (max 50 karaketers)"
-
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
-msgid "Location"
-msgstr "Locatie"
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "Aan favorieten toevoegen"
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
-#: actions/register.php:92 actions/updateprofile.php:109
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
-msgid "Location is too long (max 255 chars)."
-msgstr "Locatie is te lang (maximaal 255 tekens)."
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "Onbekend document."
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
-#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
-#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
-#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: actions/editgroup.php:56
 #, php-format
-msgid "Login"
-msgstr "Inloggen"
+msgid "Edit %s group"
+msgstr "Groep %s bewerken"
 
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Log in met een [OpenID](%%doc.openid%%) account."
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
+msgstr "U moet aangemeld zijn om een groep aan te kunnen maken."
 
-#: ../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 ""
-"Log in met je gebruikersnaam en wachtwoord. Heb je nog geen gebruikersnaam? "
-"[Registreer](%%action.register%%) dan een nieuw account, of probeer [OpenID]"
-"(%%action.openidlogin%%)."
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+msgid "You must be an admin to edit the group"
+msgstr "U moet beheerder zijn om de groep te kunnen bewerken"
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
-msgid "Logout"
-msgstr "Uitloggen"
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
+msgstr "Gebruik dit formulier om de groep te bewerken."
 
-#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
-msgid "Longer name, preferably your \"real\" name"
-msgstr "Langere naam, mogelijk je \"eigen\" naam"
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, php-format
+msgid "description is too long (max %d chars)."
+msgstr "de beschrijving is te lang (maximaal %d tekens)"
 
-#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
-msgid "Lost or forgotten password?"
-msgstr "Wachtwoord kwijt of vergeten?"
+#: actions/editgroup.php:253
+msgid "Could not update group."
+msgstr "Het was niet mogelijk de groep bij te werken."
 
-#: ../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 "Maak een nieuw emailadres aan voor te posten naar; verwijder de oude."
+#: actions/editgroup.php:269
+msgid "Options saved."
+msgstr "De instellingen zijn opgeslagen."
+
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "E-mailinstellingen"
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
 #: actions/emailsettings.php:71
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
-msgstr "Geef hier aan hoe je de notificaties wilt van %%site.name%%."
+msgstr "E-mail ontvangen  van %%site.name%% beheren."
 
-#  String should contain a variable token for since 'when'
-#: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
-msgid "Member since"
-msgstr "Lid sinds"
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "Adres"
 
-#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
-#, php-format
-msgid "Microblog by %s"
-msgstr "Microblog van %s"
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr "Huidige bevestigde e-mailadres"
 
-#: ../actions/smssettings.php:304
-#, php-format
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "Verwijderen"
+
+#: actions/emailsettings.php:113
 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."
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
 msgstr ""
-"Je provider van je mobiel. Als je weet welke provider je SMS over MAIL kan "
-"verzorgen en niet in de lijst staat kan je een verzoek bij ons doen, liefst "
-"met de gegevens erbij.  laat ons per mail iets weten %s."
-
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-msgid "My text and files are available under "
-msgstr "Mijn tekst en bestanden zijn beschikbaar onder_"
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#: actions/emailsettings.php:142 actions/smssettings.php:152
-msgid "New"
-msgstr "Nieuw"
+"Er wordt gewacht op bevestiging van dit adres. Controleer uw inbox en uw "
+"spambox voor een bericht met nadere instructies."
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
-#, php-format
-msgid "New email address for posting to %s"
-msgstr "Nieuw email adres om te posten aan %s"
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "Annuleren"
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
-msgid "New incoming email address added."
-msgstr "Nieuw binnenkomende emailadres is toegevoegd"
+#: actions/emailsettings.php:121
+msgid "Email Address"
+msgstr "E-mailadres"
 
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
-msgid "New nickname"
-msgstr "Nieuwe gebruikersnaam"
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr "E-mailadres, zoals \"gebruikersnaam@example.org\""
 
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
-msgstr "Nieuw bericht"
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "Toevoegen"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-msgid "New password"
-msgstr "Nieuw wachtwoord"
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+msgstr "Inkomende e-mail"
 
-#: ../actions/recoverpassword.php:314
-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:101
-#: actions/profilesettings.php:74 actions/register.php:165
-#: actions/login.php:228 actions/profilesettings.php:98
-#: actions/register.php:367 actions/showgroup.php:224
-#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
-msgid "Nickname"
-msgstr "Gebruikersnaam"
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
+msgstr "Stuur een email naar dit adres om een nieuw bericht te posten"
 
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69 actions/finishopenidlogin.php:181
-#: actions/profilesettings.php:225 actions/register.php:76
-#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
-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:171 actions/profilesettings.php:203
-#: actions/register.php:74 actions/updateprofile.php:78
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#: actions/emailsettings.php:145 actions/smssettings.php:162
+msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
-"Gebruikersnaam moet bestaan uit alleen kleine letters en cijfers en geen "
-"spaties."
+"Een nieuw e-mailadres instellen voor het onvangen van e-mail; verwijdert het "
+"eerder geinstelde e-mailadres."
 
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
-msgid "Nickname not allowed."
-msgstr "Gebruikersnaam niet toegestaan."
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
+msgstr "Nieuw"
 
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
-msgstr "Gebruikersnaam van de gebruiker die je wilt volgen"
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
+msgstr "Voorkeuren"
 
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
-msgid "Nickname or email"
-msgstr "Gebruikersnaam of e-mail"
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
+msgstr "Mij e-mailen bij nieuwe abonnementen."
 
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
-msgid "No"
-msgstr "Nee"
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr "Mij een e-mail sturen als iemand mijn mededeling als favoriet instelt."
 
-#: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
-msgstr "Geen Jabber-ID."
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
+msgstr "Mij een e-mail sturen als iemand mij een privébericht zendt."
 
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
-msgid "No authorization request!"
-msgstr "Geen autorisatie verzoek!"
+#: actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr ""
+"Mij een e-mail sturen als iemand mij een antwoord met \"@\" erin stuurt."
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
-msgid "No carrier selected."
-msgstr "Geen provider geselecteerd"
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
+msgstr "Vrienden toestaan me te porren en te e-mailen."
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
-msgstr "Geen code ingevuld"
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
+msgstr "Ik wil mededelingen per e-mail versturen."
 
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
-#: actions/confirmaddress.php:75
-msgid "No confirmation code."
-msgstr "Geen bevestigingscode."
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
+msgstr "Een MicroID voor mijn e-mailadres publiceren."
 
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
-#: actions/newnotice.php:126 classes/Command.php:223
-msgid "No content!"
-msgstr "Geen inhoud!"
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Opslaan"
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
-msgid "No email address."
-msgstr "Geen emailadres"
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+msgstr "De voorkeuren zijn opgeslagen."
 
-#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
-msgid "No id."
-msgstr "Geen ID."
+#: actions/emailsettings.php:319
+msgid "No email address."
+msgstr "Geen e-mailadres"
 
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
-msgid "No incoming email address."
-msgstr "Geen binnenkomende emailadres"
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
+msgstr "Kan het emailadres niet normaliseren"
 
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr "Geen gebruikersnaam verschaft door de server op afstand."
+#: actions/emailsettings.php:330
+msgid "Not a valid email address"
+msgstr "Geen geldig e-mailadres."
 
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
-msgid "No nickname."
-msgstr "Geen gebruikersnaam."
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
+msgstr "U hebt dit al ingesteld als uw e-mailadres."
 
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229 actions/emailsettings.php:240
-#: actions/imsettings.php:214 actions/smssettings.php:237
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
-msgid "No pending confirmation to cancel."
-msgstr "Geen bevestiging in behandeling om te annuleren."
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another user."
+msgstr "Dit e-mailadres is al geregistreerd door een andere gebruiker."
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
-msgstr "Geen telefoonnummer"
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+msgstr "De bevestigingscode kon niet ingevoegd worden."
 
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
-msgstr "Geen profiel-URL teruggestuurd door de server."
+#: actions/emailsettings.php:358
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr ""
+"Een bevestigingscode is verzonden naar het e-mailadres dat u hebt "
+"toegevoegd. Controleer uw inbox (en spam box!) Voor de code en instructies "
+"hoe het te gebruiken."
 
-#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
-msgid "No registered email address for that user."
-msgstr "Geen geregistreerd e-mailadres voor die gebruiker."
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
+msgstr "Er is geen openstaand bevestigingsverzoek om te annuleren."
 
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr "Geen verzoek gevonden!"
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "Dat is het verkeerde IM-adres."
 
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
-msgid "No results"
-msgstr "Geen resultaten"
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "Bevestiging geannuleerd."
 
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
-msgstr "Geen afmeting."
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
+msgstr "Dit is niet uw e-mailadres."
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
-msgid "No status found with that ID."
-msgstr "Geen status gevonden met dit ID"
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "Het adres is verwijderd."
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
-msgid "No status with that ID found."
-msgstr "Geen status gevonden met dat ID"
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
+msgstr "Geen binnenkomend e-mailadres"
 
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
-msgstr "Die OpenID is niet bekend."
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
+msgstr "Kan de gebruikersgegevens niet vernieuwen"
 
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
-msgid "No such document."
-msgstr "Onbekend document."
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
+msgstr "Het e-mailadres voor inkomende mail is verwijderd."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30 actions/shownotice.php:32
-#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
-msgid "No such notice."
-msgstr "Onbekend bericht."
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
+msgstr "Het nieuwe binnenkomende e-mailadres is toegevoegd."
 
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr "Onbekende herstelcode."
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+msgid "Popular notices"
+msgstr "Populaire mededelingen"
 
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-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/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 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
-msgid "No such user."
-msgstr "Onbekende gebruiker."
+#: actions/favorited.php:67
+#, php-format
+msgid "Popular notices, page %d"
+msgstr "Populaire mededelingen, pagina %d"
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-msgid "No user with that email address or username."
-msgstr "Geen gebruiker met dit emailadres of gebruikersnaam"
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
+msgstr "De meest populaire mededelingen op de site op dit moment."
 
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
-msgstr "Niemand te tonen!"
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+"Favoriete mededelingen zijn te zien op deze pagina, maar er zijn nog geen "
+"favoriete mededelingen."
 
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr "Geen geldige herstelcode."
+#: actions/favorited.php:153
+msgid ""
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
+msgstr ""
+"U kunt een mededeling aan uw favorieten toevoegen door op de knop \"Aan "
+"favorieten toevoegen\" te klikken bij mededelingen die u de moeite waard "
+"vindt."
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
-msgstr "Geen geregistreerde gebruiker"
+#: actions/favorited.php:156
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
+msgstr ""
+"U kunt een [gebruiker registreren](%%action.register%%) en de eerste "
+"mededeling voor de favorietenlijst plaatsen!"
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
-msgid "Not a supported data format."
-msgstr "Geen juiste ingevulde gegevens"
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
+msgstr "Favoriete mededelingen van %s"
 
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
-msgstr "Geen geldige Jabber-ID"
+#: actions/favoritesrss.php:115
+#, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Updates op de favorietenlijst van %1$s op %2$s."
 
-#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-msgid "Not a valid OpenID."
-msgstr "Geen geldige OpenID."
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Deze mededeling staat al in uw favorietenlijst."
 
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
-msgid "Not a valid email address"
-msgstr "Geen geldig e-mailadres."
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Van favotietenlijst verwijderen"
 
-#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-msgid "Not a valid email address."
-msgstr "Geen geldig e-mailadres."
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr "Nieuwe gebruikers"
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-#: actions/editgroup.php:186 actions/newgroup.php:137
-#: actions/profilesettings.php:195 actions/register.php:161
-msgid "Not a valid nickname."
-msgstr "Geen geldige gebruikersnaam."
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr "Nieuwe gebruikers, pagina %d"
 
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
-msgstr "Geen geldige profiel-URL (ongeldige diensten)."
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
+msgstr "Een selectie van de actieve gebruikers op %s"
 
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr "Geen geldige profiel-URL (geen XRDS gedefinieerd)."
+#: actions/file.php:34
+msgid "No notice id"
+msgstr "Geen mededelings-ID"
 
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr "Geen geldige profiel-URL (geen YADIS document)."
+#: actions/file.php:38
+msgid "No notice"
+msgstr "Geen mededeling"
 
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
-msgid "Not an image or corrupt file."
-msgstr "Geen afbeelding of beschadigd bestand."
+#: actions/file.php:42
+msgid "No attachments"
+msgstr "Geen bijlagen"
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
-msgid "Not authorized."
-msgstr "Niet geautoriseerd."
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr "Geen toegevoegde bijlagen"
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Onverwacht antwoord!"
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
-msgid "Not found"
-msgstr "Niet gevonden"
+#: actions/finishremotesubscribe.php:80
+msgid "User being listened to does not exist."
+msgstr "De gebruiker waarnaar wordt geluisterd bestaat niet."
 
-#: ../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 actions/block.php:59 actions/disfavor.php:61
-#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
-#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
-#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
-#: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Niet ingelogd."
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+msgstr "U kunt het lokale abonnement gebruiken!"
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
-msgid "Not subscribed!."
-msgstr "Niet geabonneerd!"
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
+msgstr ""
+"Die gebruiker heeft de mogelijkheid om te abonneren voor u geblokkeerd."
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
-msgstr "Bericht zoeken"
+#: actions/finishremotesubscribe.php:106
+msgid "You are not authorized."
+msgstr "U hebt niet de juiste toegangsrechten."
 
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
-#, php-format
-msgid "Notice feed for %s"
-msgstr "Berichten-feed voor %s"
+#: actions/finishremotesubscribe.php:109
+msgid "Could not convert request token to access token."
+msgstr ""
+"Het was niet mogelijk het verzoektoken te converteren naar een toegangstoken."
 
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
-msgstr "Bericht heeft geen profiel"
+#: actions/finishremotesubscribe.php:114
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr ""
+"De diensten op afstand gebruiken een onbekende versie van het OMB-protocol."
 
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
-msgid "Notices"
-msgstr "Berichten"
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr ""
+"Er is een fout opgetreden tijdens het bijwerken van het profiel op afstand."
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
-#, php-format
-msgid "Notices tagged with %s"
-msgstr "Berichten tagged met %s"
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+msgid "No such group."
+msgstr "De opgegeven groep bestaat niet."
 
-#: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
-msgstr "Oud wachtwoord"
+#: actions/getfile.php:75
+msgid "No such file."
+msgstr "Het bestand bestaat niet."
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
-msgid "OpenID"
-msgstr "OpenID"
-
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
-msgid "OpenID Account Setup"
-msgstr "OpenID-account instellen"
-
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-msgid "OpenID Auto-Submit"
-msgstr "OpenID automatisch verzenden"
-
-#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
-#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-msgid "OpenID Login"
-msgstr "Log in met OpenID"
-
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-#: actions/openidlogin.php:102 actions/openidsettings.php:101
-msgid "OpenID URL"
-msgstr "OpenID-URL"
-
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
-msgid "OpenID authentication cancelled."
-msgstr "OpenID-authenticatie geannuleerd."
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr "OpenID-authenticatie niet gelukt: %s"
-
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "OpenID-fout: %s"
-
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr "OpenID verwijderd."
-
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
-msgstr "OpenID-instellingen."
-
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-msgid "Optionally add a personal message to the invitation."
-msgstr "Eventueel een persoonlijke boodschap aan de uitnodiging"
+#: actions/getfile.php:79
+msgid "Cannot read file."
+msgstr "Het bestand kon niet gelezen worden."
 
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
-msgid "Partial upload."
-msgstr "Gedeeltelijke uploaden."
-
-#: ../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 actions/finishopenidlogin.php:118
-#: actions/login.php:231 actions/register.php:372
-#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-msgid "Password"
-msgstr "Wachtwoord"
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
+msgstr "Er is geen groep aangegeven."
 
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
-msgid "Password and confirmation do not match."
-msgstr "Wachtwoord en bevestiging komen niet overeen."
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr "Alleen een beheerder kan groepsleden blokkeren."
 
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
-msgid "Password must be 6 chars or more."
-msgstr "Wachtwoord moet uit 6 of meer tekens bestaan."
+#: actions/groupblock.php:95
+msgid "User is already blocked from group."
+msgstr "Deze gebruiker is al de toegang tot de groep ontzegd."
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-msgid "Password recovery requested"
-msgstr "Wachtwoordherstel aangevraagd"
+#: actions/groupblock.php:100
+msgid "User is not a member of group."
+msgstr "De gebruiker is geen lid van de groep."
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-msgid "Password saved."
-msgstr "Wachtwoord opgeslagen."
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+msgid "Block user from group"
+msgstr "Gebruiker toegang tot de groep blokkeren"
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-msgid "Passwords don't match."
-msgstr "Wachtwoorden komen niet overeen."
+#: actions/groupblock.php:162
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+"Weet u zeker dat u gebruiker \"%s\" uit de groep \"%s\" wilt weren? De "
+"gebruiker wordt dan uit de groep verwijderd, kan er geen berichten meer "
+"plaatsen en kan zich in de toekomst ook niet meer op de groep abonneren."
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
-msgstr "Mensen"
+#: actions/groupblock.php:178
+msgid "Do not block this user from this group"
+msgstr "Deze gebruiker niet de toegang tot deze groep ontzeggen"
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
-msgstr "Mensen zoeken"
+#: actions/groupblock.php:179
+msgid "Block this user from this group"
+msgstr "Deze gebruiker de toegang tot deze groep ontzeggen"
 
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
-msgstr "Mensen zoeken"
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
+msgstr ""
+"Er is een databasefout opgetreden bij het uitsluiten van de gebruiker van de "
+"groep."
 
-#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
-msgid "Personal"
-msgstr "Persoonlijk"
+#: actions/groupbyid.php:74
+msgid "No ID"
+msgstr "Geen ID"
 
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-msgid "Personal message"
-msgstr "Persoonlijk bericht"
+#: actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
+msgstr "U moet aangemeld zijn om een groep te kunnen bewerken."
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "Telefoonnummer, geen spaties of leestekens, met netnummer"
+#: actions/groupdesignsettings.php:141
+msgid "Group design"
+msgstr "Groepsontwerpen"
 
-#: ../actions/userauthorization.php:78
+#: actions/groupdesignsettings.php:152
 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\"."
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
 msgstr ""
-"Ga alsjeblieft deze details na om er zeker van te zijn dat je je wilt "
-"abonneren op de berichten van deze gebruiker. Als je niet zojuist hebt "
-"aangegeven je op iemand's berichten te willen abonneren, klik dan op "
-"\"Annuleer\"."
-
-#: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
-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/emailsettings.php:86
-#: actions/imsettings.php:68 actions/smssettings.php:94
-#: actions/twittersettings.php:70 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
-msgid "Preferences"
-msgstr "Voorkeuren"
-
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163 actions/emailsettings.php:180
-#: actions/imsettings.php:152 actions/smssettings.php:171
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
-msgid "Preferences saved."
-msgstr "Voorkeuren opgeslagen."
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
-msgid "Preferred language"
-msgstr "Taal voorkeur"
-
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
-msgid "Privacy"
-msgstr "Privacy"
+"Het uiterlijk van uw groep aanpassen met een achtergrondafbeeldingen en een "
+"kleurenpalet van uw keuze."
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-msgid "Problem saving notice."
-msgstr "Probleem bij opslaan bericht."
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+msgid "Couldn't update your design."
+msgstr "Het was niet mogelijk uw ontwerp bij te werken."
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
-msgid "Profile"
-msgstr "Profiel"
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+msgid "Unable to save your design settings!"
+msgstr "Het was niet mogelijk om uw ontwerpinstellingen op te slaan!"
 
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
-msgstr "Profiel-URL"
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+msgid "Design preferences saved."
+msgstr "De ontwerpvoorkeuren zijn opgeslagen."
 
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
-msgstr "Profielinstellingen"
-
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-msgid "Profile unknown"
-msgstr "Profiel onbekend"
-
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
-msgid "Public Stream Feed"
-msgstr "Openbare feed"
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
+msgstr "Groepslogo"
 
-#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
-msgid "Public timeline"
-msgstr "Openbare tijdlijn"
+#: actions/grouplogo.php:150
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
+"Hier kunt u een logo voor uw groep uploaden. De maximale bestandsgrootte is %"
+"s."
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Publiceer een MicroID voor mijn Jabber / GTalk adres"
+#: actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
+msgstr "Selecteer een vierkant uit de afbeelding die het logo wordt."
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
-msgid "Publish a MicroID for my email address."
-msgstr "Publiceer een MicroID voor mijn email adres"
+#: actions/grouplogo.php:396
+msgid "Logo updated."
+msgstr "Logo geactualiseerd."
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr "Recent Tags"
+#: actions/grouplogo.php:398
+msgid "Failed updating logo."
+msgstr "Het bijwerken van het logo is mislukt."
 
-#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
-msgid "Recover"
-msgstr "Herstellen"
+#: actions/groupmembers.php:93 lib/groupnav.php:92
+#, php-format
+msgid "%s group members"
+msgstr "leden van de groep %s"
 
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
-msgid "Recover password"
-msgstr "Wachtwoord herstellen"
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
+msgstr "% groeps leden, pagina %d"
 
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-msgid "Recovery code for unknown user."
-msgstr "Herstelcode voor onbekende gebruiker."
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr "Ledenlijst van deze groep"
 
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
-#: actions/register.php:152 actions/register.php:207 lib/util.php:328
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-msgid "Register"
-msgstr "Registreer"
+#: actions/groupmembers.php:175 lib/groupnav.php:107
+msgid "Admin"
+msgstr "Beheerder"
 
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
-msgid "Registration not allowed."
-msgstr "Registratie niet toegestaan"
+#: actions/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
+msgstr "Blokkeren"
 
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
-msgid "Registration successful"
-msgstr "Registratie gelukt"
+#: actions/groupmembers.php:441
+msgid "Make user an admin of the group"
+msgstr "Deze gebruiker groepsbeheerder maken"
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
-msgid "Reject"
-msgstr "Afwijzen"
+#: actions/groupmembers.php:473
+msgid "Make Admin"
+msgstr "Beheerder maken"
 
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
-msgid "Remember me"
-msgstr "Onthoud mij"
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr "Deze gebruiker beheerder maken"
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
-msgid "Remote profile with no matching profile"
-msgstr "Profiel op afstand zonder overeenkomend profiel"
+#: actions/grouprss.php:133
+#, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Updates voor leden van %1$s op %2$s."
 
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
-msgstr "Abonneren op afstand"
+#: actions/groupsearch.php:52
+#, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"Zoeken naar groepen op %%site.name%% op basis van naam, locatie of "
+"interesses of beschrijving. Scheid de zoektermen met spaties. Iedere "
+"zoekterm moet uit drie of meer tekens bestaan."
 
-#: ../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 actions/emailsettings.php:101
-#: actions/emailsettings.php:134 actions/imsettings.php:102
-#: actions/openidsettings.php:166 actions/smssettings.php:103
-#: actions/smssettings.php:146 actions/twittersettings.php:115
-msgid "Remove"
-msgstr "Verwijderen"
+#: actions/groupsearch.php:58
+msgid "Group search"
+msgstr "Groepen zoeken"
 
-#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
-msgstr "Verwijder OpenID"
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+msgid "No results."
+msgstr "Geen resultaten."
 
-#: ../actions/openidsettings.php:73
+#: actions/groupsearch.php:82
+#, php-format
 msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
 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/personal.php:55 lib/personalgroupnav.php:103
-msgid "Replies"
-msgstr "Antwoorden"
+"Als u de groep waar u naar zoekt niet kunt vinden, dan kunt u deze zelf "
+"[aanmaken](%%action.newgroup%%)."
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
-#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
-#: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: actions/groupsearch.php:85
 #, php-format
-msgid "Replies to %s"
-msgstr "Antwoorden aan %s"
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+"U kunt een [gebruiker registreren](%%action.register%%) en de groep zelf "
+"[aanmaken](%%action.newgroup%%)!"
 
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
-msgid "Reset"
-msgstr "Herstellen"
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Groepen"
 
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
-msgid "Reset password"
-msgstr "Wachtwoord herstellen"
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Groepen, pagina %d"
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-msgid "SMS"
-msgstr "SMS"
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
+"Met groepen van %%%%site.name%%%% kunt u gebruikers vinden met gelijke "
+"interessen en daarmee in contact treden. Nadat u lid bent geworden van een "
+"groep, kunt u berichten naar alle gebruikers zenden met door het voorvoegsel "
+"\"!groepsnaam\" te gebruiken. Als u geen groep ziet die u aantreft, "
+"[doorzoek dan de groepen](%%%%action.groupsearch%%%%) of [start zelf een "
+"groep!](%%%%action.newgroup%%%%)."
+
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Nieuwe groep aanmaken"
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
-msgid "SMS Phone number"
-msgstr "SMS telefoonnummer"
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr "Alleen beheerders kunnen groepsleden deblokkeren."
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
-msgstr "SMS instellingen"
+#: actions/groupunblock.php:95
+msgid "User is not blocked from group."
+msgstr "De gebruiker is niet de toegang tot de groep ontzegd."
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
-msgid "SMS confirmation"
-msgstr "SMS bevestiging"
+#: actions/groupunblock.php:128 actions/unblock.php:108
+msgid "Error removing the block."
+msgstr "Er is een fout opgetreden bij het verwijderen van de blokkade."
 
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
-msgid "Same as password above"
-msgstr "Gelijk aan wachtwoord hierboven"
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "IM-instellingen"
 
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
-msgid "Same as password above. Required."
-msgstr "Gelijk aan wachtwoord hierboven. verplicht"
-
-#: ../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 actions/emailsettings.php:182
-#: actions/facebooksettings.php:114 actions/imsettings.php:157
-#: actions/othersettings.php:117 actions/profilesettings.php:150
-#: actions/smssettings.php:169 actions/subscriptions.php:124
-#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
-msgid "Save"
-msgstr "Opslaan"
+#: actions/imsettings.php:70
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+"U kunt berichten verzenden en ontvangen via Jabber/GTalk [\"instant messages"
+"\"](%%doc.im%%). Maak hieronder uw instellingen."
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
-msgid "Search"
-msgstr "Zoeken"
+#: actions/imsettings.php:89
+msgid "IM is not available."
+msgstr "IM is niet beschikbaar."
 
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
-msgstr "Doorzoek feed"
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Huidige bevestigde Jabber/GTalk adres."
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/imsettings.php:114
 #, php-format
 msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
+"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 ""
-"Zoek naar berichten op %%site.name%% op basis van hun inhoud. Scheid "
-"zoektermen met spaties; ze moeten uit 3 of meer tekens bestaan."
+"Er wordt gewacht op bevestiging van dit adres. Controleer uw Jabber/GTalk-"
+"gebruiker op een bericht met nadere instructies. Hebt u %s aan uw "
+"contactenlijst toegevoegd?"
 
-#: ../actions/peoplesearch.php:28
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "IM-adres"
+
+#: actions/imsettings.php:126
 #, 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."
+"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 ""
-"Zoek naar mensen op %%site.name%% op basis van hun naam, locatie of "
-"interesses. Scheid de zoektermen met spaties; ze moeten uit 3 of meer tekens "
-"bestaan."
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
-msgid "Select a carrier"
-msgstr "Selecteer een provider"
-
-#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
-#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
-msgid "Send"
-msgstr "Verstuur"
-
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
-msgstr "Stuur een email naar dit adres om een nieuw bericht te posten"
+"Jabber-ID of GTalk-adres, zoals \"gebruiker@example.org\". Zorg ervoor dat u "
+"%s eerst aan uw contactenlijst in uw IM-programma of in GTalk toevoegt."
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
-msgstr "Stuur mij een bericht van nieuwe abonnees via een email"
-
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Stuur mij berichten via 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 ""
-"Stuur me aankondigingen via sms, maar ik begrijp dat ik kosten van mijn "
-"provider kan hebben."
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr "Mededeling versturen als mijn Jabber/GTalk-status wijzigt."
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
-"Stuur me antwoorden via Jabber / GTalk van mensen op wie ik niet geabonneerd "
-"ben."
+"Stuur me antwoorden via Jabber/GTalk van gebruiker op wie ik niet "
+"geabonneerd ben."
 
-#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
-msgid "Settings"
-msgstr "Instellingen"
-
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
-msgid "Settings saved."
-msgstr "Instellingen opgeslagen."
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr "De meest populaire tags van de afgelopen week"
-
-#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:114
-msgid "Someone else already has this OpenID."
-msgstr "Iemand anders heeft die OpenID al."
-
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
-msgstr "Er is iets eigenaardigs gebeurd."
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
-msgstr "Sorry, inkomende mail is niet toegestaan"
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
-msgstr "Sorry, dit adres is niet een juist mailadres van je."
-
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
-msgid "Source"
-msgstr "Bron"
-
-#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
-msgid "Statistics"
-msgstr "Statistieken"
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Een MicroID voor mijn Jabber/GTalk-adres publiceren."
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-msgid "Stored OpenID not found."
-msgstr "Opgeslagen OpenID niet gevonden."
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "Geen Jabber-ID."
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
-#: actions/showstream.php:197 actions/showstream.php:206
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
-msgid "Subscribe"
-msgstr "Abonneren"
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr "Het was niet mogelijk om het Jabber-ID te normaliseren"
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
-msgid "Subscribers"
-msgstr "Abonnees"
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "Geen geldige Jabber-ID"
 
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
-msgid "Subscription authorized"
-msgstr "Abonnement geautoriseerd"
+#: actions/imsettings.php:299
+msgid "That is already your Jabber ID."
+msgstr "U hebt dit al ingesteld als uw Jabber-ID."
 
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
-msgid "Subscription rejected"
-msgstr "Abonnement afgewezen"
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr "Het Jabber-ID wordt al gebruikt door een andere gebruiker."
 
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27 actions/showstream.php:240
-#: actions/showstream.php:322 actions/subscriptions.php:27
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
-msgid "Subscriptions"
-msgstr "Abonnementen"
+#: actions/imsettings.php:327
+#, php-format
+msgid ""
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr ""
+"Er is een bevestigingscode verstuurd naar het opgegeven IM-adres. U moet "
+"ermee akkoord gaan dat %s berichten aan u verzendt."
 
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
-msgid "System error uploading file."
-msgstr "Systeemfout bij uploaden bestand."
+#: actions/imsettings.php:387
+msgid "That is not your Jabber ID."
+msgstr "Dit is niet uw Jabber-ID."
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
-#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
-msgid "Tags"
-msgstr "Tags"
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr "Postvak IN van %s - pagina %d"
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "Tekst"
+#: actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr "Postvak IN van %s"
 
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
-msgid "Text search"
-msgstr "Tekst doorzoeken"
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr "Dit is uw Postvak IN dat uw inkomende privéberichten bevat."
 
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
-msgstr "Die OpenID is niet van jou."
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr "Het is niet mogelijk uitnodigingen te verzenden."
 
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
-msgstr "Dit adres is al bevestigd."
+#: actions/invite.php:41
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr ""
+"U moet aangemeld zijn om anderen te kunnen uitnodigen gebruik te maken van %s"
 
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
-msgstr "Die bevestigingscode is niet voor jou!"
+#: actions/invite.php:72
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "Ongeldig e-mailadres: %s"
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr "Dit Emailadres is al geregistreerd door iemand anders"
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
+msgstr "De uitnodiging(en) zijn verzonden"
 
-#: ../actions/avatar.php:80 actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
-msgstr "Dat bestand is te groot."
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr "Nieuwe gebruikers uitnodigen"
 
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
-msgid "That is already your Jabber ID."
-msgstr "Dat is al je Jabber-ID."
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr "U bent als geabonneerd op deze gebruikers:"
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
-msgid "That is already your email address."
-msgstr "Dit is al je mailadres."
+#: actions/invite.php:131 actions/invite.php:139
+#, php-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
-msgid "That is already your phone number."
-msgstr "Dit is al je telefoonnummer"
+#: actions/invite.php:136
+msgid ""
+"These people are already users and you were automatically subscribed to them:"
+msgstr ""
+"Deze gebruikers zijn al geregistreerd en u kunt zich automatisch bij hun "
+"abonneren:"
 
-#: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
-msgid "That is not your Jabber ID."
-msgstr "Dat is niet je Jabber-ID."
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
+msgstr "Uitnodiging(en) zijn verzonden aan de volgende mensen:"
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
-msgid "That is not your email address."
-msgstr "Dit is niet je emailadres"
+#: actions/invite.php:150
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr ""
+"U wordt op de hoogte gesteld wanneer uw genodigden de uitnodiging accepteren "
+"en zich bij de site registreren. Dank u wel voor het laten groeien van de "
+"gemeenschap!"
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
-msgstr "Dit is niet je telefoonnummer"
+#: actions/invite.php:162
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
+msgstr ""
+"Gebruik deze pagina om uw vrienden en collega´s uit te nodigen deze dienst "
+"te gebruiken."
 
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-#: actions/emailsettings.php:367 actions/imsettings.php:349
-msgid "That is the wrong IM address."
-msgstr "Dat is het verkeerde IM-adres."
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "E-mailadressen"
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
-msgstr "Dit is het verkeerde bevestigings code/nummer"
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr "Adressen van uit te nodigen vrienden (één per regel)"
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-msgid "That phone number already belongs to another user."
-msgstr "Dit telefoonnummer is al in gebruik door iemand"
+#: actions/invite.php:192
+msgid "Personal message"
+msgstr "Persoonlijk bericht"
 
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49 actions/twitapistatuses.php:330
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-msgid "That's too long. Max notice size is 140 chars."
-msgstr "Dat is te lang. Maximale bericht lengte is 140 tekens."
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
+msgstr "Persoonlijk bericht bij de uitnodiging (optioneel)."
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "Dat is te lang. Maximale bericht lengte is 255 tekens."
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
+msgstr "Verzenden"
 
-#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/invite.php:226
 #, 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/emailsettings.php:282
-#: actions/imsettings.php:258 actions/smssettings.php:282
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
-msgid "The address was removed."
-msgstr "Het adres was verwijderd."
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s heeft u uitgenodigd voor %2$s"
 
-#: ../actions/userauthorization.php:312
+#: actions/invite.php:228
+#, php-format
 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:"
+"%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 ""
-"Het abonnement is geautoriseerd maar er is geen callback-URL doorgegeven. "
-"Loop de instructies van de site na voor details over hoe het abonnement te "
-"autoriseren. Je abonnement-token is:"
+"%1$s heeft u uitgenodigd voor %2$s (%3$s).\n"
+"\n"
+"%2$s is een microblogdienst waarmee u mensen op de hoogte kunt houden van "
+"wat u interesseert en bezig houdt.\n"
+"\n"
+"U kunt ook nieuws over uzelf of uw ideeën en gedachten met anderen delen. "
+"Het is ook de ideale plek om mensen te ontmoeten met dezelfde interesses als "
+"u.\n"
+"\n"
+"%1$s schreef:\n"
+"\n"
+"%4$s\n"
+"\n"
+"U kunt %1$s's profielpagina op %2$s hier bekijken:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Als u het wilt proberen, klik dan op de verwijzing hieronder om de "
+"uitnodiging te accepteren.\n"
+"\n"
+"%6$s\n"
+"\n"
+"Als u geen interesse hebt, kunt u dit bericht negeren. Bedankt voor uw "
+"geduld.\n"
+"\n"
+"Met vriendelijke groet, %2$s\n"
 
-#: ../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 ""
-"Het abonnement is afgewezen maar er is geen callback-URL doorgegeven. Loop "
-"de instructies van de site na voor details over hoe het abonnement volledig "
-"af te wijzen."
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
+msgstr "U moet aangemeld zijn om lid te worden van een groep."
 
-#: ../actions/subscribers.php:35 actions/subscribers.php:35
-#, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr "Dit zijn de mensen die %s's berichten volgen."
+#: actions/joingroup.php:90 lib/command.php:217
+msgid "You are already a member of that group"
+msgstr "U bent al lid van deze groep"
 
-#: ../actions/subscribers.php:33 actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr "Dit zijn de mensen die jouw berichten volgen."
+#: actions/joingroup.php:128 lib/command.php:234
+#, php-format
+msgid "Could not join user %s to group %s"
+msgstr "Het was niet mogelijk om de gebruiker %s toe te voegen aan de groep %s"
 
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/joingroup.php:135 lib/command.php:239
 #, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr "Dit zijn de mensen van wie %s de berichten volgt."
+msgid "%s joined group %s"
+msgstr "%s is lid geworden van de groep %s"
 
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr "Dit zijn de mensen van wie jij de berichten volgt."
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
+msgstr "U moet aangemeld zijn om een groep te kunnen verlaten."
 
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
-msgid ""
-"These people are already users and you were automatically subscribed to them:"
-msgstr ""
-"Deze mensen zijn al geregistreerd en jij kan je automatisch bij hun "
-"abonneren: "
+#: actions/leavegroup.php:90 lib/command.php:268
+msgid "You are not a member of that group."
+msgstr "U bent geen lid van deze groep"
 
-#: ../actions/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
-msgstr "Deze bevestigingscode is te oud. Begin alsjeblieft opnieuw."
+#: actions/leavegroup.php:119 lib/command.php:278
+msgid "Could not find membership record."
+msgstr "Er is geen groepslidmaatschap aangetroffen."
 
-#: ../lib/openid.php:195
-msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
-msgstr ""
-"Dit formulier zou zichzelf automatisch moeten versturen. Zoniet, klik dan op "
-"de verstuurknop om naar je OpenID-provider te gaan."
+#: actions/leavegroup.php:127 lib/command.php:284
+#, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "De gebruiker %s kon niet uit de groet %s verwijderd worden"
 
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/leavegroup.php:134 lib/command.php:289
 #, 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 ""
-"Dit is de eerste keer dat je bij %s ingelogd bent dus moeten we je OpenID "
-"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
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-msgid "This method requires a POST or DELETE."
-msgstr "Dit vraagt om te posten of te verwijderen"
-
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
-msgid "This method requires a POST."
-msgstr "Je moet hier dus posten"
+msgid "%s left group %s"
+msgstr "%s heeft de groep %s verlaten"
 
-#: ../lib/util.php:164 lib/util.php:246
-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/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "U bent al aangemeld."
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
-msgid "Timezone"
-msgstr "Tijdzone"
+#: actions/login.php:110 actions/login.php:120
+msgid "Invalid or expired token."
+msgstr "Het token is ongeldig of verlopen."
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
-msgid "Timezone not selected."
-msgstr "Tijdzone niet geselecteerd"
+#: actions/login.php:143
+msgid "Incorrect username or password."
+msgstr "De gebruikersnaam of wachtwoord is onjuist."
 
-#: ../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 ""
-"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/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
+msgstr "Er is een fout opgetreden tijdens het instellen van de gebruiker."
 
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
-msgid "Two user ids or screen_names must be supplied."
-msgstr "Twee gebruikers ID of namen moeten worden gegeven"
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "Aanmelden"
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL van je homepage, blog, of profiel op een andere site"
+#: actions/login.php:243
+msgid "Login to site"
+msgstr "Aanmelden"
 
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-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/emailsettings.php:144 actions/imsettings.php:118
-#: actions/recoverpassword.php:39 actions/smssettings.php:143
-#: actions/twittersettings.php:108 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-msgid "Unexpected form submission."
-msgstr "Formulier onverwacht ingezonden."
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Gebruikersnaam"
 
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
-msgid "Unexpected password reset."
-msgstr "Wachtwoord onverwacht teruggesteld."
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Wachtwoord"
 
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-msgid "Unknown action"
-msgstr "Onbekende aktie"
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "Aanmeldgegevens onthouden"
 
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-msgid "Unknown version of OMB protocol."
-msgstr "Onbekende versie van het OMB-protocol."
+#: actions/login.php:253 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
+msgstr "Voortaan automatisch aanmelden. Niet gebruiken op gedeelde computers!"
 
-#: ../lib/util.php:269 lib/util.php:285
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "Wachtwoord kwijt of vergeten?"
+
+#: actions/login.php:282
 msgid ""
-"Unless otherwise specified, contents of this site are copyright by the "
-"contributors and available under the "
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
 msgstr ""
-"Tenzij anders gespecificeerd valt de inhoud van deze site onder het "
-"copyright van de auteurs en is beschikbaar onder de_"
+"Om veiligheidsredenen moet u uw gebruikersnaam en wachtwoord nogmaals "
+"invoeren alvorens u uw instellingen kunt wijzigen."
 
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
+#: actions/login.php:286
 #, php-format
-msgid "Unrecognized address type %s"
-msgstr "Onherkenbaar adrestype %s"
-
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
-msgstr "Abonnement opheffen"
-
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-msgid "Unsupported OMB version"
-msgstr "Niet ondersteunde OMB-versie"
-
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
-msgid "Unsupported image file format."
-msgstr "Niet ondersteund beeldbestandsformaat."
-
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
-msgstr "Bijwerkingen door SMS"
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"Meld u aan met uw gebruikersnaam en wachtwoord. Hebt u nog geen "
+"gebruikersnaam? [Registreer een nieuwe gebruiker](%%action.register%%)."
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
-msgstr "Bijwerkingen door de messenger (IM)"
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr "Alleen beheerders kunnen andere gebruikers beheerder maken."
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/makeadmin.php:95
 #, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr "Bijwerkingen van %1$s en vrienden op %2$s!"
+msgid "%s is already an admin for group \"%s\"."
+msgstr "%s is al beheerder van de groep \"%s\""
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/makeadmin.php:132
 #, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr "Bijwerkingen van %1$s op %2$s!"
-
-#: ../actions/avatar.php:68 actions/profilesettings.php:161
-#: actions/avatarsettings.php:162 actions/grouplogo.php:232
-msgid "Upload"
-msgstr "Uploaden"
+msgid "Can't get membership record for %s in group %s"
+msgstr "Het was niet mogelijk te bevestigen dat %s lid is van de groep %s"
 
-#: ../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 ""
-"Hier kun je een nieuwe \"avatar\" (gebruikersafbeelding) uploaden. Je kunt "
-"het plaatje achteraf niet bewerken, dus zorg ervoor dat het min of meer "
-"vierkant is. Het moet ook onder site licentie vallen. Gebruik een afbeelding "
-"die je eigendom is en die je wilt delen."
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr "Het is niet mogelijk %s beheerder te maken van de groep %s"
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr "Upload een nieuwe profielfoto"
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr "Geen huidige status"
 
-#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
-msgstr ""
-"Gebruik deze pagina om je vrienden en collega´s uit te nodigen voor deze "
-"site"
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr "Nieuwe groep"
 
-#: ../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 "Alleen gebruikt voor updates, aankondigingen en wachtwoordherstel"
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
+msgstr "Gebruik dit formulier om een nieuwe groep aan te maken."
 
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
-msgid "User being listened to doesn't exist."
-msgstr "Gebruiker waarnaar geluisterd wordt bestaat 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/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
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-msgid "User has no profile."
-msgstr "Gebruiker heeft geen profiel."
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr "Nieuw bericht"
 
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
-msgstr "Gebruikersnaam"
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
+msgstr "U kunt geen bericht naar deze gebruiker zenden."
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr "Gebruiker niet gevonden"
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+msgstr "Geen inhoud!"
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
-msgid "What timezone are you normally in?"
-msgstr "Welke tijdzone heb je normaal?"
+#: actions/newmessage.php:158
+msgid "No recipient specified."
+msgstr "Er is geen ontvanger aangegeven."
 
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
-#, php-format
-msgid "What's up, %s?"
-msgstr "Hoe staat het ermee, %s?"
+#: actions/newmessage.php:164 lib/command.php:370
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly instead."
+msgstr "Stuur geen berichten naar uzelf. Zeg het gewoon in uw hoofd."
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-#: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Waar je bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\""
+#: actions/newmessage.php:181
+msgid "Message sent"
+msgstr "Bericht verzonden."
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/newmessage.php:185 lib/command.php:375
 #, php-format
-msgid "Wrong image type for '%s'"
-msgstr "Foutief beeldbestandstype voor '%s'"
+msgid "Direct message to %s sent"
+msgstr "Het directe bericht aan %s is verzonden"
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
-#, php-format
-msgid "Wrong size image at '%s'"
-msgstr "Verkeerde afmeting van afbeelding bij '%s'"
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
+msgstr "Er is een Ajax-fout opgetreden"
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
-msgid "Yes"
-msgstr "Ja"
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "Nieuw bericht"
 
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-msgid "You already have this OpenID!"
-msgstr "Je hebt die OpenID al!"
+#: actions/newnotice.php:199
+msgid "Notice posted"
+msgstr "De mededeling is verzonden"
 
-#: ../actions/deletenotice.php:37 actions/deletenotice.php:37
+#: actions/noticesearch.php:68
+#, php-format
 msgid ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
 msgstr ""
-"Je staat op het punt een bericht definitief te verwijderen._ _ Als dit "
-"gebeurd kan het nooit meer teruggevonden worden."
-
-#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
-msgstr "Je bent al aangemeld!"
-
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-msgid "You are already subscribed to these users:"
-msgstr "Je bent bij deze abonnees al aangemeld:"
+"Zoek naar mededelingen op %%site.name%% op basis van inhoud. Scheid "
+"zoektermen met spaties. Zoektermen moeten uit drie of meer tekens bestaan."
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
-msgid "You are not friends with the specified user."
-msgstr "Je bent niet verbonden met deze gebruiker"
-
-#: ../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:145
-msgid "You can create a new account to start posting notices."
-msgstr "Je kunt een nieuw account aanmaken om berichten te gaan plaatsen."
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "Tekst doorzoeken"
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
+#: actions/noticesearch.php:91
 #, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "Je kunt een SMS ontvangen via mail van %%site.name%%."
+msgid "Search results for \"%s\" on %s"
+msgstr "Zoekresultaten voor \"%s\" op %s"
 
-#: ../actions/openidsettings.php:86
+#: actions/noticesearch.php:121
+#, php-format
 msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 msgstr ""
-"Je kunt een OpenID van je account verwijderen door op de knop \"Verwijder\" "
-"te klikken."
+"U kunt de eerste zijn die een bericht plaatst in [dit onderwerp](%%%%action."
+"newnotice%%%%?status_textarea=%s)!"
 
-#: ../actions/imsettings.php:28 actions/imsettings.php:28
-#, fuzzy, php-format
+#: actions/noticesearch.php:124
+#, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
-"Je kunt berichten verzenden en ontvangen via Jabber/GTalk [instant messages]"
-"(%%doc.im%%). Configureer je adres en instellingen hieronder."
+"U kunt een [gebruiker registeren](%%%%action.register%%%%) en dan de eerste "
+"zijn die een bericht plaatst in [dit onderwerp](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+
+#: actions/noticesearchrss.php:89
+#, php-format
+msgid "Updates with \"%s\""
+msgstr "Updates met \"%s\""
+
+#: actions/noticesearchrss.php:91
+#, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Updates die overeenkomen met de zoekterm \"%1$s\" op %2$s."
 
-#: ../actions/profilesettings.php:27
+#: actions/nudge.php:85
 msgid ""
-"You can update your personal profile info here so people know more about you."
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
-"Je kunt hier je persoonlijke profielinformatie bijwerken zodat mensen meer "
-"over je weten."
+"Deze gebruiker is niet te porren of heeft zijn e-mailadres nog niet "
+"bevestigd."
 
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
-msgstr "Je kunt het lokale abonnement gebruiken!"
+#: actions/nudge.php:94
+msgid "Nudge sent"
+msgstr "De por is verzonden"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
-msgid "You can't register if you don't agree to the license."
-msgstr "Je kunt niet registreren als je niet met de licentie akkoord gaat."
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr "De por is verzonden!"
 
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
-msgid "You did not send us that profile"
-msgstr "Je hebt dat profiel niet ingezonden"
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+msgstr "Mededeling heeft geen profiel"
 
-#: ../lib/mail.php:147
+#: actions/oembed.php:86 actions/shownotice.php:180
 #, 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 ""
-"Je hebt een nieuw postadres op %1$s.\n"
-"\n"
-"Zend een email naar %2$s om een nieuwe post te zetten.\n"
-"\n"
-"Meer mail instructies vind je op %3$s.\n"
-"\n"
-"Met vriendelijke groet,\n"
-"%4$s"
+msgid "%1$s's status on %2$s"
+msgstr "Status van %1$s op %2$s"
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
-msgid "You may not delete another user's status."
-msgstr "Je mag geen status van een ander wissen"
+#: actions/oembed.php:157
+msgid "content type "
+msgstr "inhoudstype "
 
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr ""
-"Je moet ingelogd zijn om andere te uit te nodigen om gebruik te maken van %s"
+#: actions/oembed.php:160
+msgid "Only "
+msgstr "Alleen "
 
-#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
-"U wordt verwittigd wanneer uw genodigden aanvaarden de uitnodiging en te "
-"registreren op de site. Bedankt voor de verspreiding en groei van de "
-"gemeenschap!"
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
+msgstr "Geen ondersteund gegevensformaat."
 
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr "Je bent geïdentificeerd. Vul hieronder een nieuw wachtwoord in."
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "Mensen zoeken"
 
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
-msgid "Your OpenID URL"
-msgstr "Je OpenID-URL"
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "Mededeling zoeken"
 
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
-msgstr "Je gebruikersnaam op deze server, of je geregistreerde e-mailadres."
+#: actions/othersettings.php:60
+msgid "Other Settings"
+msgstr "Overige instellingen"
 
-#: ../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 ""
-"Met [OpenID](%%doc.openid%%) kun je op vele sites inloggen met hetzelfde "
-"gebruikersaccount. Hier kun je de aan je account gekoppelde OpenID's beheren."
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr "Overige instellingen beheren."
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
-msgid "a few seconds ago"
-msgstr "een paar seconden geleden"
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr " (gratis dienst)"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
-#, php-format
-msgid "about %d days ago"
-msgstr "ongeveer %d dagen geleden"
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
+msgstr "URL's inkorten met"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
-#, php-format
-msgid "about %d hours ago"
-msgstr "ongeveer %d uur geleden"
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
+msgstr "Te gebruiken automatische verkortingsdienst."
+
+#: actions/othersettings.php:122
+msgid "View profile designs"
+msgstr "Profielontwerpen bekijken"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr "Profielontwerpen weergeven of verbergen"
+
+#: actions/othersettings.php:153
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "De URL voor de verkortingdienst is te lang (maximaal 50 tekens)."
+
+#: actions/outbox.php:58
 #, php-format
-msgid "about %d minutes ago"
-msgstr "ongeveer %d minuten geleden"
+msgid "Outbox for %s - page %d"
+msgstr "Postvak UIT voor %s - pagina %d"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: actions/outbox.php:61
 #, php-format
-msgid "about %d months ago"
-msgstr "ongeveer %d maanden geleden"
+msgid "Outbox for %s"
+msgstr "Postvak UIT voor %s"
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
-msgid "about a day ago"
-msgstr "ongeveer een dag geleden"
+#: actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr "Dit is uw Postvak UIT waarin de door u verzonden privéberichten staan."
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
-msgid "about a minute ago"
-msgstr "ongeveer een minuut geleden"
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "Wachtwoord wijzigen"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
-msgid "about a month ago"
-msgstr "ongeveer een maand geleden"
+#: actions/passwordsettings.php:69
+msgid "Change your password."
+msgstr "Wachtwoord wijzigen"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
-msgid "about a year ago"
-msgstr "ongeveer een jaar geleden"
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+msgid "Password change"
+msgstr "Wachtwoord wijzigen"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
-msgid "about an hour ago"
-msgstr "ongeveer een uur geleden"
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "Oud wachtwoord"
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
-msgstr "Verwijderen"
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "Nieuw wachtwoord"
 
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117 actions/noticesearch.php:136
-#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
-msgid "in reply to..."
-msgstr "in antwoord op..."
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "Zes of meer tekens"
 
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124 actions/noticesearch.php:143
-#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
-msgid "reply"
-msgstr "antwoord"
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "Bevestigen"
 
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
+#: actions/passwordsettings.php:113
 msgid "same as password above"
 msgstr "gelijk aan wachtwoord hierboven"
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
-msgid "unsupported file type"
-msgstr "Dit filetype is niet toegestaan"
-
-#: ../lib/util.php:1309 lib/util.php:1443
-msgid "« After"
-msgstr "« Later"
-
-#: 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
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Er is een problem ontstaan met je sessie, Porbeer nog eens aub."
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "Wijzigen"
 
-#: actions/disfavor.php:55 actions/disfavor.php:81
-msgid "This notice is not a favorite!"
-msgstr "Dit bericht is geen favoriet"
+#: actions/passwordsettings.php:154 actions/register.php:230
+msgid "Password must be 6 or more characters."
+msgstr "Het wachtwoord moet zes of meer tekens bevatten."
 
-#: actions/disfavor.php:63 actions/disfavor.php:87
-msgid "Could not delete favorite."
-msgstr "Kan deze favoriet niet verwijderen"
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "De wachtwoorden komen niet overeen."
 
-#: actions/disfavor.php:72 lib/favorform.php:140
-msgid "Favor"
-msgstr "Favoriet"
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "Het oude wachtwoord is onjuist"
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
-msgstr "Stuur mij een Email als iemand mij als favoriet aanduid"
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "Fout bij opslaan gebruiker; ongeldig."
 
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-msgid "Send me email when someone sends me a private message."
-msgstr "Stuur mij een Email als iemand mij een privebericht toezend"
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "Het was niet mogelijk het nieuwe wachtwoord op te slaan."
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
-msgid "This notice is already a favorite!"
-msgstr "Dit bericht is al een favoriet"
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "Het wachtwoord is opgeslagen."
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132 actions/favor.php:86
-#: actions/twitapifavorites.php:125 classes/Command.php:152
-msgid "Could not create favorite."
-msgstr "Kan geen favoriet aanmaken"
+#: actions/peoplesearch.php:52
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"Zoeken naar gebruikers op %%site.name%% op basis van hun naam, locatie of "
+"interesses. Scheid de zoektermen met spaties. Zoektermen moeten uit drie of "
+"meer tekens bestaan."
 
-#: actions/favor.php:70
-msgid "Disfavor"
-msgstr "Niet favoriet"
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "Gebruikers zoeken"
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/peopletag.php:70
 #, php-format
-msgid "%s favorite notices"
-msgstr "%s favorite berichten"
+msgid "Not a valid people tag: %s"
+msgstr "Geen geldig gebruikerslabel: %s"
 
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/peopletag.php:144
 #, php-format
-msgid "Feed of favorite notices of %s"
-msgstr "Feed voor favorieten berichten van %s"
+msgid "Users self-tagged with %s - page %d"
+msgstr "Gebruikers die zichzelf met %s hebben gelabeld - pagina %d"
 
-#: actions/inbox.php:28 actions/inbox.php:59
-#, php-format
-msgid "Inbox for %s - page %d"
-msgstr "Inbox van %s - pagina %d"
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "Ongeldige mededelinginhoud"
 
-#: actions/inbox.php:30 actions/inbox.php:62
+#: actions/postnotice.php:90
 #, php-format
-msgid "Inbox for %s"
-msgstr "Inbox van %s"
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+"De mededelingenlicentie \"%s\" is niet compatibel met de licentie \"%s\" van "
+"deze site."
 
-#: actions/inbox.php:53 actions/inbox.php:115
-msgid "This is your inbox, which lists your incoming private messages."
-msgstr "Dit is jouw inbox, waar je inkomende priveberichten staan"
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "Profielinstellingen"
 
-#: actions/invite.php:178 actions/invite.php:213
-#, php-format
+#: actions/profilesettings.php:71
 msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+"You can update your personal profile info here so people know more about you."
 msgstr ""
-"%1$s heeft je uitgenodigd om hem te volgen op %2$s (%3$s).\n"
-"\n"
-
-#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-msgid "Automatically login in the future; "
-msgstr "Automatisch in de toekomst inloggen;_"
+"Hier kunt u uw persoonlijke profiel bijwerken met informatie over uzelf voor "
+"andere gebruikers."
 
-#: actions/login.php:122 actions/login.php:264
-msgid "For security reasons, please re-enter your "
-msgstr "Voor veiligheidsredenen herhaal hier je_"
+#: actions/profilesettings.php:99
+msgid "Profile information"
+msgstr "Profielinformatie"
 
-#: actions/login.php:126 actions/login.php:268
-msgid "Login with your username and password. "
-msgstr "Log in met je gebruikersnaam en paswoord._"
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties"
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
-msgid "That's too long. Max message size is 140 chars."
-msgstr "Dit is te lang. max. 140 karakters invoeren."
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full name"
+msgstr "Volledige naam"
 
-#: actions/newmessage.php:65 actions/newmessage.php:128
-msgid "No recipient specified."
-msgstr "Geen begunstigde aangeduid"
+#: actions/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "Thuispagina"
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206 actions/newmessage.php:131
-#: actions/newmessage.php:168 classes/Command.php:237
-msgid "You can't send a message to this user."
-msgstr "Je kunt geen bericht naar deze gebruiker zenden"
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "De URL van uw thuispagina, blog of profiel bij een andere website"
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "Stuur geen berichten naar jezelf, spreek gewoon zachtjes tegen jezelf."
+#: actions/profilesettings.php:122 actions/register.php:460
+#, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Geef een beschrijving van uzelf en uw interesses in %d tekens"
 
-#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
-msgid "No such user"
-msgstr "Geen gebruiker gevonden zoals je zoekt"
+#: actions/profilesettings.php:125 actions/register.php:463
+msgid "Describe yourself and your interests"
+msgstr "Beschrijf uzelf en uw interesses"
 
-#: actions/newmessage.php:117 actions/newmessage.php:67
-msgid "New message"
-msgstr "Nieuw bericht"
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "Beschrijving"
 
-#: actions/noticesearch.php:95 actions/noticesearch.php:146
-msgid "Notice without matching profile"
-msgstr "Bericht zonder bekend profiel"
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "Locatie"
 
-#: actions/openidsettings.php:28 actions/openidsettings.php:70
-#, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr "[OpenID](%%doc.openid%%) laat je toe om in meerdere sites in te loggen_"
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "Waar u bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\""
 
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
-msgstr "wil je een OpenID toevoegen op je account hier_"
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
+msgstr "Labels"
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
+#: actions/profilesettings.php:140
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
+"Eigen labels (letter, getallen, -, ., en _). Gescheiden door komma's of "
+"spaties"
 
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-msgid "You can remove an OpenID from your account "
-msgstr ""
+#: actions/profilesettings.php:144
+msgid "Language"
+msgstr "Taal"
 
-#: actions/outbox.php:28 actions/outbox.php:58
-#, php-format
-msgid "Outbox for %s - page %d"
-msgstr ""
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr "Voorkeurstaal"
 
-#: actions/outbox.php:30 actions/outbox.php:61
-#, php-format
-msgid "Outbox for %s"
-msgstr ""
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr "Tijdzone"
 
-#: actions/outbox.php:53 actions/outbox.php:116
-msgid "This is your outbox, which lists private messages you have sent."
-msgstr ""
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
+msgstr "In welke tijdzone verblijft u meestal?"
 
-#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
-#, php-format
+#: actions/profilesettings.php:160
 msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
-msgstr ""
-
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
-msgid "You can update your personal profile info here "
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
+"Automatisch abonneren bij abonnement op mij (beste voor automatische "
+"processen)"
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
-msgid "User without matching profile"
-msgstr ""
+#: actions/profilesettings.php:221 actions/register.php:223
+#, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "De beschrijving is te lang (maximaal %d tekens)."
 
-#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
-msgstr ""
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr "Er is geen tijdzone geselecteerd."
 
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
-msgstr ""
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr "Taal is te lang (max 50 tekens)."
 
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a "
-msgstr ""
+#: actions/profilesettings.php:246 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Ongeldig label: '%s'"
 
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-msgid "Your nickname on this server, "
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
 msgstr ""
+"Het was niet mogelijk de instelling voor automatisch abonneren voor de "
+"gebruiker bij te werken."
 
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-msgid "Instructions for recovering your password "
-msgstr ""
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+msgstr "Het profiel kon niet opgeslagen worden."
 
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
-msgid "New password successfully saved. "
-msgstr ""
+#: actions/profilesettings.php:336
+msgid "Couldn't save tags."
+msgstr "Het was niet mogelijk de labels op te slaan."
 
-#: actions/register.php:95 actions/register.php:180
-msgid "Password must be 6 or more characters."
-msgstr ""
+#: actions/profilesettings.php:344
+msgid "Settings saved."
+msgstr "De instellingen zijn opgeslagen."
 
-#: actions/register.php:216
+#: actions/public.php:83
 #, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
-msgstr ""
+msgid "Beyond the page limit (%s)"
+msgstr "Meer dan de paginalimiet (%s)"
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
-msgstr ""
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
+msgstr "Het was niet mogelijk de publieke stream op te halen."
 
-#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
+#: actions/public.php:129
 #, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr ""
+msgid "Public timeline, page %d"
+msgstr "Openbare tijdlijn, pagina %d"
 
-#: actions/showfavorites.php:61 actions/showfavorites.php:145
-#, php-format
-msgid "Feed for favorites of %s"
-msgstr ""
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr "Openbare tijdlijn"
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-msgid "Could not retrieve favorite notices."
-msgstr ""
+#: actions/public.php:151
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Publieke streamfeed (RSS 1.0)"
 
-#: actions/showmessage.php:33 actions/showmessage.php:81
-msgid "No such message."
-msgstr ""
+#: actions/public.php:155
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Publieke streamfeed (RSS 1.0)"
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
-msgstr ""
+#: actions/public.php:159
+msgid "Public Stream Feed (Atom)"
+msgstr "Publieke streamfeed (Atom)"
 
-#: actions/showmessage.php:61 actions/showmessage.php:108
+#: actions/public.php:179
 #, php-format
-msgid "Message to %1$s on %2$s"
-msgstr ""
-
-#: actions/showmessage.php:66 actions/showmessage.php:113
-#, php-format
-msgid "Message from %1$s on %2$s"
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
 msgstr ""
+"Dit is de publieke tijdlijn voor %%site.name%%, maar niemand heeft nog "
+"berichten geplaatst."
 
-#: actions/showstream.php:154
-msgid "Send a message"
-msgstr ""
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr "U kunt de eerste zijn die een bericht plaatst!"
 
-#: actions/smssettings.php:312 actions/smssettings.php:464
+#: actions/public.php:186
 #, php-format
-msgid "Mobile carrier for your phone. "
-msgstr ""
-
-#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
-#, php-format
-msgid "Direct messages to %s"
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
+"Waarom [registreert u geen gebruiker](%%action.register%%) en plaatst u als "
+"eerste een bericht?"
 
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/public.php:233
 #, php-format
-msgid "All the direct messages sent to %s"
-msgstr ""
-
-#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-msgid "Direct Messages You've Sent"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
+"Dit is %%site.name%%, een [microblogdienst](http://en.wikipedia.org/wiki/"
+"Micro-blogging) gebaseerd op de Vrije Software [StatusNet](http://status."
+"net/). [Registreer nu](%%%%action.register%%%%) om mededelingen over uzelf "
+"te delen met vrienden, familie en collega's! [Meer lezen...](%%%%doc.help%%%"
+"%)"
 
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/public.php:238
 #, php-format
-msgid "All the direct messages sent from %s"
-msgstr ""
-
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-msgid "No message text!"
-msgstr ""
-
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-msgid "Recipient user not found."
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
 msgstr ""
+"Dit is %%site.name%%, een [microblogdienst](http://en.wikipedia.org/wiki/"
+"Micro-blogging) gebaseerd op de Vrije Software [StatusNet](http://status."
+"net/)"
 
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
+#: actions/publictagcloud.php:57
+msgid "Public tag cloud"
+msgstr "Publieke woordwolk"
 
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "%s / Favorites from %s"
-msgstr ""
+msgid "These are most popular recent tags on %s "
+msgstr "De meest recente en populairste labels op %s "
 
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/publictagcloud.php:69
 #, php-format
-msgid "%s updates favorited by %s / %s."
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
+"Nog niemand heeft een bericht met het [hekjelabel](%%doc.tags%%) verzonden."
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
-#, php-format
-msgid "%s added your notice as a favorite"
-msgstr ""
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
+msgstr "U kunt de eerste zijn die een bericht plaatst!"
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
+#: actions/publictagcloud.php:75
 #, php-format
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
 msgstr ""
+"U kunt een [gebruiker registeren](%%%%action.register%%%%) en dan de eerste "
+"zijn die er een plaatst!"
 
-#: actions/twittersettings.php:27
-msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
-msgstr ""
-
-#: actions/twittersettings.php:41 actions/twittersettings.php:60
-msgid "Twitter settings"
-msgstr ""
-
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-msgid "Twitter Account"
-msgstr ""
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
+msgstr "Woordwolk"
 
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-msgid "Current verified Twitter account."
-msgstr ""
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "U bent al aangemeld!"
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr ""
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "Onbekende herstelcode."
 
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-msgid "No spaces, please."
-msgstr ""
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "Geen geldige herstelcode."
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
-msgstr ""
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr "Herstelcode voor onbekende gebruiker."
 
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-msgid "Automatically send my notices to Twitter."
-msgstr ""
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "Er is een fout opgetreden die te maken heeft met de bevestigingscode."
 
-#: actions/twittersettings.php:75 actions/twittersettings.php:146
-msgid "Send local \"@\" replies to Twitter."
-msgstr ""
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
+msgstr "Deze bevestigingscode is te oud. Begin alstublieft opnieuw."
 
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-msgid "Subscribe to my Twitter friends here."
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
 msgstr ""
+"Het was niet mogelijk het bevestigde e-mailadres voor de gebruiker bij te "
+"werken."
 
-#: actions/twittersettings.php:122
+#: actions/recoverpassword.php:152
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
 msgstr ""
+"Als u uw wachtwoord kwijt bent of vergeten bent, dan is het mogelijk een "
+"nieuw wachtwoord toegezonden te krijgen op het e-mailadres dat bij uw "
+"gebruiker staat opgeslagen."
 
-#: actions/twittersettings.php:128 actions/twittersettings.php:334
-msgid "Could not verify your Twitter credentials!"
-msgstr ""
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
+msgstr "U bent geïdentificeerd. Voer hieronder een nieuw wachtwoord in. "
 
-#: actions/twittersettings.php:137
-#, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr ""
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
+msgstr "Wachtwoordherstel"
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-msgid "Unable to save your Twitter settings!"
-msgstr ""
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
+msgstr "Gebruikersnaam of e-mailadres"
 
-#: actions/twittersettings.php:174 actions/twittersettings.php:376
-msgid "Twitter settings saved."
-msgstr ""
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
+msgstr "Uw gebruikersnaam op deze server, of uw geregistreerde e-mailadres."
 
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-msgid "That is not your Twitter account."
-msgstr ""
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
+msgstr "Herstellen"
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
-msgid "Couldn't remove Twitter user."
-msgstr ""
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "Wachtwoord herstellen"
 
-#: actions/twittersettings.php:212 actions/twittersettings.php:407
-msgid "Twitter account removed."
-msgstr ""
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr "Wachtwoord herstellen"
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
-msgid "Couldn't save Twitter preferences."
-msgstr ""
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
+msgstr "Wachtwoordherstel aangevraagd"
 
-#: actions/twittersettings.php:245 actions/twittersettings.php:461
-msgid "Twitter preferences saved."
-msgstr ""
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
+msgstr "Onbekende handeling"
 
-#: actions/userauthorization.php:84 actions/userauthorization.php:86
-msgid "Please check these details to make sure "
-msgstr ""
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "Zes of meer tekens, en vergeet uw wachtwoord niet!"
 
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
-msgid "The subscription has been authorized, but no "
-msgstr ""
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Gelijk aan het wachtwoord hierboven"
 
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-msgid "The subscription has been rejected, but no "
-msgstr ""
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "Herstellen"
 
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-msgid "Command results"
-msgstr ""
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "Voer een gebruikersnaam of e-mailadres in."
 
-#: classes/Channel.php:148 classes/Channel.php:204
-msgid "Command complete"
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
 msgstr ""
+"Er bestaat geen gebruiker met het opgegeven e-mailadres of de opgegeven "
+"gebruikersnaam."
 
-#: classes/Channel.php:158 classes/Channel.php:215
-msgid "Command failed"
-msgstr ""
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr "Die gebruiker heeft geen e-mailadres geregistreerd."
 
-#: classes/Command.php:39 classes/Command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr ""
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "Er is een fout opgetreden bij het opslaan van de adresbevestiging."
 
-#: classes/Command.php:96 classes/Command.php:113
-#, php-format
-msgid "Subscriptions: %1$s\n"
+#: actions/recoverpassword.php:325
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
 msgstr ""
+"De instructies om uw wachtwoord te herstellen zijn verstuurd naar het e-"
+"mailadres dat voor uw gebruiker is geregistreerd."
 
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
-msgid "User has no last notice"
-msgstr ""
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
+msgstr "Het wachtwoord is onverwacht opnieuw ingesteld."
 
-#: classes/Command.php:146 classes/Command.php:166
-msgid "Notice marked as fave."
-msgstr ""
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "Het wachtwoord moet uit zes of meer tekens bestaan."
 
-#: classes/Command.php:166 classes/Command.php:189
-#, php-format
-msgid "%1$s (%2$s)"
-msgstr ""
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
+msgstr "Het wachtwoord en de bevestiging komen niet overeen."
 
-#: classes/Command.php:169 classes/Command.php:192
-#, php-format
-msgid "Fullname: %s"
-msgstr ""
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
+msgstr "Het nieuwe wachtwoord is opgeslagen. U bent nu aangemeld."
 
-#: classes/Command.php:172 classes/Command.php:195
-#, php-format
-msgid "Location: %s"
-msgstr ""
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
+msgstr "U kunt zich alleen registreren als u wordt uitgenodigd."
 
-#: classes/Command.php:175 classes/Command.php:198
-#, php-format
-msgid "Homepage: %s"
-msgstr ""
+#: actions/register.php:92
+msgid "Sorry, invalid invitation code."
+msgstr "Sorry. De uitnodigingscode is ongeldig."
 
-#: classes/Command.php:178 classes/Command.php:201
-#, php-format
-msgid "About: %s"
-msgstr ""
+#: actions/register.php:112
+msgid "Registration successful"
+msgstr "De registratie is voltooid"
 
-#: classes/Command.php:200 classes/Command.php:228
-#, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
-msgstr ""
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "Registreren"
 
-#: classes/Command.php:214 classes/Command.php:245
-#, php-format
-msgid "Direct message to %s sent"
-msgstr ""
+#: actions/register.php:135
+msgid "Registration not allowed."
+msgstr "Registratie is niet toegestaan."
 
-#: classes/Command.php:216 classes/Command.php:247
-msgid "Error sending direct message."
-msgstr ""
+#: actions/register.php:198
+msgid "You can't register if you don't agree to the license."
+msgstr "U kunt zich niet registreren als u niet met de licentie akkoord gaat."
 
-#: classes/Command.php:263 classes/Command.php:300
-msgid "Specify the name of the user to subscribe to"
-msgstr ""
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "Geen geldig e-mailadres."
 
-#: classes/Command.php:270 classes/Command.php:307
-#, php-format
-msgid "Subscribed to %s"
-msgstr ""
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "Het e--mailadres bestaat al."
 
-#: classes/Command.php:288 classes/Command.php:328
-msgid "Specify the name of the user to unsubscribe from"
-msgstr ""
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "Ongeldige gebruikersnaam of wachtwoord."
 
-#: classes/Command.php:295 classes/Command.php:335
-#, php-format
-msgid "Unsubscribed from %s"
+#: actions/register.php:342
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
 msgstr ""
+"Via dit formulier kunt u een nieuwe gebruiker aanmaken. Daarna kunt u "
+"mededelingen uitsturen en contact maken met vrienden en collega's. "
 
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
-msgid "Command not yet implemented."
-msgstr ""
+#: actions/register.php:424
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties. Verplicht."
 
-#: classes/Command.php:313 classes/Command.php:356
-msgid "Notification off."
-msgstr ""
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr "Zes of meer tekens. Verplicht"
 
-#: classes/Command.php:315 classes/Command.php:358
-msgid "Can't turn off notification."
-msgstr ""
+#: actions/register.php:433
+msgid "Same as password above. Required."
+msgstr "Gelijk aan het wachtwoord hierboven. Verplicht"
 
-#: classes/Command.php:333 classes/Command.php:379
-msgid "Notification on."
-msgstr ""
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "E-mail"
 
-#: classes/Command.php:335 classes/Command.php:381
-msgid "Can't turn on notification."
-msgstr ""
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
+msgstr "Alleen gebruikt voor updates, aankondigingen en wachtwoordherstel"
 
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
-msgstr ""
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
+msgstr "Een langere naam, mogelijk uw echte naam"
 
-#: classes/Message.php:53 classes/Message.php:56
-msgid "Could not insert message."
-msgstr ""
+#: actions/register.php:493
+msgid "My text and files are available under "
+msgstr "Mijn teksten en bestanden zijn beschikbaar onder "
 
-#: classes/Message.php:63 classes/Message.php:66
-msgid "Could not update message with new URI."
-msgstr ""
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
+msgstr "Creative Commons Naamsvermelding 3.0"
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
+#: actions/register.php:496
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
 msgstr ""
+" behalve de volgende privégegevens: wachtwoord, e-mailadres, IM-adres, "
+"telefoonnummer."
 
-#: lib/mail.php:147 lib/mail.php:289
+#: actions/register.php:537
 #, php-format
 msgid ""
-"You have a new posting address on %1$s.\n"
+"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 ""
+"Gefeliciteerd, %s! Welkom bij  %%%%site.name%%%%. Hier staan aan aantal "
+"handelingen die u wellicht uit wilt voeren:\n"
+"\n"
+"* Naar uw [profiel](%s) gaan en uw eerste bericht verzenden;\n"
+"* Een [Jabber/GTalk-adres](%%%%action.imsettings%%%%) toevoegen zodat u "
+"vandaaruit mededelingen kunt verzenden;\n"
+"* [Gebruikers zoeken](%%%%action.peoplesearch%%%%) die u al kent of waarmee "
+"u interesses deelt;\n"
+"* [Uw profiel](%%%%action.profilesettings%%%%) bijwerken om anderen meer "
+"over uzelf te vertellen;\n"
+"* De [online documentatie](%%%%doc.help%%%%) raadplegen voor mogelijkheden "
+"die u nog niet kent.\n"
+"\n"
+"Dank u wel voor het registreren en we hopen dat deze dienst u biedt wat u "
+"ervan verwacht."
 
-#: lib/mail.php:249 lib/mail.php:508
-#, php-format
-msgid "New private message from %s"
+#: actions/register.php:561
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
 msgstr ""
+"U ontvangt snel een e-mailbericht  met daarin instructies over hoe u uw e-"
+"mail kunt bevestigen."
 
-#: lib/mail.php:253 lib/mail.php:512
+#: actions/remotesubscribe.php:98
 #, php-format
 msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+"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 u te abonneren kunt u [aanmelden](%%action.login%%), of een nieuw "
+"gebruiker [registreren](%%action.register%%). Als u al een gebruiker bij een "
+"[compatibele microblogsite](%%doc.openmublog%%) hebt, voer dan hieronder uw "
+"profiel-URL in."
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr ""
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr "Abonneren op afstand"
 
-#: lib/openid.php:195 lib/openid.php:203
-msgid "This form should automatically submit itself. "
-msgstr ""
+#: actions/remotesubscribe.php:124
+msgid "Subscribe to a remote user"
+msgstr "Op een gebruiker uit een andere systeem abonneren"
 
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-msgid "Favorites"
-msgstr ""
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "Gebruikersnaam"
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-#, php-format
-msgid "%s's favorite notices"
-msgstr ""
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr "De gebruikersnaam van de gebruiker die u wilt volgen"
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-msgid "User"
-msgstr ""
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "Profiel-URL"
 
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-msgid "Inbox"
-msgstr ""
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "De URL van uw profiel bij een andere, compatibele microblogdienst"
 
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-msgid "Your incoming messages"
-msgstr ""
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
+msgstr "Abonneren"
 
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-msgid "Outbox"
-msgstr ""
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr "Ongeldige profiel-URL (foutieve opmaak)"
 
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-msgid "Your sent messages"
+#: actions/remotesubscribe.php:168
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
 msgstr ""
+"De URL voor het profiel is niet geldig (het is geen YADIS-document of er is "
+"geen of ongeldige XRDS gedefinieerd)."
 
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-msgid "Twitter"
-msgstr ""
+#: actions/remotesubscribe.php:176
+msgid "That’s a local profile! Login to subscribe."
+msgstr "Dat is een lokaal profiel. Meld u aan om te abonneren."
 
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
-msgstr ""
+#: actions/remotesubscribe.php:183
+msgid "Couldn’t get a request token."
+msgstr "Het was niet mogelijk een verzoektoken te krijgen."
 
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-msgid "To"
-msgstr ""
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
+#, php-format
+msgid "Replies to %s"
+msgstr "Antwoorden aan %s"
 
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-msgid "Could not parse message."
-msgstr ""
+#: actions/replies.php:127
+#, php-format
+msgid "Replies to %s, page %d"
+msgstr "Antwoorden aan %s, pagina %d"
 
-#: actions/all.php:63 actions/facebookhome.php:162
-#, fuzzy, php-format
-msgid "%s and friends, page %d"
-msgstr "%s en vrienden"
+#: actions/replies.php:144
+#, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Antwoordenfeed voor %s (RSS 1.0)"
 
-#: actions/avatarsettings.php:76
-msgid "You can upload your personal avatar."
-msgstr ""
+#: actions/replies.php:151
+#, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Antwoordenfeed voor %s (RSS 2.0)"
 
-#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
-#, fuzzy
-msgid "Avatar settings"
-msgstr "Instellingen"
+#: actions/replies.php:158
+#, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Antwoordenfeed voor %s (Atom)"
 
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-msgid "Original"
+#: actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
 msgstr ""
+"Dit is de tijdlijn met de antwoorden aan %s, maar %s heeft nog geen "
+"antwoorden ontvangen."
 
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-msgid "Preview"
+#: actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
 msgstr ""
+"U kunt gesprekken aanknopen met andere gebruikers, op meer gebruikers "
+"abonneren of [lid worden van groepen](%%action.groups%%)."
 
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
-msgid "Crop"
+#: actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
+"U kunt proberen [%s te porren](../%s) of [een bericht voor die gebruiker "
+"plaatsen](%%%%action.newnotice%%%%?status_textarea=%s)."
 
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-msgid "There was a problem with your session token. "
-msgstr ""
+#: actions/repliesrss.php:72
+#, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Antwoorden aan %1$s op %2$s."
 
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-msgid "Pick a square area of the image to be your avatar"
-msgstr ""
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "Favoriete mededelingen van %s, pagina %d"
 
-#: actions/avatarsettings.php:327 actions/grouplogo.php:384
-msgid "Lost our file data."
-msgstr ""
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
+msgstr "Het was niet mogelijk de favoriete mededelingen op te halen."
 
-#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
-#, fuzzy
-msgid "Lost our file."
-msgstr "Onbekend bericht."
+#: actions/showfavorites.php:170
+#, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Favorietenfeed van %s (RSS 1.0)"
 
-#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
-#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
-msgid "Unknown file type"
-msgstr ""
+#: actions/showfavorites.php:177
+#, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Favorietenfeed van %s (RSS 2.0)"
 
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr ""
+#: actions/showfavorites.php:184
+#, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Favorietenfeed van %s (Atom)"
 
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
+#: actions/showfavorites.php:205
+msgid ""
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""
+"U hebt nog geen favoriete mededelingen. Klik op de knop \"Aan favorieten "
+"toevoegen\" bij mededelingen die u aanstaan om ze op een lijst te bewaren en "
+"ze uit te lichten."
 
-#: actions/block.php:111
-#, fuzzy
-msgid "Block user"
-msgstr "Onbekende gebruiker."
+#: actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+"%s heeff nog geen mededelingen op de eigen favorietenlijst geplaatst. Plaats "
+"een interessant bericht, en dan komt u misschien wel op de "
+"favorietenlijst. :)"
 
-#: actions/block.php:129
-msgid "Are you sure you want to block this user? "
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
 msgstr ""
+"%s heeft nog geen favorietenlijst. U kunt een [gebruiker registeren](%%%%"
+"action.register%%%%) en dan interessante mededelingen plaatsten die "
+"misschien aan favorietenlijsten zijn toe te voegen. :)"
 
-#: actions/block.php:162
-#, fuzzy
-msgid "You have already blocked this user."
-msgstr "Je bent al aangemeld!"
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr "Dit is de manier om dat te delen wat u wilt."
 
-#: actions/block.php:167
-msgid "Failed to save block information."
-msgstr ""
+#: actions/showgroup.php:82 lib/groupnav.php:86
+#, php-format
+msgid "%s group"
+msgstr "%s groep"
 
-#: actions/confirmaddress.php:159
-#, fuzzy, php-format
-msgid "The address \"%s\" has been "
-msgstr "Het adres was verwijderd."
+#: actions/showgroup.php:84
+#, php-format
+msgid "%s group, page %d"
+msgstr "groep %s, pagina %d"
 
-#: actions/deletenotice.php:73
-msgid "You are about to permanently delete a notice. "
-msgstr ""
+#: actions/showgroup.php:218
+msgid "Group profile"
+msgstr "Groepsprofiel"
 
-#: actions/disfavor.php:94
-msgid "Add to favorites"
-msgstr ""
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
+msgid "URL"
+msgstr "URL"
 
-#: actions/editgroup.php:54
-#, php-format
-msgid "Edit %s group"
-msgstr ""
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
+msgid "Note"
+msgstr "Opmerking"
 
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-msgid "Inboxes must be enabled for groups to work"
-msgstr ""
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr "Aliasen"
 
-#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-msgid "You must be logged in to create a group."
-msgstr ""
+#: actions/showgroup.php:293
+msgid "Group actions"
+msgstr "Groepshandelingen"
 
-#: actions/editgroup.php:87 actions/grouplogo.php:87
-#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
-#, fuzzy
-msgid "No nickname"
-msgstr "Geen gebruikersnaam."
+#: actions/showgroup.php:328
+#, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Mededelingenfeed voor groep %s (RSS 1.0)"
 
-#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
-#: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
-#, fuzzy
-msgid "No such group"
-msgstr "Onbekend bericht."
+#: actions/showgroup.php:334
+#, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Mededelingenfeed voor groep %s (RSS 2.0)"
 
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
-msgid "You must be an admin to edit the group"
-msgstr ""
+#: actions/showgroup.php:340
+#, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Mededelingenfeed voor groep %s (Atom)"
 
-#: actions/editgroup.php:157
-msgid "Use this form to edit the group."
-msgstr ""
+#: actions/showgroup.php:345
+#, php-format
+msgid "FOAF for %s group"
+msgstr "Vriend van een vriend voor de groep %s"
 
-#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
-#, fuzzy
-msgid "Nickname must have only lowercase letters "
-msgstr ""
-"Gebruikersnaam moet bestaan uit alleen kleine letters en cijfers en geen "
-"spaties."
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
+msgid "Members"
+msgstr "Leden"
 
-#: actions/editgroup.php:198 actions/newgroup.php:149
-#, fuzzy
-msgid "description is too long (max 140 chars)."
-msgstr "Biografie is te lang (maximaal 140 tekens)"
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/tagcloudsection.php:71
+msgid "(None)"
+msgstr "(geen)"
 
-#: actions/editgroup.php:218
-#, fuzzy
-msgid "Could not update group."
-msgstr "Kon gebruiker niet actualiseren."
+#: actions/showgroup.php:392
+msgid "All members"
+msgstr "Alle leden"
 
-#: actions/editgroup.php:226
-#, fuzzy
-msgid "Options saved."
-msgstr "Instellingen opgeslagen."
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "Statistieken"
 
-#: actions/emailsettings.php:107 actions/imsettings.php:108
-#, fuzzy, php-format
-msgid "Awaiting confirmation on this address. "
-msgstr "Fout bij bevestigingscode."
+#: actions/showgroup.php:432
+msgid "Created"
+msgstr "Aangemaakt"
 
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-msgid "Make a new email address for posting to; "
+#: actions/showgroup.php:448
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
+"**%s** is een gebruikersgroep bij %%site.name%%, een [microblogdienst]"
+"(http://en.wikipedia.org/wiki/Micro-blogging) gebaseerd op de Vrije Software "
+"[StatusNet](http://status.net/). De groepsleden wisselen korte berichten uit "
+"over hun leven en interesses. [Registreer nu](%%%%action.register%%%%) om "
+"lid te worden van deze groep en nog veel meer! [Meer lezen...](%%%%doc.help%%"
+"%%)"
 
-#: actions/emailsettings.php:157
-msgid "Send me email when someone "
+#: actions/showgroup.php:454
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
 msgstr ""
+"**%s** is een gebruikersgroep op %%%%site.name%%%%, een [microblogdienst]"
+"(http://en.wikipedia.org/wiki/Micro-blogging) gebaseerd op de Vrije Software "
+"[StatusNet](http://status.net/). De leden wisselen korte mededelingen uit "
+"over hun ervaringen en interesses. "
 
-#: actions/emailsettings.php:168
-msgid "Allow friends to nudge me and send me an email."
-msgstr ""
+#: actions/showgroup.php:482
+msgid "Admins"
+msgstr "Beheerders"
 
-#: actions/emailsettings.php:321
-#, fuzzy
-msgid "That email address already belongs "
-msgstr "E-mailadres bestaat al."
+#: actions/showmessage.php:81
+msgid "No such message."
+msgstr "Dat bericht bestaat niet."
 
-#: actions/emailsettings.php:343
-#, fuzzy
-msgid "A confirmation code was sent to the email address you added. "
-msgstr ""
-"Een bevestigingscode is verstuurd naar het opgegeven IM-adres. Je moet ermee "
-"accoord gaan dat %s boodschappen aan jou stuurt."
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient may read this message."
+msgstr "Alleen de verzender en de ontvanger kunnen dit bericht lezen."
 
-#: actions/facebookhome.php:110
-msgid "Server error - couldn't get user!"
-msgstr ""
+#: actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr "Bericht aan %1$s op %2$s"
 
-#: actions/facebookhome.php:196
+#: actions/showmessage.php:113
 #, php-format
-msgid "If you would like the %s app to automatically update "
-msgstr ""
+msgid "Message from %1$s on %2$s"
+msgstr "Bericht van %1$s op %2$s"
+
+#: actions/shownotice.php:90
+msgid "Notice deleted."
+msgstr "Deze mededeling is verwijderd."
 
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#: actions/showstream.php:73
 #, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr ""
+msgid " tagged %s"
+msgstr " met het label %s"
 
-#: actions/facebookhome.php:218
-msgid "Skip"
-msgstr ""
+#: actions/showstream.php:79
+#, php-format
+msgid "%s, page %d"
+msgstr "%s, pagina %d"
 
-#: actions/facebookhome.php:235
-#, fuzzy
-msgid "No notice content!"
-msgstr "Geen inhoud!"
+#: actions/showstream.php:122
+#, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Mededelingenfeed voor %s met het label %s (RSS 1.0)"
 
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-msgid "Pagination"
-msgstr ""
+#: actions/showstream.php:129
+#, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Mededelingenfeed voor %s (RSS 1.0)"
 
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-#, fuzzy
-msgid "After"
-msgstr "« Later"
+#: actions/showstream.php:136
+#, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Mededelingenfeed voor %s (RSS 2.0)"
 
-#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
-#, fuzzy
-msgid "Before"
-msgstr "Eerder »"
+#: actions/showstream.php:143
+#, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Mededelingenfeed voor %s (Atom)"
+
+#: actions/showstream.php:148
+#, php-format
+msgid "FOAF for %s"
+msgstr "Vriend van een vriend (FOAF) voor %s"
 
-#: actions/facebookinvite.php:70
+#: actions/showstream.php:191
 #, php-format
-msgid "Thanks for inviting your friends to use %s"
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
 msgstr ""
+"Dit is de tijdlijn voor %s, maar %s heeft nog geen berichten verzonden."
 
-#: actions/facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
 msgstr ""
+"Hebt u recentelijk iets interessants gezien? U hebt nog geen mededelingen "
+"verstuurd, dus dit is een ideaal moment om daarmee te beginnen!"
 
-#: actions/facebookinvite.php:96
+#: actions/showstream.php:198
 #, php-format
-msgid "You have been invited to %s"
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
+"U kunt proberen %s te porren of [een bericht voor die gebruiker plaatsen](%%%"
+"%action.newnotice%%%%?status_textarea=%s)."
 
-#: actions/facebookinvite.php:105
-#, fuzzy, php-format
-msgid "Invite your friends to use %s"
-msgstr "Feed voor vrienden van %s"
-
-#: actions/facebookinvite.php:113
+#: actions/showstream.php:234
 #, php-format
-msgid "Friends already using %s:"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
+"**%s** is actief op %%site.name%%, een [microblogdienst](http://en.wikipedia."
+"org/wiki/Micro-blogging) gebaseerd op de Vrije Software [StatusNet](http://"
+"status.net/). [Registreer nu](%%%%action.register%%%%) om te abonneren op de "
+"mededelingen van **%s** en nog veel meer! [Meer lezen...](%%%%doc.help%%%%)"
 
-#: actions/facebookinvite.php:130
+#: actions/showstream.php:239
 #, php-format
-msgid "Send invitations"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
 msgstr ""
+"**%s** heeft een gebruiker op %%%%site.name%%%%, een [microblogdienst]"
+"(http://en.wikipedia.org/wiki/Micro-blogging) gebaseerd op de Vrije Software "
+"[StatusNet](http://status.net/). "
 
-#: actions/facebookremove.php:56
-#, fuzzy
-msgid "Couldn't remove Facebook user."
-msgstr "Kon gebruiker niet actualiseren."
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "SMS-instellingen"
 
-#: actions/facebooksettings.php:65
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr "U kunt SMS-berichten per e-mail ontvangen van %%site.name%%."
 
-#: actions/facebooksettings.php:67
-#, fuzzy
-msgid "Sync preferences saved."
-msgstr "Voorkeuren opgeslagen."
+#: actions/smssettings.php:91
+msgid "SMS is not available."
+msgstr "SMS is niet beschikbaar."
 
-#: actions/facebooksettings.php:90
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Huidige bevestigde telefoonnummer met SMS-functie."
 
-#: actions/facebooksettings.php:97
-msgid "Send \"@\" replies to Facebook."
-msgstr ""
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
+msgstr "Er wordt gewacht op bevestiging van dit telefoonnummer."
 
-#: actions/facebooksettings.php:106
-#, fuzzy
-msgid "Prefix"
-msgstr "Profiel"
+#: actions/smssettings.php:130
+msgid "Confirmation code"
+msgstr "Bevestigingscode"
 
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
-msgstr ""
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
+msgstr "Voer de code in die u via uw telefoon hebt ontvangen."
 
-#: actions/facebooksettings.php:124
-#, php-format
-msgid "If you would like %s to automatically update "
-msgstr ""
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
+msgstr "SMS-telefoonnummer"
 
-#: actions/facebooksettings.php:147
-#, fuzzy
-msgid "Sync preferences"
-msgstr "Voorkeuren"
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "Telefoonnummer zonder spaties of leestekens, met netnummer"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
-msgid "Disfavor favorite"
+#: actions/smssettings.php:174
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
 msgstr ""
+"Stuur me mededelingen via SMS. Ik begrijp dat dit exorbitante rekeningen van "
+"mijn provider kan opleveren."
 
-#: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
-#, fuzzy
-msgid "Popular notices"
-msgstr "Populaire berichten"
+#: actions/smssettings.php:306
+msgid "No phone number."
+msgstr "Geen telefoonnummer."
 
-#: actions/favorited.php:67
-#, fuzzy, php-format
-msgid "Popular notices, page %d"
-msgstr "Populaire berichten, pagina %d"
+#: actions/smssettings.php:311
+msgid "No carrier selected."
+msgstr "Er is geen provider geselecteerd."
 
-#: actions/favorited.php:79
-msgid "The most popular notices on the site right now."
-msgstr "De meest populaire berichten op de site op dit moment."
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
+msgstr "U hebt dit al ingesteld als uw telefoonnummer."
 
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
-msgid "Featured users"
-msgstr "Nieuwe gebruikers"
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
+msgstr "Dit telefoonnummer is al in gebruik bij een andere gebruiker."
 
-#: actions/featured.php:71
-#, php-format
-msgid "Featured users, page %d"
-msgstr "Nieuwe gebruikers, pagina %d"
+#: actions/smssettings.php:347
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"Er is een bevestigingscode is verzonden naar het telefoonnummer dat u hebt "
+"toegevoegd. Controleer uw telefoon voor de code en instructies."
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some of the great users on %s"
-msgstr "Een selectie van de actieve gebruikers op %s"
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
+msgstr "Dit is het verkeerde bevestigingsnummer."
 
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
-msgstr "Die gebruiker is geblokkeerd voor inschrijving"
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
+msgstr "Dit is niet uw telefoonnummer."
 
-#: actions/groupbyid.php:79
-msgid "No ID"
-msgstr "Geen ID"
+#: actions/smssettings.php:465
+msgid "Mobile carrier"
+msgstr "Mobiele aanbieder"
 
-#: actions/grouplogo.php:138 actions/grouplogo.php:191
-msgid "Group logo"
-msgstr "Groeps logo"
+#: actions/smssettings.php:469
+msgid "Select a carrier"
+msgstr "Selecteer een provider"
 
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
-msgstr "Je kan hier een logo voor je groep uploaden"
+#: actions/smssettings.php:476
+#, 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 ""
+"De provider van uw mobiele telefoon. Als u een provider kent die e-mail via "
+"SMS ondersteunt, maar nog niet in de lijst is opgenomen, laat dit ons dan "
+"via e-mail weten op het e-mailadres %s."
 
-#: actions/grouplogo.php:448
-msgid "Logo updated."
-msgstr "Logo geactualiseerd."
+#: actions/smssettings.php:498
+msgid "No code entered"
+msgstr "Er is geen code ingevoerd"
 
-#: actions/grouplogo.php:450
-msgid "Failed updating logo."
-msgstr "Actualiseren van je logo is niet gelukt."
+#: actions/subedit.php:70
+msgid "You are not subscribed to that profile."
+msgstr "U bent niet geabonneerd op dat profiel."
 
-#: actions/groupmembers.php:93 lib/groupnav.php:91
-#, php-format
-msgid "%s group members"
-msgstr "%s groeps leden"
+#: actions/subedit.php:83
+msgid "Could not save subscription."
+msgstr "Het was niet mogelijk het abonnement op te slaan."
 
-#: actions/groupmembers.php:96
-#, php-format
-msgid "%s group members, page %d"
-msgstr "% groeps leden, pagina %d"
+#: actions/subscribe.php:55
+msgid "Not a local user."
+msgstr "Dit is geen lokale gebruiker."
 
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
-msgstr "Lijst van de leden in deze groep"
+#: actions/subscribe.php:69
+msgid "Subscribed"
+msgstr "Geabonneerd"
 
-#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
-msgid "Groups"
-msgstr "Groepen"
+#: actions/subscribers.php:50
+#, php-format
+msgid "%s subscribers"
+msgstr "%s abonnees"
 
-#: actions/groups.php:64
+#: actions/subscribers.php:52
 #, php-format
-msgid "Groups, page %d"
-msgstr "Groepen, pagina %d"
+msgid "%s subscribers, page %d"
+msgstr "%s abonnees, pagina %d"
 
-#: actions/groups.php:90
+#: actions/subscribers.php:63
+msgid "These are the people who listen to your notices."
+msgstr "Dit zijn de gebruikers die uw mededelingen volgen."
+
+#: actions/subscribers.php:67
 #, php-format
-msgid "%%%%site.name%%%% groups let you find and talk with "
+msgid "These are the people who listen to %s's notices."
+msgstr "Dit zijn de gebruikers die de mededelingen van %s volgen."
+
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
 msgstr ""
+"U hebt geen abonnees. Als u zich abonneert op andere gebruikers, abonneren "
+"die zich wellicht op u."
 
-#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-msgid "Create a new group"
-msgstr "Maak een nieuw groep aan"
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr "%s heeft geen abonnees. Wilt u de eerste zijn?"
 
-#: actions/groupsearch.php:57
+#: actions/subscribers.php:114
 #, php-format
 msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
 msgstr ""
-"Zoek naar groepen op %%site.name%%, op basis van hun naam, locatie of "
-"interesses. Scheid de zoektermen met spaties; ze moeten uit 3 of meer tekens "
-"bestaan."
+"%s heeft geen abonnees. Als u zich [registreert](%%%%action.register%%%%) "
+"kunt u de eerste zijn."
 
-#: actions/groupsearch.php:63
-msgid "Group search"
-msgstr "Groep zoeken"
+#: actions/subscriptions.php:52
+#, php-format
+msgid "%s subscriptions"
+msgstr "%s abonnementen"
 
-#: actions/imsettings.php:70
-msgid "You can send and receive notices through "
-msgstr "Je kan berichten zenden en ontvangen via_"
+#: actions/subscriptions.php:54
+#, php-format
+msgid "%s subscriptions, page %d"
+msgstr "%s abonnementen, pagina %d"
 
-#: actions/imsettings.php:120
+#: actions/subscriptions.php:65
+msgid "These are the people whose notices you listen to."
+msgstr "Dit zijn de gebruikers van wie u de mededelingen volgt."
+
+#: actions/subscriptions.php:69
 #, php-format
-msgid "Jabber or GTalk address, "
-msgstr "Jabber of GTalk adres,_"
+msgid "These are the people whose notices %s listens to."
+msgstr "Dit zijn de gebruikers waarvan %s de mededelingen volgt."
 
-#: actions/imsettings.php:147
-msgid "Send me replies through Jabber/GTalk "
-msgstr "Stuur mij reacties via Jabber/GTalk."
+#: actions/subscriptions.php:121
+#, php-format
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
+msgstr ""
+"U bent op dit moment op geen enkele gebruiker geabonneerd. Abonneer u op "
+"gebruikers die u kent. [Zoek gebruikers](%%action.peoplesearch%%), bekijk de "
+"leden van groepen waar uw interesse naar uitgaat en kijk in de [lijst met "
+"uitgelichte gebruikers](%%action.featured%%). Als u [Twitter gebruikt](%%"
+"action.twittersettings%%), kunt u automatisch abonneren op de gebruikers die "
+"u daar al volgt."
 
-#: actions/imsettings.php:321
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
 #, php-format
-msgid "A confirmation code was sent "
-msgstr "Een bevestigingscode is gezonden naar_"
+msgid "%s is not listening to anyone."
+msgstr "%s luistert nergens naar."
 
-#: actions/joingroup.php:65
-msgid "You must be logged in to join a group."
-msgstr "Je moet ingelogd zijn om deze groep bij te wonen"
+#: actions/subscriptions.php:194
+msgid "Jabber"
+msgstr "Jabber"
 
-#: actions/joingroup.php:95
-msgid "You are already a member of that group"
-msgstr "Je bent al aangemeld bij deze groep!"
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
+msgstr "SMS"
 
-#: actions/joingroup.php:128
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Kan de gebruiker %s niet aan de %s groep toevoegen "
+#: actions/tagother.php:33
+msgid "Not logged in"
+msgstr "Niet aangemeld."
 
-#: actions/joingroup.php:135
+#: actions/tagother.php:39
+msgid "No id argument."
+msgstr "Geen ID-argument."
+
+#: actions/tagother.php:65
 #, php-format
-msgid "%s joined group %s"
-msgstr "% is bij de groep gekomen %s"
+msgid "Tag %s"
+msgstr "Label %s"
 
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
-msgstr "De inbox moet aan staan voor groepen om te kunnen functioneren"
+#: actions/tagother.php:77 lib/userprofile.php:75
+msgid "User profile"
+msgstr "Gebruikersprofiel"
 
-#: actions/leavegroup.php:65
-msgid "You must be logged in to leave a group."
-msgstr "Je moet ingelogd zijn om uit te schrijven uit de groep"
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
+msgstr "Foto"
 
-#: actions/leavegroup.php:88
-msgid "No such group."
-msgstr "Groep onbekend"
+#: actions/tagother.php:141
+msgid "Tag user"
+msgstr "Gebruiker labelen"
 
-#: actions/leavegroup.php:95
-msgid "You are not a member of that group."
-msgstr "Je bent geen lid van deze groep"
+#: actions/tagother.php:151
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+"Labels voor deze gebruiker (letters, cijfers, -, ., en _). Gebruik komma's "
+"of spaties als scheidingsteken"
 
-#: actions/leavegroup.php:100
-msgid "You may not leave a group while you are its administrator."
+#: actions/tagother.php:193
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
-"Als administrator/eigenaar van de groep kan je niet je lidmaatschap opgeven"
+"U kunt alleen gebruikers labelen waarop u geabonneerd bent of die op u "
+"geabonneerd zijn."
 
-#: actions/leavegroup.php:130
-msgid "Could not find membership record."
-msgstr "Kon geen member vinden"
+#: actions/tagother.php:200
+msgid "Could not save tags."
+msgstr "Het was niet mogelijk de labels op te slaan."
 
-#: actions/leavegroup.php:138
-#, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "Kan de gebruiker %s niet verwijderen uit de groep %s"
+#: actions/tagother.php:236
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+"Gebruik dit formulier om labels toe te voegen aan uw abonnementen of "
+"abonnees."
 
-#: actions/leavegroup.php:145
+#: actions/tag.php:68
 #, php-format
-msgid "%s left group %s"
-msgstr "%s heeft de groep verlaten %s"
+msgid "Notices tagged with %s, page %d"
+msgstr "Kennisgevingen met het label %s, pagina %d"
 
-#: actions/login.php:225 lib/facebookaction.php:304
-msgid "Login to site"
-msgstr "Login op de website"
+#: actions/tag.php:86
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Mededelingenfeed voor label %s (RSS 1.0)"
 
-#: actions/microsummary.php:69
-msgid "No current status"
-msgstr "Geen huidige status"
+#: actions/tag.php:92
+#, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Mededelingenfeed voor label %s (RSS 2.0)"
 
-#: actions/newgroup.php:53
-msgid "New group"
-msgstr "Nieuwe groep"
+#: actions/tag.php:98
+#, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Mededelingenfeed voor label %s (Atom)"
 
-#: actions/newgroup.php:115
-msgid "Use this form to create a new group."
-msgstr "Gebruik dit formulier voor de nieuwe groep te maken"
+#: actions/tagrss.php:35
+msgid "No such tag."
+msgstr "Onbekend label."
 
-#: actions/newgroup.php:177
-msgid "Could not create group."
-msgstr "Kan de groep niet maken"
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
+msgstr "De API-functie is in bewerking."
 
-#: actions/newgroup.php:191
-msgid "Could not set group membership."
-msgstr "Kan de groeps-lidmaatschap niet aanmaken"
+#: actions/unsubscribe.php:77
+msgid "No profile id in request."
+msgstr "Het profiel-ID was niet aanwezig in het verzoek."
 
-#: actions/newmessage.php:119 actions/newnotice.php:132
-msgid "That's too long. "
-msgstr "Dit is te lang._"
+#: actions/unsubscribe.php:84
+msgid "No profile with that id."
+msgstr "Er is geen profiel met dat ID."
 
-#: actions/newmessage.php:134
-msgid "Don't send a message to yourself; "
-msgstr "Geen berichten naar jezelf zenden; _"
+#: actions/unsubscribe.php:98
+msgid "Unsubscribed"
+msgstr "Het abonnement is opgezegd"
 
-#: actions/newnotice.php:166
-msgid "Notice posted"
-msgstr "Berichten gepubliceerd "
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+"De licentie \"%s\" voor de stream die u wilt volgen is niet compatibel met "
+"de sitelicentie \"%s\"."
 
-#: actions/newnotice.php:200 classes/Channel.php:163
-msgid "Ajax Error"
-msgstr "Ajax fout"
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "Abonneren"
 
-#: actions/nudge.php:85
+#: actions/userauthorization.php:110
 msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
 msgstr ""
-"Deze gebruiker is het niet mogelijk nudges te hebben en/of heeft een niet "
-"bevestigd e-mailadres"
+"Controleer alstublieft deze details om er zeker van te zijn dat u zich wilt "
+"abonneren op de mededelingen van deze gebruiker. Als u zojuist niet hebt "
+"aangegeven dat u zich op de mededelingen van een gebruiker wilt abonneren, "
+"klik dan op \"Afwijzen\"."
 
-#: actions/nudge.php:94
-msgid "Nudge sent"
-msgstr "Nudge verzonden"
+#: actions/userauthorization.php:188
+msgid "License"
+msgstr "Licentie"
 
-#: actions/nudge.php:97
-msgid "Nudge sent!"
-msgstr "Nudge verzonden!"
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "Aanvaarden"
 
-#: actions/openidlogin.php:97
-msgid "OpenID login"
-msgstr "Log in met OpenID"
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Abonnement geautoriseerd"
 
-#: actions/openidsettings.php:128
-msgid "Removing your only OpenID "
-msgstr "Verwijder je enigste OpenID"
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "Afwijzen"
 
-#: actions/othersettings.php:60
-msgid "Other Settings"
-msgstr "Andere instellingen"
+#: actions/userauthorization.php:212
+msgid "Reject this subscription"
+msgstr "Dit abonnement weigeren"
 
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Beheer verschillende andere optie´s"
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
+msgstr "Geen autorisatieverzoek!"
 
-#: actions/othersettings.php:93
-#, fuzzy
-msgid "URL Auto-shortening"
-msgstr "URL auto-sorteren"
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+msgstr "Het abonnement is geautoriseerd"
 
-#: actions/othersettings.php:112
-msgid "Service"
-msgstr "Service"
+#: actions/userauthorization.php:249
+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 ""
+"Het abonnement is afgewezen, maar er is geen callback-URL doorgegeven. "
+"Controleer de instructies van de site voor informatie over het volledig "
+"afwijzen van een abonnement. Uw abonnementstoken is:"
 
-#: actions/othersettings.php:113
-msgid "Automatic shortening service to use."
-msgstr "Automatische verkorting dienst te gebruiken"
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
+msgstr "Het abonnement is afgewezen"
 
-#: actions/othersettings.php:144
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "URL verkorting dienst is te lang (max. 50tekens)."
+#: actions/userauthorization.php:261
+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 ""
+"Het abonnement is afgewezen, maar er is geen callback-URL doorgegeven. "
+"Controleer de instructies van de site voor informatie over het volledig "
+"afwijzen van een abonnement."
 
-#: actions/passwordsettings.php:69
-msgid "Change your password."
-msgstr "Verander je wachtwoord"
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr "De abonnee-URI \"%s\" is hier niet te vinden"
 
-#: actions/passwordsettings.php:89
-msgid "Password change"
-msgstr "Wachtwoord veranderd"
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr "De URI \"%s\" voor de stream is te lang."
 
-#: actions/peopletag.php:35
+#: actions/userauthorization.php:307
 #, php-format
-msgid "Not a valid people tag: %s"
-msgstr "Geen geldige personen-tag: %s"
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr "de URI \"%s\" voor de stream is een lokale gebruiker."
 
-#: actions/peopletag.php:47
+#: actions/userauthorization.php:322
 #, php-format
-msgid "Users self-tagged with %s - page %d"
-msgstr "Gebruikers eigen-tagged met %s - page %d"
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr "De profiel-URL \"%s\" is niet geldig."
 
-#: actions/peopletag.php:91
+#: actions/userauthorization.php:338
 #, php-format
-msgid "These are users who have tagged themselves \"%s\" "
-msgstr "Er zijn gebruikers die hebben hunzelf getagged \"%s\""
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr "De avatar-URL \"%s\" is niet geldig."
 
-#: actions/profilesettings.php:91
-msgid "Profile information"
-msgstr "Profiel informatie"
+#: actions/userauthorization.php:343
+#, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Het was niet mogelijk de avatar-URL \"%s\" te lezen."
 
-#: actions/profilesettings.php:124
+#: actions/userauthorization.php:348
+#, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Er staat een verkeerd afbeeldingsttype op de avatar-URL \"%s\"."
+
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr "Geen ID."
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+msgid "Profile design"
+msgstr "Profielontwerp"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
 msgstr ""
+"U kunt het uiterlijk van uw profiel aanpassen door een achtergrondafbeelding "
+"toe te voegen of het kleurenpalet aan te passen."
 
-#: actions/profilesettings.php:144
-msgid "Automatically subscribe to whoever "
-msgstr ""
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr "Geniet van uw hotdog!"
 
-#: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/usergroups.php:64
 #, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Ongeldige tag: '%s'"
+msgid "%s groups, page %d"
+msgstr "%s groepen, pagina %d"
 
-#: actions/profilesettings.php:311
-msgid "Couldn't save tags."
-msgstr "Kon de tags niet opslaan."
+#: actions/usergroups.php:130
+msgid "Search for more groups"
+msgstr "Meer groepen zoeken"
 
-#: actions/public.php:107
+#: actions/usergroups.php:153
 #, php-format
-msgid "Public timeline, page %d"
-msgstr "Openbare tijdlijn, pagina %d"
+msgid "%s is not a member of any group."
+msgstr "%s is van geen enkele groep lid."
 
-#: actions/public.php:173
-msgid "Could not retrieve public stream."
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
+"U kunt [naar groepen zoeken](%%action.groupsearch%%) en daar lid van worden."
 
-#: actions/public.php:220
+#: classes/File.php:137
 #, php-format
 msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
 msgstr ""
+"Bestanden mogen niet groter zijn dan %d bytes, en uw bestand was %d bytes. "
+"Probeer een kleinere versie te uploaden."
 
-#: actions/publictagcloud.php:57
-msgid "Public tag cloud"
-msgstr "Publieke tag-wolk"
-
-#: actions/publictagcloud.php:63
+#: classes/File.php:147
 #, php-format
-msgid "These are most popular recent tags on %s "
-msgstr "De meest recente en populairste tags %s_"
-
-#: actions/publictagcloud.php:119
-msgid "Tag cloud"
-msgstr "Tag-wolk"
-
-#: actions/register.php:139 actions/register.php:349
-msgid "Sorry, only invited people can register."
-msgstr "Sorry, maar alleen uitgenodigde mensen kunnen registeren"
-
-#: actions/register.php:149
-msgid "You can't register if you don't "
-msgstr "Je kunt niet registreren als je niet_"
-
-#: actions/register.php:286
-msgid "With this form you can create "
-msgstr "Met dit formulier maak je_"
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+"Een bestand van deze grootte overschijdt uw gebruikersquota van %d bytes."
 
-#: actions/register.php:368
-msgid "1-64 lowercase letters or numbers, "
-msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties_"
+#: classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+"Een bestand van deze grootte overschijdt uw maandelijkse quota van %d bytes."
 
-#: actions/register.php:382 actions/register.php:386
-msgid "Used only for updates, announcements, "
-msgstr "Alleen gebruikt voor updates, aankondigingen _"
+#: classes/Message.php:55
+msgid "Could not insert message."
+msgstr "Het was niet mogelijk het bericht in te voegen."
 
-#: actions/register.php:398
-msgid "URL of your homepage, blog, "
-msgstr "URL van je homepage, blog, _"
+#: classes/Message.php:65
+msgid "Could not update message with new URI."
+msgstr "Het was niet mogelijk het bericht bij te werken met de nieuwe URI."
 
-#: actions/register.php:404
-msgid "Describe yourself and your "
-msgstr "Beschrijf jezelf en je_"
+#: classes/Notice.php:164
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "Er is een databasefout opgetreden bij de invoer van de hashtag: %s"
 
-#: actions/register.php:410
-msgid "Where you are, like \"City, "
-msgstr "Waar je bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\"_"
+#: classes/Notice.php:179
+msgid "Problem saving notice. Too long."
+msgstr ""
+"Er is een probleem opgetreden bij het opslaan van de mededeling. Deze is te "
+"lang."
 
-#: actions/register.php:432
-msgid " except this private data: password, "
+#: classes/Notice.php:183
+msgid "Problem saving notice. Unknown user."
 msgstr ""
-"_behalve de volgende privégegevens: wachtwoord, e-mailadres, IM-adres, "
-"telefoonnummer._"
+"Er was een probleem bij het opslaan vna de kennisgeving. De gebruiker is "
+"onbekend."
 
-#: actions/register.php:471
-#, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
-msgstr "Gefeliciteer, %s en welkom op de site \"%%site.name%%._"
+#: classes/Notice.php:188
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+"U hebt te snel te veel mededelingen verstuurd. Kom even op adem en probeer "
+"het over enige tijd weer."
 
-#: actions/register.php:495
-msgid "(You should receive a message by email "
+#: classes/Notice.php:194
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
 msgstr ""
+"Te veel duplicaatberichten te snel achter elkaar. Neem een adempauze en "
+"plaats over een aantal minuten pas weer een bericht."
 
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
+#: classes/Notice.php:202
+msgid "You are banned from posting notices on this site."
 msgstr ""
+"U bent geblokkeerd en mag geen mededelingen meer achterlaten op deze site."
 
-#: actions/replies.php:118
-#, php-format
-msgid "Replies to %s, page %d"
-msgstr "Antwoorden aan %s, pagina %d"
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
+msgstr "Er is een probleem opgetreden bij het opslaan van de mededeling."
 
-#: actions/showfavorites.php:79
+#: classes/Notice.php:1120
 #, php-format
-msgid "%s favorite notices, page %d"
+msgid "DB error inserting reply: %s"
 msgstr ""
+"Er is een databasefout opgetreden bij het invoegen van het antwoord: %s"
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: classes/User.php:347
 #, php-format
-msgid "%s group"
-msgstr "%s groep"
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Welkom bij %1$s, @%2$s!"
 
-#: actions/showgroup.php:79
-#, php-format
-msgid "%s group, page %d"
-msgstr "%s groep, pagina %d"
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Profiel"
 
-#: actions/showgroup.php:206
-msgid "Group profile"
-msgstr "Groeps profiel"
+#: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
+msgstr "Uw profielgegevens wijzigen"
 
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
-msgid "URL"
-msgstr "URL"
+#: lib/accountsettingsaction.php:112
+msgid "Upload an avatar"
+msgstr "Avatar uploaden"
 
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
-msgid "Note"
-msgstr "Bericht"
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr "Uw wachtwoord wijzigen"
 
-#: actions/showgroup.php:270
-msgid "Group actions"
-msgstr "Groeps aktie"
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
+msgstr "E-mailafhandeling wijzigen"
 
-#: actions/showgroup.php:323
-#, php-format
-msgid "Notice feed for %s group"
-msgstr "Berichten-feed voor groep %s"
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
+msgstr "Ontwerp"
 
-#  String should contain a variable token for since 'when'
-#: actions/showgroup.php:357 lib/groupnav.php:90
-msgid "Members"
-msgstr "Lid"
+#: lib/accountsettingsaction.php:124
+msgid "Design your profile"
+msgstr "Uw profiel ontwerpen"
 
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
-msgid "(None)"
-msgstr "(geen)"
+#: lib/accountsettingsaction.php:128
+msgid "Other"
+msgstr "Overige"
 
-#: actions/showgroup.php:370
-msgid "All members"
-msgstr "Alle leden"
+#: lib/accountsettingsaction.php:128
+msgid "Other options"
+msgstr "Overige instellingen"
 
-#: actions/showgroup.php:378
+#: lib/action.php:144
 #, php-format
-msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
-msgstr ""
-"**%s** is een gebruikersgroep op  %%%%site.name%%%%, een [micro-"
-"blogging](http://en.wikipedia.org/wiki/Micro-blogging) service_"
-
-#: actions/showmessage.php:98
-msgid "Only the sender and recipient "
-msgstr "Alleen de zender en ontvanger_"
+msgid "%s - %s"
+msgstr "%s - %s"
 
-#: actions/showstream.php:73
-#, php-format
-msgid "%s, page %d"
-msgstr "%s, pagina %d"
+#: lib/action.php:159
+msgid "Untitled page"
+msgstr "Naamloze pagina"
 
-#: actions/showstream.php:143
-msgid "'s profile"
-msgstr "'s profiel"
+#: lib/action.php:424
+msgid "Primary site navigation"
+msgstr "Primaire sitenavigatie"
 
-#: actions/showstream.php:236 actions/tagother.php:77
-msgid "User profile"
-msgstr "Gebruikersprofiel"
+#: lib/action.php:430
+msgid "Home"
+msgstr "Thuis"
 
-#: actions/showstream.php:240 actions/tagother.php:81
-msgid "Photo"
-msgstr "Foto"
+#: lib/action.php:430
+msgid "Personal profile and friends timeline"
+msgstr "Persoonlijk profiel en tijdlijn van vrienden"
 
-#: actions/showstream.php:317
-msgid "User actions"
-msgstr "Gebruikers akties"
+#: lib/action.php:432
+msgid "Account"
+msgstr "Gebruiker"
 
-#: actions/showstream.php:342
-msgid "Send a direct message to this user"
-msgstr "Stuur de gebruiker een direct bericht"
+#: lib/action.php:432
+msgid "Change your email, avatar, password, profile"
+msgstr "Uw e-mailadres, avatar, wachtwoord of profiel wijzigen"
 
-#: actions/showstream.php:343
-msgid "Message"
-msgstr "Bericht"
+#: lib/action.php:435
+msgid "Connect"
+msgstr "Koppelen"
 
-#: actions/showstream.php:451
-msgid "All subscribers"
-msgstr "Alle abonnees"
+#: lib/action.php:435
+msgid "Connect to services"
+msgstr "Met diensten verbinden"
 
-#: actions/showstream.php:533
-msgid "All groups"
-msgstr "Alle groepen"
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
+msgstr "Uitnodigen"
 
-#: actions/showstream.php:542
+#: lib/action.php:440 lib/subgroupnav.php:106
 #, php-format
-msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
-msgstr ""
-"**%s** heeft een account op %%%%site.name%%%%, een [micro-"
-"blogging](http://en.wikipedia.org/wiki/Micro-blogging) service_"
-
-#: actions/smssettings.php:128
-msgid "Phone number, no punctuation or spaces, "
-msgstr "Telefoonnummer, geen leestekens of spaties,_"
+msgid "Invite friends and colleagues to join you on %s"
+msgstr "Vrienden en collega's uitnodigen om u te vergezellen op %s"
 
-#: actions/smssettings.php:162
-#, fuzzy
-msgid "Send me notices through SMS; "
-msgstr "Stuur mij berichten via Jabber/GTalk."
+#: lib/action.php:445
+msgid "Logout"
+msgstr "Afmelden"
 
-#: actions/smssettings.php:335
-#, fuzzy
-msgid "A confirmation code was sent to the phone number you added. "
-msgstr "Die bevestigingscode is niet voor jou!"
+#: lib/action.php:445
+msgid "Logout from the site"
+msgstr "Van de site afmelden"
 
-#: actions/smssettings.php:453
-msgid "Mobile carrier"
-msgstr ""
+#: lib/action.php:450
+msgid "Create an account"
+msgstr "Gebruiker aanmaken"
 
-#: actions/subedit.php:70
-#, fuzzy
-msgid "You are not subscribed to that profile."
-msgstr "Je hebt dat profiel niet ingezonden"
+#: lib/action.php:453
+msgid "Login to the site"
+msgstr "Bij de site aanmelden"
 
-#: actions/subedit.php:83
-#, fuzzy
-msgid "Could not save subscription."
-msgstr "Kon abonnement niet aanmaken."
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
+msgstr "Help"
 
-#: actions/subscribe.php:55
-#, fuzzy
-msgid "Not a local user."
-msgstr "Onbekende gebruiker."
+#: lib/action.php:456
+msgid "Help me!"
+msgstr "Help me!"
 
-#: actions/subscribe.php:69
-#, fuzzy
-msgid "Subscribed"
-msgstr "Abonneren"
+#: lib/action.php:459
+msgid "Search"
+msgstr "Zoeken"
 
-#: actions/subscribers.php:50
-#, fuzzy, php-format
-msgid "%s subscribers"
-msgstr "Abonnees"
+#: lib/action.php:459
+msgid "Search for people or text"
+msgstr "Naar gebruikers of tekst zoeken"
 
-#: actions/subscribers.php:52
-#, php-format
-msgid "%s subscribers, page %d"
-msgstr ""
+#: lib/action.php:480
+msgid "Site notice"
+msgstr "Kennisgeving van site"
 
-#: actions/subscribers.php:63
-#, fuzzy
-msgid "These are the people who listen to "
-msgstr "Dit zijn de mensen die %s's berichten volgen."
+#: lib/action.php:546
+msgid "Local views"
+msgstr "Lokale weergaven"
 
-#: actions/subscribers.php:67
-#, fuzzy, php-format
-msgid "These are the people who "
-msgstr "Dit zijn de mensen die %s's berichten volgen."
+#: lib/action.php:612
+msgid "Page notice"
+msgstr "Kennisgeving van pagina"
 
-#: actions/subscriptions.php:52
-#, fuzzy, php-format
-msgid "%s subscriptions"
-msgstr "Alle abonnementen"
+#: lib/action.php:714
+msgid "Secondary site navigation"
+msgstr "Secundaire sitenavigatie"
 
-#: actions/subscriptions.php:54
-#, fuzzy, php-format
-msgid "%s subscriptions, page %d"
-msgstr "Alle abonnementen"
+#: lib/action.php:721
+msgid "About"
+msgstr "Over"
 
-#: actions/subscriptions.php:65
-#, fuzzy
-msgid "These are the people whose notices "
-msgstr "Dit zijn de mensen van wie %s de berichten volgt."
+#: lib/action.php:723
+msgid "FAQ"
+msgstr "Veelgestelde vragen"
 
-#: actions/subscriptions.php:69
-#, fuzzy, php-format
-msgid "These are the people whose "
-msgstr "Dit zijn de mensen die %s's berichten volgen."
+#: lib/action.php:727
+msgid "TOS"
+msgstr "TOS"
 
-#: actions/subscriptions.php:122
-#, fuzzy
-msgid "Jabber"
-msgstr "Geen Jabber-ID."
+#: lib/action.php:730
+msgid "Privacy"
+msgstr "Privacy"
 
-#: actions/tag.php:43
-#, fuzzy, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Microblog van %s"
+#: lib/action.php:732
+msgid "Source"
+msgstr "Bron"
 
-#: actions/tag.php:66
-#, php-format
-msgid "Messages tagged \"%s\", most recent first"
-msgstr ""
+#: lib/action.php:734
+msgid "Contact"
+msgstr "Contact"
 
-#: actions/tagother.php:33
-#, fuzzy
-msgid "Not logged in"
-msgstr "Niet ingelogd."
+#: lib/action.php:736
+msgid "Badge"
+msgstr "Naamplaatje"
 
-#: actions/tagother.php:39
-#, fuzzy
-msgid "No id argument."
-msgstr "Onbekend document."
+#: lib/action.php:764
+msgid "StatusNet software license"
+msgstr "Licentie van de StatusNet-software"
 
-#: actions/tagother.php:65
+#: lib/action.php:767
 #, php-format
-msgid "Tag %s"
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
+"**%%site.name%%** is een microblogdienst van [%%site.broughtby%%](%%site."
+"broughtbyurl%%). "
 
-#: actions/tagother.php:141
-msgid "Tag user"
-msgstr ""
+#: lib/action.php:769
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** is een microblogdienst. "
 
-#: actions/tagother.php:149
+#: lib/action.php:771
+#, php-format
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
+"De site werkt met de [StatusNet](http://status.net/) microblogsoftware, "
+"versie %s, beschikbaar onder de [GNU Affero General Public License](http://"
+"www.fsf.org/licensing/licenses/agpl-3.0.html)."
+
+#: lib/action.php:785
+msgid "Site content license"
+msgstr "Licentie voor siteinhoud"
 
-#: actions/tagother.php:164
+#: lib/action.php:794
+msgid "All "
+msgstr "Alle "
+
+#: lib/action.php:799
+msgid "license."
+msgstr "licentie."
+
+#: lib/action.php:1052
+msgid "Pagination"
+msgstr "Paginering"
+
+#: lib/action.php:1061
+msgid "After"
+msgstr "Na"
+
+#: lib/action.php:1069
+msgid "Before"
+msgstr "Voor"
+
+#: lib/action.php:1117
 msgid "There was a problem with your session token."
-msgstr ""
+msgstr "Er is een probleem met uw sessietoken."
 
-#: actions/tagother.php:191
-msgid ""
-"You can only tag people you are subscribed to or who are subscribed to you."
-msgstr ""
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr "Bijlagen"
 
-#: actions/tagother.php:198
-#, fuzzy
-msgid "Could not save tags."
-msgstr "Kon avatarinformatie niet opslaan"
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr "Auteur"
 
-#: actions/tagother.php:233
-msgid "Use this form to add tags to your subscribers or subscriptions."
-msgstr ""
+#: lib/attachmentlist.php:278
+msgid "Provider"
+msgstr "Provider"
 
-#: actions/tagrss.php:35
-#, fuzzy
-msgid "No such tag."
-msgstr "Onbekend bericht."
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr "Mededelingen die deze bijlage bevatten"
 
-#: actions/tagrss.php:66
-#, fuzzy, php-format
-msgid "Microblog tagged with %s"
-msgstr "Microblog van %s"
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr "Labels voor deze bijlage"
 
-#: actions/twitapiblocks.php:47
-msgid "Block user failed."
-msgstr ""
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
+msgstr "Commandoresultaten"
 
-#: actions/twitapiblocks.php:69
-msgid "Unblock user failed."
-msgstr ""
+#: lib/channel.php:210
+msgid "Command complete"
+msgstr "Het commando is uitgevoerd"
 
-#: actions/twitapiusers.php:48
-#, fuzzy
-msgid "Not found."
-msgstr "Geen verzoek gevonden!"
+#: lib/channel.php:221
+msgid "Command failed"
+msgstr "Het uitvoeren van het commando is mislukt"
 
-#: actions/twittersettings.php:71
-msgid "Add your Twitter account to automatically send "
-msgstr ""
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr "Dit commando is nog niet geïmplementeerd."
 
-#: actions/twittersettings.php:119
-msgid "Twitter user name"
-msgstr ""
+#: lib/command.php:88
+#, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "De gebruiker %s is niet aangetroffen"
 
-#: actions/twittersettings.php:126
-#, fuzzy
-msgid "Twitter password"
-msgstr "Nieuw wachtwoord"
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr "Het heeft niet zoveel zin om uzelf te porren..."
 
-#: actions/twittersettings.php:228
-msgid "Twitter Friends"
-msgstr ""
+#: lib/command.php:99
+#, php-format
+msgid "Nudge sent to %s"
+msgstr "De por naar %s is verzonden"
 
-#: actions/twittersettings.php:327
-msgid "Username must have only numbers, "
+#: lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
 msgstr ""
+"Abonnementen: %1$s\n"
+"Abonnees: %2$s\n"
+"Mededelingen: %3$s"
 
-#: actions/twittersettings.php:341
-#, fuzzy, php-format
-msgid "Unable to retrieve account information "
-msgstr "Kon e-mailbevestiging niet verwijderen."
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr "Er bestaat geen mededeling met dat ID"
 
-#: actions/unblock.php:108
-#, fuzzy
-msgid "Error removing the block."
-msgstr "Fout bij opslaan van de gebruiker."
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
+msgstr "Deze gebruiker heeft geen laatste mededeling"
 
-#: actions/unsubscribe.php:50
-#, fuzzy
-msgid "No profile id in request."
-msgstr "Geen profiel-URL teruggestuurd door de server."
+#: lib/command.php:190
+msgid "Notice marked as fave."
+msgstr "De mededeling is op de favorietenlijst geplaatst."
 
-#: actions/unsubscribe.php:57
-#, fuzzy
-msgid "No profile with that id."
-msgstr "Profiel op afstand zonder overeenkomend profiel"
+#: lib/command.php:315
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
 
-#: actions/unsubscribe.php:71
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "Abonnement opheffen"
+#: lib/command.php:318
+#, php-format
+msgid "Fullname: %s"
+msgstr "Volledige naam: %s"
 
-#: actions/usergroups.php:63
+#: lib/command.php:321
 #, php-format
-msgid "%s groups"
-msgstr ""
+msgid "Location: %s"
+msgstr "Locatie: %s"
 
-#: actions/usergroups.php:65
+#: lib/command.php:324
 #, php-format
-msgid "%s groups, page %d"
-msgstr ""
+msgid "Homepage: %s"
+msgstr "Thuispagina: %s"
 
-#: classes/Notice.php:104
-#, fuzzy
-msgid "Problem saving notice. Unknown user."
-msgstr "Probleem bij opslaan bericht."
+#: lib/command.php:327
+#, php-format
+msgid "About: %s"
+msgstr "Over: %s"
 
-#: classes/Notice.php:109
-msgid ""
-"Too many notices too fast; take a breather and post again in a few minutes."
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
 msgstr ""
+"Het bericht te is lang. De maximale lengte is %d tekens. De lengte van uw "
+"bericht was %d"
 
-#: classes/Notice.php:116
-msgid "You are banned from posting notices on this site."
+#: lib/command.php:377
+msgid "Error sending direct message."
+msgstr "Er is een fout opgetreden bij het verzonden van het directe bericht."
+
+#: lib/command.php:431
+#, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
+"De mededeling is te lang. De maximale lengte is %d tekens. Uw mededeling "
+"bevatte %d tekens"
 
-#: lib/accountsettingsaction.php:108
-#, fuzzy
-msgid "Upload an avatar"
-msgstr "Actualiseren avatar niet gelukt."
+#: lib/command.php:439
+#, php-format
+msgid "Reply to %s sent"
+msgstr "Het antwoord aan %s is verzonden"
 
-#: lib/accountsettingsaction.php:119
-msgid "Other"
-msgstr ""
+#: lib/command.php:441
+msgid "Error saving notice."
+msgstr "Er is een fout opgetreden bij het opslaan van de mededeling."
 
-#: lib/accountsettingsaction.php:120
-msgid "Other options"
-msgstr ""
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
+msgstr "Geef de naam op van de gebruiker waarop u wilt abonneren"
 
-#: lib/action.php:130
+#: lib/command.php:502
 #, php-format
-msgid "%s - %s"
-msgstr ""
+msgid "Subscribed to %s"
+msgstr "Geabonneerd op %s"
 
-#: lib/action.php:145
-msgid "Untitled page"
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
+"Geef de naam op van de gebruiker waarvoor u het abonnement wilt opzeggen"
 
-#: lib/action.php:316
-msgid "Primary site navigation"
-msgstr ""
+#: lib/command.php:530
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr "Uw abonnement op %s is opgezegd"
 
-#: lib/action.php:322
-msgid "Personal profile and friends timeline"
-msgstr ""
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
+msgstr "Dit commando is nog niet geïmplementeerd."
 
-#: lib/action.php:325
-msgid "Search for people or text"
-msgstr ""
+#: lib/command.php:551
+msgid "Notification off."
+msgstr "Notificaties uitgeschakeld."
 
-#  This would be appropriate for the footer menu link (actual context isn't clear!)
-#: lib/action.php:328
-#, fuzzy
-msgid "Account"
-msgstr "Over ons"
+#: lib/command.php:553
+msgid "Can't turn off notification."
+msgstr "Het is niet mogelijk de mededelingen uit te schakelen."
 
-#: lib/action.php:328
-msgid "Change your email, avatar, password, profile"
-msgstr ""
+#: lib/command.php:574
+msgid "Notification on."
+msgstr "Notificaties ingeschakeld."
 
-#: lib/action.php:330
-msgid "Connect to IM, SMS, Twitter"
-msgstr ""
+#: lib/command.php:576
+msgid "Can't turn on notification."
+msgstr "Het is niet mogelijk de notificatie uit te schakelen."
 
-#: lib/action.php:332
-msgid "Logout from the site"
-msgstr ""
+#: lib/command.php:597
+#, php-format
+msgid "Could not create login token for %s"
+msgstr "Het was niet mogelijk een aanmeldtoken aan te maken voor %s"
 
-#: lib/action.php:335
-msgid "Login to the site"
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
+"Deze verwijzing kan slechts één keer gebruikt worden en is twee minuten "
+"geldig: %s"
 
-#: lib/action.php:338
+#: lib/command.php:618
 #, fuzzy
-msgid "Create an account"
-msgstr "Maak een nieuw account aan"
+msgid "You are not subscribed to anyone."
+msgstr "U bent niet geabonneerd op dat profiel."
 
-#: lib/action.php:341
+#: lib/command.php:620
 #, fuzzy
-msgid "Login with OpenID"
-msgstr "Die OpenID is niet bekend."
+msgid "You are subscribed to these people: "
+msgstr "U bent niet geabonneerd op dat profiel."
 
-#: lib/action.php:344
+#: lib/command.php:637
 #, fuzzy
-msgid "Help me!"
-msgstr "Help"
+msgid "No one is subscribed to you."
+msgstr "Het was niet mogelijk om een ander op u te laten abonneren"
 
-#: lib/action.php:362
+#: lib/command.php:639
 #, fuzzy
-msgid "Site notice"
-msgstr "Nieuw bericht"
+msgid "These people are subscribed to you: "
+msgstr "Gebruikers met een abonnement op %s"
 
-#: lib/action.php:417
-msgid "Local views"
-msgstr ""
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "U bent geen lid van deze groep"
 
-#: lib/action.php:472
+#: lib/command.php:658
 #, fuzzy
-msgid "Page notice"
-msgstr "Nieuw bericht"
+msgid "You are a member of these groups: "
+msgstr "U bent geen lid van deze groep."
 
-#: lib/action.php:562
+#: lib/command.php:670
 #, fuzzy
-msgid "Secondary site navigation"
-msgstr "Abonnementen"
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+"Commando's:\n"
+"on - notificaties inschakelen\n"
+"off - notificaties uitschakelen\n"
+"help - deze hulptekst weergeven\n"
+"follow <gebruiker> - abonneren op gebruiker\n"
+"leave <gebruiker> - abonnement op gebruiker opzeggen\n"
+"d <gebruiker> <tekst> - direct bericht aan gebruiker\n"
+"get <gebruiker> - laatste mededeling van gebruiker opvragen\n"
+"whois <gebruiker> - profielinformatie van gebruiker opvragen\n"
+"fav <gebruiker> - laatste mededeling van gebruiker op favorietenlijst "
+"zetten\n"
+"fav #<mededeling-ID> - mededelingen met aangegeven ID op favorietenlijst "
+"zetten\n"
+"reply #<mededeling-ID> - antwoorden op de mededeling met het aangegeven ID\n"
+"reply <gebruiker> - antwoorden op de laatste mededeling van gebruiker\n"
+"join <groep> - lid worden van groep\n"
+"login - verwijzing opvragen naar de webpagina voor aanmelden\n"
+"drop <groep> - groepslidmaatschap opzeggen\n"
+"stats - uw statistieken opvragen\n"
+"stop - zelfde als 'off'\n"
+"quit - zelfde als 'off'\n"
+"sub <gebruiker> - zelfde als 'follow'\n"
+"unsub <gebruiker> - zelfde als 'leave'\n"
+"last <gebruiker> - zelfde als 'get'\n"
+"on <gebruiker> - nog niet beschikbaar\n"
+"off <gebruiker> - nog niet beschikbaar\n"
+"nudge <gebruiker> - gebruiker porren\n"
+"invite <phone number> - nog niet beschikbaar\n"
+"track <word> - nog niet beschikbaar\n"
+"untrack <word> - nog niet beschikbaar\n"
+"track off - nog niet beschikbaar\n"
+"untrack all - nog niet beschikbaar\n"
+"tracks - nog niet beschikbaar\n"
+"tracking - nog niet beschikbaar\n"
+
+#: lib/common.php:192
+msgid "No configuration file found. "
+msgstr "Er is geen instellingenbestand aangetroffen. "
+
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
+msgstr "Er is gezocht naar instellingenbestanden op de volgende plaatsen: "
+
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+"U kunt proberen de installer uit te voeren om dit probleem op te lossen."
+
+#: lib/common.php:195
+msgid "Go to the installer."
+msgstr "Naar het installatieprogramma gaan."
+
+#: lib/connectsettingsaction.php:110
+msgid "IM"
+msgstr "IM"
 
-#: lib/action.php:602 lib/action.php:623
-msgid "StatusNet software license"
-msgstr ""
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Updates via instant messenger (IM)"
 
-#: lib/action.php:630
-msgid "All "
-msgstr ""
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
+msgstr "Updates via SMS"
 
-#: lib/action.php:635
-msgid "license."
-msgstr ""
+#: lib/dberroraction.php:60
+msgid "Database error"
+msgstr "Databasefout"
 
-#: lib/blockform.php:123 lib/blockform.php:153
-#, fuzzy
-msgid "Block this user"
-msgstr "Onbekende gebruiker."
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr "Achtergrondafbeelding wijzigen"
 
-#: lib/blockform.php:153
-msgid "Block"
-msgstr ""
+#: lib/designsettings.php:105
+msgid "Upload file"
+msgstr "Bestand uploaden"
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
-msgid "Disfavor this notice"
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
+"U kunt een persoonlijke achtergrondafbeelding uploaden. De maximale "
+"bestandsgroote is 2 megabyte."
 
-#: lib/facebookaction.php:268
-#, php-format
-msgid "To use the %s Facebook Application you need to login "
-msgstr ""
+#: lib/designsettings.php:139
+msgid "On"
+msgstr "Aan"
 
-#: lib/facebookaction.php:271
-#, fuzzy
-msgid " a new account."
-msgstr "Maak een nieuw account aan"
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr "Uit"
 
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-#, fuzzy
-msgid "Published"
-msgstr "Openbaar"
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr "Achtergrondafbeelding inschakelen of uitschakelen."
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr "Achtergrondafbeelding naast elkaar"
+
+#: lib/designsettings.php:170
+msgid "Change colours"
+msgstr "Kleuren wijzigen"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr "Achtergrond"
+
+#: lib/designsettings.php:191
+msgid "Content"
+msgstr "Inhoud"
+
+#: lib/designsettings.php:204
+msgid "Sidebar"
+msgstr "Menubalk"
+
+#: lib/designsettings.php:217
+msgid "Text"
+msgstr "Tekst"
+
+#: lib/designsettings.php:230
+msgid "Links"
+msgstr "Verwijzingen"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr "Standaardinstellingen gebruiken"
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr "Standaardontwerp toepassen"
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr "Standaardinstellingen toepassen"
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr "Ontwerp opslaan"
+
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
+msgstr "Foutieve standaard kleurinstellingen: "
+
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
+msgstr "Het standaardontwerp is weer ingesteld."
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
+msgstr "Mededeling uit favorieten verwijderen"
 
 #: lib/favorform.php:114 lib/favorform.php:140
-#, fuzzy
 msgid "Favor this notice"
-msgstr "Onbekend bericht."
+msgstr "Deze kennisgeving op de favorietenlijst plaatsen"
+
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr "Aan favorieten toevoegen"
 
 #: lib/feedlist.php:64
 msgid "Export data"
-msgstr ""
+msgstr "Gegevens exporteren"
+
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr "RSS 1.0"
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr "RSS 2.0"
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr "Atom"
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr "Vrienden van vrienden (FOAF)"
 
 #: lib/galleryaction.php:121
 msgid "Filter tags"
-msgstr ""
+msgstr "Labels filteren"
 
 #: lib/galleryaction.php:131
 msgid "All"
-msgstr ""
+msgstr "Alle"
+
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
+msgstr "Selecteer een label om op te filteren"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:140
 msgid "Tag"
-msgstr ""
+msgstr "Label"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
-msgstr ""
+msgstr "Kies een label om de lijst kleiner te maken"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:143
 msgid "Go"
-msgstr ""
+msgstr "OK"
 
-#: lib/groupeditform.php:148
-#, fuzzy
+#: lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
-msgstr "URL van je homepage, blog, of profiel op een andere site"
+msgstr "De URL van de thuispagina of de blog van de groep of het onderwerp"
 
-#: lib/groupeditform.php:151
-#, fuzzy
-msgid "Description"
-msgstr "Abonnementen"
+#: lib/groupeditform.php:168
+msgid "Describe the group or topic"
+msgstr "Beschrijf de groep of het onderwerp"
 
-#: lib/groupeditform.php:153
-#, fuzzy
-msgid "Describe the group or topic in 140 chars"
-msgstr "Beschrijf jezelf en je interesses in 140 tekens"
+#: lib/groupeditform.php:170
+#, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "Beschrijf de groep of het onderwerp in %d tekens"
 
-#: lib/groupeditform.php:158
-#, fuzzy
+#: lib/groupeditform.php:172
+msgid "Description"
+msgstr "Beschrijving"
+
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr "Waar je bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\""
-
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
-msgid "Group"
 msgstr ""
+"Locatie voor de groep - als relevant. Iets als \"Plaats, regio, land\"."
 
-#: lib/groupnav.php:100
-msgid "Admin"
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
+"Extra namen voor de groep, gescheiden door komma's of spaties. Maximaal %d."
+
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+msgid "Group"
+msgstr "Groep"
 
 #: lib/groupnav.php:101
+msgid "Blocked"
+msgstr "Geblokkeerd"
+
+#: lib/groupnav.php:102
+#, php-format
+msgid "%s blocked users"
+msgstr "%s geblokkeerde gebruikers"
+
+#: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
-msgstr ""
+msgstr "Eigenschappen van de groep %s bewerken"
 
-#: lib/groupnav.php:106
-#, fuzzy
+#: lib/groupnav.php:113
 msgid "Logo"
-msgstr "Uitloggen"
+msgstr "Logo"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:114
 #, php-format
 msgid "Add or edit %s logo"
-msgstr ""
+msgstr "Logo voor %s toevoegen of verwijderen"
+
+#: lib/groupnav.php:120
+#, php-format
+msgid "Add or edit %s design"
+msgstr "%s-ontwerp toevoegen of bewerken"
 
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
-msgstr ""
+msgstr "Groepen met de meeste leden"
 
 #: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
-msgstr ""
+msgstr "Groepen met de meeste berichten"
 
 #: lib/grouptagcloudsection.php:56
 #, php-format
 msgid "Tags in %s group's notices"
-msgstr ""
+msgstr "Labels in de groepsmededelingen van %s"
 
 #: lib/htmloutputter.php:104
-#, fuzzy
-msgid "This page is not available in a "
-msgstr "Deze pagina is niet beschikbaar in een mediatype dat jij accepteert"
+msgid "This page is not available in a media type you accept"
+msgstr "Deze pagina is niet beschikbaar in een mediatype dat u accepteert"
+
+#: lib/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Dat bestand is te groot. De maximale bestandsgrootte is %s."
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr "Gedeeltelijke upload."
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr "Er is een systeemfout opgetreden tijdens het uploaden van het bestand."
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr "Het bestand is geen afbeelding of het bestand is beschadigd."
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr "Niet ondersteund beeldbestandsformaat."
+
+#: lib/imagefile.php:118
+msgid "Lost our file."
+msgstr "Het bestand is zoekgeraakt."
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr "Onbekend bestandstype"
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr "[%s]"
 
 #: lib/joinform.php:114
-#, fuzzy
 msgid "Join"
-msgstr "Inloggen"
+msgstr "Toetreden"
 
 #: lib/leaveform.php:114
-#, fuzzy
 msgid "Leave"
-msgstr "Opslaan"
+msgstr "Verlaten"
 
-#: lib/logingroupnav.php:76
-#, fuzzy
+#: lib/logingroupnav.php:80
 msgid "Login with a username and password"
-msgstr "Ongeldige gebruikersnaam of wachtwoord."
+msgstr "Aanmelden met gebruikersnaam en wachtwoord"
 
-#: lib/logingroupnav.php:79
-#, fuzzy
+#: lib/logingroupnav.php:86
 msgid "Sign up for a new account"
-msgstr "Maak een nieuw account aan"
+msgstr "Nieuwe gebruiker aanmaken"
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "Gebruikers kunnen alleen hun eigen postvakken lezen."
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
 msgstr ""
+"U hebt geen privéberichten. U kunt privéberichten verzenden aan andere "
+"gebruikers. Mensen kunnen u privéberichten sturen die alleen u kunt lezen."
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+msgid "from"
+msgstr "van"
+
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "E-mailadresbevestiging"
 
-#: lib/mail.php:175
+#: lib/mail.php:174
 #, php-format
 msgid ""
 "Hey, %s.\n"
 "\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%s\n"
+"\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
 msgstr ""
+"Hallo %s.\n"
+"\n"
+"Iemand heeft zojuist dit e-mailadres ingegeven op %s.\n"
+"\n"
+"Als u dit was, en als u uw ingave wilt bevestigen, gebruik dan de "
+"onderstaande URL:\n"
+"\n"
+"%s\n"
+"\n"
+"Als u het bovenstaande niet herkent, negeer dit bericht dan.\n"
+"\n"
+"Dank u wel voor uw tijd.\n"
+"%s\n"
+
+#: lib/mail.php:235
+#, php-format
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr "%1$s volgt nu uw berichten %2$s."
 
-#: lib/mail.php:236
-#, fuzzy, php-format
-msgid "%1$s is now listening to "
-msgstr "%1$s volgt nu je berichten op %2$s."
+#: lib/mail.php:240
+#, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
+"%1$s volgt nu uw medelingen op %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"\n"
+"Met vriendelijke groet,\n"
+"%7$s.\n"
+"----\n"
+"Wijzig uw e-mailadres of instellingen op %8$s\n"
 
-#: lib/mail.php:254
-#, fuzzy, php-format
+#: lib/mail.php:253
+#, php-format
 msgid "Location: %s\n"
 msgstr "Locatie: %s\n"
 
-#: lib/mail.php:256
-#, fuzzy, php-format
+#: lib/mail.php:255
+#, php-format
 msgid "Homepage: %s\n"
-msgstr "Homepage: %s\n"
+msgstr "Thuispagina: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
 "\n"
 msgstr ""
+"Beschrijving: %s\n"
+"\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:285
 #, php-format
-msgid "You've been nudged by %s"
-msgstr ""
+msgid "New email address for posting to %s"
+msgstr "Nieuw e-mailadres om e-mail te versturen aan %s"
 
-#: lib/mail.php:465
+#: lib/mail.php:288
 #, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
+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 ""
+"U hebt een nieuw postadres op %1$s.\n"
+"\n"
+"Zend een e-mail naar %2$s om nieuwe berichten te versturen.\n"
+"\n"
+"Meer informatie over e-mailen vindt u op %3$s.\n"
+"\n"
+"Met vriendelijke groet,\n"
+"%4$s"
 
-#: lib/mail.php:555
-#, fuzzy, php-format
-msgid "%1$s just added your notice from %2$s"
-msgstr "%1$s volgt nu je berichten op %2$s."
+#: lib/mail.php:412
+#, php-format
+msgid "%s status"
+msgstr "%s status"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
-#, fuzzy
-msgid "From"
-msgstr " van "
+#: lib/mail.php:438
+msgid "SMS confirmation"
+msgstr "SMS-bevestiging"
 
-#: lib/messageform.php:110
-msgid "Send a direct notice"
+#: lib/mail.php:462
+#, php-format
+msgid "You've been nudged by %s"
+msgstr "%s heeft u gepord"
+
+#: lib/mail.php:466
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
 msgstr ""
+"%1$s (%2$s) vraagt zich af wat u tegenwoordig doet en nodigt u uit om dat te "
+"delen.\n"
+"\n"
+"Laat dus iets van u horen!\n"
+"\n"
+"%3$s\n"
+"\n"
+"Schrijf geen antwoord op deze e-mail. Die komt niet aan bij de juiste "
+"gebruiker.\n"
+"\n"
+"Met vriendelijke groet,\n"
+"%4$s\n"
 
-#: lib/noticeform.php:125
-#, fuzzy
-msgid "Send a notice"
-msgstr "Nieuw bericht"
+#: lib/mail.php:509
+#, php-format
+msgid "New private message from %s"
+msgstr "U hebt een nieuw privébericht van %s."
 
-#: lib/noticeform.php:152
-#, fuzzy
-msgid "Available characters"
-msgstr "6 of meer tekens"
+#: lib/mail.php:513
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%5$s\n"
+msgstr ""
+"%1$s (%2$s) heeft u een privébericht gezonden:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"Hier kunt u antwoorden:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Schrijf geen antwoord op deze e-mail. Die komt niet aan bij de juiste "
+"gebruiker.\n"
+"\n"
+"Met vriendelijke groet,\n"
+"%5$s\n"
 
-#: lib/noticelist.php:426
-#, fuzzy
-msgid "in reply to"
-msgstr "in antwoord op"
+#: lib/mail.php:554
+#, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s (@%s) heeft uw mededeling als favoriet toegevoegd"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
-msgid "Reply to this notice"
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
 msgstr ""
+"%1$s (@%7$s) heeft uw mededeling van %2$s zojuist op de favorietenlijst "
+"geplaatst.\n"
+"\n"
+"De URL van uw mededeling is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"De inhoud van uw mededeling luidt:\n"
+"\n"
+"%4$s\n"
+"\n"
+"U kunt de favorietenlijst van %1$s via de volgende verwijzing bekijken:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Met vriendelijke groet,\n"
+"%6$s\n"
 
-#: lib/noticelist.php:451
-#, fuzzy
-msgid "Reply"
-msgstr "antwoord"
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr "%s (@%s) heeft u een mededeling gestuurd"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
-msgid "Delete this notice"
+#: lib/mail.php:613
+#, php-format
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
 msgstr ""
+"%1$s (@%9$s) heeft u een bericht gezonden (een antwoord met \"@\") op %2$s.\n"
+"\n"
+"De mededeling staat hier:\n"
+"\n"
+"%3$s\n"
+"\n"
+"De inhoud is:\n"
+"\n"
+"%4$s\n"
+"\n"
 
-#: lib/noticelist.php:474
-msgid "Delete"
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+"Er is een databasefout opgetreden tijdens het opslaan van uw bestand. "
+"Probeer het alstublieft opnieuw."
+
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
+"Het te uploaden bestand is groter dan de ingestelde upload_max_filesize in "
+"php.ini."
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+"Het te uploaden bestand is groter dan de ingestelde MAX_FILE_SIZE in het "
+"HTML-formulier."
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr "De upload is slechts gedeeltelijk voltooid."
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr "De tijdelijke map is niet aanwezig."
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr "Het was niet mogelijk naar schijf te schrijven."
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr "Het uploaden van het bestand is tegengehouden door een uitbreiding."
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr "Met dit bestand wordt het quotum van de gebruiker overschreden!"
+
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr "Het bestand kon niet verplaatst worden naar de doelmap."
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+msgid "Could not determine file's mime-type!"
+msgstr "Het was niet mogelijk het MIME-type van het bestand te bepalen!"
+
+#: lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr " Probeer een ander %s-formaat te gebruiken."
+
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr "Het bestandstype %s wordt door deze server niet ondersteund."
+
+#: lib/messageform.php:120
+msgid "Send a direct notice"
+msgstr "Directe mededeling verzenden"
+
+#: lib/messageform.php:146
+msgid "To"
+msgstr "Aan"
+
+#: lib/messageform.php:162 lib/noticeform.php:173
+msgid "Available characters"
+msgstr "Beschikbare tekens"
+
+#: lib/noticeform.php:145
+msgid "Send a notice"
+msgstr "Mededeling verzenden"
+
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
+msgstr "Hallo, %s."
+
+#: lib/noticeform.php:180
+msgid "Attach"
+msgstr "Toevoegen"
+
+#: lib/noticeform.php:184
+msgid "Attach a file"
+msgstr "Bestand toevoegen"
+
+#: lib/noticelist.php:478
+msgid "in context"
+msgstr "in context"
+
+#: lib/noticelist.php:498
+msgid "Reply to this notice"
+msgstr "Op deze mededeling antwoorden"
+
+#: lib/noticelist.php:499
+msgid "Reply"
+msgstr "Antwoorden"
 
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
-msgstr ""
+msgstr "Deze gebruiker porren"
 
 #: lib/nudgeform.php:128
 msgid "Nudge"
-msgstr ""
+msgstr "Porren"
 
 #: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
+msgstr "Deze gebruiker porren"
+
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "Er is een fout opgetreden tijdens het invoegen van een nieuw profiel"
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "Er is een fout opgetreden bij het toevoegen van de avatar"
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
 msgstr ""
+"Er is een fout opgetreden tijdens het invoegen in het profiel op afstand."
+
+#: lib/oauthstore.php:345
+msgid "Duplicate notice"
+msgstr "Kennisgeving van duplicaat"
+
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
+msgstr "Kon nieuw abonnement niet toevoegen."
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "Persoonlijk"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "Antwoorden"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr "Favorieten"
+
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr "Gebruiker"
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr "Postvak IN"
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr "Uw inkomende berichten"
+
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr "Postvak UIT"
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr "Uw verzonden berichten"
 
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
-msgstr ""
+msgstr "Labels in de mededelingen van %s"
 
-#: lib/profilelist.php:182
-msgid "(none)"
-msgstr ""
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "Abonnementen"
+
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "Alle abonnementen"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "Abonnees"
+
+#: lib/profileaction.php:157
+msgid "All subscribers"
+msgstr "Alle abonnees"
+
+#: lib/profileaction.php:177
+msgid "User ID"
+msgstr "Gebruikers-ID"
+
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "Lid sinds"
 
-#: lib/publicgroupnav.php:76
+#: lib/profileaction.php:235
+msgid "All groups"
+msgstr "Alle groepen"
+
+#: lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Openbaar"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:82
 msgid "User groups"
-msgstr ""
+msgstr "Gebruikersgroepen"
 
-#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
-msgstr ""
+msgstr "Recente labels"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:88
 msgid "Featured"
-msgstr ""
+msgstr "Uitgelicht"
 
-#: lib/publicgroupnav.php:90
-#, fuzzy
+#: lib/publicgroupnav.php:92
 msgid "Popular"
-msgstr "Personen zoeken"
+msgstr "Populair"
+
+#: lib/searchaction.php:120
+msgid "Search site"
+msgstr "Site doorzoeken"
+
+#: lib/searchaction.php:162
+msgid "Search help"
+msgstr "Hulp bij zoeken"
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "Gebruikers"
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr "Gebruikers op deze site vinden"
 
 #: lib/searchgroupnav.php:82
-#, fuzzy
 msgid "Notice"
-msgstr "Berichten"
+msgstr "Mededeling"
+
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr "Inhoud van mededelingen vinden"
 
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
-msgstr ""
+msgstr "Groepen op deze site vinden"
 
 #: lib/section.php:89
 msgid "Untitled section"
-msgstr ""
+msgstr "Naamloze sectie"
 
-#: lib/subgroupnav.php:81
-#, fuzzy, php-format
+#: lib/section.php:106
+msgid "More..."
+msgstr "Meer..."
+
+#: lib/subgroupnav.php:83
+#, php-format
 msgid "People %s subscribes to"
-msgstr "Abonneren op afstand"
+msgstr "Gebruikers waarop %s een abonnement heeft"
 
-#: lib/subgroupnav.php:89
-#, fuzzy, php-format
+#: lib/subgroupnav.php:91
+#, php-format
 msgid "People subscribed to %s"
-msgstr "Abonneren op afstand"
+msgstr "Gebruikers met een abonnement op %s"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
+msgstr "Groepen waar %s lid van is"
+
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
 msgstr ""
 
-#: lib/subgroupnav.php:104
-#, php-format
-msgid "Invite friends and colleagues to join you on %s"
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
 msgstr ""
 
-#: lib/subs.php:53
-#, fuzzy
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(geen)"
+
+#: lib/subs.php:48
+msgid "Already subscribed!"
+msgstr "U bent al gebonneerd!"
+
+#: lib/subs.php:52
 msgid "User has blocked you."
-msgstr "De gebruiker heeft je geblokkeerd."
+msgstr "Deze gebruiker negeert u."
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Abonnement geautoriseerd"
+#: lib/subs.php:56
+msgid "Could not subscribe."
+msgstr "Kan niet abonneren "
+
+#: lib/subs.php:75
+msgid "Could not subscribe other to you."
+msgstr "Het was niet mogelijk om een ander op u te laten abonneren"
+
+#: lib/subs.php:124
+msgid "Not subscribed!"
+msgstr "Niet geabonneerd!"
+
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
+msgstr "Kon abonnement niet verwijderen."
 
 #: lib/tagcloudsection.php:56
 msgid "None"
@@ -4893,37 +4866,106 @@ msgstr "Geen"
 
 #: lib/topposterssection.php:74
 msgid "Top posters"
-msgstr ""
-
-#: lib/unblockform.php:120 lib/unblockform.php:150
-msgid "Unblock this user"
-msgstr "Deblokkeer deze gebruiker."
-
-#: lib/unblockform.php:150
-msgid "Unblock"
-msgstr "Deblokkeer"
+msgstr "Meest actieve gebruikers"
 
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Uitschrijven van deze gebruiker"
 
-#, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "Maak een nieuw account aan"
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "Abonnement opheffen"
+
+#: lib/userprofile.php:116
+msgid "Edit Avatar"
+msgstr "Avatar bewerken"
+
+#: lib/userprofile.php:236
+msgid "User actions"
+msgstr "Gebruikershandelingen"
+
+#: lib/userprofile.php:248
+msgid "Edit profile settings"
+msgstr "Profielinstellingen bewerken"
+
+#: lib/userprofile.php:249
+msgid "Edit"
+msgstr "Bewerken"
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "Kon e-mail niet bevestigen."
+#: lib/userprofile.php:272
+msgid "Send a direct message to this user"
+msgstr "Deze gebruiker een direct bericht zenden"
 
-#~ msgid "Email address"
-#~ msgstr "E-mailadres"
+#: lib/userprofile.php:273
+msgid "Message"
+msgstr "Bericht"
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Fout bij toevoegen bericht"
+#: lib/util.php:821
+msgid "a few seconds ago"
+msgstr "een paar seconden geleden"
+
+#: lib/util.php:823
+msgid "about a minute ago"
+msgstr "ongeveer een minuut geleden"
 
-#~ 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 ""
-#~ "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."
+#: lib/util.php:825
+#, php-format
+msgid "about %d minutes ago"
+msgstr "ongeveer %d minuten geleden"
+
+#: lib/util.php:827
+msgid "about an hour ago"
+msgstr "ongeveer een uur geleden"
+
+#: lib/util.php:829
+#, php-format
+msgid "about %d hours ago"
+msgstr "ongeveer %d uur geleden"
+
+#: lib/util.php:831
+msgid "about a day ago"
+msgstr "ongeveer een dag geleden"
+
+#: lib/util.php:833
+#, php-format
+msgid "about %d days ago"
+msgstr "ongeveer %d dagen geleden"
+
+#: lib/util.php:835
+msgid "about a month ago"
+msgstr "ongeveer een maand geleden"
+
+#: lib/util.php:837
+#, php-format
+msgid "about %d months ago"
+msgstr "ongeveer %d maanden geleden"
+
+#: lib/util.php:839
+msgid "about a year ago"
+msgstr "ongeveer een jaar geleden"
+
+#: lib/webcolor.php:82
+#, php-format
+msgid "%s is not a valid color!"
+msgstr "%s is geen geldige kleur."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr "%s is geen geldige kleur. Gebruik drie of zes hexadecimale tekens."
+
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr "Het was niet mogelijk het bericht te verwerken."
+
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr "Geen geregistreerde gebruiker"
+
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr "Dit is niet uw inkomende e-mailadres."
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr "Inkomende e-mail is niet toegestaan."
diff --git a/locale/nn/LC_MESSAGES/statusnet.mo b/locale/nn/LC_MESSAGES/statusnet.mo
index 7dbde4019..abb9b6191 100644
--- a/locale/nn/LC_MESSAGES/statusnet.mo
+++ b/locale/nn/LC_MESSAGES/statusnet.mo
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index 4da276adb..7dcdcb0df 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -1,4218 +1,2992 @@
-# nn_NO translation of StatusNet.
-#
+# Translation of StatusNet to Norwegian Nynorsk
 #
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: StatusNet 0.6.3\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-03-16 18:52+0000\n"
-"Last-Translator: Simon Hansen <simonboba@gmail.com>\n"
-"Language-Team: Norwegian/Nynorsk <i18n-nn@lister.ping.uio.no>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:54+0000\n"
+"Language-Team: Norwegian Nynorsk\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
-
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
-#, php-format
-msgid " Search Stream for \"%s\""
-msgstr " Søkestraum for «%s»"
-
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-#: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
-msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr ""
-" unnateke privatdata: passord, epostadresse, ljonmeldingsadresse og "
-"telefonnummer."
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr " frå "
-
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr "%1$s / Oppdateringar som svarar til %2$s"
-
-#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s har invitert deg til %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 ""
-"%$1s har invitert deg til %2$s (%3$s).\n"
-"\n"
-"%$2s er ei mikrobloggingteneste som let deg halda deg oppdatert på folk du "
-"kjenner og/eller som interesserer deg.\n"
-"\n"
-"Du kan òg dela nyhende om deg sjølv, dine tankar eller livet ditt på nettet "
-"med folk som kjenner til deg. Det er supert for å møte nye folk med like "
-"interesser.\n"
-"\n"
-"%1$s sa:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Du kan sjå profilsida til %1$s på %2$s her:\n"
-"\n"
-"%5$s\n"
-"\n"
-"Viss du vil prøva tenesta, klikk på lenka nedanfor for å akseptera "
-"invitasjonen.\n"
-"\n"
-"Beste helsing, %2$s\n"
-
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s høyrer no på notisane dine 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 fylgjer no oppdateringane dine på %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Beste helsing,\n"
-"%4$s.\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: nn\n"
+"X-Message-Group: out-statusnet\n"
 
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "%1$s oppdateringar som svarar på oppdateringar frå %2$s / %3$s."
-
-#: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr "%1$s sin status på %2$s"
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "Dette emneord finst ikkje."
 
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
-#, php-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
+msgstr "Brukaren finst ikkje."
 
-#: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/all.php:84
 #, php-format
-msgid "%s Public Stream"
-msgstr "%s offentlege straum"
+msgid "%s and friends, page %d"
+msgstr "%s med vener, side %d"
 
-#: ../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
-#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s med vener"
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
-#, php-format
-msgid "%s public timeline"
-msgstr "%s offentleg tidsline"
+#: actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Straum for vener av %s"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
-#, php-format
-msgid "%s status"
-msgstr "%s status"
+#: actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Straum for vener av %s"
 
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
-#, php-format
-msgid "%s timeline"
-msgstr "%s tidsline"
+#: actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Straum for vener av %s"
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/all.php:127
 #, php-format
-msgid "%s updates from everyone!"
-msgstr "%s oppdateringar frå alle saman!"
-
-#: ../actions/register.php:213
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
-"(Du mottek ein epost med instruksjonar på korleis du stadfester epostadressa "
-"di)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: actions/all.php:132
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
 msgstr ""
-"**%%site.name%%** er ei mikrobloggingteneste av [%%site.broughtby%%](%%site."
-"broughtbyurl%%). "
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
-#, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** er ei mikrobloggingteneste. "
-
-#: ../lib/util.php:274 lib/util.php:290
-msgid ". Contributors should be attributed by full name or nickname."
-msgstr ". Bidrag skal verta fylgd av fullt namn eller kallenamn."
-
-#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
-#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-"1-64 små bokstavar eller tal, ingen punktum (og liknande) eller mellomrom"
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 små bokstavar eller tal, ingen punktum (og liknande) eller mellomrom. "
-"Kravd."
-
-#: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr "6 eller fleire teikn"
-
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
-msgid "6 or more characters, and don't forget it!"
-msgstr "6 eller fleire teikn, og ikkje gløym dei."
-
-#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
-msgid "6 or more characters. Required."
-msgstr "6 eller fleire teikn. Kravd."
-
-#: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/all.php:134
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
-"Sendte godkjenningskode til ljonmeldingsadressa du la til. Du må godtaka %s "
-"for å senda meldinger til deg."
-
-#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
-msgstr ""
-"Sendte godkjenningskode til epostadressa du la til. Sjekk innboksen (og "
-"søppelpostboksen) for koden og veiledning på korleis du nyttar han."
 
-#: ../actions/smssettings.php:216 actions/smssettings.php:224
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#, php-format
 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."
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
 msgstr ""
-"Sende godkjenningskode til telefonnummeret du la til. Sjekk innboksen for "
-"koden og veiledning på korleis du nyttar han."
-
-#: ../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 actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
-msgid "API method not found!"
-msgstr "Fann ikkje API-metode."
-
-#: ../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 actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
-msgid "API method under construction."
-msgstr "API-metoden er ikkje ferdig enno."
-
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
-msgid "About"
-msgstr "Om"
-
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
-msgid "Accept"
-msgstr "Godta"
-
-#: ../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 actions/emailsettings.php:120
-#: actions/imsettings.php:127 actions/openidsettings.php:111
-#: actions/smssettings.php:133 actions/twittersettings.php:163
-msgid "Add"
-msgstr "Legg til"
 
-#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
-msgstr "Legg til OpenID"
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-msgid "Add or remove OpenIDs"
-msgstr "Legg/fjern OpenID-er"
-
-#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39 actions/emailsettings.php:39
-#: actions/imsettings.php:40 actions/smssettings.php:39
-#: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
-msgstr "Adresse"
-
-#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-msgid "Addresses of friends to invite (one per line)"
-msgstr "Venene sine adresser for invitasjon (ei per line)"
-
-#: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
-msgid "All subscriptions"
-msgstr "Alle tingingar"
-
-#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
-#, php-format
-msgid "All updates for %s"
-msgstr "Alle oppdateringar for %s"
+#: actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s med vener"
 
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
 #, php-format
-msgid "All updates matching search term \"%s\""
-msgstr "Alle oppdateringer frå søket «%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
-#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
-msgid "Already logged in."
-msgstr "Allereie logga inn."
-
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
-msgid "Already subscribed!."
-msgstr "Allereie tinga!"
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
-msgid "Are you sure you want to delete this notice?"
-msgstr "Sikker på at du vil sletta notisen?"
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr "Oppdateringar frå %1$s og vener på %2$s!"
 
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
-msgid "Authorize subscription"
-msgstr "Autoriser tinging"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
+msgstr "Fann ikkje API-metode."
 
-#: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
-msgid "Automatically login in the future; not for shared computers!"
-msgstr "Logg inn automatisk i framtidi (ikkje for delte maskiner)."
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
+msgstr "Dette krev ein POST."
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/apiaccountupdatedeliverydevice.php:105
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
 msgstr ""
-"Automatisk ting notisane til dei som tingar mine (best for ikkje-menneskje)"
 
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34 actions/avatarsettings.php:65
-#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
-msgid "Avatar"
-msgstr "Brukarbilete"
-
-#: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
-msgid "Avatar updated."
-msgstr "Lasta opp brukarbilete."
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Kan ikkje oppdatera brukar."
 
-#: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
 #, 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?)"
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
 msgstr ""
-"Venter på godkjenning. Sjekk din Jabber/GTalk-konto for ei melding med "
-"instruksjonar (la du %s til venelista di?)"
-
-#: ../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 ""
-"Ventar på godkjenning. Sjekk innboksen (og søppelpostboksen) for ei melding "
-"med instruksjonar."
-
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
-msgid "Awaiting confirmation on this phone number."
-msgstr "Ventar på godkjenning for dette telefonnummeret."
-
-#: ../lib/util.php:1318 lib/util.php:1452
-msgid "Before »"
-msgstr "Før »"
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
-#: actions/profilesettings.php:82 actions/register.php:184
-#: actions/profilesettings.php:112 actions/register.php:402
-msgid "Bio"
-msgstr "Om meg"
-
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
-#: actions/register.php:89 actions/updateprofile.php:104
-#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
-msgid "Bio is too long (max 140 chars)."
-msgstr "«Om meg» er for lang (maks 140 "
-
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
-msgid "Can't delete this notice."
-msgstr "Kan ikkje sletta notisen."
-
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
-#, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr "Kan ikkje lesa brukarbilete-URL «%s»"
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404 actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-msgid "Can't save new password."
-msgstr "Klarar ikkje lagra nytt passord."
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Kan ikkje oppdatera brukar."
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62 actions/emailsettings.php:58
-#: actions/imsettings.php:59 actions/smssettings.php:62
-#: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
-msgstr "Avbryt"
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Brukaren har inga profil."
 
-#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Klarte ikkje laga OpenID-objekt."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Kan ikkje lagra profil."
 
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
-msgstr "Klarar ikkje normalisera Jabber-IDen"
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
+msgstr "Blokkering av brukar feila."
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
-msgid "Cannot normalize that email address"
-msgstr "Klarar ikkje normalisera epostadressa"
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
+msgstr "De-blokkering av brukar feila."
 
-#: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
-msgstr "Endra"
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "Inga meldingstekst!"
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
-msgstr "Endra eposthandtering"
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Det er for langt. Ein notis kan berre være 140 teikn."
 
-#: ../actions/password.php:32 actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr "Endra passord"
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "Kunne ikkje finne mottakar."
 
-#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
-msgid "Change your password"
-msgstr "Endra passordet ditt"
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr "Kan ikkje senda direktemeldingar til brukarar som du ikkje er ven med."
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-msgid "Change your profile settings"
-msgstr "Endra profilinnstillingane dine"
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "Direkte meldingar til %s"
 
-#: ../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
-#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
-#: actions/register.php:376 actions/smssettings.php:122
-msgid "Confirm"
-msgstr "Godta"
+#: actions/apidirectmessage.php:93
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr "Alle direkte meldingar sendt fra %s"
 
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "Stadfest adresse"
+#: actions/apidirectmessage.php:101
+#, php-format
+msgid "Direct messages to %s"
+msgstr "Direkte meldingar til %s"
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245 actions/emailsettings.php:256
-#: actions/imsettings.php:230 actions/smssettings.php:253
-#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
-msgid "Confirmation cancelled."
-msgstr "Stadfesting avbrutt."
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr "Alle direkte meldingar sendt til %s"
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
-msgid "Confirmation code"
-msgstr "Stadfestingskode"
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "Fann ikkje API-metode."
 
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-msgid "Confirmation code not found."
-msgstr "Fann ikkje stadfestingskode."
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
+msgstr "Fann ingen status med den ID-en."
 
-#: ../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 ""
-"Gratulerer, %s! Og velkomen til %%%%site.name%%%%. Frå her kann det henda du "
-"vil...\n"
-"\n"
-"* Gå til [profilen din](%s) og skriva den fyrste meldinga.\n"
-"* Leggja til ei [Jabber/GTalk adresse](%%%%action.imsettings%%%%) so du kann "
-"laga nye meldingar ved hjelp av direktemeldingar.\n"
-"* [Søkje etter folk](%%%%action.profilesettings%%%%) det kan hende du "
-"kjenner, eller som du delar interesser med.\n"
-"* Uppdatere dine [profilval] so du kann fortelja andre meir um deg sjølv.* "
-"Lesa [hjelpetekstane](%%%%doc.help%%%%) for å finna ut meir um funksjonar du "
-"kann ha gådd glipp av.\n"
-"\n"
-"Takk for at du blei med, og vi håpar du vil lika tenesta!"
+#: actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+msgstr "Denne notisen er alt ein favoritt!"
 
-#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
-msgid "Connect"
-msgstr "Kopla til"
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+msgstr "Kunne ikkje lagre favoritt."
 
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
-msgid "Connect existing account"
-msgstr "Kopla til eksisterande konto"
+#: actions/apifavoritedestroy.php:122
+#, fuzzy
+msgid "That status is not a favorite!"
+msgstr "Denne notisen er ikkje ein favoritt!"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
-msgid "Contact"
-msgstr "Kontakt"
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr "Kunne ikkje slette favoritt."
 
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
-#, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "Kunne ikkje laga OpenID-form: %s"
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
+msgstr "Fann ikkje brukaren, so han kan ikkje fylgjast"
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Kan ikkje fylgja brukar: %s er allereie på lista di."
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
-msgid "Could not follow user: User not found."
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
 msgstr "Fann ikkje brukaren, so han kan ikkje fylgjast"
 
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Klarte ikkje å omdirigera til tenaren: %s"
-
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
-msgid "Could not save avatar info"
-msgstr "Kan ikkje lagra brukarbilete-informasjon"
-
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
-msgid "Could not save new profile info"
-msgstr "Kan ikkje lagra ny profilinfo"
-
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
-msgid "Could not subscribe other to you."
-msgstr "Kan ikkje tinga andre til deg."
-
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
-msgid "Could not subscribe."
-msgstr "Kan ikkje tinga."
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
-msgstr "Kan ikkje oppdatera brukar med stadfesta e-postadresse."
-
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-msgid "Couldn't convert request tokens to access tokens."
-msgstr "Kan ikkje konvertera spyrjebillett til tilgongsbillett."
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+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
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-msgid "Couldn't delete email confirmation."
-msgstr "Kan ikkje sletta e-postgodkjenning."
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
+msgstr "To brukar IDer eller kallenamn er naudsynte."
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
-msgid "Couldn't delete subscription."
-msgstr "Kan ikkje sletta tinging."
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Kan ikkje hente offentleg straum."
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
-msgid "Couldn't find any statuses."
+#: actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
 msgstr "Kan ikkje finna einkvan status."
 
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-msgid "Couldn't get a request token."
-msgstr "Fekk ikkje spørjingsbillett (request token)."
-
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206 actions/emailsettings.php:223
-#: actions/imsettings.php:195 actions/smssettings.php:214
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
-msgid "Couldn't insert confirmation code."
-msgstr "Kan ikkje leggja til godkjenningskode."
-
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
-msgstr "Kan ikkje leggja til ny tinging."
-
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-msgid "Couldn't save profile."
-msgstr "Kan ikkje lagra profil."
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
-msgstr "Kan ikkje oppdatera brukar for automatisk tinging."
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
-msgid "Couldn't update user record."
-msgstr "Kan ikkje oppdatera brukarinformajon."
-
-#: ../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
-#: actions/confirmaddress.php:114 actions/emailsettings.php:280
-#: actions/emailsettings.php:411 actions/imsettings.php:252
-#: actions/imsettings.php:395 actions/othersettings.php:162
-#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
-msgid "Couldn't update user."
-msgstr "Kan ikkje oppdatera brukar."
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
+msgid "Could not create group."
+msgstr "Kunne ikkje laga gruppa."
 
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
-msgid "Create"
-msgstr "Lag"
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Kunne ikkje lagre favoritt."
 
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
-msgid "Create a new user with this nickname."
-msgstr "Lag ei ny brukar med dette kallenamnet."
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+msgid "Could not set group membership."
+msgstr "Kunne ikkje bli med i gruppa."
 
-#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
-msgid "Create new account"
-msgstr "Opprett ny konto"
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "Kallenamn må berre ha små bokstavar og nummer, ingen mellomrom."
 
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
-msgid "Creating new account for OpenID that already has a user."
-msgstr "Oppretter ny konto for OpenID som allereie har ein brukar."
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
 
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "Stadfesta Jabber/Gtalk-adresse."
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "Ikkje eit gyldig brukarnamn."
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "Godkjent mobiltelefonnummer."
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "Heimesida er ikkje ei gyldig internettadresse."
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-msgid "Current confirmed email address."
-msgstr "Godkjent epostadresse."
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
 
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
-msgstr "Noverande"
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "skildringa er for lang (maks 140 teikn)."
 
-#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s"
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "Plassering er for lang (maksimalt 255 teikn)."
 
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
 #, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Databasefeil, kan ikkje lagra svar: %s"
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
-msgid "Delete notice"
-msgstr "Slett notis"
-
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "Skriv om deg og interessene dine med 140 teikn"
-
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87 actions/register.php:172
-#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
-#: actions/register.php:385 lib/accountsettingsaction.php:113
-msgid "Email"
-msgstr "Epost"
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-msgid "Email Address"
-msgstr "Epostadresse"
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
-msgstr "Epostinnstillingar"
-
-#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-msgid "Email address already exists."
-msgstr "Epostadressa finst allereie."
-
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
-msgid "Email address confirmation"
-msgstr "Stadfesting av epostadresse"
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
-msgstr "Epostadresse («brukarnamn@example.org»)"
-
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-msgid "Email addresses"
-msgstr "Epostadresser"
+msgid "Too many aliases! Maximum %d."
+msgstr ""
 
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
-msgid "Enter a nickname or email address."
-msgstr "Skriv inn kallenamn eller epostadresse."
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Ugyldig merkelapp: %s"
 
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
-msgstr "Skriv inn koden du fekk på telefonen."
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
 
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
-msgid "Error authorizing token"
-msgstr "Feil ved godkjenning av billett."
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
-msgid "Error connecting user to OpenID."
-msgstr "Feil ved kopling av brukar til OpenID."
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Du er allereie medlem av den gruppa"
 
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
-msgstr "Feil ved å kopla til brukar."
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
-msgstr "Feil med innhenting av brukarbilete."
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Kunne ikkje melde brukaren %s inn i gruppa %s"
 
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
-msgstr "Feil med å henta inn ny profil"
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Du er ikkje medlem av den gruppa."
 
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
-msgstr "Feil med å henta inn ekstern profil"
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Kunne ikkje fjerne %s fra %s gruppa "
 
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
-msgid "Error saving address confirmation."
-msgstr "Feil med lagring av adressestadfesting."
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "%s grupper"
 
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
-msgid "Error saving remote profile"
-msgstr "Feil med lagring av ekstern profil"
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Gruppe handlingar"
 
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-msgid "Error saving the profile."
-msgstr "Feil ved lagring av profil"
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "%s grupper"
 
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-msgid "Error saving the user."
-msgstr "Feil ved lagring av brukar"
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Grupper %s er medlem av"
 
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
-msgid "Error saving user; invalid."
-msgstr "Feil ved lagring av brukar; fungerer ikkje."
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
+msgstr "Dette krev anten ein POST eller DELETE."
 
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
-#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
-#: actions/register.php:108 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-msgid "Error setting user."
-msgstr "Feil ved å setja brukar."
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
+msgstr "Du kan ikkje sletta statusen til ein annan brukar."
 
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr "Feil ved oppdatering av profil"
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "Lasta opp brukarbilete."
 
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
-msgstr "Feil ved oppdatering av ekstern profil"
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
+msgstr "Fann ingen status med den ID-en."
 
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr "Feil med stadfestingskode."
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "Det er for langt! Ein notis kan berre innehalde 140 teikn."
 
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
-msgid "Existing nickname"
-msgstr "Kallenamnet eksisterer"
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
+msgstr "Fann ikkje"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
-msgid "FAQ"
-msgstr "OSS"
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
 
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
-msgid "Failed updating avatar."
-msgstr "Feil ved oppdatering av brukarbilete."
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Støttar ikkje bileteformatet."
 
-#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/apitimelinefavorites.php:107
 #, php-format
-msgid "Feed for friends of %s"
-msgstr "Straum for vener av %s"
+msgid "%s / Favorites from %s"
+msgstr "%s / Favorittar frå %s"
 
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/apitimelinefavorites.php:119
 #, php-format
-msgid "Feed for replies to %s"
-msgstr "Straum for svar til %s"
+msgid "%s updates favorited by %s / %s."
+msgstr "%s oppdateringar favorisert av %s / %s."
 
-#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
-msgid "Feed for tag %s"
-msgstr "Straum for merkelapp %s"
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
-msgstr "Søk i innhaldet av notisar"
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
-msgstr "Finn folk på denne sida"
-
-#: ../actions/login.php:122
-msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
-msgstr ""
-"Skriv inn brukarnam og passord før du endrar innstillingar (av "
-"tryggleiksomsyn)."
-
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
-#: actions/profilesettings.php:77 actions/register.php:178
-#: actions/profilesettings.php:103 actions/register.php:391
-#: actions/showgroup.php:235 actions/showstream.php:262
-#: actions/tagother.php:105 lib/groupeditform.php:142
-msgid "Full name"
-msgstr "Fullt namn"
-
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
-#: actions/register.php:86 actions/updateprofile.php:94
-#: actions/editgroup.php:195 actions/newgroup.php:146
-#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
-msgid "Full name is too long (max 255 chars)."
-msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
-
-#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
-msgid "Help"
-msgstr "Hjelp"
-
-#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
-msgid "Home"
-msgstr "Heim"
-
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
-msgid "Homepage"
-msgstr "Heimeside"
-
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
-msgid "Homepage is not a valid URL."
-msgstr "Heimesida er ikkje ei gyldig internettadresse."
-
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
-msgid "I want to post notices by email."
-msgstr "Eg vil senda notisar med epost."
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
-msgstr "Ljonmelding"
-
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
-msgstr "Ljonmeldingadresse"
-
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
-msgstr "Ljonmeldinginnstillingar"
-
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
-msgstr ""
-"Logg inn med brukarnanm/passord for å kopla brukaren til OpenID-en, viss du "
-"allereie har ein brukar"
-
-#: ../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 ""
-"Skriv OpenID-en din i boksen nedanfor og trykk «Legg til» om du ynskjer å "
-"leggja han til."
-
-#: ../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 ""
-"Me sender deg eit nytt passord til epostadressa i kontoen din viss du har "
-"mista det gamle."
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-#: actions/emailsettings.php:127 actions/smssettings.php:140
-msgid "Incoming email"
-msgstr "Innkomande epost"
-
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
-msgid "Incoming email address removed."
-msgstr "Fjerna innkomande epostadresse."
-
-#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
-msgid "Incorrect old password"
-msgstr "Det gamle passordet stemmer ikkje"
+msgid "%s timeline"
+msgstr "%s tidsline"
 
-#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
-msgid "Incorrect username or password."
-msgstr "Feil brukarnamn eller passord"
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "Oppdateringar frå %1$s på %2$s!"
 
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
-msgstr ""
-"Instruksjonar for å få att passordet ditt er send til epostadressa som er "
-"lagra i kontoen din."
+#: actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Oppdateringar som svarar til %2$s"
 
-#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/apitimelinementions.php:126
 #, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "Ugyldig brukarbilete-nettadresse «%s»"
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr "%1$s oppdateringar som svarar på oppdateringar frå %2$s / %3$s."
 
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
 #, php-format
-msgid "Invalid email address: %s"
-msgstr "Ugyldig epostadresse: «%s»"
+msgid "%s public timeline"
+msgstr "%s offentleg tidsline"
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
 #, php-format
-msgid "Invalid homepage '%s'"
-msgstr "Ugyldig heimeside «%s»"
+msgid "%s updates from everyone!"
+msgstr "%s oppdateringar frå alle saman!"
 
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/apitimelinetag.php:101 actions/tag.php:66
 #, php-format
-msgid "Invalid license URL '%s'"
-msgstr "Ugyldig lisens-netadresse «%s»"
-
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
-msgstr "Ugyldig notisinnhald"
+msgid "Notices tagged with %s"
+msgstr "Notisar merka med %s"
 
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
-msgstr "Ugyldig notis-adresse"
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Oppdateringar frå %1$s på %2$s!"
 
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
-msgstr "Ugyldig notis-adresse"
+#: actions/apiusershow.php:96
+msgid "Not found."
+msgstr "Finst ikkje."
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "Ugyldig profil-nettadresse «%s»"
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "Slikt dokument finst ikkje."
 
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
-msgstr "Ugyldig profil-nettadresse (feil format)"
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+msgstr "Ingen kallenamn."
 
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
-msgstr "Ugyldig profil-nettadresse returnert av tenar."
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "Ingen storleik."
 
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 #: actions/avatarbynickname.php:69
 msgid "Invalid size."
 msgstr "Ugyldig storleik."
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111 actions/finishopenidlogin.php:241
-#: actions/register.php:103 actions/register.php:121
-#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
-msgid "Invalid username or password."
-msgstr "Ugyldig brukarnamn eller passord."
-
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-msgid "Invitation(s) sent"
-msgstr "Invitasjon(er) sendt"
-
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-msgid "Invitation(s) sent to the following people:"
-msgstr "Invitasjon(er) sendt til fylgjande folk:"
-
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
-msgid "Invite"
-msgstr "Invitér"
-
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-msgid "Invite new users"
-msgstr "Invitér nye brukarar"
-
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
-#, php-format
-msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
-msgstr ""
-"Den køyrer [StatusNet](http://status.net) mikroblogging-programvare, versjon %"
-"s, tilgjengeleg under [GNU Affero General Public License](http://www.fsf.org/"
-"licensing/licenses/agpl-3.0.html)."
-
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
-msgstr "Jabber-ID tilhøyrer allereie ein annan brukar."
-
-#: ../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- eller GTalk-adresse, døme «brukarnamn@example.org». Hugs å fyrst "
-"leggja %s til venelista di i ljonmeldingsklienten din."
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
-msgid "Language"
-msgstr "Språk"
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "Brukarbilete"
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
-msgid "Language is too long (max 50 chars)."
-msgstr "Språk er for langt (maksimalt 50 teikn)."
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "Du kan laste opp ein personleg avatar."
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
-msgid "Location"
-msgstr "Plassering"
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
+msgstr "Kan ikkje finne brukar"
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
-#: actions/register.php:92 actions/updateprofile.php:109
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
-msgid "Location is too long (max 255 chars)."
-msgstr "Plassering er for lang (maksimalt 255 teikn)."
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+msgid "Avatar settings"
+msgstr "Avatar-innstillingar"
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
-#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
-#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
-#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
-#, php-format
-msgid "Login"
-msgstr "Logg inn"
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr "Original"
 
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Logg inn med ein [OpenID](%%doc.openid%%)-konto."
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr "Forhandsvis"
 
-#: ../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 ""
-"Logg inn med brukarnamn og passord. Har du ikkje brukarnamn endå? [Opprett](%"
-"%action.register%%) ein ny konto, eller prøv [OpenID](%%action.openidlogin%"
-"%)."
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+msgid "Delete"
+msgstr "Slett"
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
-msgid "Logout"
-msgstr "Logg ut"
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+msgstr "Last opp"
 
-#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
-msgid "Longer name, preferably your \"real\" name"
-msgstr "Lengre namn, fortrinnsvis ditt «ekte» namn"
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
+msgstr "Skaler"
 
-#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
-msgid "Lost or forgotten password?"
-msgstr "Mista eller gløymd passord?"
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Der var eit problem med sesjonen din. Vennlegst prøv på nytt."
 
-#: ../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 "Vel ny epostadresse til å oppdatera med; fjerner den gamle."
+#: actions/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Uventa skjemasending."
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#: actions/emailsettings.php:71
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr "Styr korleis du får epost frå %%site.name%%."
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
+msgstr "Velg eit utvalg av bildet som vil blir din avatar."
 
-#: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
-msgid "Member since"
-msgstr "Medlem sidan"
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
+msgstr "Fant ikkje igjen fil data."
 
-#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
-#, php-format
-msgid "Microblog by %s"
-msgstr "Mikroblogg av %s"
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+msgstr "Lasta opp brukarbilete."
 
-#: ../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øren din. Ta kontakt på %s viss du kjenner ein mobiloperatør som "
-"aksepterer SMS-over-epost, men ikkje vistast her."
+#: actions/avatarsettings.php:363
+msgid "Failed updating avatar."
+msgstr "Feil ved oppdatering av brukarbilete."
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-msgid "My text and files are available under "
-msgstr "Teksten og filene mine er tilgjengeleg under "
+#: actions/avatarsettings.php:387
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Lasta opp brukarbilete."
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#: actions/emailsettings.php:142 actions/smssettings.php:152
-msgid "New"
-msgstr "Ny"
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+msgid "No nickname"
+msgstr "Ingen kallenamn"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
-#, php-format
-msgid "New email address for posting to %s"
-msgstr "Ny epostadresse for å oppdatera %s"
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
+msgstr "Fann ikkje gruppa"
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
-msgid "New incoming email address added."
-msgstr "La til ny innkomande epostadresse."
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "Brukarprofil"
 
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
-msgid "New nickname"
-msgstr "Nytt kallenamn"
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s med vener, side %d"
 
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
-msgstr "Ny notis"
+#: actions/blockedfromgroup.php:108
+#, fuzzy
+msgid "A list of the users blocked from joining this group."
+msgstr "Ei liste over brukarane i denne gruppa."
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-msgid "New password"
-msgstr "Nytt passord"
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "De-blokkering av brukar feila."
 
-#: ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
-msgstr "Lagra det nye passordet. Du er logga inn."
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
+msgstr "Lås opp"
 
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151 actions/login.php:101
-#: actions/profilesettings.php:74 actions/register.php:165
-#: actions/login.php:228 actions/profilesettings.php:98
-#: actions/register.php:367 actions/showgroup.php:224
-#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
-msgid "Nickname"
-msgstr "Kallenamn"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+msgid "Unblock this user"
+msgstr "Lås opp brukaren"
 
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69 actions/finishopenidlogin.php:181
-#: actions/profilesettings.php:225 actions/register.php:76
-#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
-msgid "Nickname already in use. Try another one."
-msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Ikkje logga inn"
 
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:67 ../actions/updateprofile.php:77
-#: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
-#: actions/register.php:74 actions/updateprofile.php:78
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "Kallenamn må berre ha små bokstavar og nummer, ingen mellomrom."
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
+msgstr "Ingen vald profil."
 
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
-msgid "Nickname not allowed."
-msgstr "Kallenamnet er ikkje gyldig."
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
+msgstr "Fann ingen profil med den IDen."
 
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
-msgstr "Kallenamnet til brukaren du vil fylgja"
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Blokker brukaren"
 
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
-msgid "Nickname or email"
-msgstr "Kallenamn eller epostadresse"
+#: actions/block.php:136
+msgid ""
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
+msgstr ""
 
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
+#: actions/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
 msgid "No"
 msgstr "Nei"
 
-#: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
-msgstr "Nei Jabber-ID"
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Lås opp brukaren"
 
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
-msgid "No authorization request!"
-msgstr "Ingen autoriserings-spørjing!"
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
+msgstr "Jau"
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
-msgid "No carrier selected."
-msgstr "Ingen mobiloperatør vald."
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+msgid "Block this user"
+msgstr "Blokkér denne brukaren"
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
-msgstr "Ingen innskriven kode"
+#: actions/block.php:165
+msgid "You have already blocked this user."
+msgstr "Du har allereie blokkert denne brukaren."
+
+#: actions/block.php:170
+msgid "Failed to save block information."
+msgstr "Lagring av informasjon feila."
+
+#: actions/bookmarklet.php:50
+#, fuzzy
+msgid "Post to "
+msgstr "Bilete"
 
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 #: actions/confirmaddress.php:75
 msgid "No confirmation code."
 msgstr "Ingen stadfestingskode."
 
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
-#: actions/newnotice.php:126 classes/Command.php:223
-msgid "No content!"
-msgstr "Ingen innhald."
-
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
-msgid "No email address."
-msgstr "Ingen epostadresse."
-
-#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
-msgid "No id."
-msgstr "Ingen ID."
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
-msgid "No incoming email address."
-msgstr "Ingen innkomande epostadresse."
-
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr "Ingen kallenamn gjeve av den eksterne tenaren."
-
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
-msgid "No nickname."
-msgstr "Ingen kallenamn."
-
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229 actions/emailsettings.php:240
-#: actions/imsettings.php:214 actions/smssettings.php:237
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
-msgid "No pending confirmation to cancel."
-msgstr "Ingen ventande stadfesting å avbryta."
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
-msgstr "Ingen telefonnummer."
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "Fann ikkje stadfestingskode."
 
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
-msgstr "Ingen profil-nettadresse returnert av tenar."
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "Den godkjenningskoden er ikkje for deg!"
 
-#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
-msgid "No registered email address for that user."
-msgstr "Ingen registrert epostadresse for den brukaren."
+#: actions/confirmaddress.php:90
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr "Ukjend adressetype %s"
 
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr "Fann inga spørjing."
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr "Den addressa har alt blitt bekrefta."
 
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
-msgid "No results"
-msgstr "Ingen resultat"
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "Kan ikkje oppdatera brukar."
 
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
-msgstr "Ingen storleik."
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr "Kan ikkje sletta e-postgodkjenning."
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
-msgid "No status found with that ID."
-msgstr "Fann ingen status med den ID-en."
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "Stadfest adresse"
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
-msgid "No status with that ID found."
-msgstr "Fann ingen status med den ID-en."
+#: actions/confirmaddress.php:159
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "Addressa \"%s\" har blitt bekrefta for din konto."
 
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
-msgstr "Fann ingen slik OpenID."
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Stadfestingskode"
 
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
-msgid "No such document."
-msgstr "Slikt dokument finst ikkje."
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
+msgstr "Notisar"
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30 actions/shownotice.php:32
-#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Denne notisen finst ikkje."
 
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr "Opprettingskoden finst ikkje."
-
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-msgid "No such subscription"
-msgstr "Tinginga finst ikkje."
-
-#: ../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 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
-msgid "No such user."
-msgstr "Brukaren finst ikkje."
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-msgid "No user with that email address or username."
-msgstr "Ingen brukar med den epostadressa eller det brukarnamnet."
-
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
-msgstr "Ingen å visa!"
-
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr "Ikkje ei gjenopprettingskode."
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
-msgstr "Ikkje ein registrert brukar."
-
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
-msgid "Not a supported data format."
-msgstr "Ikkje eit støtta dataformat."
-
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
-msgstr "Ikkje ein gyldig Jabber-ID"
-
-#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-msgid "Not a valid OpenID."
-msgstr "Ikkje ein gyldig OpenID."
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
-msgid "Not a valid email address"
-msgstr "Ikkje ei gyldig epostadresse"
-
-#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-msgid "Not a valid email address."
-msgstr "Ikkje ei gyldig epostadresse."
-
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-#: actions/editgroup.php:186 actions/newgroup.php:137
-#: actions/profilesettings.php:195 actions/register.php:161
-msgid "Not a valid nickname."
-msgstr "Ikkje eit gyldig brukarnamn."
-
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
-msgstr "Ikkje ein gyldig profil-netadresse (feil teneste)."
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "Kan ikkje sletta notisen."
 
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr "Ikkje brukande profil-netadresse (ingen XRDS definert)."
+#: actions/deletenotice.php:103
+#, fuzzy
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+"Du er i ferd med å sletta ei melding.  Når den fyrst er sletta, kann du "
+"ikkje finne ho att."
 
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr "Ikkje ein brukande profil-netadresse (ingen YADIS-dokument)."
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr "Slett notis"
 
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
-msgid "Not an image or corrupt file."
-msgstr "Korrupt bilete."
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr "Sikker på at du vil sletta notisen?"
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
-msgid "Not authorized."
-msgstr "Ikkje autorisert."
+#: actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "Kan ikkje sletta notisen."
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
-msgid "Not expecting this response!"
-msgstr "Venta ikkje dette svaret!"
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+msgid "Delete this notice"
+msgstr "Slett denne notisen"
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
-msgid "Not found"
-msgstr "Fann ikkje"
+#: actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
+msgstr "Der var eit problem med sesjonen din. Vennlegst prøv på nytt."
 
-#: ../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 actions/block.php:59 actions/disfavor.php:61
-#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
-#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
-#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
-#: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Ikkje logga inn"
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr "Denne notisen er ikkje ein favoritt!"
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
-msgid "Not subscribed!."
-msgstr "Ikkje tinga."
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "Legg til i favorittar"
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
-msgstr "Notissøk"
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "Slikt dokument finst ikkje."
 
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
+#: actions/editgroup.php:56
 #, php-format
-msgid "Notice feed for %s"
-msgstr "Notisstraum for %s"
+msgid "Edit %s group"
+msgstr "Rediger %s gruppa"
 
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
-msgstr "Notisen har ingen profil"
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
+msgstr "Du må være logga inn for å lage ei gruppe."
 
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
-msgid "Notices"
-msgstr "Notisar"
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+msgid "You must be an admin to edit the group"
+msgstr "Du må være administrator for å redigere gruppa"
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
-#, php-format
-msgid "Notices tagged with %s"
-msgstr "Notisar merka med %s"
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
+msgstr "Bruk dette skjemaet for å redigere gruppa"
 
-#: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
-msgstr "Gamalt passord"
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "skildringa er for lang (maks 140 teikn)."
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
-msgid "OpenID"
-msgstr "OpenID"
-
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
-msgid "OpenID Account Setup"
-msgstr "OpenID kontooppsett"
-
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-msgid "OpenID Auto-Submit"
-msgstr "OpenID auto-innsending"
-
-#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
-#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-msgid "OpenID Login"
-msgstr "OpenID-adresse"
-
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-#: actions/openidlogin.php:102 actions/openidsettings.php:101
-msgid "OpenID URL"
-msgstr "OpenID-adresse"
-
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
-msgid "OpenID authentication cancelled."
-msgstr "OpenID-påkopling avbrutt."
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr "OpenID-innlogging gjekk dunken: %s"
-
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "OpenID-feil: %s"
-
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr "Fjerna OpenID."
-
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
-msgstr "OpenID-innstillingar"
-
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-msgid "Optionally add a personal message to the invitation."
-msgstr "Eventuelt legg til ei personleg melding til invitasjonen."
+#: actions/editgroup.php:253
+msgid "Could not update group."
+msgstr "Kann ikkje oppdatera gruppa."
 
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
-msgid "Partial upload."
-msgstr "Hallvegs opplasta."
+#: actions/editgroup.php:269
+msgid "Options saved."
+msgstr "Lagra innstillingar."
 
-#: ../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 actions/finishopenidlogin.php:118
-#: actions/login.php:231 actions/register.php:372
-#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-msgid "Password"
-msgstr "Passord"
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "Epostinnstillingar"
 
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
-msgid "Password and confirmation do not match."
-msgstr "Passord og stadfesting stemmer ikkje."
+#: actions/emailsettings.php:71
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr "Styr korleis du får epost frå %%site.name%%."
 
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
-msgid "Password must be 6 chars or more."
-msgstr "Passord må vera 6 tekn eller meir."
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "Adresse"
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-msgid "Password recovery requested"
-msgstr "Passord opphenting etterspurt"
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr "Godkjent epostadresse."
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-msgid "Password saved."
-msgstr "Lagra passord."
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "Fjern"
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-msgid "Passwords don't match."
-msgstr "Passorda var ikkje like."
+#: actions/emailsettings.php:113
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
+"Ventar på godkjenning. Sjekk innboksen (og søppelpostboksen) for ei melding "
+"med instruksjonar."
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
-msgstr "Folk"
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "Avbryt"
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
-msgstr "Søk etter folk"
+#: actions/emailsettings.php:121
+msgid "Email Address"
+msgstr "Epostadresse"
 
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
-msgstr "Søk etter folk"
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr "Epostadresse («brukarnamn@example.org»)"
 
-#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
-msgid "Personal"
-msgstr "Personleg"
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "Legg til"
 
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-msgid "Personal message"
-msgstr "Personleg melding"
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+msgstr "Innkomande epost"
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "Telefonnummer, kun tall, med landskode"
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
+msgstr "Send epost til denne addressa for å legge til nye notisar."
 
-#: ../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 ""
-"Sjekk desse detaljane og forsikre deg om at du vil abonnere på denne "
-"brukaren sine notisar. Vist du ikkje har bedt om dette, klikk \"Avbryt\""
+#: actions/emailsettings.php:145 actions/smssettings.php:162
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr "Vel ny epostadresse til å oppdatera med; fjerner den gamle."
 
-#: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Legg til ein notis når min Jabber/GTalk status forandrar seg."
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
+msgstr "Ny"
 
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94 actions/emailsettings.php:86
-#: actions/imsettings.php:68 actions/smssettings.php:94
-#: actions/twittersettings.php:70 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "Brukarval"
 
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163 actions/emailsettings.php:180
-#: actions/imsettings.php:152 actions/smssettings.php:171
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
-msgid "Preferences saved."
-msgstr "Lagra brukarval."
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
-msgid "Preferred language"
-msgstr "Foretrukke språk"
-
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
-msgid "Privacy"
-msgstr "Personvern"
-
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-msgid "Problem saving notice."
-msgstr "Eit problem oppstod ved lagring av notis."
-
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
-msgid "Profile"
-msgstr "Profil"
-
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
-msgstr "Profil-adresse"
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
+msgstr "Send meg ein notis ved nye tingingar på epost."
 
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
-msgstr "Profilinnstillingar"
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+"Send meg ein epost når nokon legg til ein av mine notisar som favoritt."
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-msgid "Profile unknown"
-msgstr "Ukjend profil"
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
+msgstr "Send meg ein epost når nokon sender meg ei privat melding."
 
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
-msgid "Public Stream Feed"
-msgstr "Offentleg straum"
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "Send meg ein epost når nokon sender meg ei privat melding."
 
-#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
-msgid "Public timeline"
-msgstr "Offentleg tidsline"
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
+msgstr "Tillat vennar å sende meg ein epost."
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Publiser ein MicroID for Jabber/GTalk addressene mine"
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
+msgstr "Eg vil senda notisar med epost."
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr "Publiser ein MicroID for epost addressa mi."
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr "Nylege merkelappar"
-
-#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
-msgid "Recover"
-msgstr "Gjenopprett"
-
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
-msgid "Recover password"
-msgstr "Hent fram passord"
-
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-msgid "Recovery code for unknown user."
-msgstr "Hent fram passord for ukjend brukar."
-
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
-#: actions/register.php:152 actions/register.php:207 lib/util.php:328
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-msgid "Register"
-msgstr "Registrér"
-
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
-msgid "Registration not allowed."
-msgstr "Registrering ikkje tillatt."
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Lagra"
 
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
-msgid "Registration successful"
-msgstr "Registreringa gikk bra"
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+msgstr "Lagra brukarval."
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
-msgid "Reject"
-msgstr "Avslå"
+#: actions/emailsettings.php:319
+msgid "No email address."
+msgstr "Ingen epostadresse."
 
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
-msgid "Remember me"
-msgstr "Hugs meg"
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
+msgstr "Klarar ikkje normalisera epostadressa"
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
-msgid "Remote profile with no matching profile"
-msgstr "Ekstern profil med ingen passande profil"
+#: actions/emailsettings.php:330
+msgid "Not a valid email address"
+msgstr "Ikkje ei gyldig epostadresse"
 
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
-msgstr "Eksternt abbonement"
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
+msgstr "Det er alt din epost addresse"
 
-#: ../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 actions/emailsettings.php:101
-#: actions/emailsettings.php:134 actions/imsettings.php:102
-#: actions/openidsettings.php:166 actions/smssettings.php:103
-#: actions/smssettings.php:146 actions/twittersettings.php:115
-msgid "Remove"
-msgstr "Fjern"
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another user."
+msgstr "Den epost addressa er alt registrert hos ein annan brukar."
 
-#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
-msgstr "Fjern OpenID"
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+msgstr "Kan ikkje leggja til godkjenningskode."
 
-#: ../actions/openidsettings.php:73
+#: actions/emailsettings.php:358
 msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+"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 ""
-"Ved å fjerne din einaste OpenID vil det ikkje være mulig å logge inn! Vist "
-"du treng å fjerne den, legg til ein annan OpenID først."
+"Sendte godkjenningskode til epostadressa du la til. Sjekk innboksen (og "
+"søppelpostboksen) for koden og veiledning på korleis du nyttar han."
 
-#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
-msgid "Replies"
-msgstr "Svar"
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
+msgstr "Ingen ventande stadfesting å avbryta."
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
-#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
-#: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
-#, php-format
-msgid "Replies to %s"
-msgstr "Svar til %s"
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "Det er feil lynmeldings addresse."
 
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
-msgid "Reset"
-msgstr "Avbryt"
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "Stadfesting avbrutt."
 
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
-msgid "Reset password"
-msgstr "Tilbakestill passord"
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
+msgstr "Det er ikkje din epost addresse."
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-msgid "SMS"
-msgstr "SMS"
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "Addressa blei fjerna."
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
-msgid "SMS Phone number"
-msgstr "SMS telefon nummer"
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
+msgstr "Ingen innkomande epostadresse."
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
-msgstr "SMS innstillingar"
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
+msgstr "Kan ikkje oppdatera brukarinformajon."
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
-msgid "SMS confirmation"
-msgstr "SMS bekreftelse"
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
+msgstr "Fjerna innkomande epostadresse."
 
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
-msgid "Same as password above"
-msgstr "Samme passord som over"
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
+msgstr "La til ny innkomande epostadresse."
 
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
-msgid "Same as password above. Required."
-msgstr "Samme som passord over. Påkrevd."
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+msgid "Popular notices"
+msgstr "Populære notisar"
 
-#: ../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 actions/emailsettings.php:182
-#: actions/facebooksettings.php:114 actions/imsettings.php:157
-#: actions/othersettings.php:117 actions/profilesettings.php:150
-#: actions/smssettings.php:169 actions/subscriptions.php:124
-#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
-msgid "Save"
-msgstr "Lagra"
+#: actions/favorited.php:67
+#, php-format
+msgid "Popular notices, page %d"
+msgstr "Populære notisar, side %d"
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
-msgid "Search"
-msgstr "Søk"
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
+msgstr "Viser dei mest populære notisane på sida akkurat no."
 
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
-msgstr "Søk i straum"
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
-#, php-format
+#: actions/favorited.php:153
 msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
 msgstr ""
-"Søk i notisar på %%site.name%% i innhald. Separer nøkkelord med mellomrom; "
-"dei må være minimum 3 bokstavar eller meir."
 
-#: ../actions/peoplesearch.php:28
+#: actions/favorited.php:156
 #, 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."
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
 msgstr ""
-"Søk for mennesker på %%site.name%% i namn, lokasjon eller interesse. Separer "
-"nøkkelord med mellomrom; dei må være minimum 3 bokstavar eller meir."
 
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
-msgid "Select a carrier"
-msgstr "Velg ein tilbydar"
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
+msgstr "%s's favoritt meldingar"
 
-#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
-#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
-msgid "Send"
-msgstr "Send"
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Oppdateringar frå %1$s på %2$s!"
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
-msgstr "Send epost til denne addressa for å legge til nye notisar."
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Denne notisen er alt ein favoritt!"
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
-msgstr "Send meg ein notis ved nye tingingar på epost."
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Fjern favoritt"
 
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
-msgid "Send me notices through Jabber/GTalk."
-msgstr "Send meg ein notis via Jabber/GTalk."
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr "Profilerte folk"
 
-#: ../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 ""
-"Send meg ein notis via SMS; eg forstår at dette kan føre til kostnadar fra "
-"min tilbydar."
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr "Profilerte folk, side %d"
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr "Send meg svar via Jabber/GTalk fra folk eg ikkje abbonnerar på."
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
+msgstr "Eit utval av nokre av dei flotte folka på %s"
 
-#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
-msgid "Settings"
-msgstr "Innstillingar"
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "Ny notis"
 
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
-msgid "Settings saved."
-msgstr "Lagra innstillingar."
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Ny notis"
 
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr "Viser dei mest populære merkelappane fra siste veka"
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
 
-#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:114
-msgid "Someone else already has this OpenID."
-msgstr "Nokon andre har alt registrert den OpenID profilen."
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
-msgstr "Noko rart skjedde."
+#: actions/finishremotesubscribe.php:69
+msgid "Not expecting this response!"
+msgstr "Venta ikkje dette svaret!"
 
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
-msgstr "Beklager, inngåande epost er ikkje tillatt."
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "Brukaren du lyttar til eksisterer ikkje."
 
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
-msgstr "Beklager, det er ikkje di inngåande epost addresse."
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+msgstr "Du kan nytta det lokale abonnementet!"
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
-msgid "Source"
-msgstr "Kjeldekode"
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
+msgstr "Brukaren tillet deg ikkje å tinga meldingane sine."
 
-#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
-msgid "Statistics"
-msgstr "Statistikk"
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "Ikkje autorisert."
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-msgid "Stored OpenID not found."
-msgstr "Fann ikkje lagra OpenID"
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "Kan ikkje konvertera spyrjebillett til tilgongsbillett."
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
-#: actions/showstream.php:197 actions/showstream.php:206
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
-msgid "Subscribe"
-msgstr "Ting"
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Ukjend versjon av OMB-protokollen."
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
-msgid "Subscribers"
-msgstr "Tingarar"
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "Feil ved oppdatering av ekstern profil"
 
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
-msgid "Subscription authorized"
-msgstr "Tinging autorisert"
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+msgid "No such group."
+msgstr "Denne gruppa finst ikkje."
 
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
-msgid "Subscription rejected"
-msgstr "Tinging avvist"
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "Denne notisen finst ikkje."
 
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27 actions/showstream.php:240
-#: actions/showstream.php:322 actions/subscriptions.php:27
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
-msgid "Subscriptions"
-msgstr "Tingingar"
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Mista fila vår."
 
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
-msgid "System error uploading file."
-msgstr "Systemfeil ved opplasting av fil."
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "Ingen vald profil."
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
-#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
-msgid "Tags"
-msgstr "Merkelappar"
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "Tekst"
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "Brukar har blokkert deg."
 
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
-msgid "Text search"
-msgstr "Tekstsøk"
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "Du er ikkje medlem av den gruppa."
 
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
-msgstr "Den OpenID addressa tilhøyrer ikkje deg."
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "Blokker brukaren"
 
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
-msgstr "Den addressa har alt blitt bekrefta."
+#: actions/groupblock.php:162
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
 
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
-msgstr "Den godkjenningskoden er ikkje for deg!"
+#: actions/groupblock.php:178
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "Ei liste over brukarane i denne gruppa."
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr "Den epost addressa er alt registrert hos ein annan brukar."
+#: actions/groupblock.php:179
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "Ei liste over brukarane i denne gruppa."
 
-#: ../actions/avatar.php:80 actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
-msgstr "Fila er for stor."
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
+msgstr ""
 
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
-msgid "That is already your Jabber ID."
-msgstr "Det er alt din Jabber ID."
+#: actions/groupbyid.php:74
+msgid "No ID"
+msgstr "Ingen ID"
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
-msgid "That is already your email address."
-msgstr "Det er alt din epost addresse"
+#: actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "Du må være logga inn for å lage ei gruppe."
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
-msgid "That is already your phone number."
-msgstr "Det er alt ditt telefonnummer"
+#: actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "Grupper"
 
-#: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
-msgid "That is not your Jabber ID."
-msgstr "Det er ikkje din Jabber ID."
+#: actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
-msgid "That is not your email address."
-msgstr "Det er ikkje din epost addresse."
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Kan ikkje oppdatera brukar."
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
-msgstr "Det er ikkje ditt telefonnummer"
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!"
 
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-#: actions/emailsettings.php:367 actions/imsettings.php:349
-msgid "That is the wrong IM address."
-msgstr "Det er feil lynmeldings addresse."
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Synkroniserings innstillingar blei lagra."
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
-msgstr "Det er feil godkjennings nummer."
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
+msgstr "Logo åt gruppa"
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-msgid "That phone number already belongs to another user."
-msgstr "Det telefonnummeret er alt registrert hos ein annan brukar."
+#: actions/grouplogo.php:150
+#, fuzzy, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr "Du kan lasta opp ein logo for gruppa."
 
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49 actions/twitapistatuses.php:330
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-msgid "That's too long. Max notice size is 140 chars."
-msgstr "Det er for langt! Ein notis kan berre innehalde 140 teikn."
+#: actions/grouplogo.php:362
+#, fuzzy
+msgid "Pick a square area of the image to be the logo."
+msgstr "Velg eit utvalg av bildet som vil blir din avatar."
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "Det er for langt! Ein notis kan berre innehalde 255 teikn."
+#: actions/grouplogo.php:396
+msgid "Logo updated."
+msgstr "Logo oppdatert."
 
-#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/grouplogo.php:398
+msgid "Failed updating logo."
+msgstr "Feil ved oppdatering av logo."
+
+#: actions/groupmembers.php:93 lib/groupnav.php:92
 #, php-format
-msgid "The address \"%s\" has been confirmed for your account."
-msgstr "Addressa \"%s\" har blitt bekrefta for din konto."
+msgid "%s group members"
+msgstr "%s medlemmar i gruppa"
 
-#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274 actions/emailsettings.php:282
-#: actions/imsettings.php:258 actions/smssettings.php:282
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
-msgid "The address was removed."
-msgstr "Addressa blei fjerna."
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
+msgstr "%s medlemmar i gruppa, side %d"
 
-#: ../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 ""
-"Tingina har blitt autorisert, men ingen henvisnings URL er tilgjengleg. "
-"Sjekk med sida sine instruksjonar for korleis autorisering til tinginga skal "
-"gjennomførast. Ditt tingings teikn er: "
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr "Ei liste over brukarane i denne gruppa."
 
-#: ../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 ""
-"Tingina har blitt avvist, men ingen henvisnings URL er tilgjengleg. Sjekk "
-"med sida sine instruksjonar for korleis ein skal avvise tinginga."
+#: actions/groupmembers.php:175 lib/groupnav.php:107
+msgid "Admin"
+msgstr "Administrator"
 
-#: ../actions/subscribers.php:35 actions/subscribers.php:35
-#, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr "Dette er folk som lyttar til %s's notisar"
+#: actions/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
+msgstr "Blokkér"
 
-#: ../actions/subscribers.php:33 actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr "Dette er folk som lyttar til dine notisar."
+#: actions/groupmembers.php:441
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "Du må være administrator for å redigere gruppa"
 
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
-#, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr "Dette er folka som %s tingar oppdateringar frå."
+#: actions/groupmembers.php:473
+#, fuzzy
+msgid "Make Admin"
+msgstr "Administrator"
 
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr "Dette er dei du lyttar til."
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
 
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Oppdateringar frå %1$s på %2$s!"
+
+#: actions/groupsearch.php:52
+#, fuzzy, php-format
 msgid ""
-"These people are already users and you were automatically subscribed to them:"
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
-"Desse er alt brukarar og du var automatisk satt opp med tinging på dei:"
+"Søk for mennesker på %%site.name%% i namn, lokasjon eller interesse. Separer "
+"nøkkelord med mellomrom; dei må være minimum 3 bokstavar eller meir."
 
-#: ../actions/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
-msgstr "Denne godkjenningskoden er for gammal. Vennligst start på nytt."
+#: actions/groupsearch.php:58
+msgid "Group search"
+msgstr "Gruppesøk"
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "Ingen resultat"
 
-#: ../lib/openid.php:195
+#: actions/groupsearch.php:82
+#, php-format
 msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
 msgstr ""
-"Skjemaet burde automatisk sendast inn av seg sjølv.  Om det ikkje gjer det, "
-"kann du klikka på knappen for å gå til OpenID-tilbydaren din."
 
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/groupsearch.php:85
 #, 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 ""
-"Dette er den fyrste gongen du hev logga inn på %s, so vi må kopla din OpenID "
-"til den lokale kontoen din.  Du kann anten laga ein ny konto, eller kopla "
-"til ein eksisterande konto, om du hev ein frå før."
-
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-msgid "This method requires a POST or DELETE."
-msgstr "Dette krev anten ein POST eller 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 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
-msgid "This method requires a POST."
-msgstr "Dette krev ein POST."
-
-#: ../lib/util.php:164 lib/util.php:246
-msgid "This page is not available in a media type you accept"
-msgstr "Denne sida er ikkje tilgjengeleg i nokon mediatype du aksepterer."
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
-msgid "Timezone"
-msgstr "Tidssone"
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Grupper"
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
-msgid "Timezone not selected."
-msgstr "Tidssone er ikkje valt."
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Grupper, side %d"
 
-#: ../actions/remotesubscribe.php:43
+#: actions/groups.php:90
 #, 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."
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
 msgstr ""
-"For å tinga kann du [logga inn](%%action.login%%), eller "
-"[registrera](%%action.register%%) ein ny konto.  Um du allereie hev ein "
-"konto på ei [kompatibel mikrobloggingside](%%doc.openmublog%%), kann du "
-"oppgje URLen til profilen under."
 
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
-msgid "Two user ids or screen_names must be supplied."
-msgstr "To brukar IDer eller kallenamn er naudsynte."
-
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL til heimesida di, bloggen din, eller ein profil på ei anna side."
-
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-msgid "URL of your profile on another compatible microblogging service"
-msgstr "URL til profilsida di på ei anna kompatibel mikrobloggingteneste."
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Opprett ei ny gruppe"
 
-#: ../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 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-msgid "Unexpected form submission."
-msgstr "Uventa skjemasending."
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
 
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
-msgid "Unexpected password reset."
-msgstr "Uventa passordnullstilling."
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "Brukar har blokkert deg."
 
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-msgid "Unknown action"
-msgstr "Uventa handling."
+#: actions/groupunblock.php:128 actions/unblock.php:108
+msgid "Error removing the block."
+msgstr "Feil ved fjerning av blokka."
 
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-msgid "Unknown version of OMB protocol."
-msgstr "Ukjend versjon av OMB-protokollen."
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "Ljonmeldinginnstillingar"
 
-#: ../lib/util.php:269 lib/util.php:285
+#: actions/imsettings.php:70
+#, php-format
 msgid ""
-"Unless otherwise specified, contents of this site are copyright by the "
-"contributors and available under the "
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 msgstr ""
-"Vist anna ikkje er spesifert er innhaldet på denne sida opphavsrettslig "
-"beskyttet av bidragsytaren og er tilgjengleg under "
-
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
-#, php-format
-msgid "Unrecognized address type %s"
-msgstr "Ukjend adressetype %s"
-
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
-msgstr "Fjern tinging"
-
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-msgid "Unsupported OMB version"
-msgstr "Støttar ikkje OMB-versjonen"
-
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
-msgid "Unsupported image file format."
-msgstr "Støttar ikkje bileteformatet."
-
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
-msgstr "Oppdateringar over SMS"
+"Du kan sende og motta meldingar gjennom Jabber/GTalk [direktemeldingar](%%"
+"doc.im%%).  Set opp adressa og innstillingar under."
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
-msgstr "Oppdateringar over direktemeldingar (IM)"
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Denne sida er ikkje tilgjengleg i eit"
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr "Oppdateringar frå %1$s og vener på %2$s!"
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Stadfesta Jabber/Gtalk-adresse."
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/imsettings.php:114
 #, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr "Oppdateringar frå %1$s på %2$s!"
-
-#: ../actions/avatar.php:68 actions/profilesettings.php:161
-#: actions/avatarsettings.php:162 actions/grouplogo.php:232
-msgid "Upload"
-msgstr "Last opp"
-
-#: ../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."
+"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 ""
-"Last opp ein ny «avatar» (brukarbilete) her.  Du kan ikkje redigera bilete "
-"etter du har lasta det opp, so sørg for at det er meir eller mindre "
-"firkanta.  Det må ogso vera under den same lisensen.  Nytta eit bilete som "
-"tilhøyrer deg, og som du vil dela."
+"Venter på godkjenning. Sjekk din Jabber/GTalk-konto for ei melding med "
+"instruksjonar (la du %s til venelista di?)"
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr "Last opp eit nytt profilbilete"
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "Ljonmeldingadresse"
 
-#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/imsettings.php:126
+#, php-format
 msgid ""
-"Use this form to invite your friends and colleagues to use this service."
+"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 ""
-"Bruk dette skjemaet for å invitera vener og kolleger til å nytta denne "
-"tenesta."
+"Jabber- eller GTalk-adresse, døme «brukarnamn@example.org». Hugs å fyrst "
+"leggja %s til venelista di i ljonmeldingsklienten din."
 
-#: ../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 ""
-"Blir berre brukt for uppdateringar, viktige meldingar og for gløymde passord"
+#: actions/imsettings.php:143
+msgid "Send me notices through Jabber/GTalk."
+msgstr "Send meg ein notis via Jabber/GTalk."
 
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
-msgid "User being listened to doesn't exist."
-msgstr "Brukaren du lyttar til eksisterer ikkje."
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr "Legg til ein notis når min Jabber/GTalk status forandrar seg."
 
-#: ../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
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-msgid "User has no profile."
-msgstr "Brukaren har inga profil."
+#: actions/imsettings.php:153
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr "Send meg svar via Jabber/GTalk fra folk eg ikkje abbonnerar på."
 
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
-msgstr "Brukaren sitt kallenamn"
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Publiser ein MicroID for Jabber/GTalk addressene mine"
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr "Fant ikkje brukaren."
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "Nei Jabber-ID"
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
-msgid "What timezone are you normally in?"
-msgstr "Kva tidssone er du vanlegvis i?"
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr "Klarar ikkje normalisera Jabber-IDen"
 
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
-#, php-format
-msgid "What's up, %s?"
-msgstr "Kva skjer, %s?"
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "Ikkje ein gyldig Jabber-ID"
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-#: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Kvar er du, t.d. «By, Fylke (eller Region), Land»"
+#: actions/imsettings.php:299
+msgid "That is already your Jabber ID."
+msgstr "Det er alt din Jabber ID."
+
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr "Jabber-ID tilhøyrer allereie ein annan brukar."
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/imsettings.php:327
 #, php-format
-msgid "Wrong image type for '%s'"
-msgstr "Feil biletetype for '%s'"
+msgid ""
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr ""
+"Sendte godkjenningskode til ljonmeldingsadressa du la til. Du må godtaka %s "
+"for å senda meldinger til deg."
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/imsettings.php:387
+msgid "That is not your Jabber ID."
+msgstr "Det er ikkje din Jabber ID."
+
+#: actions/inbox.php:59
 #, php-format
-msgid "Wrong size image at '%s'"
-msgstr "Feil storleik på biletet, på '%s'"
+msgid "Inbox for %s - page %d"
+msgstr "Innboks for %s - side %d"
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
-msgid "Yes"
-msgstr "Jau"
+#: actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr "Innboks for %s"
 
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-msgid "You already have this OpenID!"
-msgstr "Du hev denne OpenIDen allereie!"
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr "Dette er innboksen for dine private meldingar."
 
-#: ../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."
+#: actions/invite.php:39
+msgid "Invites have been disabled."
 msgstr ""
-"Du er i ferd med å sletta ei melding.  Når den fyrst er sletta, kann du "
-"ikkje finne ho att."
 
-#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
-msgstr "Du er allereie logga inn!"
+#: actions/invite.php:41
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr "Du må verta logga inn for å invitera andre brukarar til %s"
 
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-msgid "You are already subscribed to these users:"
-msgstr "Du tingar allereie oppdatering frå desse brukarane:"
+#: actions/invite.php:72
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "Ugyldig epostadresse: «%s»"
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
-msgid "You are not friends with the specified user."
-msgstr "Du er ikkje ven med brukaren."
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
+msgstr "Invitasjon(er) sendt"
 
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr "Du kan endra passord her.  Vel eit godt passord!"
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr "Invitér nye brukarar"
 
-#: ../actions/register.php:135 actions/register.php:145
-msgid "You can create a new account to start posting notices."
-msgstr "Du kan laga ein ny konto og byrja skriva meldingar."
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr "Du tingar allereie oppdatering frå desse brukarane:"
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
+#: actions/invite.php:131 actions/invite.php:139
 #, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "Du kan motta SMS-meldingar gjennom e-post frå %%site.name%%."
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../actions/openidsettings.php:86
+#: actions/invite.php:136
 msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
+"These people are already users and you were automatically subscribed to them:"
 msgstr ""
-"Du kan fjerna OpenID frå kontoen din ved å klikka på knappen som seier "
-"«Fjern»."
+"Desse er alt brukarar og du var automatisk satt opp med tinging på dei:"
 
-#: ../actions/imsettings.php:28 actions/imsettings.php:28
-#, php-format
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
+msgstr "Invitasjon(er) sendt til fylgjande folk:"
+
+#: actions/invite.php:150
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 msgstr ""
-"Du kan sende og motta meldingar gjennom Jabber/GTalk "
-"[direktemeldingar](%%doc.im%%).  Set opp adressa og innstillingar under."
+"Du vil få ein notis når dei du har invitert har akseptert invitasjonen og "
+"har registrert seg på sida. Takk for å bidra til fellesskapet her!"
 
-#: ../actions/profilesettings.php:27
+#: actions/invite.php:162
 msgid ""
-"You can update your personal profile info here so people know more about you."
+"Use this form to invite your friends and colleagues to use this service."
 msgstr ""
-"Du kan oppdatera informasjonen i profilen din her, so folk kan vite meir om "
-"deg."
+"Bruk dette skjemaet for å invitera vener og kolleger til å nytta denne "
+"tenesta."
 
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
-msgstr "Du kan nytta det lokale abonnementet!"
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "Epostadresser"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
-msgid "You can't register if you don't agree to the license."
-msgstr "Du kan ikkje registrera deg om du ikkje godtek vilkåra i lisensen."
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr "Venene sine adresser for invitasjon (ei per line)"
+
+#: actions/invite.php:192
+msgid "Personal message"
+msgstr "Personleg melding"
 
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
-msgid "You did not send us that profile"
-msgstr "Du sende oss ikkje den profilen"
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
+msgstr "Eventuelt legg til ei personleg melding til invitasjonen."
+
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
+msgstr "Send"
+
+#: actions/invite.php:226
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s har invitert deg til %2$s"
 
-#: ../lib/mail.php:147
+#: actions/invite.php:228
 #, php-format
 msgid ""
-"You have a new posting address on %1$s.\n"
+"%1$s has invited you to join them on %2$s (%3$s).\n"
 "\n"
-"Send email to %2$s to post new messages.\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"
-"More email instructions at %3$s.\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"
-"Faithfully yours,\n"
-"%4$s"
-msgstr ""
-"Du hev ei ny posteadresse på %1½s.\n"
+"%1$s said:\n"
 "\n"
-"Send e-post til %2$s for å posta nyte meldingar.\n"
+"%4$s\n"
 "\n"
-"Fleiere e-postinstruksjonar finn du på %3½s.\n"
+"You can see %1$s's profile page on %2$s here:\n"
 "\n"
-"Helsing frå %4$s"
-
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
-msgid "You may not delete another user's status."
-msgstr "Du kan ikkje sletta statusen til ein annan brukar."
-
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr "Du må verta logga inn for å invitera andre brukarar til %s"
-
-#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+"%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 ""
-"Du vil få ein notis når dei du har invitert har akseptert invitasjonen og "
-"har registrert seg på sida. Takk for å bidra til fellesskapet her!"
+"%$1s har invitert deg til %2$s (%3$s).\n"
+"\n"
+"%$2s er ei mikrobloggingteneste som let deg halda deg oppdatert på folk du "
+"kjenner og/eller som interesserer deg.\n"
+"\n"
+"Du kan òg dela nyhende om deg sjølv, dine tankar eller livet ditt på nettet "
+"med folk som kjenner til deg. Det er supert for å møte nye folk med like "
+"interesser.\n"
+"\n"
+"%1$s sa:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Du kan sjå profilsida til %1$s på %2$s her:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Viss du vil prøva tenesta, klikk på lenka nedanfor for å akseptera "
+"invitasjonen.\n"
+"\n"
+"Beste helsing, %2$s\n"
 
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr "Du har blitt identifisert. Skriv inn eit nytt passord under her."
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
+msgstr "Du må være logga inn for å bli med i ei gruppe."
 
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
-msgid "Your OpenID URL"
-msgstr "Din OpenID"
+#: actions/joingroup.php:90 lib/command.php:217
+msgid "You are already a member of that group"
+msgstr "Du er allereie medlem av den gruppa"
 
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
-msgstr "Ditt kallenamn på denne servere, eller din registrerte epost addresse."
+#: actions/joingroup.php:128 lib/command.php:234
+#, php-format
+msgid "Could not join user %s to group %s"
+msgstr "Kunne ikkje melde brukaren %s inn i gruppa %s"
 
-#: ../actions/openidsettings.php:28
+#: actions/joingroup.php:135 lib/command.php:239
 #, 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%%) lar deg logge inn på mangen sider med den samme "
-"brukar kontoen. Velikehold dine OpenID herfra."
+msgid "%s joined group %s"
+msgstr "%s blei medlem av gruppe %s"
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
-msgid "a few seconds ago"
-msgstr "eit par sekund sidan"
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
+msgstr "Du må være innlogga for å melde deg ut av ei gruppe."
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
-#, php-format
-msgid "about %d days ago"
-msgstr "~%d dagar sidan"
+#: actions/leavegroup.php:90 lib/command.php:268
+msgid "You are not a member of that group."
+msgstr "Du er ikkje medlem av den gruppa."
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
-#, php-format
-msgid "about %d hours ago"
-msgstr "~%d timar sidan"
+#: actions/leavegroup.php:119 lib/command.php:278
+msgid "Could not find membership record."
+msgstr "Kan ikkje finne brukar."
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: actions/leavegroup.php:127 lib/command.php:284
 #, php-format
-msgid "about %d minutes ago"
-msgstr "~%d minutt sidan"
+msgid "Could not remove user %s to group %s"
+msgstr "Kunne ikkje fjerne %s fra %s gruppa "
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
-msgid "about %d months ago"
-msgstr "~%d månadar sidan"
-
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
-msgid "about a day ago"
-msgstr "omtrent ein dag sidan"
-
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
-msgid "about a minute ago"
-msgstr "omtrent eitt minutt sidan"
-
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
-msgid "about a month ago"
-msgstr "omtrent ein månad sidan"
-
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
-msgid "about a year ago"
-msgstr "omtrent eitt år sidan"
+msgid "%s left group %s"
+msgstr "%s forlot %s gruppa"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
-msgid "about an hour ago"
-msgstr "omtrent ein time sidan"
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "Allereie logga inn."
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
-msgstr "slett"
-
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117 actions/noticesearch.php:136
-#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
-msgid "in reply to..."
-msgstr "som svar på..."
-
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124 actions/noticesearch.php:143
-#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
-msgid "reply"
-msgstr "svar"
-
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-msgid "same as password above"
-msgstr "same passord som ovanfor"
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Ugyldig notisinnhald"
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
-msgid "unsupported file type"
-msgstr "ikkje støtta fil type"
+#: actions/login.php:143
+msgid "Incorrect username or password."
+msgstr "Feil brukarnamn eller passord"
 
-#: ../lib/util.php:1309 lib/util.php:1443
-msgid "« After"
-msgstr "« Etter"
+#: actions/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
+msgstr "Feil ved å setja brukar."
 
-#: 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
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Der var eit problem med sesjonen din. Vennlegst prøv på nytt."
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "Logg inn"
 
-#: actions/disfavor.php:55 actions/disfavor.php:81
-msgid "This notice is not a favorite!"
-msgstr "Denne notisen er ikkje ein favoritt!"
+#: actions/login.php:243
+msgid "Login to site"
+msgstr "Logg inn "
 
-#: actions/disfavor.php:63 actions/disfavor.php:87
-msgid "Could not delete favorite."
-msgstr "Kunne ikkje slette favoritt."
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Kallenamn"
 
-#: actions/disfavor.php:72 lib/favorform.php:140
-msgid "Favor"
-msgstr "Tjeneste"
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Passord"
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
-msgstr "Send meg ein epost når nokon legg til ein av mine notisar som favoritt."
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "Hugs meg"
 
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-msgid "Send me email when someone sends me a private message."
-msgstr "Send meg ein epost når nokon sender meg ei privat melding."
+#: actions/login.php:253 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
+msgstr "Logg inn automatisk i framtidi (ikkje for delte maskiner)."
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
-msgid "This notice is already a favorite!"
-msgstr "Denne notisen er alt ein favoritt!"
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "Mista eller gløymd passord?"
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132 actions/favor.php:86
-#: actions/twitapifavorites.php:125 classes/Command.php:152
-msgid "Could not create favorite."
-msgstr "Kunne ikkje lagre favoritt."
+#: actions/login.php:282
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr ""
+"Skriv inn brukarnam og passord før du endrar innstillingar (av "
+"tryggleiksomsyn)."
 
-#: actions/favor.php:70
-msgid "Disfavor"
-msgstr "Fjern favoritt"
+#: actions/login.php:286
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"Logg inn med brukarnamn og passord. Har du ikkje brukarnamn endå? [Opprett](%"
+"%action.register%%) ein ny konto, eller prøv [OpenID](%%action.openidlogin%"
+"%)."
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
-#, php-format
-msgid "%s favorite notices"
-msgstr "%s sine favorittar"
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
 
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/makeadmin.php:95
 #, php-format
-msgid "Feed of favorite notices of %s"
-msgstr "Favoritt straum for %s"
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
 
-#: actions/inbox.php:28 actions/inbox.php:59
+#: actions/makeadmin.php:132
 #, php-format
-msgid "Inbox for %s - page %d"
-msgstr "Innboks for %s - side %d"
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
 
-#: actions/inbox.php:30 actions/inbox.php:62
+#: actions/makeadmin.php:145
 #, php-format
-msgid "Inbox for %s"
-msgstr "Innboks for %s"
+msgid "Can't make %s an admin for group %s"
+msgstr ""
 
-#: actions/inbox.php:53 actions/inbox.php:115
-msgid "This is your inbox, which lists your incoming private messages."
-msgstr "Dette er innboksen for dine private meldingar."
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr "Ingen status"
 
-#: actions/invite.php:178 actions/invite.php:213
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-msgstr ""
-"%1$s har invitert deg til å bli med dei på %2$s (%3$s).\n"
-"\n"
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr "Ny gruppe"
 
-#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-msgid "Automatically login in the future; "
-msgstr "Logg inn automatisk i framtida;"
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
+msgstr "Bruk dette skjemaet for å lage ein ny gruppe."
 
-#: actions/login.php:122 actions/login.php:264
-msgid "For security reasons, please re-enter your "
-msgstr "Av åsyn til tryggleiken, skriv inn"
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr "Ny melding"
 
-#: actions/login.php:126 actions/login.php:268
-msgid "Login with your username and password. "
-msgstr "Logg inn med ditt brukarnamn og passord."
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
+msgstr "Du kan ikkje sende melding til denne brukaren."
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
-msgid "That's too long. Max message size is 140 chars."
-msgstr "Det er for langt. Ein notis kan berre være 140 teikn."
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+msgstr "Ingen innhald."
 
-#: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr "Ingen mottakar spesifisert."
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206 actions/newmessage.php:131
-#: actions/newmessage.php:168 classes/Command.php:237
-msgid "You can't send a message to this user."
-msgstr "Du kan ikkje sende melding til denne brukaren."
-
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 "Ikkje send ei melding til deg sjølv; berre sei det til deg sjølv stille og "
 "fredleg."
 
-#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
-msgid "No such user"
-msgstr "Ingen slik brukar"
-
-#: actions/newmessage.php:117 actions/newmessage.php:67
-msgid "New message"
-msgstr "Ny melding"
-
-#: actions/noticesearch.php:95 actions/noticesearch.php:146
-msgid "Notice without matching profile"
-msgstr "Notis utan tiløyrande profil"
+#: actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "Melding"
 
-#: actions/openidsettings.php:28 actions/openidsettings.php:70
+#: actions/newmessage.php:185 lib/command.php:375
 #, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr "[OpenID](%%doc.openid%%) lar deg logge inn til mangen sider"
+msgid "Direct message to %s sent"
+msgstr "Direkte melding til %s sendt"
 
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
-msgstr "Vist du ønskjer å legge til ein OpenID til din konto,"
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
+msgstr "Ajax feil"
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr "Ved å fjerne din einaste OpenID vil gjere det umuleg å logge inn!"
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "Ny notis"
 
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-msgid "You can remove an OpenID from your account "
-msgstr "Du kan fjerne ein OpenID fra din konto."
+#: actions/newnotice.php:199
+msgid "Notice posted"
+msgstr "Melding lagra"
 
-#: actions/outbox.php:28 actions/outbox.php:58
+#: actions/noticesearch.php:68
 #, php-format
-msgid "Outbox for %s - page %d"
-msgstr "Utboks for %s - side %d"
+msgid ""
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
+msgstr ""
+"Søk i notisar på %%site.name%% i innhald. Separer nøkkelord med mellomrom; "
+"dei må være minimum 3 bokstavar eller meir."
 
-#: actions/outbox.php:30 actions/outbox.php:61
-#, php-format
-msgid "Outbox for %s"
-msgstr "Utboks for %s"
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "Tekstsøk"
 
-#: actions/outbox.php:53 actions/outbox.php:116
-msgid "This is your outbox, which lists private messages you have sent."
-msgstr "Dette er din utboks som syner alle private meldingar du har sendt."
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr " Søkestraum for «%s»"
 
-#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 msgstr ""
-"Søk etter folk på %%site.name%% etter deira namn, lokasjon eller interesser."
 
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
-msgid "You can update your personal profile info here "
-msgstr "Du kan oppdatere din personlege profil her"
+#: actions/noticesearch.php:124
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
+msgstr ""
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
-msgid "User without matching profile"
-msgstr "Kan ikkje finne brukar"
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Oppdateringar frå %1$s på %2$s!"
 
-#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
-msgstr "Godkjenningskoden er for gammal."
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Alle oppdateringer frå søket «%s»"
 
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
-msgstr "Vist du har gløymt eller mista ditt"
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+"Denne brukaren tillét ikkje å bli dytta, eller har ikkje stadfasta eller sat "
+"e-postadressa si enno."
 
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a "
-msgstr "Du har blitt identifisert. Skriv inn"
+#: actions/nudge.php:94
+msgid "Nudge sent"
+msgstr "Dytta!"
 
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-msgid "Your nickname on this server, "
-msgstr "Ditt kallenamn på denne serveren,"
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr "Dytta!"
 
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-msgid "Instructions for recovering your password "
-msgstr "Instruksjonar for å hente fram passordet ditt"
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+msgstr "Notisen har ingen profil"
 
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
-msgid "New password successfully saved. "
-msgstr "Nytt passord lagra."
+#: actions/oembed.php:86 actions/shownotice.php:180
+#, php-format
+msgid "%1$s's status on %2$s"
+msgstr "%1$s sin status på %2$s"
 
-#: actions/register.php:95 actions/register.php:180
-msgid "Password must be 6 or more characters."
-msgstr "Passord må være minst 6 teikn."
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Kopla til"
 
-#: actions/register.php:216
-#, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
+#: actions/oembed.php:160
+msgid "Only "
 msgstr ""
-"Gratulerer, %s!  Og velkomen til %%%%site.name%%%%.  Herfrå kann det hende "
-"du vil..."
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
-msgstr "(Du burde motteke ein e-post snart, med"
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
+msgstr "Ikkje eit støtta dataformat."
 
-#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
-#, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr "For å tinga må du [logga inn](%%action.login%%),"
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "Søk etter folk"
 
-#: actions/showfavorites.php:61 actions/showfavorites.php:145
-#, php-format
-msgid "Feed for favorites of %s"
-msgstr "Straum for %s sine favorittar"
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "Notissøk"
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-msgid "Could not retrieve favorite notices."
-msgstr "Kunne ikkje hente fram favorittane."
+#: actions/othersettings.php:60
+msgid "Other Settings"
+msgstr "Andre innstillingar"
 
-#: actions/showmessage.php:33 actions/showmessage.php:81
-msgid "No such message."
-msgstr "Kan ikkje finne den meldinga."
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr "Velikehald andre innstillingar"
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
-msgstr "Kun sendaren og mottakaren kan lese denne meldinga."
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
 
-#: actions/showmessage.php:61 actions/showmessage.php:108
-#, php-format
-msgid "Message to %1$s on %2$s"
-msgstr "Melding til %1$s på %2$s"
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
+msgstr ""
 
-#: actions/showmessage.php:66 actions/showmessage.php:113
-#, php-format
-msgid "Message from %1$s on %2$s"
-msgstr "Melding fra %1$s på %2$s"
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
+msgstr "Den automatisk forkortingstenesta du vil bruke"
 
-#: actions/showstream.php:154
-msgid "Send a message"
-msgstr "Send ei melding"
+#: actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "Profilinnstillingar"
 
-#: actions/smssettings.php:312 actions/smssettings.php:464
-#, php-format
-msgid "Mobile carrier for your phone. "
-msgstr "Tenestetilbydar for telefonen din."
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
 
-#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
-#, php-format
-msgid "Direct messages to %s"
-msgstr "Direkte meldingar til %s"
+#: actions/othersettings.php:153
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Adressa til forkortingstenesta er for lang (maksimalt 50 teikn)."
 
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/outbox.php:58
 #, php-format
-msgid "All the direct messages sent to %s"
-msgstr "Alle direkte meldingar sendt til %s"
-
-#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-msgid "Direct Messages You've Sent"
-msgstr "Alle direkte meldingar du har sendt"
+msgid "Outbox for %s - page %d"
+msgstr "Utboks for %s - side %d"
 
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/outbox.php:61
 #, php-format
-msgid "All the direct messages sent from %s"
-msgstr "Alle direkte meldingar sendt fra %s"
-
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-msgid "No message text!"
-msgstr "Inga meldingstekst!"
+msgid "Outbox for %s"
+msgstr "Utboks for %s"
 
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-msgid "Recipient user not found."
-msgstr "Kunne ikkje finne mottakar."
+#: actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr "Dette er din utboks som syner alle private meldingar du har sendt."
 
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr "Kan ikkje senda direktemeldingar til brukarar som du ikkje er ven med."
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "Endra passord"
 
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
-#, php-format
-msgid "%s / Favorites from %s"
-msgstr "%s / Favorittar frå %s"
+#: actions/passwordsettings.php:69
+msgid "Change your password."
+msgstr "Endra passordet ditt"
 
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
-#, php-format
-msgid "%s updates favorited by %s / %s."
-msgstr "%s oppdateringar favorisert av %s / %s."
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+msgid "Password change"
+msgstr "Endra passord"
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
-#, php-format
-msgid "%s added your notice as a favorite"
-msgstr "%s la til di melding som ein favoritt"
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "Gamalt passord"
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
-#, php-format
-msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
-msgstr ""
-"%1$s la akkurat til di melding frå %2$s som ein av deira favorittar.\n"
-"\n"
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "Nytt passord"
 
-#: actions/twittersettings.php:27
-msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
-msgstr ""
-"Legg til Twitter-kontoen din for å automatisk senda dine uppdateringar til "
-"Twitter,"
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6 eller fleire teikn"
 
-#: actions/twittersettings.php:41 actions/twittersettings.php:60
-msgid "Twitter settings"
-msgstr "Twitter-innstillingar"
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "Godta"
 
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-msgid "Twitter Account"
-msgstr "Twitterkonto"
+#: actions/passwordsettings.php:113
+msgid "same as password above"
+msgstr "same passord som ovanfor"
 
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-msgid "Current verified Twitter account."
-msgstr "Noverande verifisert Twitterkonto"
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "Endra"
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr "Brukarnamn på twitter"
+#: actions/passwordsettings.php:154 actions/register.php:230
+msgid "Password must be 6 or more characters."
+msgstr "Passord må være minst 6 teikn."
 
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-msgid "No spaces, please."
-msgstr "Inga mellomrom."
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "Passorda var ikkje like."
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
-msgstr "Passord på Twitter"
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "Det gamle passordet stemmer ikkje"
 
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-msgid "Automatically send my notices to Twitter."
-msgstr "Send mine notisar til Twitter."
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "Feil ved lagring av brukar; fungerer ikkje."
 
-#: actions/twittersettings.php:75 actions/twittersettings.php:146
-msgid "Send local \"@\" replies to Twitter."
-msgstr "Send lokale «@»-svar til Twitter."
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "Klarar ikkje lagra nytt passord."
 
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-msgid "Subscribe to my Twitter friends here."
-msgstr "Ting mine twitter-vener her."
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "Lagra passord."
 
-#: actions/twittersettings.php:122
+#: actions/peoplesearch.php:52
+#, php-format
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+"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 ""
-"Brukarnamn må berre ha nummer, understrek (_), store og små bokstavar."
-"Maksimalt 15 teikn."
+"Søk for mennesker på %%site.name%% i namn, lokasjon eller interesse. Separer "
+"nøkkelord med mellomrom; dei må være minimum 3 bokstavar eller meir."
 
-#: actions/twittersettings.php:128 actions/twittersettings.php:334
-msgid "Could not verify your Twitter credentials!"
-msgstr "Twitter-informasjonen fungerer ikkje mot Twitter."
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "Søk etter folk"
 
-#: actions/twittersettings.php:137
+#: actions/peopletag.php:70
 #, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr "Klarte ikkje å hente informasjon fra kontoen din, «%s», frå Twitter."
-
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-msgid "Unable to save your Twitter settings!"
-msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!"
+msgid "Not a valid people tag: %s"
+msgstr "Ikkje gyldig merkelapp: %s"
 
-#: actions/twittersettings.php:174 actions/twittersettings.php:376
-msgid "Twitter settings saved."
-msgstr "Lagra Twitter-innstillingar."
+#: actions/peopletag.php:144
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr "Brukarar sjølv-merka med %s, side %d"
 
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-msgid "That is not your Twitter account."
-msgstr "Det er ikkje Twitter-kontoen din."
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "Ugyldig notisinnhald"
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
-msgid "Couldn't remove Twitter user."
-msgstr "Kunne ikkje fjerna Twitter-brukar."
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
 
-#: actions/twittersettings.php:212 actions/twittersettings.php:407
-msgid "Twitter account removed."
-msgstr "Fjerna Twitter-brukar."
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "Profilinnstillingar"
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
-msgid "Couldn't save Twitter preferences."
-msgstr "Klarte ikkje å lagra Twitter-innstillingar."
+#: actions/profilesettings.php:71
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+"Du kan oppdatera informasjonen i profilen din her, so folk kan vite meir om "
+"deg."
 
-#: actions/twittersettings.php:245 actions/twittersettings.php:461
-msgid "Twitter preferences saved."
-msgstr "Twitter-innstillingar lagra."
+#: actions/profilesettings.php:99
+msgid "Profile information"
+msgstr "Profil informasjon"
 
-#: actions/userauthorization.php:84 actions/userauthorization.php:86
-msgid "Please check these details to make sure "
-msgstr "Ver venleg å sjekke denne informasjonen for å forsikra um at"
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+"1-64 små bokstavar eller tal, ingen punktum (og liknande) eller mellomrom"
 
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
-msgid "The subscription has been authorized, but no "
-msgstr "Abonnementet blei godkjend, men ingen"
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full name"
+msgstr "Fullt namn"
 
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-msgid "The subscription has been rejected, but no "
-msgstr "Abonnementet blei avslådd, men ingen"
+#: actions/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "Heimeside"
 
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-msgid "Command results"
-msgstr "Resultat frå kommandoen"
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "URL til heimesida di, bloggen din, eller ein profil på ei anna side."
 
-#: classes/Channel.php:148 classes/Channel.php:204
-msgid "Command complete"
-msgstr "Kommandoen utførd"
+#: actions/profilesettings.php:122 actions/register.php:460
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Skriv om deg og interessene dine med 140 teikn"
 
-#: classes/Channel.php:158 classes/Channel.php:215
-msgid "Command failed"
-msgstr "Kommandoen feila"
+#: actions/profilesettings.php:125 actions/register.php:463
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Skildra deg sjølv og din"
 
-#: classes/Command.php:39 classes/Command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Orsak, men kommandoen er ikkje laga enno."
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "Om meg"
 
-#: classes/Command.php:96 classes/Command.php:113
-#, php-format
-msgid "Subscriptions: %1$s\n"
-msgstr "Tingingar: %1$s\n"
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "Plassering"
 
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
-msgid "User has no last notice"
-msgstr "Brukaren har ikkje siste notis"
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "Kvar er du, t.d. «By, Fylke (eller Region), Land»"
 
-#: classes/Command.php:146 classes/Command.php:166
-msgid "Notice marked as fave."
-msgstr "Notis markert som favoritt."
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
+msgstr "Merkelappar"
 
-#: classes/Command.php:166 classes/Command.php:189
-#, php-format
-msgid "%1$s (%2$s)"
-msgstr "%1$s (%2$s)"
+#: actions/profilesettings.php:140
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+"merkelappar for deg sjølv ( bokstavar, nummer, -, ., og _ ), komma eller "
+"mellomroms separert."
 
-#: classes/Command.php:169 classes/Command.php:192
-#, php-format
-msgid "Fullname: %s"
-msgstr "Fullt namn: %s"
+#: actions/profilesettings.php:144
+msgid "Language"
+msgstr "Språk"
 
-#: classes/Command.php:172 classes/Command.php:195
-#, php-format
-msgid "Location: %s"
-msgstr "Stad: %s"
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr "Foretrukke språk"
 
-#: classes/Command.php:175 classes/Command.php:198
-#, php-format
-msgid "Homepage: %s"
-msgstr "Heimeside: %s"
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr "Tidssone"
 
-#: classes/Command.php:178 classes/Command.php:201
-#, php-format
-msgid "About: %s"
-msgstr "Om: %s"
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
+msgstr "Kva tidssone er du vanlegvis i?"
 
-#: classes/Command.php:200 classes/Command.php:228
-#, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
-msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d"
+#: actions/profilesettings.php:160
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+"Automatisk ting notisane til dei som tingar mine (best for ikkje-menneskje)"
 
-#: classes/Command.php:214 classes/Command.php:245
-#, php-format
-msgid "Direct message to %s sent"
-msgstr "Direkte melding til %s sendt"
+#: actions/profilesettings.php:221 actions/register.php:223
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "«Om meg» er for lang (maks 140 "
 
-#: classes/Command.php:216 classes/Command.php:247
-msgid "Error sending direct message."
-msgstr "Ein feil oppstod ved sending av direkte melding."
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr "Tidssone er ikkje valt."
 
-#: classes/Command.php:263 classes/Command.php:300
-msgid "Specify the name of the user to subscribe to"
-msgstr "Spesifer namnet til brukaren du vil tinge"
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr "Språk er for langt (maksimalt 50 teikn)."
 
-#: classes/Command.php:270 classes/Command.php:307
+#: actions/profilesettings.php:246 actions/tagother.php:178
 #, php-format
-msgid "Subscribed to %s"
-msgstr "Tingar %s"
+msgid "Invalid tag: \"%s\""
+msgstr "Ugyldig merkelapp: %s"
 
-#: classes/Command.php:288 classes/Command.php:328
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Spesifer namnet til brukar du vil fjerne tinging på"
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
+msgstr "Kan ikkje oppdatera brukar for automatisk tinging."
 
-#: classes/Command.php:295 classes/Command.php:335
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "Tingar ikkje %s lengre"
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+msgstr "Kan ikkje lagra profil."
 
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
-msgid "Command not yet implemented."
-msgstr "Kommando ikkje implementert."
+#: actions/profilesettings.php:336
+msgid "Couldn't save tags."
+msgstr "Kan ikkje lagra merkelapp."
 
-#: classes/Command.php:313 classes/Command.php:356
-msgid "Notification off."
-msgstr "Notifikasjon av."
+#: actions/profilesettings.php:344
+msgid "Settings saved."
+msgstr "Lagra innstillingar."
 
-#: classes/Command.php:315 classes/Command.php:358
-msgid "Can't turn off notification."
-msgstr "Kan ikkje skru av notifikasjon."
+#: actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
 
-#: classes/Command.php:333 classes/Command.php:379
-msgid "Notification on."
-msgstr "Notifikasjon på."
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
+msgstr "Kan ikkje hente offentleg straum."
 
-#: classes/Command.php:335 classes/Command.php:381
-msgid "Can't turn on notification."
-msgstr "Kan ikkje slå på notifikasjon."
+#: actions/public.php:129
+#, php-format
+msgid "Public timeline, page %d"
+msgstr "Offentleg tidsline, side %d"
 
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
-msgstr "Komandoar:\n"
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr "Offentleg tidsline"
 
-#: classes/Message.php:53 classes/Message.php:56
-msgid "Could not insert message."
-msgstr "Kunne ikkje lagre melding."
+#: actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Offentleg straum"
 
-#: classes/Message.php:63 classes/Message.php:66
-msgid "Could not update message with new URI."
-msgstr "Kunne ikkje oppdatere melding med ny URI."
+#: actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Offentleg straum"
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
-msgstr "Kunne ikkje finne ein brukar med den profilen i systemet."
+#: actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Offentleg straum"
 
-#: lib/mail.php:147 lib/mail.php:289
+#: actions/public.php:179
 #, php-format
 msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
 msgstr ""
-"Du har ei ny addresse å sende til på %1$s.\n"
-"\n"
 
-#: lib/mail.php:249 lib/mail.php:508
-#, php-format
-msgid "New private message from %s"
-msgstr "Ny privat melding fra %s"
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
 
-#: lib/mail.php:253 lib/mail.php:512
+#: actions/public.php:186
 #, php-format
 msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+"Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
-"%1$s (%2$s) sendte deg ei privat melding: \n"
-"\n"
-
-#: lib/mailbox.php:43 lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "Kun brukaren kan lese sine eigne meldingar."
-
-#: lib/openid.php:195 lib/openid.php:203
-msgid "This form should automatically submit itself. "
-msgstr "Dette skjemaet vil automatisk bli sendt."
-
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-msgid "Favorites"
-msgstr "Favorittar"
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/public.php:233
 #, php-format
-msgid "%s's favorite notices"
-msgstr "%s's favoritt meldingar"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
+msgstr ""
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-msgid "User"
-msgstr "Brukar"
+#: actions/public.php:238
+#, fuzzy, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
+msgstr ""
+"Dette er %%site.name%%, ei [mikroblogging](http://en.wikipedia.org/wiki/"
+"Micro-blogging)-teneste"
 
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-msgid "Inbox"
-msgstr "Innboks"
+#: actions/publictagcloud.php:57
+msgid "Public tag cloud"
+msgstr "Offentleg emne sky"
 
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-msgid "Your incoming messages"
-msgstr "Dine innkomande meldinger"
+#: actions/publictagcloud.php:63
+#, php-format
+msgid "These are most popular recent tags on %s "
+msgstr "Dei mest populære emna på %s"
 
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-msgid "Outbox"
-msgstr "Utboks"
+#: actions/publictagcloud.php:69
+#, php-format
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
+msgstr ""
 
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-msgid "Your sent messages"
-msgstr "Dine sende meldingar"
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
+msgstr ""
 
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-msgid "Twitter"
-msgstr "Twitter"
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
 
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
-msgstr "Twitter integrerings-innstillingar"
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
+msgstr "Emne sky"
 
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-msgid "To"
-msgstr "Til"
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "Du er allereie logga inn!"
 
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-msgid "Could not parse message."
-msgstr "Kunne ikkje prosessera melding."
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "Opprettingskoden finst ikkje."
 
-#: actions/all.php:63 actions/facebookhome.php:162
-#, php-format
-msgid "%s and friends, page %d"
-msgstr "%s med vener, side %d"
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "Ikkje ei gjenopprettingskode."
 
-#: actions/avatarsettings.php:76
-msgid "You can upload your personal avatar."
-msgstr "Du kan laste opp ein personleg avatar."
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr "Hent fram passord for ukjend brukar."
 
-#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
-msgid "Avatar settings"
-msgstr "Avatar-innstillingar"
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "Feil med stadfestingskode."
 
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-msgid "Original"
-msgstr "Original"
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
+msgstr "Denne godkjenningskoden er for gammal. Vennligst start på nytt."
 
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-msgid "Preview"
-msgstr "Forhandsvis"
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
+msgstr "Kan ikkje oppdatera brukar med stadfesta e-postadresse."
 
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
-msgid "Crop"
-msgstr "Skaler"
+#: actions/recoverpassword.php:152
+msgid ""
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
+msgstr ""
 
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-msgid "There was a problem with your session token. "
-msgstr "Der var eit problem med sesjonen."
-
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-msgid "Pick a square area of the image to be your avatar"
-msgstr "Velg eit utvalg av bildet som vil blir din avatar."
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
+msgstr ""
 
-#: actions/avatarsettings.php:327 actions/grouplogo.php:384
-msgid "Lost our file data."
-msgstr "Fant ikkje igjen fil data."
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
+msgstr ""
 
-#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
-msgid "Lost our file."
-msgstr "Mista fila vår."
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
+msgstr ""
 
-#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
-#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
-msgid "Unknown file type"
-msgstr "Ukjend fil type"
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
+msgstr "Ditt kallenamn på denne servere, eller din registrerte epost addresse."
 
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "Ingen vald profil."
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
+msgstr "Gjenopprett"
 
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "Fann ingen profil med den IDen."
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "Tilbakestill passord"
 
-#: actions/block.php:111
-msgid "Block user"
-msgstr "Blokker brukaren"
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr "Hent fram passord"
 
-#: actions/block.php:129
-msgid "Are you sure you want to block this user? "
-msgstr "Er du sikker på at du vil blokkera denne brukaren?"
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
+msgstr "Passord opphenting etterspurt"
 
-#: actions/block.php:162
-msgid "You have already blocked this user."
-msgstr "Du har allereie blokkert denne brukaren."
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
+msgstr "Uventa handling."
 
-#: actions/block.php:167
-msgid "Failed to save block information."
-msgstr "Lagring av informasjon feila."
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 eller fleire teikn, og ikkje gløym dei."
 
-#: actions/confirmaddress.php:159
-#, php-format
-msgid "The address \"%s\" has been "
-msgstr "Addressa «%s» blei"
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Samme passord som over"
 
-#: actions/deletenotice.php:73
-msgid "You are about to permanently delete a notice. "
-msgstr "Du er i ferd med å fjerne ein oppdatering for godt."
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "Avbryt"
 
-#: actions/disfavor.php:94
-msgid "Add to favorites"
-msgstr "Legg til i favorittar"
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "Skriv inn kallenamn eller epostadresse."
 
-#: actions/editgroup.php:54
-#, php-format
-msgid "Edit %s group"
-msgstr "Rediger %s gruppa"
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
+msgstr "Ingen brukar med den epostadressa eller det brukarnamnet."
 
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-msgid "Inboxes must be enabled for groups to work"
-msgstr "Innboks må være slått på for at grupper skal virke"
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr "Ingen registrert epostadresse for den brukaren."
 
-#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-msgid "You must be logged in to create a group."
-msgstr "Du må være logga inn for å lage ei gruppe."
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "Feil med lagring av adressestadfesting."
 
-#: actions/editgroup.php:87 actions/grouplogo.php:87
-#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
-msgid "No nickname"
-msgstr "Ingen kallenamn"
+#: actions/recoverpassword.php:325
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr ""
+"Instruksjonar for å få att passordet ditt er send til epostadressa som er "
+"lagra i kontoen din."
 
-#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
-#: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
-msgid "No such group"
-msgstr "Fann ikkje gruppa"
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
+msgstr "Uventa passordnullstilling."
 
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
-msgid "You must be an admin to edit the group"
-msgstr "Du må være administrator for å redigere gruppa"
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "Passord må vera 6 tekn eller meir."
 
-#: actions/editgroup.php:157
-msgid "Use this form to edit the group."
-msgstr "Bruk dette skjemaet for å redigere gruppa"
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
+msgstr "Passord og stadfesting stemmer ikkje."
 
-#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
-msgid "Nickname must have only lowercase letters "
-msgstr "Kallenamn kann berre ha små bokstavar"
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
+msgstr "Lagra det nye passordet. Du er logga inn."
 
-#: actions/editgroup.php:198 actions/newgroup.php:149
-msgid "description is too long (max 140 chars)."
-msgstr "skildringa er for lang (maks 140 teikn)."
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
+msgstr "Beklage, men kun inviterte kan registrere seg."
 
-#: actions/editgroup.php:218
-msgid "Could not update group."
-msgstr "Kann ikkje oppdatera gruppa."
+#: actions/register.php:92
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "Feil med stadfestingskode."
 
-#: actions/editgroup.php:226
-msgid "Options saved."
-msgstr "Lagra innstillingar."
+#: actions/register.php:112
+msgid "Registration successful"
+msgstr "Registreringa gikk bra"
 
-#: actions/emailsettings.php:107 actions/imsettings.php:108
-#, php-format
-msgid "Awaiting confirmation on this address. "
-msgstr "Ventar på godkjenning for denne adressa."
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "Registrér"
 
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-msgid "Make a new email address for posting to; "
-msgstr "Lag ei ny e-postadresse for å posta til;"
+#: actions/register.php:135
+msgid "Registration not allowed."
+msgstr "Registrering ikkje tillatt."
 
-#: actions/emailsettings.php:157
-msgid "Send me email when someone "
-msgstr "Send meg ein epost når nokon "
+#: actions/register.php:198
+msgid "You can't register if you don't agree to the license."
+msgstr "Du kan ikkje registrera deg om du ikkje godtek vilkåra i lisensen."
 
-#: actions/emailsettings.php:168
-msgid "Allow friends to nudge me and send me an email."
-msgstr "Tillat vennar å sende meg ein epost."
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "Ikkje ei gyldig epostadresse."
 
-#: actions/emailsettings.php:321
-msgid "That email address already belongs "
-msgstr "Den e-postadressa er alt registrert hjå"
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "Epostadressa finst allereie."
 
-#: actions/emailsettings.php:343
-msgid "A confirmation code was sent to the email address you added. "
-msgstr "Sendte konfirmasjonskode til e-postadresse du la til."
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "Ugyldig brukarnamn eller passord."
 
-#: actions/facebookhome.php:110
-msgid "Server error - couldn't get user!"
-msgstr "Server feil - kunne ikkje hente brukar!"
+#: actions/register.php:342
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
 
-#: actions/facebookhome.php:196
-#, php-format
-msgid "If you would like the %s app to automatically update "
-msgstr "Vist du ønskjer at %s applikasjon skal automatisk oppgradere"
+#: actions/register.php:424
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+"1-64 små bokstavar eller tal, ingen punktum (og liknande) eller mellomrom. "
+"Kravd."
 
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "Tillat %s å oppdatere min Facebook status"
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr "6 eller fleire teikn. Kravd."
 
-#: actions/facebookhome.php:218
-msgid "Skip"
-msgstr "Hopp over"
+#: actions/register.php:433
+msgid "Same as password above. Required."
+msgstr "Samme som passord over. Påkrevd."
 
-#: actions/facebookhome.php:235
-msgid "No notice content!"
-msgstr "Ingen innhald."
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "Epost"
 
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-msgid "Pagination"
-msgstr "Paginering"
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
+msgstr ""
+"Blir berre brukt for uppdateringar, viktige meldingar og for gløymde passord"
 
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-msgid "After"
-msgstr "« Etter"
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
+msgstr "Lengre namn, fortrinnsvis ditt «ekte» namn"
 
-#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
-msgid "Before"
-msgstr "Før »"
+#: actions/register.php:493
+msgid "My text and files are available under "
+msgstr "Teksten og filene mine er tilgjengeleg under "
 
-#: actions/facebookinvite.php:70
-#, php-format
-msgid "Thanks for inviting your friends to use %s"
-msgstr "Takk for at du inviterar vennane dine til å bruke %s"
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
 
-#: actions/facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Invitasjon(er) sendt til fylgjande folk:"
+#: actions/register.php:496
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+" unnateke privatdata: passord, epostadresse, ljonmeldingsadresse og "
+"telefonnummer."
 
-#: actions/facebookinvite.php:96
+#: actions/register.php:537
 #, php-format
-msgid "You have been invited to %s"
-msgstr "Du har blitt invitert til %s"
+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 ""
+"Gratulerer, %s! Og velkomen til %%%%site.name%%%%. Frå her kann det henda du "
+"vil...\n"
+"\n"
+"* Gå til [profilen din](%s) og skriva den fyrste meldinga.\n"
+"* Leggja til ei [Jabber/GTalk adresse](%%%%action.imsettings%%%%) so du kann "
+"laga nye meldingar ved hjelp av direktemeldingar.\n"
+"* [Søkje etter folk](%%%%action.profilesettings%%%%) det kan hende du "
+"kjenner, eller som du delar interesser med.\n"
+"* Uppdatere dine [profilval] so du kann fortelja andre meir um deg sjølv.* "
+"Lesa [hjelpetekstane](%%%%doc.help%%%%) for å finna ut meir um funksjonar du "
+"kann ha gådd glipp av.\n"
+"\n"
+"Takk for at du blei med, og vi håpar du vil lika tenesta!"
 
-#: actions/facebookinvite.php:105
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Inviter venane dine til å nytta %s"
+#: actions/register.php:561
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+"(Du mottek ein epost med instruksjonar på korleis du stadfester epostadressa "
+"di)"
 
-#: actions/facebookinvite.php:113
+#: actions/remotesubscribe.php:98
 #, php-format
-msgid "Friends already using %s:"
-msgstr "Vennar som alt brukar %s:"
+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 ""
+"For å tinga kann du [logga inn](%%action.login%%), eller [registrera](%%"
+"action.register%%) ein ny konto.  Um du allereie hev ein konto på ei "
+"[kompatibel mikrobloggingside](%%doc.openmublog%%), kann du oppgje URLen til "
+"profilen under."
 
-#: actions/facebookinvite.php:130
-#, php-format
-msgid "Send invitations"
-msgstr "Send invitasjonar"
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr "Eksternt abbonement"
 
-#: actions/facebookremove.php:56
-msgid "Couldn't remove Facebook user."
-msgstr "Kunne ikkje fjerna Facebook-brukar."
+#: actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Lagre tinging for brukar: %s"
 
-#: actions/facebooksettings.php:65
-msgid "There was a problem saving your sync preferences!"
-msgstr "Der oppstod eit problem med å lagre synkroniserings innstillingane!"
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "Brukaren sitt kallenamn"
 
-#: actions/facebooksettings.php:67
-msgid "Sync preferences saved."
-msgstr "Synkroniserings innstillingar blei lagra."
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr "Kallenamnet til brukaren du vil fylgja"
 
-#: actions/facebooksettings.php:90
-msgid "Automatically update my Facebook status with my notices."
-msgstr "Automatisk uppdater Facebook-statusen min med nye uppdateringar."
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "Profil-adresse"
 
-#: actions/facebooksettings.php:97
-msgid "Send \"@\" replies to Facebook."
-msgstr "Send lokale «@»-svar til Facebook."
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "URL til profilsida di på ei anna kompatibel mikrobloggingteneste."
 
-#: actions/facebooksettings.php:106
-msgid "Prefix"
-msgstr "Førestaving"
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
+msgstr "Ting"
 
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
-msgstr "Ein tekst å legge til før alle notisar."
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr "Ugyldig profil-nettadresse (feil format)"
 
-#: actions/facebooksettings.php:124
-#, php-format
-msgid "If you would like %s to automatically update "
-msgstr "Vist du ønskjer at %s skal atuomatisk oppdatere"
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "Ikkje ein brukande profil-netadresse (ingen YADIS-dokument)."
 
-#: actions/facebooksettings.php:147
-msgid "Sync preferences"
-msgstr "Synkronisering"
+#: actions/remotesubscribe.php:176
+#, fuzzy
+msgid "That’s a local profile! Login to subscribe."
+msgstr "Det er ikkje ein lokal profil! Log inn for å tinge."
 
-#: actions/favor.php:94 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "Fjern favoritt"
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "Fekk ikkje spørjingsbillett (request token)."
 
-#: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
-msgid "Popular notices"
-msgstr "Populære notisar"
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
+#, php-format
+msgid "Replies to %s"
+msgstr "Svar til %s"
 
-#: actions/favorited.php:67
+#: actions/replies.php:127
 #, php-format
-msgid "Popular notices, page %d"
-msgstr "Populære notisar, side %d"
+msgid "Replies to %s, page %d"
+msgstr "Svar til %s, side %d"
 
-#: actions/favorited.php:79
-msgid "The most popular notices on the site right now."
-msgstr "Viser dei mest populære notisane på sida akkurat no."
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Notisstraum for %s"
 
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
-msgid "Featured users"
-msgstr "Profilerte folk"
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Notisstraum for %s"
 
-#: actions/featured.php:71
+#: actions/replies.php:158
 #, php-format
-msgid "Featured users, page %d"
-msgstr "Profilerte folk, side %d"
+msgid "Replies feed for %s (Atom)"
+msgstr "Notisstraum for %s"
 
-#: actions/featured.php:99
+#: actions/replies.php:198
 #, php-format
-msgid "A selection of some of the great users on %s"
-msgstr "Eit utval av nokre av dei flotte folka på %s"
-
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
-msgstr "Brukaren tillet deg ikkje å tinga meldingane sine."
-
-#: actions/groupbyid.php:79
-msgid "No ID"
-msgstr "Ingen ID"
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
 
-#: actions/grouplogo.php:138 actions/grouplogo.php:191
-msgid "Group logo"
-msgstr "Logo åt gruppa"
+#: actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
 
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
-msgstr "Du kan lasta opp ein logo for gruppa."
+#: actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
 
-#: actions/grouplogo.php:448
-msgid "Logo updated."
-msgstr "Logo oppdatert."
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Melding til %1$s på %2$s"
 
-#: actions/grouplogo.php:450
-msgid "Failed updating logo."
-msgstr "Feil ved oppdatering av logo."
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "%s favoritt meldingar, side %d"
 
-#: actions/groupmembers.php:93 lib/groupnav.php:91
-#, php-format
-msgid "%s group members"
-msgstr "%s medlemmar i gruppa"
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
+msgstr "Kunne ikkje hente fram favorittane."
 
-#: actions/groupmembers.php:96
+#: actions/showfavorites.php:170
 #, php-format
-msgid "%s group members, page %d"
-msgstr "%s medlemmar i gruppa, side %d"
-
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
-msgstr "Ei liste over brukarane i denne gruppa."
-
-#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
-msgid "Groups"
-msgstr "Grupper"
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Straum for vener av %s"
 
-#: actions/groups.php:64
+#: actions/showfavorites.php:177
 #, php-format
-msgid "Groups, page %d"
-msgstr "Grupper, side %d"
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Straum for vener av %s"
 
-#: actions/groups.php:90
+#: actions/showfavorites.php:184
 #, php-format
-msgid "%%%%site.name%%%% groups let you find and talk with "
-msgstr "%%%%site.name%%%% grupper lar deg finne og snakke med"
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Straum for vener av %s"
 
-#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-msgid "Create a new group"
-msgstr "Opprett ei ny gruppe"
+#: actions/showfavorites.php:205
+msgid ""
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
+msgstr ""
 
-#: actions/groupsearch.php:57
+#: actions/showfavorites.php:207
 #, php-format
 msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-msgstr "Søk etter grupper på %%site.name%% etter namn, stad eller skildring."
-
-#: actions/groupsearch.php:63
-msgid "Group search"
-msgstr "Gruppesøk"
-
-#: actions/imsettings.php:70
-msgid "You can send and receive notices through "
-msgstr "Du kan sende og motta meldingar gjennom"
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
 
-#: actions/imsettings.php:120
+#: actions/showfavorites.php:211
 #, php-format
-msgid "Jabber or GTalk address, "
-msgstr "Jabber eller GTalk addresse,"
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
 
-#: actions/imsettings.php:147
-msgid "Send me replies through Jabber/GTalk "
-msgstr "Send meg svar på Jabber/GTalk."
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
 
-#: actions/imsettings.php:321
+#: actions/showgroup.php:82 lib/groupnav.php:86
 #, php-format
-msgid "A confirmation code was sent "
-msgstr "Ein stadfestingskode vart sendt"
-
-#: actions/joingroup.php:65
-msgid "You must be logged in to join a group."
-msgstr "Du må være logga inn for å bli med i ei gruppe."
-
-#: actions/joingroup.php:95
-msgid "You are already a member of that group"
-msgstr "Du er allereie medlem av den gruppa"
+msgid "%s group"
+msgstr "%s gruppe"
 
-#: actions/joingroup.php:128
+#: actions/showgroup.php:84
 #, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Kunne ikkje melde brukaren %s inn i gruppa %s"
+msgid "%s group, page %d"
+msgstr "%s gruppe, side %d"
 
-#: actions/joingroup.php:135
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s blei medlem av gruppe %s"
+#: actions/showgroup.php:218
+msgid "Group profile"
+msgstr "Gruppe profil"
 
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
-msgstr "Innboks må være slått på for at grupper skal kunne fungere."
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
+msgid "URL"
+msgstr "URL"
 
-#: actions/leavegroup.php:65
-msgid "You must be logged in to leave a group."
-msgstr "Du må være innlogga for å melde deg ut av ei gruppe."
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
+msgid "Note"
+msgstr "Merknad"
 
-#: actions/leavegroup.php:88
-msgid "No such group."
-msgstr "Denne gruppa finst ikkje."
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
 
-#: actions/leavegroup.php:95
-msgid "You are not a member of that group."
-msgstr "Du er ikkje medlem av den gruppa."
+#: actions/showgroup.php:293
+msgid "Group actions"
+msgstr "Gruppe handlingar"
 
-#: actions/leavegroup.php:100
-msgid "You may not leave a group while you are its administrator."
-msgstr "Du kan ikkje melde deg ut av ei gruppe når du er administrator i den."
+#: actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Notisstraum for %s gruppa"
 
-#: actions/leavegroup.php:130
-msgid "Could not find membership record."
-msgstr "Kan ikkje finne brukar."
+#: actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Notisstraum for %s gruppa"
 
-#: actions/leavegroup.php:138
-#, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "Kunne ikkje fjerne %s fra %s gruppa "
+#: actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Notisstraum for %s gruppa"
 
-#: actions/leavegroup.php:145
+#: actions/showgroup.php:345
 #, php-format
-msgid "%s left group %s"
-msgstr "%s forlot %s gruppa"
-
-#: actions/login.php:225 lib/facebookaction.php:304
-msgid "Login to site"
-msgstr "Logg inn "
-
-#: actions/microsummary.php:69
-msgid "No current status"
-msgstr "Ingen status"
-
-#: actions/newgroup.php:53
-msgid "New group"
-msgstr "Ny gruppe"
-
-#: actions/newgroup.php:115
-msgid "Use this form to create a new group."
-msgstr "Bruk dette skjemaet for å lage ein ny gruppe."
-
-#: actions/newgroup.php:177
-msgid "Could not create group."
-msgstr "Kunne ikkje laga gruppa."
+msgid "FOAF for %s group"
+msgstr "Utboks for %s"
 
-#: actions/newgroup.php:191
-msgid "Could not set group membership."
-msgstr "Kunne ikkje bli med i gruppa."
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
+msgid "Members"
+msgstr "Medlemmar"
 
-#: actions/newmessage.php:119 actions/newnotice.php:132
-msgid "That's too long. "
-msgstr "Det er for langt."
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/tagcloudsection.php:71
+msgid "(None)"
+msgstr "(Ingen)"
 
-#: actions/newmessage.php:134
-msgid "Don't send a message to yourself; "
-msgstr "Ikkje send melding til deg sjølv;"
+#: actions/showgroup.php:392
+msgid "All members"
+msgstr "Alle medlemmar"
 
-#: actions/newnotice.php:166
-msgid "Notice posted"
-msgstr "Melding lagra"
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "Statistikk"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
-msgid "Ajax Error"
-msgstr "Ajax feil"
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Lag"
 
-#: actions/nudge.php:85
+#: actions/showgroup.php:448
+#, php-format
 msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
-"Denne brukaren tillét ikkje å bli dytta, eller har ikkje stadfasta eller sat "
-"e-postadressa si enno."
 
-#: actions/nudge.php:94
-msgid "Nudge sent"
-msgstr "Dytta!"
+#: actions/showgroup.php:454
+#, fuzzy, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
+msgstr ""
+"**%s** er ei brukargruppe på %%%%site.name%%%%, ei [mikroblogging](http://en."
+"wikipedia.org/wiki/Micro-blogging)-teneste"
 
-#: actions/nudge.php:97
-msgid "Nudge sent!"
-msgstr "Dytta!"
+#: actions/showgroup.php:482
+#, fuzzy
+msgid "Admins"
+msgstr "Administrator"
 
-#: actions/openidlogin.php:97
-msgid "OpenID login"
-msgstr "OpenID-innlogging"
+#: actions/showmessage.php:81
+msgid "No such message."
+msgstr "Kan ikkje finne den meldinga."
 
-#: actions/openidsettings.php:128
-msgid "Removing your only OpenID "
-msgstr "Fjernar din einaste OpenID"
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient may read this message."
+msgstr "Kun sendaren og mottakaren kan lese denne meldinga."
 
-#: actions/othersettings.php:60
-msgid "Other Settings"
-msgstr "Andre innstillingar"
+#: actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr "Melding til %1$s på %2$s"
 
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Velikehald andre innstillingar"
+#: actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr "Melding fra %1$s på %2$s"
 
-#: actions/othersettings.php:93
-msgid "URL Auto-shortening"
-msgstr "URL forkorting"
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Melding lagra"
 
-#: actions/othersettings.php:112
-msgid "Service"
-msgstr "Teneste"
+#: actions/showstream.php:73
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "Notisar merka med %s"
 
-#: actions/othersettings.php:113
-msgid "Automatic shortening service to use."
-msgstr "Den automatisk forkortingstenesta du vil bruke"
+#: actions/showstream.php:79
+#, php-format
+msgid "%s, page %d"
+msgstr "%s, side %d"
 
-#: actions/othersettings.php:144
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "Adressa til forkortingstenesta er for lang (maksimalt 50 teikn)."
+#: actions/showstream.php:122
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Notisstraum for %s gruppa"
 
-#: actions/passwordsettings.php:69
-msgid "Change your password."
-msgstr "Endra passordet ditt"
+#: actions/showstream.php:129
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Notisstraum for %s"
 
-#: actions/passwordsettings.php:89
-msgid "Password change"
-msgstr "Endra passord"
+#: actions/showstream.php:136
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Notisstraum for %s"
 
-#: actions/peopletag.php:35
-#, php-format
-msgid "Not a valid people tag: %s"
-msgstr "Ikkje gyldig merkelapp: %s"
+#: actions/showstream.php:143
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Notisstraum for %s"
 
-#: actions/peopletag.php:47
-#, php-format
-msgid "Users self-tagged with %s - page %d"
-msgstr "Brukarar sjølv-merka med %s, side %d"
+#: actions/showstream.php:148
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Utboks for %s"
 
-#: actions/peopletag.php:91
+#: actions/showstream.php:191
 #, php-format
-msgid "These are users who have tagged themselves \"%s\" "
-msgstr "Desse brukarane har merka seg sjølve med «%s»"
-
-#: actions/profilesettings.php:91
-msgid "Profile information"
-msgstr "Profil informasjon"
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
 
-#: actions/profilesettings.php:124
+#: actions/showstream.php:196
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
 msgstr ""
-"merkelappar for deg sjølv ( bokstavar, nummer, -, ., og _ ), komma eller "
-"mellomroms separert."
-
-#: actions/profilesettings.php:144
-msgid "Automatically subscribe to whoever "
-msgstr "Automatisk tinging av alle som"
-
-#: actions/profilesettings.php:229 actions/tagother.php:176
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Ugyldig merkelapp: %s"
-
-#: actions/profilesettings.php:311
-msgid "Couldn't save tags."
-msgstr "Kan ikkje lagra merkelapp."
-
-#: actions/public.php:107
-#, php-format
-msgid "Public timeline, page %d"
-msgstr "Offentleg tidsline, side %d"
-
-#: actions/public.php:173
-msgid "Could not retrieve public stream."
-msgstr "Kan ikkje hente offentleg straum."
 
-#: actions/public.php:220
+#: actions/showstream.php:198
 #, php-format
 msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
-"Dette er %%site.name%%, ei [mikroblogging](http://en.wikipedia.org/wiki"
-"/Micro-blogging)-teneste"
-
-#: actions/publictagcloud.php:57
-msgid "Public tag cloud"
-msgstr "Offentleg emne sky"
-
-#: actions/publictagcloud.php:63
-#, php-format
-msgid "These are most popular recent tags on %s "
-msgstr "Dei mest populære emna på %s"
-
-#: actions/publictagcloud.php:119
-msgid "Tag cloud"
-msgstr "Emne sky"
-
-#: actions/register.php:139 actions/register.php:349
-msgid "Sorry, only invited people can register."
-msgstr "Beklage, men kun inviterte kan registrere seg."
-
-#: actions/register.php:149
-msgid "You can't register if you don't "
-msgstr "Du kan ikkje registrera om du ikkje"
-
-#: actions/register.php:286
-msgid "With this form you can create "
-msgstr "Med dette skjemaet kan du laga"
-
-#: actions/register.php:368
-msgid "1-64 lowercase letters or numbers, "
-msgstr "1-64 små bokstavar eller tal,"
-
-#: actions/register.php:382 actions/register.php:386
-msgid "Used only for updates, announcements, "
-msgstr "Berre nytta for oppdatering, annonseringar,"
-
-#: actions/register.php:398
-msgid "URL of your homepage, blog, "
-msgstr "URL til heimesida, bloggen,"
-
-#: actions/register.php:404
-msgid "Describe yourself and your "
-msgstr "Skildra deg sjølv og din"
 
-#: actions/register.php:410
-msgid "Where you are, like \"City, "
-msgstr "Kvar er du, t.d. «Stad, Fylke, Land»"
-
-#: actions/register.php:432
-msgid " except this private data: password, "
-msgstr " unnateke privat data: passord,"
-
-#: actions/register.php:471
+#: actions/showstream.php:234
 #, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
-msgstr "Gratulerer, %s!  Og velkomen til %%%%site.name%%%%."
-
-#: actions/register.php:495
-msgid "(You should receive a message by email "
-msgstr "(Du skal få ein beskjed via epost )"
-
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
-msgstr "Det er ikkje ein lokal profil! Log inn for å tinge."
-
-#: actions/replies.php:118
-#, php-format
-msgid "Replies to %s, page %d"
-msgstr "Svar til %s, side %d"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
 
-#: actions/showfavorites.php:79
-#, php-format
-msgid "%s favorite notices, page %d"
-msgstr "%s favoritt meldingar, side %d"
+#: actions/showstream.php:239
+#, fuzzy, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
+msgstr ""
+"**%s** har ein konto på %%%%site.name%%%%, ei [mikroblogging](http://en."
+"wikipedia.org/wiki/Micro-blogging)-teneste"
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
-#, php-format
-msgid "%s group"
-msgstr "%s gruppe"
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "SMS innstillingar"
 
-#: actions/showgroup.php:79
+#: actions/smssettings.php:69
 #, php-format
-msgid "%s group, page %d"
-msgstr "%s gruppe, side %d"
-
-#: actions/showgroup.php:206
-msgid "Group profile"
-msgstr "Gruppe profil"
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr "Du kan motta SMS-meldingar gjennom e-post frå %%site.name%%."
 
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
-msgid "URL"
-msgstr "URL"
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Denne sida er ikkje tilgjengleg i eit"
 
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
-msgid "Note"
-msgstr "Merknad"
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Godkjent mobiltelefonnummer."
 
-#: actions/showgroup.php:270
-msgid "Group actions"
-msgstr "Gruppe handlingar"
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
+msgstr "Ventar på godkjenning for dette telefonnummeret."
 
-#: actions/showgroup.php:323
-#, php-format
-msgid "Notice feed for %s group"
-msgstr "Notisstraum for %s gruppa"
+#: actions/smssettings.php:130
+msgid "Confirmation code"
+msgstr "Stadfestingskode"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
-msgid "Members"
-msgstr "Medlemmar"
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
+msgstr "Skriv inn koden du fekk på telefonen."
 
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
-msgid "(None)"
-msgstr "(Ingen)"
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
+msgstr "SMS telefon nummer"
 
-#: actions/showgroup.php:370
-msgid "All members"
-msgstr "Alle medlemmar"
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "Telefonnummer, kun tall, med landskode"
 
-#: actions/showgroup.php:378
-#, php-format
+#: actions/smssettings.php:174
 msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
 msgstr ""
-"**%s** er ei brukargruppe på %%%%site.name%%%%, ei "
-"[mikroblogging](http://en.wikipedia.org/wiki/Micro-blogging)-teneste"
-
-#: actions/showmessage.php:98
-msgid "Only the sender and recipient "
-msgstr "Berre sendaren og mottakaren"
+"Send meg ein notis via SMS; eg forstår at dette kan føre til kostnadar fra "
+"min tilbydar."
 
-#: actions/showstream.php:73
-#, php-format
-msgid "%s, page %d"
-msgstr "%s, side %d"
+#: actions/smssettings.php:306
+msgid "No phone number."
+msgstr "Ingen telefonnummer."
 
-#: actions/showstream.php:143
-msgid "'s profile"
-msgstr " sin profil"
+#: actions/smssettings.php:311
+msgid "No carrier selected."
+msgstr "Ingen mobiloperatør vald."
 
-#: actions/showstream.php:236 actions/tagother.php:77
-msgid "User profile"
-msgstr "Brukarprofil"
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
+msgstr "Det er alt ditt telefonnummer"
 
-#: actions/showstream.php:240 actions/tagother.php:81
-msgid "Photo"
-msgstr "Bilete"
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
+msgstr "Det telefonnummeret er alt registrert hos ein annan brukar."
 
-#: actions/showstream.php:317
-msgid "User actions"
-msgstr "Brukarverkty"
+#: actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"Sende godkjenningskode til telefonnummeret du la til. Sjekk innboksen for "
+"koden og veiledning på korleis du nyttar han."
 
-#: actions/showstream.php:342
-msgid "Send a direct message to this user"
-msgstr "Send ei direktemelding til denne brukaren"
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
+msgstr "Det er feil godkjennings nummer."
 
-#: actions/showstream.php:343
-msgid "Message"
-msgstr "Melding"
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
+msgstr "Det er ikkje ditt telefonnummer"
 
-#: actions/showstream.php:451
-msgid "All subscribers"
-msgstr "Tingarar"
+#: actions/smssettings.php:465
+msgid "Mobile carrier"
+msgstr "Telefontilbydar"
 
-#: actions/showstream.php:533
-msgid "All groups"
-msgstr "Alle gruppar"
+#: actions/smssettings.php:469
+msgid "Select a carrier"
+msgstr "Velg ein tilbydar"
 
-#: actions/showstream.php:542
+#: actions/smssettings.php:476
 #, php-format
 msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"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 ""
-"**%s** har ein konto på %%%%site.name%%%%, ei "
-"[mikroblogging](http://en.wikipedia.org/wiki/Micro-blogging)-teneste"
-
-#: actions/smssettings.php:128
-msgid "Phone number, no punctuation or spaces, "
-msgstr "Telefonnummer, ingen punktum eller mellomrom,"
-
-#: actions/smssettings.php:162
-msgid "Send me notices through SMS; "
-msgstr "Send meg notisar på SMS;"
-
-#: actions/smssettings.php:335
-msgid "A confirmation code was sent to the phone number you added. "
-msgstr "Ei stadfestingskode vart sendt til telefonnummeret du la til."
+"Mobiloperatøren din. Ta kontakt på %s viss du kjenner ein mobiloperatør som "
+"aksepterer SMS-over-epost, men ikkje vistast her."
 
-#: actions/smssettings.php:453
-msgid "Mobile carrier"
-msgstr "Telefontilbydar"
+#: actions/smssettings.php:498
+msgid "No code entered"
+msgstr "Ingen innskriven kode"
 
 #: actions/subedit.php:70
 msgid "You are not subscribed to that profile."
@@ -4241,13 +3015,31 @@ msgid "%s subscribers, page %d"
 msgstr "%s tingarar, side %d"
 
 #: actions/subscribers.php:63
-msgid "These are the people who listen to "
-msgstr "Dette er folk som lyttar til"
+msgid "These are the people who listen to your notices."
+msgstr "Dette er folk som lyttar til dine notisar."
 
 #: actions/subscribers.php:67
 #, php-format
-msgid "These are the people who "
-msgstr "Dette er folk som"
+msgid "These are the people who listen to %s's notices."
+msgstr "Dette er folk som lyttar til %s's notisar"
+
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
+msgstr ""
+
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr ""
+
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
 
 #: actions/subscriptions.php:52
 #, php-format
@@ -4260,27 +3052,36 @@ msgid "%s subscriptions, page %d"
 msgstr "%s tingingar, side %d"
 
 #: actions/subscriptions.php:65
-msgid "These are the people whose notices "
+msgid "These are the people whose notices you listen to."
 msgstr "Dette er dei du lyttar til."
 
 #: actions/subscriptions.php:69
 #, php-format
-msgid "These are the people whose "
-msgstr "Dette er folk som"
+msgid "These are the people whose notices %s listens to."
+msgstr "Dette er folka som %s tingar oppdateringar frå."
+
+#: actions/subscriptions.php:121
+#, php-format
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
+msgstr ""
+
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s høyrer no på"
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:194
 msgid "Jabber"
 msgstr "Jabber"
 
-#: actions/tag.php:43
-#, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Notisar merka med %s, side %d"
-
-#: actions/tag.php:66
-#, php-format
-msgid "Messages tagged \"%s\", most recent first"
-msgstr "Meldingar merka med «%s», dei siste fyrst"
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
+msgstr "SMS"
 
 #: actions/tagother.php:33
 msgid "Not logged in"
@@ -4295,11 +3096,19 @@ msgstr "Manglar argumentet ID."
 msgid "Tag %s"
 msgstr "Merkelapp %s"
 
+#: actions/tagother.php:77 lib/userprofile.php:75
+msgid "User profile"
+msgstr "Brukarprofil"
+
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
+msgstr "Bilete"
+
 #: actions/tagother.php:141
 msgid "Tag user"
 msgstr "Merk brukar"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4307,239 +3116,887 @@ msgstr ""
 "Emneord for denne brukaren (bokstavar, tal, <kbd>-</kbd>, <kbd>.</kbd>, og "
 "<kbd>_</kbd>, separert med komma eller mellomrom"
 
-#: actions/tagother.php:164
-msgid "There was a problem with your session token."
-msgstr "Det var eit problem med sesjons billetten din."
-
-#: actions/tagother.php:191
+#: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Du kan berre leggje til emneord på folk som du tingar notisar frå, eller som "
 "tingar notisar frå deg."
 
-#: actions/tagother.php:198
+#: actions/tagother.php:200
 msgid "Could not save tags."
 msgstr "Kunne ikkje lagra emneord."
 
-#: actions/tagother.php:233
+#: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Bruk dette skjemaet for å leggje til emneord til dei som tingar notisar frå "
 "deg, eller som du tingar notisar frå."
 
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Notisar merka med %s, side %d"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Notisstraum for %s"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Notisstraum for %s"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Notisstraum for %s"
+
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Dette emneord finst ikkje."
 
-#: actions/tagrss.php:66
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
+msgstr "API-metoden er ikkje ferdig enno."
+
+#: actions/unsubscribe.php:77
+msgid "No profile id in request."
+msgstr "Ingen profil-ID i førespurnaden."
+
+#: actions/unsubscribe.php:84
+msgid "No profile with that id."
+msgstr "Fann ingen profil med den IDen."
+
+#: actions/unsubscribe.php:98
+msgid "Unsubscribed"
+msgstr "Fjerna tinging"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
 #, php-format
-msgid "Microblog tagged with %s"
-msgstr "Mikroblogg merka med emneordet %s"
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
 
-#: actions/twitapiblocks.php:47
-msgid "Block user failed."
-msgstr "Blokkering av brukar feila."
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "Autoriser tinging"
 
-#: actions/twitapiblocks.php:69
-msgid "Unblock user failed."
-msgstr "De-blokkering av brukar feila."
+#: actions/userauthorization.php:110
+#, fuzzy
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
+msgstr ""
+"Sjekk desse detaljane og forsikre deg om at du vil abonnere på denne "
+"brukaren sine notisar. Vist du ikkje har bedt om dette, klikk \"Avbryt\""
 
-#: actions/twitapiusers.php:48
-msgid "Not found."
-msgstr "Finst ikkje."
+#: actions/userauthorization.php:188
+#, fuzzy
+msgid "License"
+msgstr "lisens."
+
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "Godta"
+
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Lagre tinging for brukar: %s"
+
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "Avslå"
 
-#: actions/twittersettings.php:71
-msgid "Add your Twitter account to automatically send "
-msgstr "Legg til Twitter-kontoen din for å automatisk sende"
+#: actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "%s tingarar"
+
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
+msgstr "Ingen autoriserings-spørjing!"
 
-#: actions/twittersettings.php:119
-msgid "Twitter user name"
-msgstr "Brukarnamn hjå Twitter"
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+msgstr "Tinging autorisert"
 
-#: actions/twittersettings.php:126
-msgid "Twitter password"
-msgstr "Passord hjå Twitter"
+#: actions/userauthorization.php:249
+#, fuzzy
+msgid ""
+"The subscription has been authorized, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to authorize the "
+"subscription. Your subscription token is:"
+msgstr ""
+"Tingina har blitt autorisert, men ingen henvisnings URL er tilgjengleg. "
+"Sjekk med sida sine instruksjonar for korleis autorisering til tinginga skal "
+"gjennomførast. Ditt tingings teikn er: "
 
-#: actions/twittersettings.php:228
-msgid "Twitter Friends"
-msgstr "Vener på Twitter"
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
+msgstr "Tinging avvist"
 
-#: actions/twittersettings.php:327
-msgid "Username must have only numbers, "
-msgstr "Brukarnamn kan berre innehalde tal,"
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"Tingina har blitt avvist, men ingen henvisnings URL er tilgjengleg. Sjekk "
+"med sida sine instruksjonar for korleis ein skal avvise tinginga."
 
-#: actions/twittersettings.php:341
+#: actions/userauthorization.php:296
 #, php-format
-msgid "Unable to retrieve account information "
-msgstr "Klarte ikkje å hente informasjon om kontoen."
-
-#: actions/unblock.php:108
-msgid "Error removing the block."
-msgstr "Feil ved fjerning av blokka."
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
 
-#: actions/unsubscribe.php:50
-msgid "No profile id in request."
-msgstr "Ingen profil-ID i førespurnaden."
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
 
-#: actions/unsubscribe.php:57
-msgid "No profile with that id."
-msgstr "Fann ingen profil med den IDen."
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
 
-#: actions/unsubscribe.php:71
-msgid "Unsubscribed"
-msgstr "Fjerna tinging"
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
 
-#: actions/usergroups.php:63
+#: actions/userauthorization.php:338
 #, php-format
-msgid "%s groups"
-msgstr "%s grupper"
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Kan ikkje lesa brukarbilete-URL «%s»"
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Feil biletetype for '%s'"
+
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr "Ingen ID."
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "Profilinnstillingar"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "%s grupper, side %d"
 
-#: classes/Notice.php:104
+#: actions/usergroups.php:130
+#, fuzzy
+msgid "Search for more groups"
+msgstr "Søk etter folk eller innhald"
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "Du er ikkje medlem av den gruppa."
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Message.php:55
+msgid "Could not insert message."
+msgstr "Kunne ikkje lagre melding."
+
+#: classes/Message.php:65
+msgid "Could not update message with new URI."
+msgstr "Kunne ikkje oppdatere melding med ny URI."
+
+#: classes/Notice.php:164
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s"
+
+#: classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Eit problem oppstod ved lagring av notis."
+
+#: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
 msgstr "Feil ved lagring av notis.  Ukjend brukar."
 
-#: classes/Notice.php:109
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt."
 
-#: classes/Notice.php:116
+#: classes/Notice.php:194
+#, fuzzy
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+"For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt."
+
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr "Du kan ikkje lengre legge inn notisar på denne sida."
 
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
+msgstr "Eit problem oppstod ved lagring av notis."
+
+#: classes/Notice.php:1120
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "Databasefeil, kan ikkje lagra svar: %s"
+
+#: classes/User.php:347
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Melding til %1$s på %2$s"
+
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Profil"
+
 #: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
+msgstr "Endra profilinnstillingane dine"
+
+#: lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "Last opp ein avatar"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr "Endra passordet ditt"
+
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
+msgstr "Endra eposthandtering"
+
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:124
+#, fuzzy
+msgid "Design your profile"
+msgstr "Brukarprofil"
+
+#: lib/accountsettingsaction.php:128
 msgid "Other"
 msgstr "Anna"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:128
 msgid "Other options"
 msgstr "Andre val"
 
-#: lib/action.php:130
+#: lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: lib/action.php:145
+#: lib/action.php:159
 msgid "Untitled page"
 msgstr "Ingen tittel"
 
-#: lib/action.php:316
+#: lib/action.php:424
 msgid "Primary site navigation"
 msgstr "Navigasjon for hovudsida"
 
-#: lib/action.php:322
+#: lib/action.php:430
+msgid "Home"
+msgstr "Heim"
+
+#: lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr "Personleg profil og oversyn over vener"
 
-#: lib/action.php:325
-msgid "Search for people or text"
-msgstr "Søk etter folk eller innhald"
-
-#: lib/action.php:328
+#: lib/action.php:432
 msgid "Account"
 msgstr "Konto"
 
-#: lib/action.php:328
+#: lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr "Endra e-posten, avataren, passordet eller profilen"
 
-#: lib/action.php:330
-msgid "Connect to IM, SMS, Twitter"
-msgstr "Kopla til IM, SMS, Twitter"
+#: lib/action.php:435
+msgid "Connect"
+msgstr "Kopla til"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Klarte ikkje å omdirigera til tenaren: %s"
+
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
+msgstr "Invitér"
+
+#: lib/action.php:440 lib/subgroupnav.php:106
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr "Inviter vennar og kollega til å bli med deg på %s"
 
-#: lib/action.php:332
+#: lib/action.php:445
+msgid "Logout"
+msgstr "Logg ut"
+
+#: lib/action.php:445
 msgid "Logout from the site"
 msgstr "Logg ut or sida"
 
-#: lib/action.php:335
-msgid "Login to the site"
-msgstr "Logg inn or sida"
-
-#: lib/action.php:338
+#: lib/action.php:450
 msgid "Create an account"
 msgstr "Opprett ny konto"
 
-#: lib/action.php:341
-msgid "Login with OpenID"
-msgstr "Logg inn med OpenID"
+#: lib/action.php:453
+msgid "Login to the site"
+msgstr "Logg inn or sida"
+
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
+msgstr "Hjelp"
 
-#: lib/action.php:344
+#: lib/action.php:456
 msgid "Help me!"
 msgstr "Hjelp meg!"
 
-#: lib/action.php:362
+#: lib/action.php:459
+msgid "Search"
+msgstr "Søk"
+
+#: lib/action.php:459
+msgid "Search for people or text"
+msgstr "Søk etter folk eller innhald"
+
+#: lib/action.php:480
 msgid "Site notice"
 msgstr "Statusmelding"
 
-#: lib/action.php:417
+#: lib/action.php:546
 msgid "Local views"
 msgstr "Lokale syningar"
 
-#: lib/action.php:472
+#: lib/action.php:612
 msgid "Page notice"
 msgstr "Sidenotis"
 
-#: lib/action.php:562
+#: lib/action.php:714
 msgid "Secondary site navigation"
 msgstr "Andrenivås side navigasjon"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:721
+msgid "About"
+msgstr "Om"
+
+#: lib/action.php:723
+msgid "FAQ"
+msgstr "OSS"
+
+#: lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/action.php:730
+msgid "Privacy"
+msgstr "Personvern"
+
+#: lib/action.php:732
+msgid "Source"
+msgstr "Kjeldekode"
+
+#: lib/action.php:734
+msgid "Contact"
+msgstr "Kontakt"
+
+#: lib/action.php:736
+#, fuzzy
+msgid "Badge"
+msgstr "Dult"
+
+#: lib/action.php:764
 msgid "StatusNet software license"
 msgstr "StatusNets programvarelisens"
 
-#: lib/action.php:630
+#: lib/action.php:767
+#, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
+msgstr ""
+"**%%site.name%%** er ei mikrobloggingteneste av [%%site.broughtby%%](%%site."
+"broughtbyurl%%). "
+
+#: lib/action.php:769
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** er ei mikrobloggingteneste. "
+
+#: lib/action.php:771
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+"Den køyrer [StatusNet](http://status.net) mikroblogging-programvare, versjon "
+"%s, tilgjengeleg under [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "StatusNets programvarelisens"
+
+#: lib/action.php:794
 msgid "All "
 msgstr "Alle"
 
-#: lib/action.php:635
+#: lib/action.php:799
 msgid "license."
 msgstr "lisens."
 
-#: lib/blockform.php:123 lib/blockform.php:153
-msgid "Block this user"
-msgstr "Blokkér denne brukaren"
+#: lib/action.php:1052
+msgid "Pagination"
+msgstr "Paginering"
 
-#: lib/blockform.php:153
-msgid "Block"
-msgstr "Blokkér"
+#: lib/action.php:1061
+msgid "After"
+msgstr "« Etter"
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
-msgid "Disfavor this notice"
-msgstr "Fjern favoriseringsmerket"
+#: lib/action.php:1069
+msgid "Before"
+msgstr "Før »"
+
+#: lib/action.php:1117
+msgid "There was a problem with your session token."
+msgstr "Det var eit problem med sesjons billetten din."
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
 
-#: lib/facebookaction.php:268
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "Profil"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
+msgstr "Resultat frå kommandoen"
+
+#: lib/channel.php:210
+msgid "Command complete"
+msgstr "Kommandoen utførd"
+
+#: lib/channel.php:221
+msgid "Command failed"
+msgstr "Kommandoen feila"
+
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr "Orsak, men kommandoen er ikkje laga enno."
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Kan ikkje oppdatera brukar med stadfesta e-postadresse."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "Dytta!"
+
+#: lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
+msgstr "Brukaren har ikkje siste notis"
+
+#: lib/command.php:190
+msgid "Notice marked as fave."
+msgstr "Notis markert som favoritt."
+
+#: lib/command.php:315
 #, php-format
-msgid "To use the %s Facebook Application you need to login "
-msgstr "For å nytta %s Facebook-programmet må du logga inn"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#: lib/command.php:318
+#, php-format
+msgid "Fullname: %s"
+msgstr "Fullt namn: %s"
+
+#: lib/command.php:321
+#, php-format
+msgid "Location: %s"
+msgstr "Stad: %s"
+
+#: lib/command.php:324
+#, php-format
+msgid "Homepage: %s"
+msgstr "Heimeside: %s"
+
+#: lib/command.php:327
+#, php-format
+msgid "About: %s"
+msgstr "Om: %s"
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d"
+
+#: lib/command.php:377
+msgid "Error sending direct message."
+msgstr "Ein feil oppstod ved sending av direkte melding."
+
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d"
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Svar på denne notisen"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Eit problem oppstod ved lagring av notis."
+
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
+msgstr "Spesifer namnet til brukaren du vil tinge"
+
+#: lib/command.php:502
+#, php-format
+msgid "Subscribed to %s"
+msgstr "Tingar %s"
+
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
+msgstr "Spesifer namnet til brukar du vil fjerne tinging på"
+
+#: lib/command.php:530
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr "Tingar ikkje %s lengre"
+
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
+msgstr "Kommando ikkje implementert."
+
+#: lib/command.php:551
+msgid "Notification off."
+msgstr "Notifikasjon av."
+
+#: lib/command.php:553
+msgid "Can't turn off notification."
+msgstr "Kan ikkje skru av notifikasjon."
+
+#: lib/command.php:574
+msgid "Notification on."
+msgstr "Notifikasjon på."
+
+#: lib/command.php:576
+msgid "Can't turn on notification."
+msgstr "Kan ikkje slå på notifikasjon."
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Kunne ikkje laga OpenID-form: %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Du tingar ikkje oppdateringar til den profilen."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Du tingar ikkje oppdateringar til den profilen."
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Kan ikkje tinga andre til deg."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Mennesker som tingar %s"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Du er ikkje medlem av den gruppa."
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "Du er ikkje medlem av den gruppa."
+
+#: lib/command.php:670
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+
+#: lib/common.php:192
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Ingen stadfestingskode."
+
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:195
+#, fuzzy
+msgid "Go to the installer."
+msgstr "Logg inn or sida"
+
+#: lib/connectsettingsaction.php:110
+msgid "IM"
+msgstr "Ljonmelding"
+
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Oppdateringar over direktemeldingar (IM)"
+
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
+msgstr "Oppdateringar over SMS"
+
+#: lib/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Last opp"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
 
-#: lib/facebookaction.php:271
-msgid " a new account."
-msgstr "ein ny konto."
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Endra passordet ditt"
 
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-msgid "Published"
-msgstr "Publisert"
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Kopla til"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Søk"
+
+#: lib/designsettings.php:217
+msgid "Text"
+msgstr "Tekst"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Logg inn"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
+msgstr "Fjern favoriseringsmerket"
 
 #: lib/favorform.php:114 lib/favorform.php:140
 msgid "Favor this notice"
 msgstr "Favoriser denne notisen"
 
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr "Tjeneste"
+
 #: lib/feedlist.php:64
 msgid "Export data"
 msgstr "Eksporter data"
 
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr ""
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr ""
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr ""
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Filtrer emneord"
@@ -4548,57 +4005,84 @@ msgstr "Filtrer emneord"
 msgid "All"
 msgstr "Alle"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Velg ein tilbydar"
+
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Merkelapp"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "Velg ein merkelapp for å begrense lista"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "Gå"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "URL til heimesida eller bloggen for gruppa eller emnet"
 
-#: lib/groupeditform.php:151
-msgid "Description"
-msgstr "Beskriving"
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Beskriv gruppa eller emnet med 140 teikn"
 
-#: lib/groupeditform.php:153
-msgid "Describe the group or topic in 140 chars"
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
 msgstr "Beskriv gruppa eller emnet med 140 teikn"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:172
+msgid "Description"
+msgstr "Beskriving"
+
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr "Kvar er du, t.d. «Stavanger, Rogaland, Noreg»"
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
 msgid "Group"
 msgstr "Gruppe"
 
-#: lib/groupnav.php:100
-msgid "Admin"
-msgstr "Administrator"
-
 #: lib/groupnav.php:101
+#, fuzzy
+msgid "Blocked"
+msgstr "Blokkér"
+
+#: lib/groupnav.php:102
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Blokker brukaren"
+
+#: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
 msgstr "Rediger %s gruppa sine eigenskapar"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:113
 msgid "Logo"
 msgstr "Logo"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:114
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "Legg til eller rediger logoen til %s"
 
+#: lib/groupnav.php:120
+#, fuzzy, php-format
+msgid "Add or edit %s design"
+msgstr "Legg til eller rediger logoen til %s"
+
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Grupper med flest medlemmar"
@@ -4613,8 +4097,42 @@ msgid "Tags in %s group's notices"
 msgstr "Merkelappar i %s gruppa sine notisar"
 
 #: lib/htmloutputter.php:104
-msgid "This page is not available in a "
-msgstr "Denne sida er ikkje tilgjengleg i eit"
+msgid "This page is not available in a media type you accept"
+msgstr "Denne sida er ikkje tilgjengeleg i nokon mediatype du aksepterer."
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Du kan lasta opp ein logo for gruppa."
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr "Hallvegs opplasta."
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr "Systemfeil ved opplasting av fil."
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr "Korrupt bilete."
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr "Støttar ikkje bileteformatet."
+
+#: lib/imagefile.php:118
+msgid "Lost our file."
+msgstr "Mista fila vår."
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr "Ukjend fil type"
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr ""
 
 #: lib/joinform.php:114
 msgid "Join"
@@ -4624,43 +4142,87 @@ msgstr "Bli med"
 msgid "Leave"
 msgstr "Forlat"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr "Log inn med brukarnamn og passord."
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr "Opprett ny konto"
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
-msgstr "Login eller registrer med OpenID"
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "Kun brukaren kan lese sine eigne meldingar."
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr " frå "
+
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "Stadfesting av epostadresse"
 
-#: lib/mail.php:175
+#: lib/mail.php:174
 #, php-format
 msgid ""
 "Hey, %s.\n"
 "\n"
-msgstr ""
-"Hei, %s\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%s\n"
 "\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
+msgstr ""
 
-#: lib/mail.php:236
+#: lib/mail.php:235
 #, php-format
-msgid "%1$s is now listening to "
-msgstr "%1$s høyrer no på"
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr "%1$s høyrer no på notisane dine på %2$s."
 
-#: lib/mail.php:254
+#: lib/mail.php:240
+#, fuzzy, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
+"%1$s fylgjer no oppdateringane dine på %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Beste helsing,\n"
+"%4$s.\n"
+
+#: lib/mail.php:253
 #, php-format
 msgid "Location: %s\n"
 msgstr "Stad: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:255
 #, php-format
 msgid "Homepage: %s\n"
 msgstr "Heimeside: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
@@ -4669,57 +4231,225 @@ msgstr ""
 "Bio: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:285
+#, php-format
+msgid "New email address for posting to %s"
+msgstr "Ny epostadresse for å oppdatera %s"
+
+#: lib/mail.php:288
+#, 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 hev ei ny posteadresse på %1½s.\n"
+"\n"
+"Send e-post til %2$s for å posta nyte meldingar.\n"
+"\n"
+"Fleiere e-postinstruksjonar finn du på %3½s.\n"
+"\n"
+"Helsing frå %4$s"
+
+#: lib/mail.php:412
+#, php-format
+msgid "%s status"
+msgstr "%s status"
+
+#: lib/mail.php:438
+msgid "SMS confirmation"
+msgstr "SMS bekreftelse"
+
+#: lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "Du har blitt dulta av %s"
 
-#: lib/mail.php:465
+#: lib/mail.php:466
 #, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
-msgstr "%1$s (%2$s) lurer på kva du gjer på"
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
+msgstr ""
 
-#: lib/mail.php:555
+#: lib/mail.php:509
 #, php-format
-msgid "%1$s just added your notice from %2$s"
-msgstr "%1$s lyttar no til notisane dine på %2$s"
+msgid "New private message from %s"
+msgstr "Ny privat melding fra %s"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
-msgid "From"
-msgstr "Frå"
+#: lib/mail.php:513
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%5$s\n"
+msgstr ""
 
-#: lib/messageform.php:110
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s la til di melding som ein favoritt"
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, php-format
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+msgstr ""
+
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+msgid "Could not determine file's mime-type!"
+msgstr "Kan ikkje hente offentleg straum."
+
+#: lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Send ei direkte melding"
 
-#: lib/noticeform.php:125
-msgid "Send a notice"
-msgstr "Send ei melding"
+#: lib/messageform.php:146
+msgid "To"
+msgstr "Til"
 
-#: lib/noticeform.php:152
+#: lib/messageform.php:162 lib/noticeform.php:173
 msgid "Available characters"
 msgstr "Tilgjenglege teikn"
 
-#: lib/noticelist.php:426
-msgid "in reply to"
-msgstr "som svar på"
+#: lib/noticeform.php:145
+msgid "Send a notice"
+msgstr "Send ei melding"
+
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
+msgstr "Kva skjer, %s?"
+
+#: lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "Ingen innhald."
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr "Svar på denne notisen"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "Svar"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
-msgid "Delete this notice"
-msgstr "Slett denne notisen"
-
-#: lib/noticelist.php:474
-msgid "Delete"
-msgstr "Slett"
-
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Dult denne brukaren"
@@ -4732,39 +4462,139 @@ msgstr "Dult"
 msgid "Send a nudge to this user"
 msgstr "Send eit dult til denne brukaren"
 
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "Feil med å henta inn ny profil"
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "Feil med innhenting av brukarbilete."
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "Feil med å henta inn ekstern profil"
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Slett notis"
+
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
+msgstr "Kan ikkje leggja til ny tinging."
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "Personleg"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "Svar"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr "Favorittar"
+
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr "Brukar"
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr "Innboks"
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr "Dine innkomande meldinger"
+
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr "Utboks"
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr "Dine sende meldingar"
+
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Merkelappar i %s sine notisar"
 
-#: lib/profilelist.php:182
-msgid "(none)"
-msgstr "(ingen)"
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "Tingingar"
+
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "Alle tingingar"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "Tingarar"
+
+#: lib/profileaction.php:157
+msgid "All subscribers"
+msgstr "Tingarar"
 
-#: lib/publicgroupnav.php:76
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "Brukar"
+
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "Medlem sidan"
+
+#: lib/profileaction.php:235
+msgid "All groups"
+msgstr "Alle gruppar"
+
+#: lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Offentleg"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Brukar grupper"
 
-#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Nylege emneord"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Framheva"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Populære"
 
+#: lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Søk"
+
+#: lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Søk"
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "Folk"
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr "Finn folk på denne sida"
+
 #: lib/searchgroupnav.php:82
 msgid "Notice"
 msgstr "Notis"
 
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr "Søk i innhaldet av notisar"
+
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Finn grupper på denne sida"
@@ -4773,33 +4603,63 @@ msgstr "Finn grupper på denne sida"
 msgid "Untitled section"
 msgstr "Seksjon utan tittel"
 
-#: lib/subgroupnav.php:81
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Mennesker %s tingar"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:91
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Mennesker som tingar %s"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Grupper %s er medlem av"
 
-#: lib/subgroupnav.php:104
-#, php-format
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Inviter vennar og kollega til å bli med deg på %s"
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
 
-#: lib/subs.php:53
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(ingen)"
+
+#: lib/subs.php:48
+msgid "Already subscribed!"
+msgstr ""
+
+#: lib/subs.php:52
 msgid "User has blocked you."
 msgstr "Brukar har blokkert deg."
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Lagre tinging for brukar: %s"
+#: lib/subs.php:56
+msgid "Could not subscribe."
+msgstr "Kan ikkje tinga."
+
+#: lib/subs.php:75
+msgid "Could not subscribe other to you."
+msgstr "Kan ikkje tinga andre til deg."
+
+#: lib/subs.php:124
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Ikkje tinga."
+
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
+msgstr "Kan ikkje sletta tinging."
 
 #: lib/tagcloudsection.php:56
 msgid "None"
@@ -4809,30 +4669,106 @@ msgstr "Ingen"
 msgid "Top posters"
 msgstr "Med flest meldingar"
 
-#: lib/unblockform.php:120 lib/unblockform.php:150
-msgid "Unblock this user"
-msgstr "Lås opp brukaren"
-
-#: lib/unblockform.php:150
-msgid "Unblock"
-msgstr "Lås opp"
-
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Fjern tinging fra denne brukaren"
 
-#, fuzzy
-#~ msgid "Code not yet ready."
-#~ msgstr "Kunne ikkje prosessera melding."
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "Fjern tinging"
 
+#: lib/userprofile.php:116
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "Opprett ny konto"
+msgid "Edit Avatar"
+msgstr "Brukarbilete"
 
-#, fuzzy
-#~ msgid "Check if you are sure you want to delete your account."
-#~ msgstr "Sikker på at du vil sletta notisen?"
+#: lib/userprofile.php:236
+msgid "User actions"
+msgstr "Brukarverkty"
 
+#: lib/userprofile.php:248
 #, fuzzy
-#~ msgid "Showing recently popular notices"
-#~ msgstr "Søk i innhaldet av notisar"
+msgid "Edit profile settings"
+msgstr "Profilinnstillingar"
+
+#: lib/userprofile.php:249
+msgid "Edit"
+msgstr ""
+
+#: lib/userprofile.php:272
+msgid "Send a direct message to this user"
+msgstr "Send ei direktemelding til denne brukaren"
+
+#: lib/userprofile.php:273
+msgid "Message"
+msgstr "Melding"
+
+#: lib/util.php:821
+msgid "a few seconds ago"
+msgstr "eit par sekund sidan"
+
+#: lib/util.php:823
+msgid "about a minute ago"
+msgstr "omtrent eitt minutt sidan"
+
+#: lib/util.php:825
+#, php-format
+msgid "about %d minutes ago"
+msgstr "~%d minutt sidan"
+
+#: lib/util.php:827
+msgid "about an hour ago"
+msgstr "omtrent ein time sidan"
+
+#: lib/util.php:829
+#, php-format
+msgid "about %d hours ago"
+msgstr "~%d timar sidan"
+
+#: lib/util.php:831
+msgid "about a day ago"
+msgstr "omtrent ein dag sidan"
+
+#: lib/util.php:833
+#, php-format
+msgid "about %d days ago"
+msgstr "~%d dagar sidan"
+
+#: lib/util.php:835
+msgid "about a month ago"
+msgstr "omtrent ein månad sidan"
+
+#: lib/util.php:837
+#, php-format
+msgid "about %d months ago"
+msgstr "~%d månadar sidan"
+
+#: lib/util.php:839
+msgid "about a year ago"
+msgstr "omtrent eitt år sidan"
+
+#: lib/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "Heimesida er ikkje ei gyldig internettadresse."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr "Kunne ikkje prosessera melding."
+
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr "Ikkje ein registrert brukar."
+
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr "Beklager, det er ikkje di inngåande epost addresse."
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr "Beklager, inngåande epost er ikkje tillatt."
diff --git a/locale/pl/LC_MESSAGES/statusnet.mo b/locale/pl/LC_MESSAGES/statusnet.mo
index dba116252..d3ab4e974 100644
--- a/locale/pl/LC_MESSAGES/statusnet.mo
+++ b/locale/pl/LC_MESSAGES/statusnet.mo
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index 54c52e949..94fb477f1 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -1,4677 +1,3049 @@
-# translation of pl.po to Polish
-# Paweł Wilk <siefca@gnu.org>, 2008.
-# Piotr Drąg <piotrdrag@gmail.com>, 2009.
-#
-# Polish language has 3 plural forms.
-# Special case is used for one and some numbers ending in 2, 3, or 4.
-# Example:
-# 1         WINDOW  -> 1 OKNO
-# x2 to x4  WINDOWS -> x2 do x4 OKNA (x != 1)
-# 5 or more WINDOWS -> 5 lub więcej OKIEN
+# Translation of StatusNet to Polish
 #
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: pl\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-14 10:32-0700\n"
-"PO-Revision-Date: 2009-09-09 15:47+0200\n"
-"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
-"Language-Team: Polish <pl@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:44:02+0000\n"
+"Language-Team: Polish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%"
-"100<10 || n%100>=20) ? 1 : 2);\n"
-
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
-#, php-format
-msgid " Search Stream for \"%s\""
-msgstr " Znajdź strumień dla \"%s\""
-
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-#: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
-msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr ""
-" poza tymi prywatnymi danymi: hasło, adres e-mail, adres komunikatora, numer "
-"telefonu."
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr " z "
-
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr "%1$s/aktualizacje odpowiadające na %2$s"
-
-#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
-#: actions/invite.php:218 actions/invite.php:220
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s zapraszają Cię, abyś dołączył do nich w %2$s"
-
-#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\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 ""
-"Użytkownik %1$s zapraszają Cię, abyś dołączył do nich w %2$s (%3$s).\n"
-"\n"
-"%2$s jest usługą mikroblogowania, która umożliwia pozostawanie w kontakcie z "
-"osobami, których znasz i z tymi, którzy Cię interesują.\n"
-"\n"
-"Możesz także dzielić się w sieci nowinkami o sobie, swoimi przemyśleniami, "
-"lub swoim życiem z osobami, którzy Cię znają. To także wspaniały sposób na "
-"poznawanie nowych osób, którzy dzielą Twoje zainteresowania.\n"
-"\n"
-"Użytkownik %1$s powiedział:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Możesz zobaczyć stronę profilu %1$s na %2$s tutaj:\n"
-"\n"
-"%5$s\n"
-"\n"
-"Jeśli chcesz wypróbować usługę, naciśnij na poniższy odnośnik, aby "
-"zaakceptować zaproszenie.\n"
-"\n"
-"%6$s\n"
-"\n"
-"Jeśli nie, możesz zignorować tę wiadomość. Dziękujemy za Twoją cierpliwość i "
-"czas.\n"
-"\n"
-"Z poważaniem, %2$s\n"
-
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
-#: lib/mail.php:236 lib/mail.php:235
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "Użytkownik %1$s obserwuje teraz Twoje wpisy na %2$s."
-
-#: ../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 ""
-"Użytkownik %1$s obserwuje teraz Twoje wpisy na %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Z poważaniem,\n"
-"%4$s.\n"
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
-#: actions/twitapistatuses.php:328
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "%1$s aktualizuje tę odpowiedź na aktualizacje od %2$s/%3$s."
-
-#: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161 actions/shownotice.php:174
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr "Status użytkownika %1$s na %2$s"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pl\n"
+"X-Message-Group: out-statusnet\n"
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "Nie ma takiego znacznika."
 
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
-#: actions/invite.php:125 actions/invite.php:133
-#, php-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
+msgstr "Brak takiego użytkownika."
 
-#: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90 actions/publicrss.php:89
+#: actions/all.php:84
 #, php-format
-msgid "%s Public Stream"
-msgstr "Publiczny strumień użytkownika %s"
+msgid "%s and friends, page %d"
+msgstr "Użytkownik %s i przyjaciele, strona %d"
 
-#: ../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
-#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
-#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
-#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
-#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
-#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
-#: lib/personalgroupnav.php:100
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "Użytkownik %s i przyjaciele"
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
-#: actions/twitapistatuses.php:37
+#: actions/all.php:99
 #, php-format
-msgid "%s public timeline"
-msgstr "Publiczna oś czasu użytkownika %s"
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Kanał dla znajomych użytkownika %s (RSS 1.0)"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
+#: actions/all.php:107
 #, php-format
-msgid "%s status"
-msgstr "Status użytkownika %s"
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Kanał dla znajomych użytkownika %s (RSS 2.0)"
 
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
-#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/all.php:115
 #, php-format
-msgid "%s timeline"
-msgstr "Oś czasu użytkownika %s"
+msgid "Feed for friends of %s (Atom)"
+msgstr "Kanał dla znajomych użytkownika %s (Atom)"
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
-#: actions/twitapistatuses.php:41
+#: actions/all.php:127
 #, php-format
-msgid "%s updates from everyone!"
-msgstr "Użytkownik %s aktualizuje od każdego!"
-
-#: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
-"(Powinieneś właśnie otrzymać wiadomość e-mail, zawierającą instrukcje "
-"potwierdzenia adresu e-mail)"
+"To jest oś czasu użytkownika %s i przyjaciół, ale nikt jeszcze nic nie "
+"wysłał."
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
-#: lib/action.php:752
+#: actions/all.php:132
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
 msgstr ""
-"**%%site.name%%** jest usługą mikroblogowania prowadzoną przez [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"Spróbuj zasubskrybować więcej osób, [dołączyć do grupy](%%action.groups%%) "
+"lub wysłać coś samemu."
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
-#: lib/action.php:754
+#: actions/all.php:134
 #, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** jest usługą mikroblogowania. "
-
-#: ../lib/util.php:274 lib/util.php:290
-msgid ". Contributors should be attributed by full name or nickname."
-msgstr ""
-". Współtwórcy powinni być wymienieni z imienia i nazwiska lub pseudonimu."
-
-#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
-#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 małe litery lub liczby, bez spacji i znaków przestankowych"
-
-#: ../actions/register.php:152 actions/register.php:166
-#: actions/register.php:368 actions/register.php:414
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
-"1-64 małe litery lub liczby, bez spacji i znaków przestankowych. Wymagane."
-
-#: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr "6 lub więcej znaków"
-
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
-msgid "6 or more characters, and don't forget it!"
-msgstr "6 lub więcej znaków, i nie zapomnij go!"
-
-#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373 actions/register.php:419
-msgid "6 or more characters. Required."
-msgstr "6 lub więcej znaków. Wymagane."
+"Możesz spróbować [szturchnąć użytkownika %s](../%s) z jego profilu lub "
+"[wysłać coś wymagającego jego uwagi](%%%%action.newnotice%%%%?"
+"status_textarea=%s)."
 
-#: ../actions/imsettings.php:197 actions/imsettings.php:205
-#: actions/imsettings.php:321
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
 msgstr ""
-"Kod potwierdzający został wysłany na dodany adres komunikatora. Musisz "
-"zaakceptować otrzymywanie wiadomości od %s."
+"Dlaczego nie [zarejestrujesz konta](%%%%action.register%%%%) i wtedy "
+"szturchniesz użytkownika %s lub wyślesz wpis wymagającego jego uwagi."
 
-#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
-#: actions/emailsettings.php:350
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
-msgstr ""
-"Kod potwierdzający został wysłany na dodany adres e-mail. Sprawdź w swojej "
-"skrzynce odbiorczej (także w wiadomościach niechcianych!), czy otrzymałeś "
-"kod i instrukcje dotyczące jego użycia."
+#: actions/all.php:165
+msgid "You and friends"
+msgstr "Ty i przyjaciele"
 
-#: ../actions/smssettings.php:216 actions/smssettings.php:224
-msgid ""
-"A confirmation code was sent to the phone number you added. Check your inbox "
-"(and spam box!) for the code and instructions on how to use it."
-msgstr ""
-"Kod potwierdzający został wysłany na dodany numer telefonu. Sprawdź w swojej "
-"skrzynce odbiorczej (także w wiadomościach niechcianych!), czy otrzymałeś "
-"kod i instrukcje dotyczące jego użycia."
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr "Aktualizacje od %1$s i przyjaciół na %2$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 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 actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
-#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
-#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
-#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
-#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
-#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
-#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
-#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
-#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
-#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
-#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
-#: actions/twitapiusers.php:34
-msgid "API method not found!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
 msgstr "Nie znaleziono metody 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 actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
-#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
-#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
-#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
-#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
-#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
-msgid "API method under construction."
-msgstr "Metoda API jest w trakcie tworzenia."
-
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
-#: lib/action.php:706
-msgid "About"
-msgstr "O usłudze"
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
+msgstr "Ta metoda wymaga POST."
 
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143 actions/userauthorization.php:178
-msgid "Accept"
-msgstr "Zaakceptuj"
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+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 actions/emailsettings.php:120
-#: actions/imsettings.php:127 actions/openidsettings.php:111
-#: actions/smssettings.php:133 actions/twittersettings.php:163
-#: actions/twittersettings.php:166 actions/twittersettings.php:182
-msgid "Add"
-msgstr "Dodaj"
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Nie można zaktualizować użytkownika."
 
-#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
-msgstr "Dodaj konto OpenID"
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-msgid "Add or remove OpenIDs"
-msgstr "Dodaj lub usuń konta 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
-#: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
-msgstr "Adres"
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+"Serwer nie może obsłużyć aż tyle danych POST (%s bajty) z powodu bieżącej "
+"konfiguracji."
 
-#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-#: actions/invite.php:181 actions/invite.php:183
-msgid "Addresses of friends to invite (one per line)"
-msgstr "Adresy przyjaciół, których zapraszasz (jeden na wiersz)"
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "Nie można zapisać ustawień wyglądu!"
 
-#: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422 lib/profileaction.php:126
-msgid "All subscriptions"
-msgstr "Wszystkie subskrypcje"
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Nie można zaktualizować wyglądu."
 
-#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92 actions/publicrss.php:91
-#, php-format
-msgid "All updates for %s"
-msgstr "Wszystkie aktualizacje od %s"
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Użytkownik nie posiada profilu."
 
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
-#, php-format
-msgid "All updates matching search term \"%s\""
-msgstr "Wszystkie aktualizacje pasujące do wyszukiwanego terminu \"%s\""
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Nie można zapisać profilu."
 
-#: ../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
-#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
-msgid "Already logged in."
-msgstr "Jesteś już zalogowany."
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
+msgstr "Zablokowanie użytkownika nie powiodło się."
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
-msgid "Already subscribed!."
-msgstr "Już subskrybowane!"
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
+msgstr "Odblokowanie użytkownika nie powiodło się."
 
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113 actions/deletenotice.php:114
-msgid "Are you sure you want to delete this notice?"
-msgstr "Jesteś pewien, że chcesz usunąć ten wpis?"
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "Brak tekstu wiadomości!"
 
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81 actions/userauthorization.php:76
-msgid "Authorize subscription"
-msgstr "Upoważnij subskrypcję"
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Wiadomość jest za długa. Maksymalna długość to 140 znaków."
 
-#: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
-#: actions/register.php:416 actions/register.php:463
-msgid "Automatically login in the future; not for shared computers!"
-msgstr ""
-"Automatyczne logowanie. Nie użyj na komputerach używanych przez wiele osób!"
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "Nie znaleziono odbiorcy."
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-#: actions/profilesettings.php:144 actions/profilesettings.php:145
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
-"Automatycznie zasubskrybuj każdego, kto mnie zasubskrybuje (najlepsze dla "
-"botów)"
-
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34 actions/avatarsettings.php:65
-#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
-#: actions/avatarsettings.php:67 actions/showgroup.php:211
-#: actions/showgroup.php:216
-msgid "Avatar"
-msgstr "Awatar"
+"Nie można wysłać bezpośredniej wiadomości do użytkowników, którzy nie są "
+"Twoimi przyjaciółmi."
 
-#: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
-msgid "Avatar updated."
-msgstr "Zaktualizowano awatar."
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "Bezpośrednia wiadomość do użytkownika %s"
 
-#: ../actions/imsettings.php:55 actions/imsettings.php:56
-#: actions/imsettings.php:108
+#: actions/apidirectmessage.php:93
 #, php-format
-msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
-msgstr ""
-"Oczekiwanie na potwierdzenie tego adresu. Sprawdź swoje konto Jabbera/GTalk, "
-"czy otrzymałeś wiadomość z dalszymi instrukcjami (dodałeś %s do listy "
-"znajomych?)."
-
-#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
-#: actions/emailsettings.php:107
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-"Oczekiwanie na potwierdzenie tego adresu. Sprawdź swoją skrzynkę odbiorczą "
-"(także w wiadomościach niechcianych!), czy otrzymałeś wiadomość z dalszymi "
-"instrukcjami."
+msgid "All the direct messages sent from %s"
+msgstr "Wszystkie bezpośrednie wiadomości wysłane od użytkownika %s"
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
-msgid "Awaiting confirmation on this phone number."
-msgstr "Oczekiwanie na potwierdzenie tego numeru telefonu."
+#: actions/apidirectmessage.php:101
+#, php-format
+msgid "Direct messages to %s"
+msgstr "Bezpośrednia wiadomość do użytkownika %s"
 
-#: ../lib/util.php:1318 lib/util.php:1452
-msgid "Before »"
-msgstr "Wcześniej »"
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr "Wszystkie bezpośrednie wiadomości wysłane do użytkownika %s"
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
-#: actions/profilesettings.php:82 actions/register.php:184
-#: actions/profilesettings.php:112 actions/register.php:402
-#: actions/register.php:448
-msgid "Bio"
-msgstr "O mnie"
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "Nie znaleziono metody API!"
 
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
-#: actions/register.php:89 actions/updateprofile.php:104
-#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107 actions/updateprofile.php:109
-#: actions/profilesettings.php:206 actions/register.php:211
-msgid "Bio is too long (max 140 chars)."
-msgstr "Wpis \"O mnie\" jest za długi (maksymalnie 140 znaków)."
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
+msgstr "Nie znaleziono statusów z tym identyfikatorem."
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
-msgid "Can't delete this notice."
-msgstr "Nie można usunąć tego wpisu."
+#: actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
+msgstr "Ten status jest już ulubiony!"
 
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123 actions/updateprofile.php:125
-#, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr "Nie można odczytać adresu URL awatara \"%s\""
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+msgstr "Nie można utworzyć ulubionego wpisu."
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404 actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
-msgid "Can't save new password."
-msgstr "Nie można zapisać nowego hasła."
+#: actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
+msgstr "Ten status nie jest ulubiony!"
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62 actions/emailsettings.php:58
-#: actions/imsettings.php:59 actions/smssettings.php:62
-#: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
-msgstr "Anuluj"
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr "Nie można usunąć ulubionego wpisu."
 
-#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-#: lib/openid.php:133
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Nie można utworzyć instancji obiektu klienta OpenID."
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
+msgstr "Nie można obserwować użytkownika: nie znaleziono użytkownika."
 
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
-msgstr "Nie można znormalizować tego identyfikatora Jabbera"
+#: actions/apifriendshipscreate.php:118
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr "Nie można obserwować użytkownika: %s jest już na Twojej liście."
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311 actions/emailsettings.php:318
-msgid "Cannot normalize that email address"
-msgstr "Nie można znormalizować tego adresu e-mail"
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "Nie można obserwować użytkownika: nie znaleziono użytkownika."
 
-#: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
-msgstr "Zmień"
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
-msgstr "Zmień obsługę adresu e-mail"
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
+msgstr "Należy dostarczyć dwa identyfikatory lub nazwy użytkowników."
 
-#: ../actions/password.php:32 actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr "Zmień hasło"
+#: actions/apifriendshipsshow.php:135
+msgid "Could not determine source user."
+msgstr "Nie można określić użytkownika źródłowego."
 
-#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
-msgid "Change your password"
-msgstr "Zmień hasło"
+#: actions/apifriendshipsshow.php:143
+msgid "Could not find target user."
+msgstr "Nie można znaleźć użytkownika docelowego."
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-msgid "Change your profile settings"
-msgstr "Zmień ustawienia profilu"
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
+msgid "Could not create group."
+msgstr "Nie można utworzyć grupy."
 
-#: ../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
-#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
-#: actions/register.php:376 actions/smssettings.php:122
-#: actions/recoverpassword.php:236 actions/register.php:422
-msgid "Confirm"
-msgstr "Potwierdź"
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
+msgid "Could not create aliases."
+msgstr "Nie można utworzyć aliasów."
 
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "Potwierdź adres"
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+msgid "Could not set group membership."
+msgstr "Nie można ustawić członkostwa w grupie."
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245 actions/emailsettings.php:256
-#: actions/imsettings.php:230 actions/smssettings.php:253
-#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374 actions/emailsettings.php:386
-msgid "Confirmation cancelled."
-msgstr "Anulowano potwierdzenie."
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "Pseudonim może zawierać tylko małe litery i cyfry, bez spacji."
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
-msgid "Confirmation code"
-msgstr "Kod potwierdzający"
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr "Pseudonim jest już używany. Spróbuj innego."
 
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-msgid "Confirmation code not found."
-msgstr "Nie znaleziono kodu potwierdzającego."
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "To nie jest prawidłowy pseudonim."
 
-#: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521
-#, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"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 ""
-"Gratulacje, %s! Witaj na %%%%site.name%%%%. Stąd możesz chcieć...\n"
-"\n"
-"* Przejść do [swojego profilu](%s) i wysłać swoją pierwszą wiadomość.\n"
-"* Dodać [adres Jabbera/GTalk](%%%%action.imsettings%%%%), abyś mógł wysyłać "
-"wpisy przez komunikatora.\n"
-"* [Poszukać osób](%%%%action.peoplesearch%%%%), których możesz znać lub "
-"którzy dzielą Twoje zainteresowania. \n"
-"* Zaktualizować swoje [ustawienia profilu](%%%%action.profilesettings%%%%), "
-"aby powiedzieć innym więcej o sobie. \n"
-"* Przeczytać [dokumentację w sieci](%%%%doc.help%%%%), aby dowiedzieć się o "
-"funkcjach, które mogłeś pominąć. \n"
-"\n"
-"Dziękujemy za zarejestrowanie się i mamy nadzieję, że używanie tej usługi "
-"sprawi Ci przyjemność."
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "Strona domowa nie jest prawidłowym adresem URL."
 
-#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
-#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
-#: lib/action.php:425
-msgid "Connect"
-msgstr "Połącz"
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "Imię i nazwisko jest za długie (maksymalnie 255 znaków)."
 
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
-msgid "Connect existing account"
-msgstr "Połącz z istniejącym kontem"
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "opis jest za długi (maksymalnie 140 znaków)."
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
-#: lib/action.php:719
-msgid "Contact"
-msgstr "Kontakt"
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "Położenie jest za długie (maksymalnie 255 znaków)."
 
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
-#: lib/openid.php:190
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
 #, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "Nie można utworzyć formularza OpenID: %s"
+msgid "Too many aliases! Maximum %d."
+msgstr "Za dużo aliasów! Maksymalnie %d."
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
-#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
 #, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr "Nie można obserwować użytkownika: %s jest już na Twojej liście."
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
-msgid "Could not follow user: User not found."
-msgstr "Nie można obserwować użytkownika: nie znaleziono użytkownika."
+msgid "Invalid alias: \"%s\""
+msgstr "Nieprawidłowy alias: \"%s\""
 
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
-#: lib/openid.php:172
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
 #, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Nie można przekierować do serwera: %s"
-
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166 actions/updateprofile.php:176
-msgid "Could not save avatar info"
-msgstr "Nie można zapisać informacji o awatarze"
-
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159 actions/updateprofile.php:163
-msgid "Could not save new profile info"
-msgstr "Nie można zapisać informacji o nowym profilu"
-
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
-msgid "Could not subscribe other to you."
-msgstr "Nie można zasubskrybować innych do Ciebie."
-
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
-msgid "Could not subscribe."
-msgstr "Nie można zasubskrybować."
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
-msgstr "Nie można zaktualizować użytkownika z potwierdzonym adresem e-mail."
-
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-msgid "Couldn't convert request tokens to access tokens."
-msgstr "Nie można przekonwertować tokenów żądań na tokeny dostępu."
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Alias \"%s\" jest już używany. Spróbuj innego."
 
-#: ../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
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-#: actions/emailsettings.php:382
-msgid "Couldn't delete email confirmation."
-msgstr "Nie można usunąć potwierdzenia adresu e-mail."
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr "Alias nie może być taki sam jak pseudonim."
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
-msgid "Couldn't delete subscription."
-msgstr "Nie można usunąć subskrypcji."
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Jesteś już członkiem tej grupy"
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
-msgid "Couldn't find any statuses."
-msgstr "Nie można znaleźć żadnych statusów."
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr "Zostałeś zablokowany w tej grupie przez administratora."
 
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-msgid "Couldn't get a request token."
-msgstr "Nie można uzyskać tokenu żądana."
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Nie można dołączyć użytkownika %s do grupy %s"
 
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206 actions/emailsettings.php:223
-#: actions/imsettings.php:195 actions/smssettings.php:214
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325 actions/emailsettings.php:344
-msgid "Couldn't insert confirmation code."
-msgstr "Nie można wprowadzić kodu potwierdzającego."
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Nie jesteś członkiem tej grupy."
 
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
-msgstr "Nie można wprowadzić nowej subskrypcji."
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Nie można usunąć użytkownika %s z grupy %s"
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-#: actions/twitapiaccount.php:82
-msgid "Couldn't save profile."
-msgstr "Nie można zapisać profilu."
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "Grupy %s"
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
-msgstr "Nie można zaktualizować użytkownika do automatycznej subskrypcji."
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Działania grupy"
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
-#: actions/emailsettings.php:447 actions/emailsettings.php:469
-#: actions/smssettings.php:515 actions/smssettings.php:539
-#: actions/smssettings.php:516 actions/smssettings.php:540
-msgid "Couldn't update user record."
-msgstr "Nie można zaktualizować wpisu użytkownika."
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "Grupy %s"
 
-#: ../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
-#: actions/confirmaddress.php:114 actions/emailsettings.php:280
-#: actions/emailsettings.php:411 actions/imsettings.php:252
-#: actions/imsettings.php:395 actions/othersettings.php:162
-#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408 actions/emailsettings.php:287
-#: actions/emailsettings.php:418 actions/othersettings.php:167
-#: actions/profilesettings.php:260
-msgid "Couldn't update user."
-msgstr "Nie można zaktualizować użytkownika."
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Grupy %s są członkiem"
 
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
-msgid "Create"
-msgstr "Utwórz"
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
+msgstr "Ta metoda wymaga POST lub DELETE."
 
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
-msgid "Create a new user with this nickname."
-msgstr "Utwórz nowego użytkownika o tym pseudonimie."
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
+msgstr "Nie można usuwać statusów innych użytkowników."
 
-#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
-msgid "Create new account"
-msgstr "Utwórz nowe konto"
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "Usunięto awatar."
 
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
-msgid "Creating new account for OpenID that already has a user."
-msgstr ""
-"Tworzenie nowego konta dla identyfikatora OpenID, który posiada już "
-"użytkownika."
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
+msgstr "Nie znaleziono statusów z tym identyfikatorem."
 
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "Obecnie potwierdzone adresy Jabbera/GTalk."
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "Wpis jest za długi. Maksymalna długość to 140 znaków."
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "Obecnie potwierdzone numery telefonów z włączoną usługą SMS."
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
+msgstr "Nie znaleziono"
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-msgid "Current confirmed email address."
-msgstr "Obecnie potwierdzone adresy e-mail."
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#, fuzzy, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr "Maksymalny rozmiar wpisu to 140 znaków, w tym adres URL załącznika."
 
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
-msgstr "Obecnie"
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Nieobsługiwany format pliku obrazu."
 
-#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
-#: classes/Notice.php:114 classes/Notice.php:124
+#: actions/apitimelinefavorites.php:107
 #, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "Błąd bazy danych podczas wprowadzania znacznika hasha: %s"
+msgid "%s / Favorites from %s"
+msgstr "%s/ulubione wpisy od %s"
 
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
-#: classes/Notice.php:757 classes/Notice.php:1042
+#: actions/apitimelinefavorites.php:119
 #, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Błąd bazy danych podczas wprowadzania odpowiedzi: %s"
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79 actions/deletenotice.php:111
-msgid "Delete notice"
-msgstr "Usuń wpis"
+msgid "%s updates favorited by %s / %s."
+msgstr "Użytkownik %s aktualizuje ulubione według %s/%s."
 
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114 actions/register.php:404
-#: actions/register.php:450
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "Opisz się i swoje zainteresowania w 140 znakach"
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
+#, php-format
+msgid "%s timeline"
+msgstr "Oś czasu użytkownika %s"
 
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87 actions/register.php:172
-#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
-#: actions/register.php:385 lib/accountsettingsaction.php:113
-#: actions/register.php:427 actions/register.php:431
-msgid "Email"
-msgstr "E-mail"
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "Aktualizacje od %1$s na %2$s!"
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-msgid "Email Address"
-msgstr "Adres e-mail"
+#: actions/apitimelinementions.php:116
+#, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s/aktualizacje wspominające %2$s"
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
-msgstr "Ustawienia adresu e-mail"
+#: actions/apitimelinementions.php:126
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr "%1$s aktualizuje tę odpowiedź na aktualizacje od %2$s/%3$s."
 
-#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-#: actions/register.php:200
-msgid "Email address already exists."
-msgstr "Adres e-mail już istnieje."
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#, php-format
+msgid "%s public timeline"
+msgstr "Publiczna oś czasu użytkownika %s"
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
-msgid "Email address confirmation"
-msgstr "Potwierdzenie adresu e-mail"
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#, php-format
+msgid "%s updates from everyone!"
+msgstr "Użytkownik %s aktualizuje od każdego!"
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
-msgstr "Adres e-mail, taki jak \"NazwaUżytkownika@przykład.org\""
+#: actions/apitimelinetag.php:101 actions/tag.php:66
+#, php-format
+msgid "Notices tagged with %s"
+msgstr "Wpisy ze znacznikiem %s"
 
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-#: actions/invite.php:179 actions/invite.php:181
-msgid "Email addresses"
-msgstr "Adresy e-mail"
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Aktualizacje ze znacznikiem %1$s na %2$s!"
 
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
-msgid "Enter a nickname or email address."
-msgstr "Podaj pseudonim lub adres e-mail."
+#: actions/apiusershow.php:96
+msgid "Not found."
+msgstr "Nie znaleziono."
 
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
-msgstr "Podaj kod, który otrzymałeś na telefonie."
+#: actions/attachment.php:73
+msgid "No such attachment."
+msgstr "Nie ma takiego załącznika."
 
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161 actions/userauthorization.php:200
-msgid "Error authorizing token"
-msgstr "Błąd podczas upoważniania tokena"
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+msgstr "Brak pseudonimu."
 
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
-#: actions/finishopenidlogin.php:325
-msgid "Error connecting user to OpenID."
-msgstr "Błąd podczas łączenia użytkownika z OpenID."
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "Brak rozmiaru."
 
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
-msgstr "Błąd podczas łączenia użytkownika."
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "Nieprawidłowy rozmiar."
 
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
-msgstr "Błąd podczas wprowadzania awatara"
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "Awatar"
 
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
-msgstr "Błąd podczas wprowadzania nowego profilu"
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "Można wysłać swój osobisty awatar. Maksymalny rozmiar pliku to %s."
 
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
-msgstr "Błąd podczas wprowadzania zdalnego profilu"
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
+msgstr "Użytkownik bez odpowiadającego profilu"
 
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
-msgid "Error saving address confirmation."
-msgstr "Błąd podczas zapisywania potwierdzenia adresu."
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+msgid "Avatar settings"
+msgstr "Ustawienia awatara"
 
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164 actions/userauthorization.php:203
-msgid "Error saving remote profile"
-msgstr "Błąd podczas zapisie zdalnego profilu"
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr "Oryginał"
 
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-#: lib/openid.php:238
-msgid "Error saving the profile."
-msgstr "Błąd podczas zapisywania profilu."
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr "Podgląd"
 
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-#: lib/openid.php:249
-msgid "Error saving the user."
-msgstr "Błąd podczas zapisywanie użytkownika."
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+msgid "Delete"
+msgstr "Usuń"
 
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
-msgid "Error saving user; invalid."
-msgstr "Błąd podczas zapisywania użytkownika; nieprawidłowy."
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+msgstr "Wyślij"
 
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
-#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
-#: actions/register.php:108 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-#: actions/login.php:120 actions/recoverpassword.php:372
-#: actions/register.php:235
-msgid "Error setting user."
-msgstr "Błąd podczas ustawiania użytkownika."
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
+msgstr "Przytnij"
 
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr "Błąd podczas aktualizowania profilu"
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Wystąpił problem z tokenem sesji. Spróbuj ponownie."
 
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
-msgstr "Błąd podczas aktualizowania zdalnego profilu"
+#: actions/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Nieoczekiwane wysłanie formularza."
 
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr "Błąd kodu potwierdzającego."
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
+msgstr "Wybierz kwadratowy obszar obrazu do awatara"
 
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
-msgid "Existing nickname"
-msgstr "Istniejący pseudonim"
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
+msgstr "Utracono dane pliku."
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
-#: lib/action.php:708
-msgid "FAQ"
-msgstr "FAQ"
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+msgstr "Zaktualizowano awatar."
 
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Zaktualizowanie awatara nie powiodło się."
 
-#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
-#: actions/allrss.php:110 actions/allrss.php:118
-#, php-format
-msgid "Feed for friends of %s"
-msgstr "Kanał dla znajomych użytkownika %s"
-
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
-#, php-format
-msgid "Feed for replies to %s"
-msgstr "Kanał dla odpowiedzi do użytkownika %s"
-
-#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
-#: actions/tag.php:68
-#, php-format
-msgid "Feed for tag %s"
-msgstr "Kanał dla znaczników %s"
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
-msgstr "Przeszukaj zawartość wpisów"
+#: actions/avatarsettings.php:387
+msgid "Avatar deleted."
+msgstr "Usunięto awatar."
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
-msgstr "Znajdź osoby na tej stronie"
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+msgid "No nickname"
+msgstr "Brak pseudonimu"
 
-#: ../actions/login.php:122 actions/login.php:247
-msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
-msgstr ""
-"Z powodów bezpieczeństwa ponownie podaj nazwę użytkownika i hasło przed "
-"zmienianiem ustawień."
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
+msgstr "Nie ma takiej grupy"
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
-#: actions/profilesettings.php:77 actions/register.php:178
-#: actions/profilesettings.php:103 actions/register.php:391
-#: actions/showgroup.php:235 actions/showstream.php:262
-#: actions/tagother.php:105 lib/groupeditform.php:142
-#: actions/showgroup.php:237 actions/showstream.php:255
-#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
-#: actions/showstream.php:220 lib/groupeditform.php:157
-msgid "Full name"
-msgstr "Imię i nazwisko"
+#: actions/blockedfromgroup.php:90
+#, php-format
+msgid "%s blocked profiles"
+msgstr "%s zablokowane profile"
 
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
-#: actions/register.php:86 actions/updateprofile.php:94
-#: actions/editgroup.php:195 actions/newgroup.php:146
-#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97 actions/updateprofile.php:99
-#: actions/editgroup.php:197 actions/newgroup.php:147
-#: actions/profilesettings.php:203 actions/register.php:208
-msgid "Full name is too long (max 255 chars)."
-msgstr "Imię i nazwisko jest za długie (maksymalnie 255 znaków)."
+#: actions/blockedfromgroup.php:93
+#, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s zablokowane profile, strona %d"
 
-#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
-#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
-msgid "Help"
-msgstr "Pomoc"
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr "Lista użytkowników zablokowanych w tej grupie."
 
-#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
-#: lib/action.php:417
-msgid "Home"
-msgstr "Strona główna"
+#: actions/blockedfromgroup.php:281
+msgid "Unblock user from group"
+msgstr "Odblokuj użytkownika w tej grupie"
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146 actions/register.php:442
-#: lib/groupeditform.php:161
-msgid "Homepage"
-msgstr "Strona domowa"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
+msgstr "Odblokuj"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
-#: actions/editgroup.php:194 actions/newgroup.php:144
-#: actions/profilesettings.php:200 actions/register.php:205
-msgid "Homepage is not a valid URL."
-msgstr "Strona domowa nie jest prawidłowym adresem URL."
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+msgid "Unblock this user"
+msgstr "Odblokuj tego użytkownika"
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173 actions/emailsettings.php:178
-msgid "I want to post notices by email."
-msgstr "Chcę wysyłać wpisy przez e-mail."
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Niezalogowany."
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
-msgstr "Komunikator"
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
+msgstr "Nie podano profilu."
 
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
-msgstr "Adres komunikatora"
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
+msgstr "Brak profilu o tym identyfikatorze."
 
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
-msgstr "Ustawienia komunikatora"
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Zablokuj użytkownika"
 
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
+#: actions/block.php:136
 msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
 msgstr ""
-"Jeśli już masz konto, zaloguj się za pomocą nazwy użytkownika i hasła, aby "
-"połączyć je ze swoim identyfikatorem OpenID."
+"Jesteś pewny, że chcesz zablokować tego użytkownika. Po tym jego subskrypcja "
+"do Ciebie zostanie usunięta, nie będzie mógł Cię zasubskrybować w "
+"przyszłości i nie będziesz powiadamiany o żadnych odpowiedziach @ od niego."
 
-#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
-msgid ""
-"If you want to add an OpenID to your account, enter it in the box below and "
-"click \"Add\"."
-msgstr ""
-"Jeśli chcesz dodać identyfikator OpenID do swojego konta, podaj go w "
-"poniższym polu i naciśnij \"Dodaj\"."
+#: actions/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
+msgid "No"
+msgstr "Nie"
 
-#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
-msgstr ""
-"Jeśli zapomniałeś lub zgubiłeś swoje hasło, możesz otrzymać nowe na adres e-"
-"mail, który podałeś."
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Odblokuj tego użytkownika"
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-#: actions/emailsettings.php:127 actions/smssettings.php:140
-msgid "Incoming email"
-msgstr "Wiadomości przychodzące"
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
+msgstr "Tak"
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443 actions/emailsettings.php:450
-#: actions/smssettings.php:518 actions/smssettings.php:519
-msgid "Incoming email address removed."
-msgstr "Usunięto przychodzący adres e-mail."
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+msgid "Block this user"
+msgstr "Zablokuj tego użytkownika"
 
-#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
-msgid "Incorrect old password"
-msgstr "Niepoprawne stare hasło"
+#: actions/block.php:165
+msgid "You have already blocked this user."
+msgstr "Ten użytkownik został już zablokowany."
 
-#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
-#: actions/facebookhome.php:129
-msgid "Incorrect username or password."
-msgstr "Niepoprawna nazwa użytkownika lub hasło."
+#: actions/block.php:170
+msgid "Failed to save block information."
+msgstr "Zapisanie informacji o blokadzie nie powiodło się."
 
-#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
-#: actions/recoverpassword.php:322
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
-msgstr ""
-"Instrukcje przywracania hasła zostały wysłane na adres e-mail zarejestrowany "
-"z Twoim kontem."
+#: actions/bookmarklet.php:50
+#, fuzzy
+msgid "Post to "
+msgstr "Zdjęcie"
 
-#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118 actions/updateprofile.php:120
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "Nieprawidłowy adres URL awatara \"%s\""
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+msgstr "Brak kodu potwierdzającego."
 
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
-#: actions/invite.php:72
-#, php-format
-msgid "Invalid email address: %s"
-msgstr "Nieprawidłowy adres e-mail: %s"
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "Nie znaleziono kodu potwierdzającego."
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102 actions/updateprofile.php:104
-#, php-format
-msgid "Invalid homepage '%s'"
-msgstr "Nieprawidłowa strona domowa \"%s\""
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "Ten kod potwierdzający nie jest przeznaczony dla Ciebie!"
 
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86 actions/updateprofile.php:88
+#: actions/confirmaddress.php:90
 #, php-format
-msgid "Invalid license URL '%s'"
-msgstr "Nieprawidłowy adres URL licencji \"%s\""
-
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
-msgstr "Nieprawidłowa zawartość wpisu"
-
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
-msgstr "Nieprawidłowy adres URI wpisu"
-
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
-msgstr "Nieprawidłowy adres URL wpisu"
+msgid "Unrecognized address type %s"
+msgstr "Nierozpoznany typ adresu %s"
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91 actions/updateprofile.php:93
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "Nieprawidłowy adres URL profilu \"%s\"."
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr "Ten adres został już potwierdzony."
 
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
-msgstr "Nieprawidłowy adres URL profilu (błędny format)"
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "Nie można zaktualizować użytkownika."
 
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
-msgstr "Nieprawidłowy adres URL profilu zwrócony przez serwer."
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr "Nie można usunąć potwierdzenia adresu e-mail."
 
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
-#: actions/avatarbynickname.php:69
-msgid "Invalid size."
-msgstr "Nieprawidłowy rozmiar."
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "Potwierdź adres"
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111 actions/finishopenidlogin.php:241
-#: actions/register.php:103 actions/register.php:121
-#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211 actions/finishopenidlogin.php:284
-#: actions/finishopenidlogin.php:307 actions/register.php:230
-#: actions/register.php:251
-msgid "Invalid username or password."
-msgstr "Nieprawidłowa nazwa użytkownika lub hasło."
+#: actions/confirmaddress.php:159
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "Adres \"%s\" został potwierdzony dla Twojego konta."
 
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-#: actions/invite.php:104
-msgid "Invitation(s) sent"
-msgstr "Wysłano zaproszenia"
+#: actions/conversation.php:99
+msgid "Conversation"
+msgstr "Rozmowa"
 
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-#: actions/invite.php:138
-msgid "Invitation(s) sent to the following people:"
-msgstr "Wysłano zaproszenia do następujących osób:"
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
+msgstr "Wpisy"
 
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
-#: lib/facebookaction.php:221 lib/subgroupnav.php:105
-msgid "Invite"
-msgstr "Zaproś"
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
+msgstr "Nie ma takiego wpisu."
 
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-#: actions/invite.php:106
-msgid "Invite new users"
-msgstr "Zaproś nowych użytkowników"
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "Nie można usunąć tego wpisu."
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
-#: lib/action.php:756
-#, php-format
+#: actions/deletenotice.php:103
 msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
 msgstr ""
-"Działa pod kontrolą oprogramowania do mikroblogowania [StatusNet](http://"
-"status.net/) w wersji %s, dostępnego na [Powszechnej Licencji Publicznej GNU "
-"Affero](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"Za chwilę wpis zostanie trwale usunięty. Kiedy to się stanie, to już się nie "
+"odstanie."
 
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
-msgstr "Identyfikator Jabbera należy już do innego użytkownika."
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr "Usuń wpis"
 
-#: ../actions/imsettings.php:62 actions/imsettings.php:63
-#: actions/imsettings.php:120
-#, php-format
-msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
-msgstr ""
-"Adres Jabbera lub GTalk, taki jak \"NazwaUżytkownika@przykład.org\". "
-"Najpierw upewnij się, że dodałeś %s do listy znajomych w komunikatorze lub "
-"na GTalk."
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr "Jesteś pewien, że chcesz usunąć ten wpis?"
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128 actions/profilesettings.php:129
-msgid "Language"
-msgstr "Język"
+#: actions/deletenotice.php:145
+msgid "Do not delete this notice"
+msgstr "Nie usuwaj tego wpisu"
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217 actions/profilesettings.php:218
-msgid "Language is too long (max 50 chars)."
-msgstr "Język jest za długi (maksymalnie 50 znaków)."
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+msgid "Delete this notice"
+msgstr "Usuń ten wpis"
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125 actions/showgroup.php:246
-#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
-#: actions/register.php:454 actions/showgroup.php:251
-#: actions/showstream.php:229 actions/userauthorization.php:128
-#: lib/groupeditform.php:171 lib/profilelist.php:185
-msgid "Location"
-msgstr "Położenie"
+#: actions/deletenotice.php:157
+msgid "There was a problem with your session token.  Try again, please."
+msgstr "Wystąpił problem z tokenem sesji. Spróbuj ponownie."
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
-#: actions/register.php:92 actions/updateprofile.php:109
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112 actions/updateprofile.php:114
-#: actions/editgroup.php:203 actions/newgroup.php:153
-#: actions/profilesettings.php:209 actions/register.php:214
-msgid "Location is too long (max 255 chars)."
-msgstr "Położenie jest za długie (maksymalnie 255 znaków)."
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr "Ten wpis nie jest ulubiony!"
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
-#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
-#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
-#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
-#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
-#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
-#: lib/facebookaction.php:295 lib/facebookaction.php:321
-#, php-format
-msgid "Login"
-msgstr "Zaloguj się"
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "Dodaj do ulubionych"
 
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62 actions/openidlogin.php:70
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Zaloguj się za pomocą konta [OpenID](%%doc.openid%%)."
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "Nie ma takiego dokumentu."
 
-#: ../actions/login.php:126 actions/login.php:251
+#: actions/editgroup.php:56
 #, php-format
-msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
-"%). "
-msgstr ""
-"Zaloguj się za pomocą nazwy użytkownika i hasła. Nie masz ich jeszcze? "
-"[Zarejestruj](%%action.register%%) nowe konto lub wypróbuj [OpenID](%%action."
-"openidlogin%%). "
+msgid "Edit %s group"
+msgstr "Edytuj grupę %s"
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
-#: lib/action.php:435
-msgid "Logout"
-msgstr "Wyloguj się"
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
+msgstr "Musisz być zalogowany, aby utworzyć grupę."
 
-#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393 actions/register.php:439
-msgid "Longer name, preferably your \"real\" name"
-msgstr "Dłuższa nazwa, najlepiej twoje \"prawdziwe\" nazwisko"
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+msgid "You must be an admin to edit the group"
+msgstr "Musisz być administratorem, aby zmodyfikować grupę"
 
-#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
-#: lib/facebookaction.php:327
-msgid "Lost or forgotten password?"
-msgstr "Zgubione lub zapomniane hasło?"
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
+msgstr "Użyj tego formularza, aby zmodyfikować grupę."
 
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-#: actions/emailsettings.php:81 actions/smssettings.php:89
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr "Używaj nowego adresu e-mail do wysyłania; anuluj stary."
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "opis jest za długi (maksymalnie 140 znaków)."
+
+#: actions/editgroup.php:253
+msgid "Could not update group."
+msgstr "Nie można zaktualizować grupy."
+
+#: actions/editgroup.php:269
+msgid "Options saved."
+msgstr "Zapisano opcje."
+
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "Ustawienia adresu e-mail"
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
 #: actions/emailsettings.php:71
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Zarządzaj, jak otrzymywać wiadomości e-mail od %%site.name%%."
 
-#: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480 lib/profileaction.php:182
-msgid "Member since"
-msgstr "Członek od"
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "Adres"
 
-#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
-#: actions/userrss.php:93
-#, php-format
-msgid "Microblog by %s"
-msgstr "Mikroblog użytkownika %s"
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr "Obecnie potwierdzone adresy e-mail."
 
-#: ../actions/smssettings.php:304 actions/smssettings.php:464
-#, php-format
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "Usuń"
+
+#: actions/emailsettings.php:113
 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."
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
 msgstr ""
-"Operator komórkowy Twojego telefonu. Jeśli znasz operatora, który akceptuje "
-"wiadomości SMS przez e-mail, a nie znajduje się na liście, wyślij wiadomość "
-"e-mail na %s (w języku angielskim), aby nam o tym powiedzieć."
-
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-#: actions/register.php:430 actions/finishopenidlogin.php:106
-#: actions/register.php:477
-msgid "My text and files are available under "
-msgstr "Moje teksty i pliki są dostępne na "
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#: actions/emailsettings.php:142 actions/smssettings.php:152
-msgid "New"
-msgstr "Nowe"
-
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
-#, php-format
-msgid "New email address for posting to %s"
-msgstr "Nowy adres e-mail do wysyłania do %s"
+"Oczekiwanie na potwierdzenie tego adresu. Sprawdź swoją skrzynkę odbiorczą "
+"(także w wiadomościach niechcianych!), czy otrzymałeś wiadomość z dalszymi "
+"instrukcjami."
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465 actions/emailsettings.php:472
-#: actions/smssettings.php:542 actions/smssettings.php:543
-msgid "New incoming email address added."
-msgstr "Dodano nowy przychodzący adres e-mail."
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "Anuluj"
 
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
-msgid "New nickname"
-msgstr "Nowy pseudonim"
+#: actions/emailsettings.php:121
+msgid "Email Address"
+msgstr "Adres e-mail"
 
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
-msgstr "Nowy wpis"
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr "Adres e-mail, taki jak \"NazwaUżytkownika@przykład.org\""
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-#: actions/recoverpassword.php:232
-msgid "New password"
-msgstr "Nowe hasło"
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "Dodaj"
 
-#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
-#: actions/recoverpassword.php:379
-msgid "New password successfully saved. You are now logged in."
-msgstr "Pomyślnie zapisano nowe hasło. Jesteś teraz zalogowany."
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+msgstr "Wiadomości przychodzące"
 
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151 actions/login.php:101
-#: actions/profilesettings.php:74 actions/register.php:165
-#: actions/login.php:228 actions/profilesettings.php:98
-#: actions/register.php:367 actions/showgroup.php:224
-#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
-#: actions/showgroup.php:226 actions/showstream.php:244
-#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
-#: actions/showgroup.php:231 actions/showstream.php:209
-#: lib/facebookaction.php:314 lib/groupeditform.php:152
-msgid "Nickname"
-msgstr "Pseudonim"
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
+msgstr "Wyślij wiadomość e-mail na ten adres, aby wysyłać nowe wpisy."
 
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69 actions/finishopenidlogin.php:181
-#: actions/profilesettings.php:225 actions/register.php:76
-#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159 actions/editgroup.php:185
-#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
-#: actions/profilesettings.php:215 actions/register.php:196
-msgid "Nickname already in use. Try another one."
-msgstr "Pseudonim jest już używany. Spróbuj innego."
+#: actions/emailsettings.php:145 actions/smssettings.php:162
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr "Używaj nowego adresu e-mail do wysyłania; anuluj stary."
 
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:67 ../actions/updateprofile.php:77
-#: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
-#: actions/register.php:74 actions/updateprofile.php:78
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81 actions/editgroup.php:179
-#: actions/newgroup.php:130 actions/register.php:156
-#: actions/updateprofile.php:83 actions/editgroup.php:181
-#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
-#: actions/profilesettings.php:193 actions/register.php:193
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "Pseudonim może zawierać tylko małe litery i cyfry, bez spacji."
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
+msgstr "Nowe"
 
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
-msgid "Nickname not allowed."
-msgstr "Niedozwolony pseudonim."
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
+msgstr "Preferencje"
 
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
-msgstr "Pseudonim użytkownika którego chcesz obserwować"
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
+msgstr "Wyślij mi wpisy nowych subskrypcji przez e-mail."
 
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
-msgid "Nickname or email"
-msgstr "Pseudonim lub adres e-mail"
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr "Wyślij mi wiadomość e-mail, kiedy ktoś doda mój wpis jako ulubiony."
 
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
-#: actions/deletenotice.php:116 actions/block.php:149
-#: actions/deletenotice.php:115 actions/groupblock.php:176
-msgid "No"
-msgstr "Nie"
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
+msgstr "Wyślij mi wiadomość e-mail, kiedy ktoś wyśle mi prywatną wiadomość."
 
-#: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
-msgstr "Brak identyfikatora Jabbera."
+#: actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "Wyślij mi wiadomość e-mail, kiedy ktoś wyśle mi odpowiedź \"@\"."
 
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153 actions/userauthorization.php:192
-msgid "No authorization request!"
-msgstr "Brak żądania upoważnienia!"
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
+msgstr "Pozwól przyjaciołom na szturchanie mnie i wyślij mi wiadomość e-mail."
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
-msgid "No carrier selected."
-msgstr "Nie wybrano operatora."
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
+msgstr "Chcę wysyłać wpisy przez e-mail."
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
-msgstr "Nie podano kodu"
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
+msgstr "Opublikuj MicroID adresu e-mail."
 
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
-#: actions/confirmaddress.php:75
-msgid "No confirmation code."
-msgstr "Brak kodu potwierdzającego."
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Zapisz"
 
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
-#: actions/newnotice.php:126 classes/Command.php:223
-#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
-#: actions/newnotice.php:162 lib/command.php:216
-msgid "No content!"
-msgstr "Brak zawartości!"
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+msgstr "Zapisano preferencje."
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr "Brak adresu e-mail."
 
-#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
-msgid "No id."
-msgstr "Brak identyfikatora."
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430 actions/emailsettings.php:437
-#: actions/smssettings.php:505 actions/smssettings.php:506
-msgid "No incoming email address."
-msgstr "Brak przychodzącego adresu e-mail."
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
+msgstr "Nie można znormalizować tego adresu e-mail"
 
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr "Zdalny serwer nie dostarczył pseudonimu."
+#: actions/emailsettings.php:330
+msgid "Not a valid email address"
+msgstr "To nie jest prawidłowy adres e-mail"
 
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
-msgid "No nickname."
-msgstr "Brak pseudonimu."
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
+msgstr "Ten adres e-mail jest już Twój."
 
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229 actions/emailsettings.php:240
-#: actions/imsettings.php:214 actions/smssettings.php:237
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358 actions/emailsettings.php:370
-msgid "No pending confirmation to cancel."
-msgstr "Brak oczekujących potwierdzeń do anulowania."
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another user."
+msgstr "Ten adres e-mail należy już do innego użytkownika."
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
-msgstr "Brak numeru telefonu."
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+msgstr "Nie można wprowadzić kodu potwierdzającego."
 
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
-msgstr "Serwer nie zwrócił adresu URL profilu."
+#: actions/emailsettings.php:358
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr ""
+"Kod potwierdzający został wysłany na dodany adres e-mail. Sprawdź w swojej "
+"skrzynce odbiorczej (także w wiadomościach niechcianych!), czy otrzymałeś "
+"kod i instrukcje dotyczące jego użycia."
 
-#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
-msgid "No registered email address for that user."
-msgstr "Brak zarejestrowanych adresów e-mail dla tego użytkownika."
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
+msgstr "Brak oczekujących potwierdzeń do anulowania."
 
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr "Nie znaleziono żądania!"
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "To jest błędny adres komunikatora."
 
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85 actions/noticesearch.php:117
-msgid "No results"
-msgstr "Brak wyników"
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "Anulowano potwierdzenie."
 
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
-msgstr "Brak rozmiaru."
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
+msgstr "To nie jest Twój adres e-mail."
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
-#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
-#: actions/twitapistatuses.php:426
-msgid "No status found with that ID."
-msgstr "Nie znaleziono statusów z tym identyfikatorem."
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "Adres został usunięty."
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
-#: actions/twitapistatuses.php:399
-msgid "No status with that ID found."
-msgstr "Nie znaleziono statusów z tym identyfikatorem."
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
+msgstr "Brak przychodzącego adresu e-mail."
 
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
-msgstr "Nie ma takiego identyfikatora OpenID."
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
+msgstr "Nie można zaktualizować wpisu użytkownika."
 
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
-msgid "No such document."
-msgstr "Nie ma takiego dokumentu."
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
+msgstr "Usunięto przychodzący adres e-mail."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30 actions/shownotice.php:32
-#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
-msgid "No such notice."
-msgstr "Nie ma takiego wpisu."
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
+msgstr "Dodano nowy przychodzący adres e-mail."
 
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr "Nie ma takiego kodu przywracania."
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+msgid "Popular notices"
+msgstr "Popularne wpisy"
 
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-msgid "No such subscription"
-msgstr "Nie ma takiej subskrypcji"
-
-#: ../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 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
-#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
-#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
-#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
-#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
-#: lib/command.php:178 lib/command.php:227 lib/command.php:264
-#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
-msgid "No such user."
-msgstr "Brak takiego użytkownika."
+#: actions/favorited.php:67
+#, php-format
+msgid "Popular notices, page %d"
+msgstr "Popularne wpisy, strona %d"
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
-msgid "No user with that email address or username."
-msgstr "Brak użytkownika z tym adresem e-mail lub nazwą użytkownika."
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
+msgstr "Najpopularniejsze wpisy na stronie w te chwili."
 
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
-msgstr "Nie ma kogo pokazać!"
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+"Ulubione wpisy są widoczne na tej stronie, ale nikt nie oznaczył jeszcze "
+"żadnego jako ulubiony."
 
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr "To nie jest kod przywracania."
+#: actions/favorited.php:153
+msgid ""
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
+msgstr ""
+"Bądź pierwszym, który doda wpis do ulubionych naciskając przycisk ulubionego "
+"obok wpisu, który Ci się podoba."
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
-msgid "Not a registered user."
-msgstr "To nie jest zarejestrowany użytkownik."
+#: actions/favorited.php:156
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
+msgstr ""
+"Dlaczego nie [zarejestrujesz konta](%%action.register%%) i zostaniesz "
+"pierwszym, który doda wpis do ulubionych!"
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
-#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
-#: lib/twitterapi.php:741
-msgid "Not a supported data format."
-msgstr "To nie jest obsługiwany format danych."
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
+msgstr "Ulubione wpisy użytkownika %s"
 
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
-msgstr "To nie jest prawidłowy identyfikator Jabbera"
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Aktualizacje od %1$s na %2$s!"
 
-#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-#: lib/openid.php:143
-msgid "Not a valid OpenID."
-msgstr "To nie jest prawidłowy identyfikator OpenID."
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Ten wpis jest już ulubiony!"
 
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315 actions/emailsettings.php:322
-msgid "Not a valid email address"
-msgstr "To nie jest prawidłowy adres e-mail"
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Usuń wpis z ulubionych"
 
-#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-#: actions/register.php:189
-msgid "Not a valid email address."
-msgstr "To nie jest prawidłowy adres e-mail."
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr "Znani użytkownicy"
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-#: actions/editgroup.php:186 actions/newgroup.php:137
-#: actions/profilesettings.php:195 actions/register.php:161
-#: actions/editgroup.php:188 actions/newgroup.php:138
-#: actions/profilesettings.php:196 actions/register.php:198
-msgid "Not a valid nickname."
-msgstr "To nie jest prawidłowy pseudonim."
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr "Znani użytkownicy, strona %d"
 
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
-msgstr "To nie jest prawidłowy adres URL profilu (niepoprawne usługi)."
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
+msgstr "Wybór znanych użytkowników na %s"
 
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr "To nie jest prawidłowy adres URL profilu (nie podano XRDS)."
+#: actions/file.php:34
+msgid "No notice id"
+msgstr "Brak identyfikatora wpisu"
 
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr "To nie jest prawidłowy adres URL profilu (brak dokumentu YADIS)."
+#: actions/file.php:38
+msgid "No notice"
+msgstr "Brak wpisu"
 
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
-msgid "Not an image or corrupt file."
-msgstr "To nie jest obraz lub lub plik jest uszkodzony."
+#: actions/file.php:42
+msgid "No attachments"
+msgstr "Brak załączników"
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
-msgid "Not authorized."
-msgstr "Brak upoważnienia."
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr "Nie wysłano załączników"
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Nieoczekiwana odpowiedź!"
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
-#: actions/twitapistatuses.php:284
-msgid "Not found"
-msgstr "Nie znaleziono"
-
-#: ../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 actions/block.php:59 actions/disfavor.php:61
-#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
-#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
-#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
-#: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
-#: actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/makeadmin.php:61 actions/newnotice.php:88
-msgid "Not logged in."
-msgstr "Niezalogowany."
-
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
-msgid "Not subscribed!."
-msgstr "Nie zasubskrybowane!"
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
-msgstr "Wyszukiwanie wpisów"
-
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
-#, php-format
-msgid "Notice feed for %s"
-msgstr "Kanał wpisów dla %s"
-
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
-msgstr "Wpis nie posiada profilu"
-
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
-#: actions/conversation.php:149 lib/facebookaction.php:572
-#: lib/profileaction.php:206
-msgid "Notices"
-msgstr "Wpisy"
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
-#: actions/twitapitags.php:69
-#, php-format
-msgid "Notices tagged with %s"
-msgstr "Wpisy ze znacznikiem %s"
-
-#: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
-msgstr "Stare hasło"
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "Obserwowany użytkownik nie istnieje."
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81 lib/action.php:418
-msgid "OpenID"
-msgstr "OpenID"
-
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
-msgid "OpenID Account Setup"
-msgstr "Ustawienia konta OpenID"
-
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-#: lib/openid.php:269
-msgid "OpenID Auto-Submit"
-msgstr "Automatyczne wysłanie OpenID"
-
-#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
-#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-#: actions/openidlogin.php:89
-msgid "OpenID Login"
-msgstr "Login OpenID"
-
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-#: actions/openidlogin.php:102 actions/openidsettings.php:101
-#: actions/openidlogin.php:111
-msgid "OpenID URL"
-msgstr "Adres URL identyfikatora OpenID"
-
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
-#: actions/finishopenidlogin.php:129
-msgid "OpenID authentication cancelled."
-msgstr "Anulowano uwierzytelnienie OpenID."
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
-#: actions/finishopenidlogin.php:133
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr "Uwierzytelnienie OpenID nie powiodło się: %s"
-
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
-#: lib/openid.php:145
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "Niepowodzenie OpenID: %s"
-
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr "Usunięto identyfikator OpenID."
-
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
-msgstr "Ustawienia OpenID"
-
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-#: actions/invite.php:186 actions/invite.php:188
-msgid "Optionally add a personal message to the invitation."
-msgstr "Opcjonalnie dodaj osobistą wiadomość do zaproszenia."
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+msgstr "Można używać lokalnej subskrypcji!"
 
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
-msgid "Partial upload."
-msgstr "Częściowo wysłano."
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
+msgstr "Ten użytkownik zablokował Cię z subskrypcji."
 
-#: ../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 actions/finishopenidlogin.php:118
-#: actions/login.php:231 actions/register.php:372
-#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-#: actions/login.php:214 lib/facebookaction.php:315
-#: actions/finishopenidlogin.php:117 actions/register.php:418
-#: lib/facebookaction.php:317
-msgid "Password"
-msgstr "Hasło"
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "Brak upoważnienia."
 
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
-msgid "Password and confirmation do not match."
-msgstr "Hasło i potwierdzenie nie pasują do siebie."
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "Nie można przekonwertować tokenów żądań na tokeny dostępu."
 
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
-msgid "Password must be 6 chars or more."
-msgstr "Hasło musi mieć sześć lub więcej znaków."
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Nieznana wersja protokołu OMB."
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
-msgid "Password recovery requested"
-msgstr "Zażądano przywracania hasła"
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "Błąd podczas aktualizowania zdalnego profilu"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
-msgid "Password saved."
-msgstr "Zapisano hasło."
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+msgid "No such group."
+msgstr "Nie ma takiej grupy."
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-#: actions/passwordsettings.php:150 actions/register.php:220
-msgid "Passwords don't match."
-msgstr "Hasła nie pasują do siebie."
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "Nie ma takiego wpisu."
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
-msgstr "Osoby"
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Utracono plik."
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
-msgstr "Wyszukiwanie osób"
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
+msgstr "Nie podano grupy."
 
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
-msgstr "Wyszukiwanie osób"
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr "Tylko administrator może blokować członków grupy."
 
-#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
-#: lib/personalgroupnav.php:99
-msgid "Personal"
-msgstr "Osobiste"
+#: actions/groupblock.php:95
+msgid "User is already blocked from group."
+msgstr "Użytkownik został już zablokował w grupie."
 
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-#: actions/invite.php:184 actions/invite.php:186
-msgid "Personal message"
-msgstr "Osobista wiadomość"
+#: actions/groupblock.php:100
+msgid "User is not a member of group."
+msgstr "Użytkownik nie jest członkiem grupy."
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-#: actions/smssettings.php:128
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "Numer telefonu, bez znaków przestankowych i spacji, z kodem państwa"
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+msgid "Block user from group"
+msgstr "Zablokuj użytkownika w grupie"
 
-#: ../actions/userauthorization.php:78
+#: actions/groupblock.php:162
+#, php-format
 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\"."
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
 msgstr ""
-"Sprawdź te szczegóły, aby upewnić się, czy chcesz subskrybować wpisy tego "
-"użytkownika. Jeśli nie chcesz, po prostu naciśnij \"Anuluj\"."
+"Jesteś pewny, że chcesz zablokować użytkownika \"%s\" w grupie \"%s\"? "
+"Zostanie usunięty z grupy, nie będzie mógł wysyłać wpisów i zasubskrybować "
+"grupy w przyszłości."
 
-#: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Wyślij wpis, kiedy zmieni się mój status na Jabberze/GTalk."
+#: actions/groupblock.php:178
+msgid "Do not block this user from this group"
+msgstr "Nie blokuj tego użytkownika w tej grupie"
 
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94 actions/emailsettings.php:86
-#: actions/imsettings.php:68 actions/smssettings.php:94
-#: actions/twittersettings.php:70 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134 actions/twittersettings.php:137
-msgid "Preferences"
-msgstr "Preferencje"
+#: actions/groupblock.php:179
+msgid "Block this user from this group"
+msgstr "Zablokuj tego użytkownika w tej grupie"
 
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163 actions/emailsettings.php:180
-#: actions/imsettings.php:152 actions/smssettings.php:171
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
-#: actions/emailsettings.php:293 actions/othersettings.php:173
-msgid "Preferences saved."
-msgstr "Zapisano preferencje."
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
+msgstr "Błąd bazy danych podczas blokowania użytkownika w grupie."
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129 actions/profilesettings.php:130
-msgid "Preferred language"
-msgstr "Preferowany język"
+#: actions/groupbyid.php:74
+msgid "No ID"
+msgstr "Brak identyfikatora"
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
-#: lib/action.php:715
-msgid "Privacy"
-msgstr "Prywatność"
+#: actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
+msgstr "Musisz być zalogowany, aby zmodyfikować grupę."
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
-#: classes/Notice.php:216 classes/Notice.php:232
-msgid "Problem saving notice."
-msgstr "Problem podczas zapisywania wpisu."
+#: actions/groupdesignsettings.php:141
+msgid "Group design"
+msgstr "Wygląd grupy"
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr "Profil"
+#: actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr "Dostosuj wygląd grupy za pomocą wybranego obrazu tła i palety kolorów."
 
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
-msgstr "Adres URL profilu"
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+msgid "Couldn't update your design."
+msgstr "Nie można zaktualizować wyglądu."
 
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
-msgstr "Ustawienia profilu"
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+msgid "Unable to save your design settings!"
+msgstr "Nie można zapisać ustawień wyglądu!"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-#: actions/updateprofile.php:58
-msgid "Profile unknown"
-msgstr "Nieznany profil"
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+msgid "Design preferences saved."
+msgstr "Zapisano preferencje wyglądu."
 
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
-msgid "Public Stream Feed"
-msgstr "Kanał publicznego strumienia"
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
+msgstr "Logo grupy"
 
-#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
-#: actions/public.php:120
-msgid "Public timeline"
-msgstr "Publiczna oś czasu"
+#: actions/grouplogo.php:150
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr "Można wysłać obraz logo grupy. Maksymalny rozmiar pliku to %s."
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Opublikuj MicroID adresu Jabbera/GTalk."
+#: actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
+msgstr "Wybierz kwadratowy obszar obrazu, który będzie logo."
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178 actions/emailsettings.php:183
-msgid "Publish a MicroID for my email address."
-msgstr "Opublikuj MicroID adresu e-mail."
+#: actions/grouplogo.php:396
+msgid "Logo updated."
+msgstr "Zaktualizowano logo."
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr "Ostatnie znaczniki"
+#: actions/grouplogo.php:398
+msgid "Failed updating logo."
+msgstr "Zaktualizowanie logo nie powiodło się."
 
-#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
-msgid "Recover"
-msgstr "Przywróć"
+#: actions/groupmembers.php:93 lib/groupnav.php:92
+#, php-format
+msgid "%s group members"
+msgstr "Członkowie grupy %s"
 
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
-msgid "Recover password"
-msgstr "Przywróć hasło"
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
+msgstr "Członkowie grupy %s, strona %d"
 
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-msgid "Recovery code for unknown user."
-msgstr "Kod przywracania dla nieznanego użytkownika."
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr "Lista użytkowników znajdujących się w tej grupie."
 
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
-#: actions/register.php:152 actions/register.php:207 lib/util.php:328
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
-#: actions/register.php:108 actions/register.php:486 lib/action.php:440
-#: lib/facebookaction.php:281
-msgid "Register"
-msgstr "Zarejestruj się"
+#: actions/groupmembers.php:175 lib/groupnav.php:107
+msgid "Admin"
+msgstr "Administrator"
 
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
-#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
-#: actions/register.php:129
-msgid "Registration not allowed."
-msgstr "Rejestracja nie jest dozwolona."
+#: actions/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
+msgstr "Zablokuj"
 
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67 actions/register.php:106
-msgid "Registration successful"
-msgstr "Rejestracja powiodła się"
+#: actions/groupmembers.php:441
+msgid "Make user an admin of the group"
+msgstr "Uczyń użytkownika administratorem grupy"
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144 actions/userauthorization.php:179
-msgid "Reject"
-msgstr "Odrzuć"
+#: actions/groupmembers.php:473
+msgid "Make Admin"
+msgstr "Uczyń administratorem"
 
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
-#: actions/register.php:461
-msgid "Remember me"
-msgstr "Zapamiętaj mnie"
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr "Uczyń tego użytkownika administratorem"
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74 actions/updateprofile.php:76
-msgid "Remote profile with no matching profile"
-msgstr "Zdalny profil bez odpowiadającego profilu"
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Aktualizacje od %1$s na %2$s!"
 
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
-msgstr "Zasubskrybuj zdalnie"
+#: actions/groupsearch.php:52
+#, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"Znajdź grupy na %%site.name%% według ich nazwy, położenia lub opisu. Oddziel "
+"terminy spacjami; muszą mieć trzy znaki lub więcej."
 
-#: ../actions/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 actions/emailsettings.php:101
-#: actions/emailsettings.php:134 actions/imsettings.php:102
-#: actions/openidsettings.php:166 actions/smssettings.php:103
-#: actions/smssettings.php:146 actions/twittersettings.php:115
-#: actions/twittersettings.php:118
-msgid "Remove"
-msgstr "Usuń"
+#: actions/groupsearch.php:58
+msgid "Group search"
+msgstr "Znajdź grupę"
 
-#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
-msgstr "Usuń identyfikator OpenID"
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+msgid "No results."
+msgstr "Brak wyników."
 
-#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
+#: actions/groupsearch.php:82
+#, php-format
 msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
 msgstr ""
-"Usunięcie jedynego identyfikatora OpenID uniemożliwi zalogowanie się! Jeśli "
-"musisz je usunąć, dodaj najpierw inne."
-
-#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
-#: lib/personalgroupnav.php:104
-msgid "Replies"
-msgstr "Odpowiedzi"
+"Jeśli nie możesz znaleźć grupy, której szukasz, możesz sam [ją utworzyć](%%"
+"action.newgroup%%)."
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
-#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
-#: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104 actions/replies.php:118
-#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/groupsearch.php:85
 #, php-format
-msgid "Replies to %s"
-msgstr "Odpowiedzi na %s"
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+"Dlaczego nie [zarejestrujesz konta](%%action.register%%) i sam [utworzysz "
+"grupę](%%action.newgroup%%)!"
 
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
-msgid "Reset"
-msgstr "Przywróć"
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Grupy"
 
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
-msgid "Reset password"
-msgstr "Przywróć hasło"
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Grupy, strona %d"
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-#: actions/subscriptions.php:125 actions/subscriptions.php:184
-msgid "SMS"
-msgstr "SMS"
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
+"Grupy %%%%site.name%%%% umożliwiają znalezienie i rozmawianie z osobami o "
+"podobnych zainteresowaniach. Po dołączeniu do grupy można wysyłać wiadomości "
+"do wszystkich członków używając składni \"!nazwagrupy\". Nie widzisz grupy, "
+"która Cię interesuje? Spróbuj ją [znaleźć](%%%%action.groupsearch%%%%) lub "
+"[założyć własną!](%%%%action.newgroup%%%%)"
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
-msgid "SMS Phone number"
-msgstr "Numer telefonu SMS"
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Utwórz nową grupę"
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
-msgstr "Ustawienia SMS"
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr "Tylko administrator może odblokowywać członków grupy."
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
-msgid "SMS confirmation"
-msgstr "Potwierdzenie SMS"
+#: actions/groupunblock.php:95
+msgid "User is not blocked from group."
+msgstr "Użytkownik nie został zablokowany w grupie."
 
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
-msgid "Same as password above"
-msgstr "Takie samo jak powyższe hasło"
+#: actions/groupunblock.php:128 actions/unblock.php:108
+msgid "Error removing the block."
+msgstr "Błąd podczas usuwania blokady."
 
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377 actions/register.php:423
-msgid "Same as password above. Required."
-msgstr "Takie samo jak powyższe hasło. Wymagane."
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "Ustawienia komunikatora"
 
-#: ../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 actions/emailsettings.php:182
-#: actions/facebooksettings.php:114 actions/imsettings.php:157
-#: actions/othersettings.php:117 actions/profilesettings.php:150
-#: actions/smssettings.php:169 actions/subscriptions.php:124
-#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171 actions/emailsettings.php:187
-#: actions/subscriptions.php:126 actions/tagother.php:154
-#: actions/twittersettings.php:164 actions/othersettings.php:119
-#: actions/profilesettings.php:152 actions/subscriptions.php:185
-#: actions/twittersettings.php:180 lib/designsettings.php:256
-#: lib/groupeditform.php:196
-msgid "Save"
-msgstr "Zapisz"
+#: actions/imsettings.php:70
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+"Można wysyłać i odbierać wpisy przez [komunikator](%%doc.im%%) Jabber/GTalk. "
+"Skonfiguruj adres i ustawienia poniżej."
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
-msgid "Search"
-msgstr "Znajdź"
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Ta strona nie jest dostępna w "
 
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
-msgstr "Znajdź kanał strumienia"
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Obecnie potwierdzone adresy Jabbera/GTalk."
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57 actions/noticesearch.php:68
+#: actions/imsettings.php:114
 #, php-format
 msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
+"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 ""
-"Znajdź wpisy na %%site.name%% według ich zawartości. Oddziel wyszukiwane "
-"terminy spacjami. Terminy muszą mieć trzy znaki lub więcej."
+"Oczekiwanie na potwierdzenie tego adresu. Sprawdź swoje konto Jabbera/GTalk, "
+"czy otrzymałeś wiadomość z dalszymi instrukcjami (dodałeś %s do listy "
+"znajomych?)."
+
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "Adres komunikatora"
 
-#: ../actions/peoplesearch.php:28 actions/peoplesearch.php:52
+#: actions/imsettings.php:126
 #, 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."
+"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 ""
-"Znajdź osoby na %%site.name%% według ich nazwiska, położenia lub "
-"zainteresowań. Oddziel wyszukiwane terminy spacjami. Terminy muszą mieć trzy "
-"znaki lub więcej."
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
-msgid "Select a carrier"
-msgstr "Wybierz operatora"
-
-#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
-#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
-#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
-#: lib/noticeform.php:179
-msgid "Send"
-msgstr "Wyślij"
-
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
-msgstr "Wyślij wiadomość e-mail na ten adres, aby wysyłać nowe wpisy."
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
-msgstr "Wyślij mi wpisy nowych subskrypcji przez e-mail."
+"Adres Jabbera lub GTalk, taki jak \"NazwaUżytkownika@przykład.org\". "
+"Najpierw upewnij się, że dodałeś %s do listy znajomych w komunikatorze lub "
+"na GTalk."
 
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Wyślij mi wpisy przez Jabbera/GTalk."
 
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
-#: actions/smssettings.php:162
-msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
-msgstr ""
-"Wyślij mi wpisy przez SMS. Rozumiem, że mogę otrzymywać większe rachunki od "
-"swojego operatora."
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr "Wyślij wpis, kiedy zmieni się mój status na Jabberze/GTalk."
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-#: actions/imsettings.php:147
+#: actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Wyślij mi odpowiedzi przez Jabbera/GTalk od osób, których nie subskrybuję."
 
-#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
-#: lib/facebookaction.php:228 lib/facebookaction.php:230
-msgid "Settings"
-msgstr "Ustawienia"
-
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319 actions/profilesettings.php:318
-msgid "Settings saved."
-msgstr "Zapisano ustawienia."
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr "Wyświetlanie najpopularniejszych znaczników od ostatniego tygodnia"
-
-#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:114
-msgid "Someone else already has this OpenID."
-msgstr "Ktoś inny już posiada ten identyfikator OpenID."
-
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
-msgstr "Stało się coś dziwnego."
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
-msgid "Sorry, no incoming email allowed."
-msgstr "Przepraszamy, przychodzący e-mail nie jest dozwolony."
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
-msgid "Sorry, that is not your incoming email address."
-msgstr "Przepraszamy, to nie jest twój przychodzący adres e-mail."
-
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
-#: lib/action.php:717
-msgid "Source"
-msgstr "Kod źródłowy"
-
-#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476 actions/showgroup.php:375
-#: actions/showgroup.php:421 lib/profileaction.php:173
-msgid "Statistics"
-msgstr "Statystyki"
-
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
-#: actions/finishopenidlogin.php:318
-msgid "Stored OpenID not found."
-msgstr "Nie znaleziono przechowywanego identyfikatora 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
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139 actions/showstream.php:345
-msgid "Subscribe"
-msgstr "Zasubskrybuj"
-
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
-#: lib/subgroupnav.php:90
-msgid "Subscribers"
-msgstr "Subskrybenci"
-
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338 actions/userauthorization.php:344
-#: actions/userauthorization.php:378
-msgid "Subscription authorized"
-msgstr "Upoważniono subskrypcję"
-
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349 actions/userauthorization.php:355
-#: actions/userauthorization.php:389
-msgid "Subscription rejected"
-msgstr "Odrzucono subskrypcję"
-
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27 actions/showstream.php:240
-#: actions/showstream.php:322 actions/subscriptions.php:27
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
-#: lib/subgroupnav.php:82
-msgid "Subscriptions"
-msgstr "Subskrypcje"
-
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
-msgid "System error uploading file."
-msgstr "Błąd systemu podczas wysyłania pliku."
-
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
-#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
-#: actions/tagother.php:209 lib/profilelist.php:160
-#: actions/profilesettings.php:123 actions/showstream.php:255
-#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
-msgid "Tags"
-msgstr "Znaczniki"
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-#: lib/designsettings.php:217
-msgid "Text"
-msgstr "Tekst"
-
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67 actions/noticesearch.php:78
-msgid "Text search"
-msgstr "Znajdź tekst"
-
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
-msgstr "Ten identyfikator OpenID nie należy do Ciebie."
-
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
-msgstr "Ten adres został już potwierdzony."
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Opublikuj MicroID adresu Jabbera/GTalk."
 
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
-msgstr "Ten kod potwierdzający nie jest przeznaczony dla Ciebie!"
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "Brak identyfikatora Jabbera."
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-#: actions/emailsettings.php:328
-msgid "That email address already belongs to another user."
-msgstr "Ten adres e-mail należy już do innego użytkownika."
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr "Nie można znormalizować tego identyfikatora Jabbera"
 
-#: ../actions/avatar.php:80 actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
-msgstr "Ten plik jest za duży."
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "To nie jest prawidłowy identyfikator Jabbera"
 
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "Ten identyfikator Jabbera jest już Twój."
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318 actions/emailsettings.php:325
-msgid "That is already your email address."
-msgstr "Ten adres e-mail jest już Twój."
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr "Identyfikator Jabbera należy już do innego użytkownika."
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
-msgid "That is already your phone number."
-msgstr "Ten numer telefonu jest już Twój."
+#: actions/imsettings.php:327
+#, php-format
+msgid ""
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr ""
+"Kod potwierdzający został wysłany na dodany adres komunikatora. Musisz "
+"zaakceptować otrzymywanie wiadomości od %s."
 
-#: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "To nie jest Twój identyfikator Jabbera."
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397 actions/emailsettings.php:404
-msgid "That is not your email address."
-msgstr "To nie jest Twój adres e-mail."
-
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
-msgstr "To nie jest Twój numer telefonu."
-
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-#: actions/emailsettings.php:367 actions/imsettings.php:349
-#: actions/emailsettings.php:374
-msgid "That is the wrong IM address."
-msgstr "To jest błędny adres komunikatora."
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
-msgstr "To jest błędny numer potwierdzenia."
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-msgid "That phone number already belongs to another user."
-msgstr "Ten numer telefonu należy już do innego użytkownika."
-
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49 actions/twitapistatuses.php:330
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-#: actions/newnotice.php:136 actions/twitapistatuses.php:294
-#: lib/facebookaction.php:485 actions/newnotice.php:166
-#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
-#: scripts/maildaemon.php:70
-msgid "That's too long. Max notice size is 140 chars."
-msgstr "Wpis jest za długi. Maksymalna długość to 140 znaków."
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
-#: actions/twitapiaccount.php:66
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "Wpis jest za długi. Maksymalna długość to 255 znaków."
-
-#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
-#: actions/confirmaddress.php:159
+#: actions/inbox.php:59
 #, php-format
-msgid "The address \"%s\" has been confirmed for your account."
-msgstr "Adres \"%s\" został potwierdzony dla Twojego konta."
+msgid "Inbox for %s - page %d"
+msgstr "Odebrane wiadomości użytkownika %s - strona %d"
 
-#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274 actions/emailsettings.php:282
-#: actions/imsettings.php:258 actions/smssettings.php:282
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413 actions/emailsettings.php:423
-msgid "The address was removed."
-msgstr "Adres został usunięty."
+#: actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr "Odebrane wiadomości użytkownika %s"
 
-#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
-#: actions/userauthorization.php:380
-msgid ""
-"The subscription has been authorized, but no callback URL was passed. Check "
-"with the site's instructions for details on how to authorize the "
-"subscription. Your subscription token is:"
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
-"Subskrypcja została upoważniona, ale nie przekazano zwrotnego adresu URL. "
-"Sprawdź w instrukcjach strony, jak upoważnić subskrypcję. Token subskrypcji:"
+"To jest skrzynka odbiorcza, która wyświetla przychodzące wiadomości prywatne."
 
-#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
-#: actions/userauthorization.php:391
-msgid ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the site's instructions for details on how to fully reject the "
-"subscription."
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr "Zaproszenia zostały wyłączone."
+
+#: actions/invite.php:41
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
 msgstr ""
-"Subskrypcja została odrzucona, ale nie przekazano zwrotnego adresu URL. "
-"Sprawdź w instrukcjach strony, jak w pełni odrzucić subskrypcję."
+"Należy być zalogowanym, aby zapraszać innych użytkowników do używania %s"
 
-#: ../actions/subscribers.php:35 actions/subscribers.php:35
-#: actions/subscribers.php:67
+#: actions/invite.php:72
 #, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr "Osoby obserwujące wpisy użytkownika %s."
+msgid "Invalid email address: %s"
+msgstr "Nieprawidłowy adres e-mail: %s"
 
-#: ../actions/subscribers.php:33 actions/subscribers.php:33
-#: actions/subscribers.php:63
-msgid "These are the people who listen to your notices."
-msgstr "Osoby obserwujący Twoje wpisy."
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
+msgstr "Wysłano zaproszenia"
 
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
-#: actions/subscriptions.php:69
-#, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr "Osoby, których wpisy obserwuje użytkownik %s."
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr "Zaproś nowych użytkowników"
 
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-#: actions/subscriptions.php:65
-msgid "These are the people whose notices you listen to."
-msgstr "Osoby, których wpisy obserwujesz."
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr "Jesteś już zasubskrybowany do tych użytkowników:"
 
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
-#: actions/invite.php:130
+#: actions/invite.php:131 actions/invite.php:139
+#, php-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
 "Te osoby są już użytkownikami i zostałeś do nich automatycznie "
 "zasubskrybowany:"
 
-#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. Please start again."
-msgstr "Kod potwierdzający jest za stary. Rozpocznij ponownie."
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
+msgstr "Wysłano zaproszenia do następujących osób:"
 
-#: ../lib/openid.php:195 lib/openid.php:206
+#: actions/invite.php:150
 msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 msgstr ""
-"Ten formularz powinien wysłać się automatycznie. Jeśli tak się nie stanie, "
-"naciśnij przycisk Wyślij, aby przejść do dostawcy OpenID."
+"Zostaniesz powiadomiony, kiedy ktoś zaakceptuje zaproszenie i zarejestruje "
+"się na stronie. Dziękujemy za pomoc w zwiększaniu społeczności!"
 
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
-#, php-format
+#: actions/invite.php:162
 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."
+"Use this form to invite your friends and colleagues to use this service."
 msgstr ""
-"Jeżeli logujesz się do %s po raz pierwszy, musimy połączyć identyfikator "
-"OpenID z lokalnym kontem. Można utworzyć nowe konto lub połączyć z "
-"istniejącym, jeśli je posiadasz."
-
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
-#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
-#: actions/twitapistatuses.php:416
-msgid "This method requires a POST or DELETE."
-msgstr "Ta metoda wymaga POST lub DELETE."
+"Użyj tego formularza, aby zaprosić przyjaciół i kolegów do używania tej "
+"usługi."
 
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
-#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
-#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
-#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
-msgid "This method requires a POST."
-msgstr "Ta metoda wymaga POST."
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "Adresy e-mail"
 
-#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
-msgid "This page is not available in a media type you accept"
-msgstr "Ta strona jest niedostępna dla akceptowanego typu medium"
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr "Adresy przyjaciół, których zapraszasz (jeden na wiersz)"
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138 actions/profilesettings.php:139
-msgid "Timezone"
-msgstr "Strefa czasowa"
+#: actions/invite.php:192
+msgid "Personal message"
+msgstr "Osobista wiadomość"
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211 actions/profilesettings.php:212
-msgid "Timezone not selected."
-msgstr "Nie wybrano strefy czasowej."
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
+msgstr "Opcjonalnie dodaj osobistą wiadomość do zaproszenia."
 
-#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
+msgstr "Wyślij"
+
+#: actions/invite.php:226
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s zapraszają Cię, abyś dołączył do nich w %2$s"
+
+#: actions/invite.php:228
 #, 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."
+"%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 ""
-"Aby zasubskrybować, można [zalogować się](%%action.login%%) lub "
-"[zarejestrować](%%action.register%%) nowe konto. Jeśli już posiadasz konto "
-"na [zgodnej stronie mikroblogowania](%%doc.openmublog%%), podaj poniżej "
-"adres URL profilu."
+"Użytkownik %1$s zapraszają Cię, abyś dołączył do nich w %2$s (%3$s).\n"
+"\n"
+"%2$s jest usługą mikroblogowania, która umożliwia pozostawanie w kontakcie z "
+"osobami, których znasz i z tymi, którzy Cię interesują.\n"
+"\n"
+"Możesz także dzielić się w sieci nowinkami o sobie, swoimi przemyśleniami, "
+"lub swoim życiem z osobami, którzy Cię znają. To także wspaniały sposób na "
+"poznawanie nowych osób, którzy dzielą Twoje zainteresowania.\n"
+"\n"
+"Użytkownik %1$s powiedział:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Możesz zobaczyć stronę profilu %1$s na %2$s tutaj:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Jeśli chcesz wypróbować usługę, naciśnij na poniższy odnośnik, aby "
+"zaakceptować zaproszenie.\n"
+"\n"
+"%6$s\n"
+"\n"
+"Jeśli nie, możesz zignorować tę wiadomość. Dziękujemy za Twoją cierpliwość i "
+"czas.\n"
+"\n"
+"Z poważaniem, %2$s\n"
 
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-msgid "Two user ids or screen_names must be supplied."
-msgstr "Należy dostarczyć dwa identyfikatory lub nazwy użytkowników."
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
+msgstr "Musisz być zalogowany, aby dołączyć do grupy."
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109 actions/register.php:398
-#: actions/register.php:444
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "Adres URL strony domowej, bloga lub profilu na innej stronie"
+#: actions/joingroup.php:90 lib/command.php:217
+msgid "You are already a member of that group"
+msgstr "Jesteś już członkiem tej grupy"
 
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-msgid "URL of your profile on another compatible microblogging service"
-msgstr "Adres URL profilu na innej, zgodnej usłudze mikroblogowania"
+#: actions/joingroup.php:128 lib/command.php:234
+#, php-format
+msgid "Could not join user %s to group %s"
+msgstr "Nie można dołączyć użytkownika %s do grupy %s"
 
-#: ../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 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-#: actions/avatarsettings.php:263 actions/emailsettings.php:247
-#: actions/grouplogo.php:324 actions/twittersettings.php:306
-#: actions/twittersettings.php:322 lib/designsettings.php:301
-msgid "Unexpected form submission."
-msgstr "Nieoczekiwane wysłanie formularza."
+#: actions/joingroup.php:135 lib/command.php:239
+#, php-format
+msgid "%s joined group %s"
+msgstr "Użytkownik %s dołączył do grupy %s"
 
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
-msgid "Unexpected password reset."
-msgstr "Nieoczekiwane przywrócenie hasła."
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
+msgstr "Musisz być zalogowany, aby opuścić grupę."
 
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-#: actions/recoverpassword.php:210
-msgid "Unknown action"
-msgstr "Nieznane działanie"
+#: actions/leavegroup.php:90 lib/command.php:268
+msgid "You are not a member of that group."
+msgstr "Nie jesteś członkiem tej grupy."
 
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-msgid "Unknown version of OMB protocol."
-msgstr "Nieznana wersja protokołu OMB."
+#: actions/leavegroup.php:119 lib/command.php:278
+msgid "Could not find membership record."
+msgstr "Nie można znaleźć wpisu członkostwa."
 
-#: ../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 ""
-"Jeśli nie podano inaczej, prawa autorskie do zawartości tej strony należy do "
-"współtwórców i jest dostępna na warunkach licencji "
+#: actions/leavegroup.php:127 lib/command.php:284
+#, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "Nie można usunąć użytkownika %s z grupy %s"
 
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
-msgid "Unrecognized address type %s"
-msgstr "Nierozpoznany typ adresu %s"
+msgid "%s left group %s"
+msgstr "Użytkownik %s opuścił grupę %s"
 
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
-msgstr "Zrezygnuj z subskrypcji"
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "Jesteś już zalogowany."
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-#: actions/updateprofile.php:51
-msgid "Unsupported OMB version"
-msgstr "Nieobsługiwana wersja OMB"
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Nieprawidłowa zawartość wpisu"
 
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
-msgid "Unsupported image file format."
-msgstr "Nieobsługiwany format pliku obrazu."
+#: actions/login.php:143
+msgid "Incorrect username or password."
+msgstr "Niepoprawna nazwa użytkownika lub hasło."
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
-msgstr "Aktualizacje przez wiadomości SMS"
+#: actions/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
+msgstr "Błąd podczas ustawiania użytkownika."
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
-msgstr "Aktualizacje przez komunikator"
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "Zaloguj się"
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
-#: actions/twitapistatuses.php:94
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr "Aktualizacje od %1$s i przyjaciół na %2$s!"
+#: actions/login.php:243
+msgid "Login to site"
+msgstr "Zaloguj się na stronie"
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
-#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr "Aktualizacje od %1$s na %2$s!"
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Pseudonim"
 
-#: ../actions/avatar.php:68 actions/profilesettings.php:161
-#: actions/avatarsettings.php:162 actions/grouplogo.php:232
-#: actions/avatarsettings.php:165 actions/grouplogo.php:238
-msgid "Upload"
-msgstr "Wyślij"
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Hasło"
 
-#: ../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."
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "Zapamiętaj mnie"
+
+#: actions/login.php:253 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
-"Tu można wysłać nowego \"awatara\" (obraz użytkownika). Nie można "
-"modyfikować obrazu po jego wysłaniu, więc upewnij się, że jest w miarę "
-"kwadratowy. Musi być także na licencji strony. Użyj obrazu, który należy do "
-"Ciebie, i którym chcesz się dzielić."
+"Automatyczne logowanie. Nie użyj na komputerach używanych przez wiele osób!"
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr "Wyślij nowy obraz profilu"
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "Zgubione lub zapomniane hasło?"
 
-#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
-#: actions/invite.php:156
+#: actions/login.php:282
 msgid ""
-"Use this form to invite your friends and colleagues to use this service."
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
 msgstr ""
-"Użyj tego formularza, aby zaprosić przyjaciół i kolegów do używania tej "
-"usługi."
-
-#: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176 actions/register.php:382
-#: actions/register.php:386 actions/register.php:428 actions/register.php:432
-msgid "Used only for updates, announcements, and password recovery"
-msgstr "Używane tylko do aktualizacji, ogłoszeń i przywracania hasła"
-
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
-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/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
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
-#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
-#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr "Użytkownik nie posiada profilu."
-
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
-msgstr "Pseudonim użytkownika"
+"Z powodów bezpieczeństwa ponownie podaj nazwę użytkownika i hasło przed "
+"zmienianiem ustawień."
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr "Nie znaleziono użytkownika."
+#: actions/login.php:286
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"Zaloguj się za pomocą nazwy użytkownika i hasła. Nie masz ich jeszcze? "
+"[Zarejestruj](%%action.register%%) nowe konto lub wypróbuj [OpenID](%%action."
+"openidlogin%%). "
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139 actions/profilesettings.php:140
-msgid "What timezone are you normally in?"
-msgstr "W jakiej strefie czasowej zwykle się znajdujesz?"
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr "Tylko administrator może uczynić innego użytkownika administratorem."
 
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: actions/makeadmin.php:95
 #, php-format
-msgid "What's up, %s?"
-msgstr "Co słychać, %s?"
-
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-#: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119 actions/register.php:410
-#: actions/register.php:456
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Gdzie jesteś, np. \"miasto, województwo (lub region), kraj\""
+msgid "%s is already an admin for group \"%s\"."
+msgstr "Użytkownika %s jest już administratorem grupy \"%s\"."
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132 actions/updateprofile.php:134
+#: actions/makeadmin.php:132
 #, php-format
-msgid "Wrong image type for '%s'"
-msgstr "Błędny typ obrazu dla \"%s\""
+msgid "Can't get membership record for %s in group %s"
+msgstr "Nie można uzyskać wpisu członkostwa użytkownika %s w grupie %s"
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127 actions/updateprofile.php:129
+#: actions/makeadmin.php:145
 #, php-format
-msgid "Wrong size image at '%s'"
-msgstr "Błędny rozmiar obrazu \"%s\""
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141 actions/deletenotice.php:115
-#: actions/block.php:150 actions/deletenotice.php:116
-#: actions/groupblock.php:177
-msgid "Yes"
-msgstr "Tak"
-
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-msgid "You already have this OpenID!"
-msgstr "Już posiadasz ten identyfikator OpenID!"
+msgid "Can't make %s an admin for group %s"
+msgstr "Nie można uczynić %s administratorem grupy %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 ""
-"Wpis zostanie za chwilę trwale usunięty. Kiedy to się stanie, to już się nie "
-"odstanie."
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr "Brak obecnego statusu"
 
-#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
-msgstr "Jesteś już zalogowany!"
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr "Nowa grupa"
 
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-#: actions/invite.php:122
-msgid "You are already subscribed to these users:"
-msgstr "Jesteś już zasubskrybowany do tych użytkowników:"
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
+msgstr "Użyj tego formularza, aby utworzyć nową grupę."
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
-msgid "You are not friends with the specified user."
-msgstr "Nie jesteś przyjacielem podanego użytkownika."
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr "Nowa wiadomość"
 
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr "Tutaj można zmienić hasło. Wybierz dobre!"
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
+msgstr "Nie można wysłać wiadomości do tego użytkownika."
 
-#: ../actions/register.php:135 actions/register.php:145
-msgid "You can create a new account to start posting notices."
-msgstr "Można utworzyć nowe konto, aby rozpocząć wysyłanie wpisów."
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+msgstr "Brak zawartości!"
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "Można otrzymywać wiadomości SMS przez e-mail od %%site.name%%."
+#: actions/newmessage.php:158
+msgid "No recipient specified."
+msgstr "Nie podano odbiorcy."
 
-#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr ""
-"Można usunąć identyfikator OpenID ze swojego konta naciskając przycisk \"Usuń"
-"\"."
+"Don't send a message to yourself; just say it to yourself quietly instead."
+msgstr "Nie wysyłaj wiadomości do siebie, po prostu powiedz to sobie po cichu."
 
-#: ../actions/imsettings.php:28 actions/imsettings.php:28
-#: actions/imsettings.php:70
-#, php-format
-msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
-msgstr ""
-"Można wysyłać i odbierać wpisy przez [komunikator](%%doc.im%%) Jabber/GTalk. "
-"Skonfiguruj adres i ustawienia poniżej."
+#: actions/newmessage.php:181
+msgid "Message sent"
+msgstr "Wysłano wiadomość"
 
-#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
-msgid ""
-"You can update your personal profile info here so people know more about you."
-msgstr ""
-"Tutaj można zaktualizować osobiste informacje w profilu, aby inni mogli "
-"lepiej Cię poznać."
+#: actions/newmessage.php:185 lib/command.php:375
+#, php-format
+msgid "Direct message to %s sent"
+msgstr "Wysłano bezpośrednią wiadomość do użytkownika %s"
 
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
-msgstr "Można używać lokalnej subskrypcji!"
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
+msgstr "Błąd AJAX"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43 actions/register.php:149
-#: actions/register.php:186
-msgid "You can't register if you don't agree to the license."
-msgstr ""
-"Nie możesz się zarejestrować, jeśli nie zgadzasz się z warunkami licencji."
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "Nowy wpis"
 
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67 actions/updateprofile.php:69
-msgid "You did not send us that profile"
-msgstr "Nie wysłałeś nam tego profilu"
+#: actions/newnotice.php:199
+msgid "Notice posted"
+msgstr "Wysłano wpis"
 
-#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
+#: actions/noticesearch.php:68
 #, 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"
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
 msgstr ""
-"Posiadasz nowy adres wysyłania na %1$s.\n"
-"\n"
-"Wyślij wiadomość e-mail na %2$s, aby wysłać nowe wpisy.\n"
-"\n"
-"Więcej instrukcji dotyczących poczty e-mail można znaleźć na %3$s.\n"
-"\n"
-"Z poważaniem,\n"
-"%4$s"
+"Znajdź wpisy na %%site.name%% według ich zawartości. Oddziel wyszukiwane "
+"terminy spacjami. Terminy muszą mieć trzy znaki lub więcej."
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
-#: actions/twitapistatuses.php:443
-msgid "You may not delete another user's status."
-msgstr "Nie można usuwać statusów innych użytkowników."
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "Znajdź tekst"
 
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
-#: actions/invite.php:41
+#: actions/noticesearch.php:91
 #, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr ""
-"Należy być zalogowanym, aby zapraszać innych użytkowników do używania %s"
+msgid "Search results for \"%s\" on %s"
+msgstr "Wyniki wyszukiwania dla \"%s\" na %s"
 
-#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
-#: actions/invite.php:144
+#: actions/noticesearch.php:121
+#, php-format
 msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 msgstr ""
-"Zostaniesz powiadomiony, kiedy ktoś zaakceptuje zaproszenie i zarejestruje "
-"się na stronie. Dziękujemy za pomoc w zwiększaniu społeczności!"
-
-#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a  new password below. "
-msgstr "Zostałeś zidentyfikowany. Podaj poniżej nowe hasło. "
-
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104 actions/openidlogin.php:113
-msgid "Your OpenID URL"
-msgstr "Twój adres URL OpenID"
-
-#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:193
-msgid "Your nickname on this server, or your registered email address."
-msgstr "Twój pseudonim na tym serwerze lub zarejestrowany adres e-mail."
+"Zostań pierwszym, który [wyśle coś na ten temat](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 
-#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
-#, php-format
+#: actions/noticesearch.php:124
+#, fuzzy, php-format
 msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
-"account.  Manage your associated OpenIDs from here."
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
-"[OpenID](%%doc.openid%%) umożliwia logowanie się do wielu stron za pomocą "
-"tego samego konta użytkownika. Tu można zarządzać powiązanymi "
-"identyfikatorami OpenID."
-
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
-#: lib/util.php:770
-msgid "a few seconds ago"
-msgstr "kilka sekund temu"
-
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
-#: lib/util.php:782
-#, php-format
-msgid "about %d days ago"
-msgstr "około %d dni temu"
-
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
-#: lib/util.php:778
-#, php-format
-msgid "about %d hours ago"
-msgstr "około %d godzin temu"
-
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
-#: lib/util.php:774
-#, php-format
-msgid "about %d minutes ago"
-msgstr "około %d minut temu"
-
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
-#: lib/util.php:786
-#, php-format
-msgid "about %d months ago"
-msgstr "około %d miesięcy temu"
-
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
-#: lib/util.php:780
-msgid "about a day ago"
-msgstr "blisko dzień temu"
-
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
-#: lib/util.php:772
-msgid "about a minute ago"
-msgstr "około minutę temu"
-
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
-#: lib/util.php:784
-msgid "about a month ago"
-msgstr "około miesiąc temu"
-
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
-#: lib/util.php:788
-msgid "about a year ago"
-msgstr "około rok temu"
-
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
-#: lib/util.php:776
-msgid "about an hour ago"
-msgstr "około godzinę temu"
-
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
-msgstr "usuń"
-
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117 actions/noticesearch.php:136
-#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
-msgid "in reply to..."
-msgstr "w odpowiedzi na..."
-
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124 actions/noticesearch.php:143
-#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
-msgid "reply"
-msgstr "odpowiedz"
-
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-msgid "same as password above"
-msgstr "takie samo jak hasło powyżej"
-
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
-#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
-#: actions/twitapistatuses.php:575
-msgid "unsupported file type"
-msgstr "nieobsługiwany typ pliku"
-
-#: ../lib/util.php:1309 lib/util.php:1443
-msgid "« After"
-msgstr "« Następne"
-
-#: 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
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-#: actions/avatarsettings.php:251 actions/emailsettings.php:229
-#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
-#: actions/newmessage.php:133 actions/newnotice.php:96
-#: actions/openidsettings.php:188 actions/othersettings.php:136
-#: actions/passwordsettings.php:131 actions/profilesettings.php:172
-#: actions/register.php:113 actions/remotesubscribe.php:53
-#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
-#: actions/twittersettings.php:294 actions/userauthorization.php:39
-#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
-#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
-#: actions/othersettings.php:138 actions/recoverpassword.php:334
-#: actions/register.php:153 actions/twittersettings.php:310
-#: lib/designsettings.php:291
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Wystąpił problem z tokenem sesji. Spróbuj ponownie."
-
-#: actions/disfavor.php:55 actions/disfavor.php:81
-msgid "This notice is not a favorite!"
-msgstr "Ten wpis nie jest ulubiony!"
-
-#: actions/disfavor.php:63 actions/disfavor.php:87
-#: actions/twitapifavorites.php:188
-msgid "Could not delete favorite."
-msgstr "Nie można usunąć ulubionego wpisu."
-
-#: actions/disfavor.php:72 lib/favorform.php:140
-msgid "Favor"
-msgstr "Dodaj do ulubionych"
-
-#: actions/emailsettings.php:92 actions/emailsettings.php:157
-msgid "Send me email when someone adds my notice as a favorite."
-msgstr "Wyślij mi wiadomość e-mail, kiedy ktoś doda mój wpis jako ulubiony."
-
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-msgid "Send me email when someone sends me a private message."
-msgstr "Wyślij mi wiadomość e-mail, kiedy ktoś wyśle mi prywatną wiadomość."
+"Dlaczego nie [zarejestrujesz konta](%%%%action.register%%%%) i zostaniesz "
+"pierwszym, który [wyśle coś na ten temat](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr "Ten wpis jest już ulubiony!"
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Aktualizacje ze znacznikiem %1$s na %2$s!"
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132 actions/favor.php:86
-#: actions/twitapifavorites.php:125 classes/Command.php:152
-#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
-#: actions/twitapifavorites.php:133 lib/command.php:145
-msgid "Could not create favorite."
-msgstr "Nie można utworzyć ulubionego wpisu."
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Wszystkie aktualizacje pasujące do wyszukiwanego terminu \"%s\""
 
-#: actions/favor.php:70
-msgid "Disfavor"
-msgstr "Usuń wpis z ulubionych"
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+"Ten użytkownik nie pozwala na szturchnięcia lub nie potwierdził lub nie "
+"ustawił jeszcze swojego adresu e-mail."
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
-#: actions/favoritesrss.php:110
-#, php-format
-msgid "%s favorite notices"
-msgstr "Ulubione wpisy użytkownika %s"
+#: actions/nudge.php:94
+msgid "Nudge sent"
+msgstr "Wysłano szturchnięcie"
 
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
-#: actions/favoritesrss.php:114
-#, php-format
-msgid "Feed of favorite notices of %s"
-msgstr "Kanał ulubionych wpisów użytkownika %s"
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr "Wysłano szturchnięcie!"
 
-#: actions/inbox.php:28 actions/inbox.php:59
-#, php-format
-msgid "Inbox for %s - page %d"
-msgstr "Odebrane wiadomości użytkownika %s - strona %d"
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+msgstr "Wpis nie posiada profilu"
 
-#: actions/inbox.php:30 actions/inbox.php:62
+#: actions/oembed.php:86 actions/shownotice.php:180
 #, php-format
-msgid "Inbox for %s"
-msgstr "Odebrane wiadomości użytkownika %s"
+msgid "%1$s's status on %2$s"
+msgstr "Status użytkownika %1$s na %2$s"
 
-#: actions/inbox.php:53 actions/inbox.php:115
-msgid "This is your inbox, which lists your incoming private messages."
-msgstr ""
-"To jest skrzynka odbiorcza, która wyświetla przychodzące wiadomości prywatne."
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Zawartość"
 
-#: actions/invite.php:178 actions/invite.php:213
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+#: actions/oembed.php:160
+msgid "Only "
 msgstr ""
-"%1$s zaprosił się do dołączenia do %2$s (%3$s).\n"
-"\n"
-
-#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-msgid "Automatically login in the future; "
-msgstr "Automatyczne logowanie; "
-
-#: actions/login.php:122 actions/login.php:264
-msgid "For security reasons, please re-enter your "
-msgstr "Z powodów bezpieczeństwa ponownie podaj "
 
-#: actions/login.php:126 actions/login.php:268
-msgid "Login with your username and password. "
-msgstr "Zaloguj się za pomocą nazwy użytkownika i hasła. "
-
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
-#: actions/twitapidirect_messages.php:150
-#: actions/twitapidirect_messages.php:145
-msgid "That's too long. Max message size is 140 chars."
-msgstr "Wiadomość jest za długa. Maksymalna długość to 140 znaków."
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
+msgstr "To nie jest obsługiwany format danych."
 
-#: actions/newmessage.php:65 actions/newmessage.php:128
-#: actions/newmessage.php:155
-msgid "No recipient specified."
-msgstr "Nie podano odbiorcy."
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "Wyszukiwanie osób"
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206 actions/newmessage.php:131
-#: actions/newmessage.php:168 classes/Command.php:237
-#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
-#: lib/command.php:230
-msgid "You can't send a message to this user."
-msgstr "Nie można wysłać wiadomości do tego użytkownika."
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "Wyszukiwanie wpisów"
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240 actions/newmessage.php:161
-#: actions/twitapidirect_messages.php:167 lib/command.php:240
-#: actions/twitapidirect_messages.php:163 lib/command.php:233
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "Nie wysyłaj wiadomości do siebie, po prostu powiedz to sobie po cichu."
+#: actions/othersettings.php:60
+msgid "Other Settings"
+msgstr "Inne ustawienia"
 
-#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163 actions/newmessage.php:114
-msgid "No such user"
-msgstr "Nie ma takiego użytkownika"
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr "Zarządzaj różnymi innymi opcjami."
 
-#: actions/newmessage.php:117 actions/newmessage.php:67
-#: actions/newmessage.php:71
-msgid "New message"
-msgstr "Nowa wiadomość"
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
 
-#: actions/noticesearch.php:95 actions/noticesearch.php:146
-msgid "Notice without matching profile"
-msgstr "Wpis bez odpowiadającego profilu"
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
+msgstr "Skracaj adresy URL za pomocą"
 
-#: actions/openidsettings.php:28 actions/openidsettings.php:70
-#, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr "[OpenID](%%doc.openid%%) umożliwia logowanie się na wiele stron "
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
+msgstr "Używana automatyczna usługa skracania."
 
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
-msgstr "Jeśli chcesz dodać identyfikator OpenID do konta, "
+#: actions/othersettings.php:122
+msgid "View profile designs"
+msgstr "Wyświetl ustawienia wyglądu profilu"
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr "Usunięcie jedynego identyfikatora OpenID uniemożliwi zalogowanie się! "
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr "Wyświetl lub ukryj ustawienia wyglądu profilu."
 
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-msgid "You can remove an OpenID from your account "
-msgstr "Można usunąć identyfikator OpenID z konta "
+#: actions/othersettings.php:153
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Adres URL usługi skracania jest za długi (maksymalnie 50 znaków)."
 
-#: actions/outbox.php:28 actions/outbox.php:58
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %s - page %d"
 msgstr "Wysłane wiadomości użytkownika %s - strona %d"
 
-#: actions/outbox.php:30 actions/outbox.php:61
+#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Wysłane wiadomości użytkownika %s"
 
-#: actions/outbox.php:53 actions/outbox.php:116
+#: actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "To są wiadomości wysłane, czyli prywatne wiadomości, które wysłałeś."
 
-#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
-#, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
-msgstr ""
-"Znajdź osoby na %%site.name%% według ich nazwiska, położenia lub "
-"zainteresowań. "
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "Zmień hasło"
 
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
-msgid "You can update your personal profile info here "
-msgstr "Można tutaj zaktualizować osobiste informacje profilu "
+#: actions/passwordsettings.php:69
+msgid "Change your password."
+msgstr "Zmień hasło."
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
-#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
-#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
-#: actions/userrss.php:103
-msgid "User without matching profile"
-msgstr "Użytkownik bez odpowiadającego profilu"
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+msgid "Password change"
+msgstr "Zmiana hasła"
 
-#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
-msgstr "Ten kod potwierdzający jest za stary. "
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "Stare hasło"
 
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
-msgstr "Jeśli zapomniałeś lub zgubiłeś"
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "Nowe hasło"
 
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a "
-msgstr "Zostałeś zidentyfikowany. Podaj "
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6 lub więcej znaków"
 
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-msgid "Your nickname on this server, "
-msgstr "Pseudonim na tym serwerze, "
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "Potwierdź"
 
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-msgid "Instructions for recovering your password "
-msgstr "Instrukcje przywracania hasła "
+#: actions/passwordsettings.php:113
+msgid "same as password above"
+msgstr "takie samo jak hasło powyżej"
 
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
-msgid "New password successfully saved. "
-msgstr "Pomyślnie zapisano nowe hasło. "
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "Zmień"
 
-#: actions/register.php:95 actions/register.php:180
-#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:154 actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr "Hasło musi mieć sześć lub więcej znaków."
 
-#: actions/register.php:216
-#, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
-msgstr "Gratulacje, %s! Witaj na %%%%site.name%%%%. Stąd możesz chcieć..."
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "Hasła nie pasują do siebie."
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
-msgstr "(Powinieneś właśnie otrzymać wiadomość przez e-mail z "
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "Niepoprawne stare hasło"
 
-#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
-#, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr "Aby zasubskrybować, można [zalogować się](%%action.login%%),"
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "Błąd podczas zapisywania użytkownika; nieprawidłowy."
 
-#: actions/showfavorites.php:61 actions/showfavorites.php:145
-#: actions/showfavorites.php:147
-#, php-format
-msgid "Feed for favorites of %s"
-msgstr "Kanał ulubionych wpisów użytkownika %s"
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "Nie można zapisać nowego hasła."
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-#: actions/showfavorites.php:179 actions/showfavorites.php:209
-msgid "Could not retrieve favorite notices."
-msgstr "Nie można odebrać ulubionych wpisów."
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "Zapisano hasło."
 
-#: actions/showmessage.php:33 actions/showmessage.php:81
-msgid "No such message."
-msgstr "Nie ma takiej wiadomości."
+#: actions/peoplesearch.php:52
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"Znajdź osoby na %%site.name%% według ich nazwiska, położenia lub "
+"zainteresowań. Oddziel wyszukiwane terminy spacjami. Terminy muszą mieć trzy "
+"znaki lub więcej."
 
-#: actions/showmessage.php:42 actions/showmessage.php:98
-msgid "Only the sender and recipient may read this message."
-msgstr "Tylko nadawca i odbiorca mogą przeczytać tę wiadomość."
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "Wyszukiwanie osób"
 
-#: actions/showmessage.php:61 actions/showmessage.php:108
+#: actions/peopletag.php:70
 #, php-format
-msgid "Message to %1$s on %2$s"
-msgstr "Wiadomość do użytkownika %1$s na %2$s"
+msgid "Not a valid people tag: %s"
+msgstr "Nieprawidłowy znacznik osób: %s"
 
-#: actions/showmessage.php:66 actions/showmessage.php:113
+#: actions/peopletag.php:144
 #, php-format
-msgid "Message from %1$s on %2$s"
-msgstr "Wiadomość od użytkownika %1$s na %2$s"
+msgid "Users self-tagged with %s - page %d"
+msgstr "Użytkownicy używający znacznika %s - strona %d"
 
-#: actions/showstream.php:154
-msgid "Send a message"
-msgstr "Wyślij wiadomość"
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "Nieprawidłowa zawartość wpisu"
 
-#: actions/smssettings.php:312 actions/smssettings.php:464
+#: actions/postnotice.php:90
 #, php-format
-msgid "Mobile carrier for your phone. "
-msgstr "Operator komórkowy Twojego telefonu. "
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
 
-#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
-#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
-#, php-format
-msgid "Direct messages to %s"
-msgstr "Bezpośrednia wiadomość do użytkownika %s"
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "Ustawienia profilu"
 
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
-#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
-#, php-format
-msgid "All the direct messages sent to %s"
-msgstr "Wszystkie bezpośrednie wiadomości wysłane do użytkownika %s"
+#: actions/profilesettings.php:71
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+"Tutaj można zaktualizować osobiste informacje w profilu, aby inni mogli "
+"lepiej Cię poznać."
 
-#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
-msgid "Direct Messages You've Sent"
-msgstr "Wysłane bezpośrednie wiadomości"
+#: actions/profilesettings.php:99
+msgid "Profile information"
+msgstr "Informacje o profilu"
 
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
-#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
-#, php-format
-msgid "All the direct messages sent from %s"
-msgstr "Wszystkie bezpośrednie wiadomości wysłane od użytkownika %s"
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64 małe litery lub liczby, bez spacji i znaków przestankowych"
 
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-#: actions/twitapidirect_messages.php:146
-#: actions/twitapidirect_messages.php:140
-msgid "No message text!"
-msgstr "Brak tekstu wiadomości!"
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full name"
+msgstr "Imię i nazwisko"
 
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-#: actions/twitapidirect_messages.php:159
-#: actions/twitapidirect_messages.php:154
-msgid "Recipient user not found."
-msgstr "Nie znaleziono odbiorcy."
+#: actions/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "Strona domowa"
 
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-#: actions/twitapidirect_messages.php:162
-#: actions/twitapidirect_messages.php:158
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
-"Nie można wysłać bezpośredniej wiadomości do użytkowników, którzy nie są "
-"Twoimi przyjaciółmi."
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "Adres URL strony domowej, bloga lub profilu na innej stronie"
 
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
-#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
-#, php-format
-msgid "%s / Favorites from %s"
-msgstr "%s/ulubione wpisy od %s"
+#: actions/profilesettings.php:122 actions/register.php:460
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Opisz się i swoje zainteresowania w 140 znakach"
 
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
-#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
-#, php-format
-msgid "%s updates favorited by %s / %s."
-msgstr "Użytkownik %s aktualizuje ulubione według %s/%s."
+#: actions/profilesettings.php:125 actions/register.php:463
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Opisz się i swoje "
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
-#: actions/twitapifavorites.php:170 lib/mail.php:554
-#: actions/twitapifavorites.php:221
-#, php-format
-msgid "%s added your notice as a favorite"
-msgstr "Użytkownik %s dodał Twój wpis jako ulubiony"
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "O mnie"
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
-#, php-format
-msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
-msgstr ""
-"Użytkownik %1$s właśnie dodał Twój wpis od %2$s jako jeden z jego "
-"ulubionych.\n"
-"\n"
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "Położenie"
 
-#: actions/twittersettings.php:27
-msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
-msgstr ""
-"Dodaj swoje konto Twittera, aby automatycznie wysyłać wpisy na Twittera, "
-
-#: actions/twittersettings.php:41 actions/twittersettings.php:60
-#: actions/twittersettings.php:61
-msgid "Twitter settings"
-msgstr "Ustawienia Twittera"
-
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-#: actions/twittersettings.php:106
-msgid "Twitter Account"
-msgstr "Konto Twittera"
-
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-#: actions/twittersettings.php:114
-msgid "Current verified Twitter account."
-msgstr "Obecnie sprawdzone konto Twittera."
-
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr "Nazwa użytkownika Twitter"
-
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-#: actions/twittersettings.php:126
-msgid "No spaces, please."
-msgstr "Bez spacji."
-
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
-msgstr "Hasło Twittera"
-
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-#: actions/twittersettings.php:142
-msgid "Automatically send my notices to Twitter."
-msgstr "Automatycznie wyślij moje wpisy na Twittera."
-
-#: actions/twittersettings.php:75 actions/twittersettings.php:146
-#: actions/twittersettings.php:149
-msgid "Send local \"@\" replies to Twitter."
-msgstr "Wyślij lokalne odpowiedzi \"@\" na Twittera."
-
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-#: actions/twittersettings.php:156
-msgid "Subscribe to my Twitter friends here."
-msgstr "Zasubskrybuj tutaj moich przyjaciół z Twittera."
-
-#: actions/twittersettings.php:122 actions/twittersettings.php:331
-#: actions/twittersettings.php:348
-msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
-msgstr ""
-"Nazwa użytkownika może zawierać tylko liczby, małe i wielkie litery oraz "
-"podkreślnik (_). Maksymalnie 15 znaków."
-
-#: actions/twittersettings.php:128 actions/twittersettings.php:334
-#: actions/twittersettings.php:338 actions/twittersettings.php:355
-msgid "Could not verify your Twitter credentials!"
-msgstr "Nie można sprawdzić danych uwierzytelniających Twittera!"
-
-#: actions/twittersettings.php:137
-#, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr "Nie można pobrać informacji o koncie \"%s\" z Twittera."
-
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-#: actions/twittersettings.php:352 actions/twittersettings.php:372
-#: actions/twittersettings.php:369 actions/twittersettings.php:389
-msgid "Unable to save your Twitter settings!"
-msgstr "Nie można zapisać ustawień Twittera!"
-
-#: actions/twittersettings.php:174 actions/twittersettings.php:376
-#: actions/twittersettings.php:380 actions/twittersettings.php:399
-msgid "Twitter settings saved."
-msgstr "Zapisano ustawienia Twittera."
-
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-#: actions/twittersettings.php:399 actions/twittersettings.php:418
-msgid "That is not your Twitter account."
-msgstr "To nie jest Twoje konto Twittera."
-
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403 actions/twittersettings.php:407
-#: actions/twittersettings.php:426
-msgid "Couldn't remove Twitter user."
-msgstr "Nie można usunąć użytkownika Twittera."
-
-#: actions/twittersettings.php:212 actions/twittersettings.php:407
-#: actions/twittersettings.php:411 actions/twittersettings.php:430
-msgid "Twitter account removed."
-msgstr "Usunięto użytkownika Twittera."
-
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453 actions/twittersettings.php:432
-#: actions/twittersettings.php:443 actions/twittersettings.php:457
-#: actions/twittersettings.php:452 actions/twittersettings.php:463
-#: actions/twittersettings.php:477
-msgid "Couldn't save Twitter preferences."
-msgstr "Nie można zapisać preferencji Twittera."
-
-#: actions/twittersettings.php:245 actions/twittersettings.php:461
-#: actions/twittersettings.php:465 actions/twittersettings.php:485
-msgid "Twitter preferences saved."
-msgstr "Zapisano preferencje Twittera."
-
-#: actions/userauthorization.php:84 actions/userauthorization.php:86
-msgid "Please check these details to make sure "
-msgstr "Sprawdź te szczegóły, aby upewnić się "
-
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
-msgid "The subscription has been authorized, but no "
-msgstr "Subskrypcja została upoważniona, ale nie "
-
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-msgid "The subscription has been rejected, but no "
-msgstr "Subskrypcja została odrzucona, ale nie "
-
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-#: lib/channel.php:138 lib/channel.php:158
-msgid "Command results"
-msgstr "Wyniki polecenia"
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "Gdzie jesteś, np. \"miasto, województwo (lub region), kraj\""
 
-#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
-msgid "Command complete"
-msgstr "Zakończono polecenie"
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
+msgstr "Znaczniki"
 
-#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
-msgid "Command failed"
-msgstr "Polecenie nie powiodło się"
+#: actions/profilesettings.php:140
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+"Znaczniki dla siebie (litery, liczby, -, . i _), oddzielone przecinkami lub "
+"spacjami"
 
-#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Przepraszamy, te polecenie nie zostało jeszcze zaimplementowane."
+#: actions/profilesettings.php:144
+msgid "Language"
+msgstr "Język"
 
-#: classes/Command.php:96 classes/Command.php:113
-#, php-format
-msgid "Subscriptions: %1$s\n"
-msgstr "Subskrypcje: %1$s\n"
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr "Preferowany język"
 
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
-#: lib/command.php:138 lib/command.php:269
-msgid "User has no last notice"
-msgstr "Użytkownik nie posiada ostatniego wpisu"
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr "Strefa czasowa"
 
-#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
-#: lib/command.php:159
-msgid "Notice marked as fave."
-msgstr "Zaznaczono wpis jako ulubiony."
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
+msgstr "W jakiej strefie czasowej zwykle się znajdujesz?"
 
-#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
-#: lib/command.php:182
-#, php-format
-msgid "%1$s (%2$s)"
-msgstr "%1$s (%2$s)"
+#: actions/profilesettings.php:160
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+"Automatycznie zasubskrybuj każdego, kto mnie zasubskrybuje (najlepsze dla "
+"botów)"
 
-#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
-#: lib/command.php:185
-#, php-format
-msgid "Fullname: %s"
-msgstr "Imię i nazwisko: %s"
+#: actions/profilesettings.php:221 actions/register.php:223
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Wpis \"O mnie\" jest za długi (maksymalnie 140 znaków)."
 
-#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
-#: lib/command.php:188
-#, php-format
-msgid "Location: %s"
-msgstr "Położenie: %s"
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr "Nie wybrano strefy czasowej."
 
-#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
-#: lib/command.php:191
-#, php-format
-msgid "Homepage: %s"
-msgstr "Strona domowa: %s"
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr "Język jest za długi (maksymalnie 50 znaków)."
 
-#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
-#: lib/command.php:194
+#: actions/profilesettings.php:246 actions/tagother.php:178
 #, php-format
-msgid "About: %s"
-msgstr "O mnie: %s"
+msgid "Invalid tag: \"%s\""
+msgstr "Nieprawidłowy znacznik: \"%s\""
 
-#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
-#: lib/command.php:221
-#, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
-msgstr "Wiadomość jest za długa - maksymalnie 140 znaków, wysłano %d"
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
+msgstr "Nie można zaktualizować użytkownika do automatycznej subskrypcji."
 
-#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
-#: actions/newmessage.php:182 lib/command.php:238
-#, php-format
-msgid "Direct message to %s sent"
-msgstr "Wysłano bezpośrednią wiadomość do użytkownika %s"
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+msgstr "Nie można zapisać profilu."
 
-#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
-#: lib/command.php:240
-msgid "Error sending direct message."
-msgstr "Błąd podczas wysyłania bezpośredniej wiadomości."
+#: actions/profilesettings.php:336
+msgid "Couldn't save tags."
+msgstr "Nie można zapisać znaczników."
 
-#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
-#: lib/command.php:293
-msgid "Specify the name of the user to subscribe to"
-msgstr "Podaj nazwę użytkownika do zasubskrybowania"
+#: actions/profilesettings.php:344
+msgid "Settings saved."
+msgstr "Zapisano ustawienia."
 
-#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
-#: lib/command.php:300
+#: actions/public.php:83
 #, php-format
-msgid "Subscribed to %s"
-msgstr "Zasubskrybowano użytkownika %s"
+msgid "Beyond the page limit (%s)"
+msgstr "Poza ograniczeniem strony (%s)"
 
-#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
-#: lib/command.php:321
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Podaj nazwę użytkownika do usunięcia subskrypcji"
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
+msgstr "Nie można pobrać publicznego strumienia."
 
-#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
-#: lib/command.php:328
+#: actions/public.php:129
 #, php-format
-msgid "Unsubscribed from %s"
-msgstr "Usunięto subskrypcję użytkownika %s"
-
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
-#: lib/command.php:346 lib/command.php:369
-msgid "Command not yet implemented."
-msgstr "Nie zaimplementowano polecenia."
-
-#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
-#: lib/command.php:349
-msgid "Notification off."
-msgstr "Wyłączono powiadomienia."
-
-#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
-#: lib/command.php:351
-msgid "Can't turn off notification."
-msgstr "Nie można wyłączyć powiadomień."
+msgid "Public timeline, page %d"
+msgstr "Publiczna oś czasu, strona %d"
 
-#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
-#: lib/command.php:372
-msgid "Notification on."
-msgstr "Włączono powiadomienia."
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr "Publiczna oś czasu"
 
-#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
-#: lib/command.php:374
-msgid "Can't turn on notification."
-msgstr "Nie można włączyć powiadomień."
+#: actions/public.php:151
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Kanał publicznego strumienia (RSS 1.0)"
 
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
-msgstr "Polecenia:\n"
+#: actions/public.php:155
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Kanał publicznego strumienia (RSS 2.0)"
 
-#: classes/Message.php:53 classes/Message.php:56
-msgid "Could not insert message."
-msgstr "Nie można wprowadzić wiadomości."
+#: actions/public.php:159
+msgid "Public Stream Feed (Atom)"
+msgstr "Kanał publicznego strumienia (Atom)"
 
-#: classes/Message.php:63 classes/Message.php:66
-msgid "Could not update message with new URI."
-msgstr "Nie można zaktualizować wiadomości za pomocą nowego adresu URL."
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+"To jest publiczna oś czasu dla %%site.name%%, ale nikt jeszcze nic nie "
+"wysłał."
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
-msgstr "Użytkownik bez odpowiadającego profilu w systemie."
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr "Zostań pierwszym, który coś wyśle!"
 
-#: lib/mail.php:147 lib/mail.php:289
+#: actions/public.php:186
 #, php-format
 msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+"Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
-"Posiadasz nowy adres wysyłania na %1$s.\n"
-"\n"
+"Dlaczego nie [zarejestrujesz konta](%%action.register%%) i zostaniesz "
+"pierwszym, który coś wyśle!"
 
-#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
+#: actions/public.php:233
 #, php-format
-msgid "New private message from %s"
-msgstr "Nowa prywatna wiadomość od użytkownika %s"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
+msgstr ""
+"To jest %%site.name%%, usługa [mikroblogowania](http://pl.wikipedia.org/wiki/"
+"Mikroblog) oparta na wolnym narzędziu [StatusNet](http://status.net/). "
+"[Dołącz teraz](%%action.register%%), aby dzielić się wpisami o sobie z "
+"przyjaciółmi, rodziną i kolegami! ([Przeczytaj więcej](%%doc.help%%))"
 
-#: lib/mail.php:253 lib/mail.php:512
+#: actions/public.php:238
 #, php-format
 msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
 msgstr ""
-"Użytkownik %1$s (%2$s) wysłał Ci prywatną wiadomość:\n"
-"\n"
-
-#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
-msgid "Only the user can read their own mailboxes."
-msgstr "Tylko użytkownik może czytać swoje skrzynki pocztowe."
+"To jest %%site.name%%, usługa [mikroblogowania](http://pl.wikipedia.org/wiki/"
+"Mikroblog) oparta na wolnym narzędziu [StatusNet](http://status.net/)."
 
-#: lib/openid.php:195 lib/openid.php:203
-msgid "This form should automatically submit itself. "
-msgstr "Ten formularz powinien automatycznie się wysłać. "
+#: actions/publictagcloud.php:57
+msgid "Public tag cloud"
+msgstr "Publiczna chmura znaczników"
 
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-#: lib/personalgroupnav.php:114
-msgid "Favorites"
-msgstr "Ulubione"
+#: actions/publictagcloud.php:63
+#, php-format
+msgid "These are most popular recent tags on %s "
+msgstr "To są najpopularniejsze ostatnie znaczniki na %s "
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-#: actions/favoritesrss.php:110 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:115
+#: actions/publictagcloud.php:69
 #, php-format
-msgid "%s's favorite notices"
-msgstr "Ulubione wpisy użytkownika %s"
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
+msgstr ""
+"Nikt jeszcze nie wysłał wpisu za pomocą [znacznika hasha](%%doc.tags%%)."
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-#: lib/personalgroupnav.php:115
-msgid "User"
-msgstr "Użytkownik"
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
+msgstr "Zostań pierwszym, który go wyśle!"
 
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-#: lib/personalgroupnav.php:124
-msgid "Inbox"
-msgstr "Odebrane"
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+"Dlaczego nie [zarejestrujesz konta](%%action.register%%) i zostaniesz "
+"pierwszym, który go wyśle!"
 
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-#: lib/personalgroupnav.php:125
-msgid "Your incoming messages"
-msgstr "Wiadomości przychodzące"
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
+msgstr "Chmura znaczników"
 
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-#: lib/personalgroupnav.php:129
-msgid "Outbox"
-msgstr "Wysłane"
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "Jesteś już zalogowany!"
 
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-#: lib/personalgroupnav.php:130
-msgid "Your sent messages"
-msgstr "Wysłane wiadomości"
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "Nie ma takiego kodu przywracania."
 
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-msgid "Twitter"
-msgstr "Twitter"
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "To nie jest kod przywracania."
 
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
-msgstr "Opcje integracji z Twitterem"
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr "Kod przywracania dla nieznanego użytkownika."
 
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
-#: lib/noticelist.php:433
-msgid "To"
-msgstr "Do"
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "Błąd kodu potwierdzającego."
 
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-#: scripts/maildaemon.php:47
-msgid "Could not parse message."
-msgstr "Nie można przeanalizować wiadomości."
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
+msgstr "Kod potwierdzający jest za stary. Rozpocznij ponownie."
 
-#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
-#: actions/facebookhome.php:161 actions/all.php:48
-#: actions/facebookhome.php:156
-#, php-format
-msgid "%s and friends, page %d"
-msgstr "Użytkownik %s i przyjaciele, strona %d"
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
+msgstr "Nie można zaktualizować użytkownika z potwierdzonym adresem e-mail."
 
-#: actions/avatarsettings.php:76
-msgid "You can upload your personal avatar."
-msgstr "Można wysłać osobisty awatar."
+#: actions/recoverpassword.php:152
+msgid ""
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
+msgstr ""
 
-#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250 actions/avatarsettings.php:119
-#: actions/avatarsettings.php:194 actions/grouplogo.php:256
-msgid "Avatar settings"
-msgstr "Ustawienia awatara"
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
+msgstr ""
 
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
-#: actions/grouplogo.php:204 actions/grouplogo.php:264
-msgid "Original"
-msgstr "Oryginał"
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
+msgstr ""
 
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
-#: actions/grouplogo.php:215 actions/grouplogo.php:276
-msgid "Preview"
-msgstr "Podgląd"
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
+msgstr ""
 
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
-#: actions/avatarsettings.php:228 actions/grouplogo.php:291
-msgid "Crop"
-msgstr "Przytnij"
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
+msgstr "Twój pseudonim na tym serwerze lub zarejestrowany adres e-mail."
 
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-msgid "There was a problem with your session token. "
-msgstr "Wystąpił problem z tokenem sesji. "
-
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-#: actions/avatarsettings.php:308
-msgid "Pick a square area of the image to be your avatar"
-msgstr "Wybierz kwadratowy obszar obrazu do awatara"
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
+msgstr "Przywróć"
 
-#: actions/avatarsettings.php:327 actions/grouplogo.php:384
-#: actions/avatarsettings.php:323 actions/grouplogo.php:382
-msgid "Lost our file data."
-msgstr "Utracono dane pliku."
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "Przywróć hasło"
 
-#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
-msgid "Lost our file."
-msgstr "Utracono plik."
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr "Przywróć hasło"
 
-#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
-#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
-#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
-msgid "Unknown file type"
-msgstr "Nieznany typ pliku"
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
+msgstr "Zażądano przywracania hasła"
 
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71
-msgid "No profile specified."
-msgstr "Nie podano profilu."
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
+msgstr "Nieznane działanie"
 
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75 actions/groupblock.php:76
-#: actions/groupunblock.php:76 actions/makeadmin.php:76
-msgid "No profile with that ID."
-msgstr "Brak profilu o tym identyfikatorze."
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 lub więcej znaków, i nie zapomnij go!"
 
-#: actions/block.php:111 actions/block.php:134
-msgid "Block user"
-msgstr "Zablokuj użytkownika"
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Takie samo jak powyższe hasło"
 
-#: actions/block.php:129
-msgid "Are you sure you want to block this user? "
-msgstr "Na pewno chcesz zablokować tego użytkownika? "
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "Przywróć"
 
-#: actions/block.php:162 actions/block.php:165
-msgid "You have already blocked this user."
-msgstr "Ten użytkownik został już zablokowany."
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "Podaj pseudonim lub adres e-mail."
 
-#: actions/block.php:167 actions/block.php:170
-msgid "Failed to save block information."
-msgstr "Zapisanie informacji o blokadzie nie powiodło się."
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
+msgstr "Brak użytkownika z tym adresem e-mail lub nazwą użytkownika."
 
-#: actions/confirmaddress.php:159
-#, php-format
-msgid "The address \"%s\" has been "
-msgstr "Adres \"%s\" został "
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr "Brak zarejestrowanych adresów e-mail dla tego użytkownika."
 
-#: actions/deletenotice.php:73
-msgid "You are about to permanently delete a notice. "
-msgstr "Za chwilę wpis zostanie trwale usunięty. "
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "Błąd podczas zapisywania potwierdzenia adresu."
 
-#: actions/disfavor.php:94
-msgid "Add to favorites"
-msgstr "Dodaj do ulubionych"
+#: actions/recoverpassword.php:325
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr ""
+"Instrukcje przywracania hasła zostały wysłane na adres e-mail zarejestrowany "
+"z Twoim kontem."
 
-#: actions/editgroup.php:54 actions/editgroup.php:56
-#, php-format
-msgid "Edit %s group"
-msgstr "Edytuj grupę %s"
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
+msgstr "Nieoczekiwane przywrócenie hasła."
 
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
-#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
-msgid "Inboxes must be enabled for groups to work"
-msgstr "Skrzynki odbiorcze grup muszą być włączone, aby działały"
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "Hasło musi mieć sześć lub więcej znaków."
 
-#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-#: actions/grouplogo.php:75 actions/editgroup.php:73
-msgid "You must be logged in to create a group."
-msgstr "Musisz być zalogowany, aby utworzyć grupę."
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
+msgstr "Hasło i potwierdzenie nie pasują do siebie."
 
-#: actions/editgroup.php:87 actions/grouplogo.php:87
-#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
-#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
-#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
-msgid "No nickname"
-msgstr "Brak pseudonimu"
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
+msgstr "Pomyślnie zapisano nowe hasło. Jesteś teraz zalogowany."
 
-#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
-#: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128 actions/grouplogo.php:104
-#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
-#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
-#: actions/showgroup.php:133
-msgid "No such group"
-msgstr "Nie ma takiej grupy"
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
+msgstr "Przepraszamy, tylko zaproszone osoby mogą się rejestrować."
 
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107 actions/grouplogo.php:111
-#: actions/editgroup.php:108 actions/editgroup.php:167
-#: actions/groupdesignsettings.php:109
-msgid "You must be an admin to edit the group"
-msgstr "Musisz być administratorem, aby zmodyfikować grupę"
+#: actions/register.php:92
+msgid "Sorry, invalid invitation code."
+msgstr "Przepraszamy, nieprawidłowy kod zaproszenia."
 
-#: actions/editgroup.php:157 actions/editgroup.php:159
-msgid "Use this form to edit the group."
-msgstr "Użyj tego formularza, aby zmodyfikować grupę."
+#: actions/register.php:112
+msgid "Registration successful"
+msgstr "Rejestracja powiodła się"
 
-#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
-msgid "Nickname must have only lowercase letters "
-msgstr "Pseudonim może zawierać tylko małe litery "
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "Zarejestruj się"
 
-#: actions/editgroup.php:198 actions/newgroup.php:149
-#: actions/editgroup.php:200 actions/newgroup.php:150
-msgid "description is too long (max 140 chars)."
-msgstr "opis jest za długi (maksymalnie 140 znaków)."
+#: actions/register.php:135
+msgid "Registration not allowed."
+msgstr "Rejestracja nie jest dozwolona."
 
-#: actions/editgroup.php:218 actions/editgroup.php:253
-msgid "Could not update group."
-msgstr "Nie można zaktualizować grupy."
+#: actions/register.php:198
+msgid "You can't register if you don't agree to the license."
+msgstr ""
+"Nie możesz się zarejestrować, jeśli nie zgadzasz się z warunkami licencji."
 
-#: actions/editgroup.php:226 actions/editgroup.php:269
-msgid "Options saved."
-msgstr "Zapisano opcje."
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "To nie jest prawidłowy adres e-mail."
 
-#: actions/emailsettings.php:107 actions/imsettings.php:108
-#, php-format
-msgid "Awaiting confirmation on this address. "
-msgstr "Oczekiwanie na potwierdzenie tego adresu. "
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "Adres e-mail już istnieje."
 
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-msgid "Make a new email address for posting to; "
-msgstr "Utwórz nowy adres e-mail do wysyłania; "
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "Nieprawidłowa nazwa użytkownika lub hasło."
 
-#: actions/emailsettings.php:157
-msgid "Send me email when someone "
-msgstr "Wyślij mi wiadomość e-mail, kiedy ktoś "
+#: actions/register.php:342
+#, fuzzy
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+"Za pomocą tego formularza można utworzyć nowe konto. Można wtedy wysyłać "
+"wpisy i połączyć się z przyjaciółmi i kolegami. (Posiadasz identyfikator "
+"[OpenID](http://openid.net/)? Wypróbuj [rejestracji OpenID](%%action."
+"openidlogin%%)!)"
 
-#: actions/emailsettings.php:168 actions/emailsettings.php:173
-msgid "Allow friends to nudge me and send me an email."
-msgstr "Pozwól przyjaciołom na szturchanie mnie i wyślij mi wiadomość e-mail."
+#: actions/register.php:424
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+"1-64 małe litery lub liczby, bez spacji i znaków przestankowych. Wymagane."
 
-#: actions/emailsettings.php:321
-msgid "That email address already belongs "
-msgstr "Ten adres e-mail już należy "
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr "6 lub więcej znaków. Wymagane."
 
-#: actions/emailsettings.php:343
-msgid "A confirmation code was sent to the email address you added. "
-msgstr "Kod potwierdzający został wysłany na dodany adres e-mail. "
+#: actions/register.php:433
+msgid "Same as password above. Required."
+msgstr "Takie samo jak powyższe hasło. Wymagane."
 
-#: actions/facebookhome.php:110 actions/facebookhome.php:109
-msgid "Server error - couldn't get user!"
-msgstr "Błąd serwera - nie można uzyskać użytkownika!"
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "E-mail"
 
-#: actions/facebookhome.php:196
-#, php-format
-msgid "If you would like the %s app to automatically update "
-msgstr "Jeśli chcesz, aby aplikacja %s automatycznie aktualizowała "
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
+msgstr "Używane tylko do aktualizacji, ogłoszeń i przywracania hasła"
 
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "Pozwól %s na aktualizowanie mojego statusu na Facebook"
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
+msgstr "Dłuższa nazwa, najlepiej twoje \"prawdziwe\" nazwisko"
 
-#: actions/facebookhome.php:218 actions/facebookhome.php:223
-#: actions/facebookhome.php:217
-msgid "Skip"
-msgstr "Pomiń"
+#: actions/register.php:493
+msgid "My text and files are available under "
+msgstr "Moje teksty i pliki są dostępne na "
 
-#: actions/facebookhome.php:235 lib/facebookaction.php:479
-#: lib/facebookaction.php:471
-msgid "No notice content!"
-msgstr "Brak zawartości wpisu!"
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
+msgstr "Creative Commons Uznanie Autorstwa 3.0"
 
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
-#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
-msgid "Pagination"
-msgstr "Paginacja"
+#: actions/register.php:496
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+" poza tymi prywatnymi danymi: hasło, adres e-mail, adres komunikatora i "
+"numer telefonu."
 
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
-#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
-msgid "After"
-msgstr "Następne"
+#: actions/register.php:537
+#, 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 ""
+"Gratulacje, %s! Witaj na %%%%site.name%%%%. Stąd możesz chcieć...\n"
+"\n"
+"* Przejść do [swojego profilu](%s) i wysłać swoją pierwszą wiadomość.\n"
+"* Dodać [adres Jabbera/GTalk](%%%%action.imsettings%%%%), abyś mógł wysyłać "
+"wpisy przez komunikatora.\n"
+"* [Poszukać osób](%%%%action.peoplesearch%%%%), których możesz znać lub "
+"którzy dzielą Twoje zainteresowania. \n"
+"* Zaktualizować swoje [ustawienia profilu](%%%%action.profilesettings%%%%), "
+"aby powiedzieć innym więcej o sobie. \n"
+"* Przeczytać [dokumentację w sieci](%%%%doc.help%%%%), aby dowiedzieć się o "
+"funkcjach, które mogłeś pominąć. \n"
+"\n"
+"Dziękujemy za zarejestrowanie się i mamy nadzieję, że używanie tej usługi "
+"sprawi Ci przyjemność."
 
-#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
-#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
-#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
-msgid "Before"
-msgstr "Wcześniej"
+#: actions/register.php:561
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+"(Powinieneś właśnie otrzymać wiadomość e-mail, zawierającą instrukcje "
+"potwierdzenia adresu e-mail)"
 
-#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
+#: actions/remotesubscribe.php:98
 #, php-format
-msgid "Thanks for inviting your friends to use %s"
-msgstr "Dziękujemy za zaproszenie przyjaciół do używania %s"
+msgid ""
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
+msgstr ""
+"Aby zasubskrybować, można [zalogować się](%%action.login%%) lub "
+"[zarejestrować](%%action.register%%) nowe konto. Jeśli już posiadasz konto "
+"na [zgodnej stronie mikroblogowania](%%doc.openmublog%%), podaj poniżej "
+"adres URL profilu."
 
-#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
-msgid "Invitations have been sent to the following users:"
-msgstr "Zaproszenia zostały wysłane do następujących użytkowników:"
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr "Zasubskrybuj zdalnie"
 
-#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
-#: actions/facebookinvite.php:94
-#, php-format
-msgid "You have been invited to %s"
-msgstr "Zostałeś zaproszony do %s"
+#: actions/remotesubscribe.php:124
+msgid "Subscribe to a remote user"
+msgstr "Zasubskrybuj zdalnego użytkownika"
 
-#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
-#: actions/facebookinvite.php:103
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Zaproś przyjaciół do używania %s"
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "Pseudonim użytkownika"
 
-#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
-#: actions/facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Przyjaciele już używający %s:"
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr "Pseudonim użytkownika którego chcesz obserwować"
 
-#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
-#: actions/facebookinvite.php:142
-#, php-format
-msgid "Send invitations"
-msgstr "Wyślij zaproszenia"
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "Adres URL profilu"
 
-#: actions/facebookremove.php:56
-msgid "Couldn't remove Facebook user."
-msgstr "Nie można usunąć użytkownika Facebook."
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "Adres URL profilu na innej, zgodnej usłudze mikroblogowania"
 
-#: actions/facebooksettings.php:65
-msgid "There was a problem saving your sync preferences!"
-msgstr "Wystąpił problem podczas zapisywania preferencji synchronizacji!"
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
+msgstr "Zasubskrybuj"
 
-#: actions/facebooksettings.php:67
-msgid "Sync preferences saved."
-msgstr "Zapisano preferencje synchronizacji."
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr "Nieprawidłowy adres URL profilu (błędny format)"
 
-#: actions/facebooksettings.php:90
-msgid "Automatically update my Facebook status with my notices."
-msgstr "Automatycznie aktualizuj status na Facebook moimi wpisami."
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "To nie jest prawidłowy adres URL profilu (brak dokumentu YADIS)."
 
-#: actions/facebooksettings.php:97
-msgid "Send \"@\" replies to Facebook."
-msgstr "Wyślij odpowiedzi \"@\" do Facebook."
+#: actions/remotesubscribe.php:176
+#, fuzzy
+msgid "That’s a local profile! Login to subscribe."
+msgstr "To jest profil lokalny! Zaloguj się, aby zasubskrybować."
 
-#: actions/facebooksettings.php:106
-msgid "Prefix"
-msgstr "Przedrostek"
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "Nie można uzyskać tokenu żądana."
 
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
-msgstr "Tekst do poprzedzenia wpisów."
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
+#, php-format
+msgid "Replies to %s"
+msgstr "Odpowiedzi na %s"
 
-#: actions/facebooksettings.php:124
+#: actions/replies.php:127
 #, php-format
-msgid "If you would like %s to automatically update "
-msgstr "Jeśli chcesz, aby %s automatycznie aktualizowało "
+msgid "Replies to %s, page %d"
+msgstr "Odpowiedzi na %s, strona %d"
 
-#: actions/facebooksettings.php:147
-msgid "Sync preferences"
-msgstr "Zsynchronizuj preferencje"
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Kanał wpisów dla %s (RSS 1.0)"
 
-#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
-msgid "Disfavor favorite"
-msgstr "Usuń wpis z ulubionych"
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Kanał wpisów dla %s (RSS 2.0)"
 
-#: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
-#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
-msgid "Popular notices"
-msgstr "Popularne wpisy"
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Kanał wpisów dla %s (Atom)"
 
-#: actions/favorited.php:67
+#: actions/replies.php:198
 #, php-format
-msgid "Popular notices, page %d"
-msgstr "Popularne wpisy, strona %d"
-
-#: actions/favorited.php:79
-msgid "The most popular notices on the site right now."
-msgstr "Najpopularniejsze wpisy na stronie w te chwili."
-
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
-#: lib/featureduserssection.php:87
-msgid "Featured users"
-msgstr "Znani użytkownicy"
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
+"To jest oś czasu wyświetlająca odpowiedzi na wpisy użytkownika %s, ale %s "
+"nie otrzymał jeszcze wpisów wymagających jego uwagi."
 
-#: actions/featured.php:71
+#: actions/replies.php:203
 #, php-format
-msgid "Featured users, page %d"
-msgstr "Znani użytkownicy, strona %d"
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+"Możesz nawiązać rozmowę z innymi użytkownikami, zasubskrybować więcej osób "
+"lub [dołączyć do grup](%%action.groups%%)."
 
-#: actions/featured.php:99
+#: actions/replies.php:205
 #, php-format
-msgid "A selection of some of the great users on %s"
-msgstr "Wybór znanych użytkowników na %s"
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+"Możesz spróbować [szturchnąć użytkownika %s](../%s) lub [wysłać coś "
+"wymagającego jego uwagi](%%%%action.newnotice%%%%?status_textarea=%s)."
 
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
-msgstr "Ten użytkownik zablokował Cię z subskrypcji."
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Wiadomość do użytkownika %1$s na %2$s"
 
-#: actions/groupbyid.php:79
-msgid "No ID"
-msgstr "Brak identyfikatora"
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "Ulubione wpisy użytkownika %s, strona %d"
 
-#: actions/grouplogo.php:138 actions/grouplogo.php:191
-#: actions/grouplogo.php:144 actions/grouplogo.php:197
-msgid "Group logo"
-msgstr "Logo grupy"
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
+msgstr "Nie można odebrać ulubionych wpisów."
 
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
-msgstr "Można wysłać obraz logo dla grupy."
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Kanał dla znajomych użytkownika %s (RSS 1.0)"
 
-#: actions/grouplogo.php:448 actions/grouplogo.php:401
-msgid "Logo updated."
-msgstr "Zaktualizowano logo."
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Kanał dla znajomych użytkownika %s (RSS 2.0)"
 
-#: actions/grouplogo.php:450 actions/grouplogo.php:403
-msgid "Failed updating logo."
-msgstr "Zaktualizowanie logo nie powiodło się."
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Kanał dla znajomych użytkownika %s (Atom)"
 
-#: actions/groupmembers.php:93 lib/groupnav.php:91
-#, php-format
-msgid "%s group members"
-msgstr "Członkowie grupy %s"
+#: actions/showfavorites.php:205
+msgid ""
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
+msgstr ""
+"Nie wybrałeś jeszcze żadnych ulubionych wpisów. Naciśnij przycisk ulubionego "
+"na wpisach, które chciałbyś dodać do zakładek na później lub rzucić na nie "
+"trochę światła."
 
-#: actions/groupmembers.php:96
+#: actions/showfavorites.php:207
 #, php-format
-msgid "%s group members, page %d"
-msgstr "Członkowie grupy %s, strona %d"
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+"Użytkownik %s nie dodał jeszcze żadnych wpisów do ulubionych. Wyślij coś "
+"interesującego, aby chcieli dodać to do swoich ulubionych. :)"
 
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
-msgstr "Lista użytkowników znajdujących się w tej grupie."
+#: actions/showfavorites.php:211
+#, fuzzy, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+"Użytkownik %s nie dodał jeszcze żadnych wpisów do ulubionych. Dlaczego nie "
+"[zarejestrujesz konta](%%%%action.register%%%%) i wyślesz coś "
+"interesującego, aby chcieli dodać to do swoich ulubionych. :)"
 
-#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
-#: lib/subgroupnav.php:98
-msgid "Groups"
-msgstr "Grupy"
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr "To jest sposób na współdzielenie tego, co chcesz."
 
-#: actions/groups.php:64
+#: actions/showgroup.php:82 lib/groupnav.php:86
 #, php-format
-msgid "Groups, page %d"
-msgstr "Grupy, strona %d"
+msgid "%s group"
+msgstr "Grupa %s"
 
-#: actions/groups.php:90
+#: actions/showgroup.php:84
 #, php-format
-msgid "%%%%site.name%%%% groups let you find and talk with "
-msgstr "Grupy %%%%site.name%%%% pozwalają na szukanie i rozmawianie z "
-
-#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
-msgid "Create a new group"
-msgstr "Utwórz nową grupę"
+msgid "%s group, page %d"
+msgstr "Grupa %s, strona %d"
 
-#: actions/groupsearch.php:57
-#, php-format
-msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-msgstr "Znajdź grupy na %%site.name%% według ich nazw, położenia lub opisu. "
+#: actions/showgroup.php:218
+msgid "Group profile"
+msgstr "Profil grupy"
 
-#: actions/groupsearch.php:63 actions/groupsearch.php:58
-msgid "Group search"
-msgstr "Znajdź grupę"
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
+msgid "URL"
+msgstr "Adres URL"
 
-#: actions/imsettings.php:70
-msgid "You can send and receive notices through "
-msgstr "Można wysyłać i otrzymywać wpisy przez "
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
+msgid "Note"
+msgstr "Wpis"
 
-#: actions/imsettings.php:120
-#, php-format
-msgid "Jabber or GTalk address, "
-msgstr "adres Jabbera lub GTalk, "
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr "Aliasy"
 
-#: actions/imsettings.php:147
-msgid "Send me replies through Jabber/GTalk "
-msgstr "Wyślij mi odpowiedzi przez Jabbera/GTalk "
+#: actions/showgroup.php:293
+msgid "Group actions"
+msgstr "Działania grupy"
 
-#: actions/imsettings.php:321
+#: actions/showgroup.php:328
 #, php-format
-msgid "A confirmation code was sent "
-msgstr "Kod potwierdzający został wysłany "
-
-#: actions/joingroup.php:65
-msgid "You must be logged in to join a group."
-msgstr "Musisz być zalogowany, aby dołączyć do grupy."
-
-#: actions/joingroup.php:95
-msgid "You are already a member of that group"
-msgstr "Jesteś już członkiem tej grupy"
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Kanał wpisów dla grupy %s (RSS 1.0)"
 
-#: actions/joingroup.php:128 actions/joingroup.php:133
+#: actions/showgroup.php:334
 #, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Nie można dołączyć użytkownika %s do grupy %s"
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Kanał wpisów dla grupy %s (RSS 2.0)"
 
-#: actions/joingroup.php:135 actions/joingroup.php:140
+#: actions/showgroup.php:340
 #, php-format
-msgid "%s joined group %s"
-msgstr "Użytkownik %s dołączył do grupy %s"
+msgid "Notice feed for %s group (Atom)"
+msgstr "Kanał wpisów dla grupy %s (Atom)"
 
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
-msgstr "Skrzynki odbiorcze dla grup muszą być włączone, aby działały."
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "FOAF dla %s"
 
-#: actions/leavegroup.php:65
-msgid "You must be logged in to leave a group."
-msgstr "Musisz być zalogowany, aby opuścić grupę."
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
+msgid "Members"
+msgstr "Członkowie"
 
-#: actions/leavegroup.php:88 actions/groupblock.php:86
-#: actions/groupunblock.php:86 actions/makeadmin.php:86
-msgid "No such group."
-msgstr "Nie ma takiej grupy."
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/tagcloudsection.php:71
+msgid "(None)"
+msgstr "(Brak)"
 
-#: actions/leavegroup.php:95
-msgid "You are not a member of that group."
-msgstr "Nie jesteś członkiem tej grupy."
+#: actions/showgroup.php:392
+msgid "All members"
+msgstr "Wszyscy członkowie"
 
-#: actions/leavegroup.php:100
-msgid "You may not leave a group while you are its administrator."
-msgstr "Nie możesz opuścić grupy, kiedy jesteś jej administratorem."
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "Statystyki"
 
-#: actions/leavegroup.php:130 actions/leavegroup.php:124
-msgid "Could not find membership record."
-msgstr "Nie można znaleźć wpisu członkostwa."
+#: actions/showgroup.php:432
+msgid "Created"
+msgstr "Utworzono"
 
-#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/showgroup.php:448
 #, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "Nie można usunąć użytkownika %s z grupy %s"
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+"**%s** jest grupą użytkowników na %%%%site.name%%%%, usłudze "
+"[mikroblogowania](http://pl.wikipedia.org/wiki/Mikroblog) opartej na wolnym "
+"narzędziu [StatusNet](http://status.net/). Jej członkowie dzielą się "
+"krótkimi wiadomościami o swoim życiu i zainteresowaniach. [Dołącz teraz](%%%%"
+"action.register%%%%), aby stać się częścią tej grupy i wiele więcej! "
+"([Przeczytaj więcej](%%%%doc.help%%%%))"
 
-#: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/showgroup.php:454
 #, php-format
-msgid "%s left group %s"
-msgstr "Użytkownik %s opuścił grupę %s"
-
-#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
-msgid "Login to site"
-msgstr "Zaloguj się na stronie"
-
-#: actions/microsummary.php:69
-msgid "No current status"
-msgstr "Brak obecnego statusu"
-
-#: actions/newgroup.php:53
-msgid "New group"
-msgstr "Nowa grupa"
-
-#: actions/newgroup.php:115
-msgid "Use this form to create a new group."
-msgstr "Użyj tego formularza, aby utworzyć nową grupę."
-
-#: actions/newgroup.php:177 actions/newgroup.php:209
-msgid "Could not create group."
-msgstr "Nie można utworzyć grupy."
-
-#: actions/newgroup.php:191 actions/newgroup.php:229
-msgid "Could not set group membership."
-msgstr "Nie można ustawić członkostwa w grupie."
-
-#: actions/newmessage.php:119 actions/newnotice.php:132
-msgid "That's too long. "
-msgstr "Wiadomość jest za długa. "
-
-#: actions/newmessage.php:134
-msgid "Don't send a message to yourself; "
-msgstr "Nie wysyłaj wiadomości do siebie; "
-
-#: actions/newnotice.php:166 actions/newnotice.php:174
-#: actions/newnotice.php:272
-msgid "Notice posted"
-msgstr "Wysłano wpis"
-
-#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
-#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
-msgid "Ajax Error"
-msgstr "Błąd AJAX"
-
-#: actions/nudge.php:85
 msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
 msgstr ""
-"Ten użytkownik nie pozwala na szturchnięcia lub nie potwierdził lub nie "
-"ustawił jeszcze swojego adresu e-mail."
-
-#: actions/nudge.php:94
-msgid "Nudge sent"
-msgstr "Wysłano szturchnięcie"
-
-#: actions/nudge.php:97
-msgid "Nudge sent!"
-msgstr "Wysłano szturchnięcie!"
-
-#: actions/openidlogin.php:97 actions/openidlogin.php:106
-msgid "OpenID login"
-msgstr "Login OpenID"
-
-#: actions/openidsettings.php:128
-msgid "Removing your only OpenID "
-msgstr "Usuwanie jedynego identyfikatora OpenID "
-
-#: actions/othersettings.php:60
-msgid "Other Settings"
-msgstr "Inne ustawienia"
-
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Zarządzaj różnymi innymi opcjami."
+"**%s** jest grupą użytkowników na %%%%site.name%%%%, usłudze "
+"[mikroblogowania](http://pl.wikipedia.org/wiki/Mikroblog) opartej na wolnym "
+"narzędziu [StatusNet](http://status.net/). Jej członkowie dzielą się "
+"krótkimi wiadomościami o swoim życiu i zainteresowaniach. "
 
-#: actions/othersettings.php:93
-msgid "URL Auto-shortening"
-msgstr "Automatyczne skracanie adresów URL"
+#: actions/showgroup.php:482
+msgid "Admins"
+msgstr "Administratorzy"
 
-#: actions/othersettings.php:112
-msgid "Service"
-msgstr "Usługa"
+#: actions/showmessage.php:81
+msgid "No such message."
+msgstr "Nie ma takiej wiadomości."
 
-#: actions/othersettings.php:113 actions/othersettings.php:111
-msgid "Automatic shortening service to use."
-msgstr "Używana automatyczna usługa skracania."
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient may read this message."
+msgstr "Tylko nadawca i odbiorca mogą przeczytać tę wiadomość."
 
-#: actions/othersettings.php:144 actions/othersettings.php:146
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "Adres URL usługi skracania jest za długi (maksymalnie 50 znaków)."
+#: actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr "Wiadomość do użytkownika %1$s na %2$s"
 
-#: actions/passwordsettings.php:69
-msgid "Change your password."
-msgstr "Zmień hasło."
+#: actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr "Wiadomość od użytkownika %1$s na %2$s"
 
-#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
-msgid "Password change"
-msgstr "Zmiana hasła"
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Wysłano wpis"
 
-#: actions/peopletag.php:35 actions/peopletag.php:70
+#: actions/showstream.php:73
 #, php-format
-msgid "Not a valid people tag: %s"
-msgstr "Nieprawidłowy znacznik osób: %s"
+msgid " tagged %s"
+msgstr " ze znacznikiem %s"
 
-#: actions/peopletag.php:47 actions/peopletag.php:144
+#: actions/showstream.php:79
 #, php-format
-msgid "Users self-tagged with %s - page %d"
-msgstr "Użytkownicy używający znacznika %s - strona %d"
+msgid "%s, page %d"
+msgstr "%s, strona %d"
 
-#: actions/peopletag.php:91
+#: actions/showstream.php:122
 #, php-format
-msgid "These are users who have tagged themselves \"%s\" "
-msgstr "To są użytkownicy którzy nadali sobie znacznik \"%s\" "
-
-#: actions/profilesettings.php:91
-msgid "Profile information"
-msgstr "Informacje o profilu"
-
-#: actions/profilesettings.php:124 actions/profilesettings.php:125
-msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
-msgstr ""
-"Znaczniki dla siebie (litery, liczby, -, . i _), oddzielone przecinkami lub "
-"spacjami"
-
-#: actions/profilesettings.php:144
-msgid "Automatically subscribe to whoever "
-msgstr "Automatycznie zasubskrybuj do każdego "
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Kanał wpisów dla %s ze znacznikiem %s (RSS 1.0)"
 
-#: actions/profilesettings.php:229 actions/tagother.php:176
-#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/showstream.php:129
 #, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Nieprawidłowy znacznik: \"%s\""
-
-#: actions/profilesettings.php:311 actions/profilesettings.php:310
-msgid "Couldn't save tags."
-msgstr "Nie można zapisać znaczników."
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Kanał wpisów dla %s (RSS 1.0)"
 
-#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/showstream.php:136
 #, php-format
-msgid "Public timeline, page %d"
-msgstr "Publiczna oś czasu, strona %d"
-
-#: actions/public.php:173 actions/public.php:184 actions/public.php:210
-msgid "Could not retrieve public stream."
-msgstr "Nie można pobrać publicznego strumienia."
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Kanał wpisów dla %s (RSS 2.0)"
 
-#: actions/public.php:220
+#: actions/showstream.php:143
 #, php-format
-msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
-msgstr ""
-"To jest %%site.name%%, usługa [mikroblogowania](http://pl.wikipedia.org/wiki/"
-"Mikroblog) "
-
-#: actions/publictagcloud.php:57
-msgid "Public tag cloud"
-msgstr "Publiczna chmura znaczników"
+msgid "Notice feed for %s (Atom)"
+msgstr "Kanał wpisów dla %s (Atom)"
 
-#: actions/publictagcloud.php:63
+#: actions/showstream.php:148
 #, php-format
-msgid "These are most popular recent tags on %s "
-msgstr "To są najpopularniejsze ostatnie znaczniki na %s "
-
-#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
-msgid "Tag cloud"
-msgstr "Chmura znaczników"
-
-#: actions/register.php:139 actions/register.php:349 actions/register.php:79
-#: actions/register.php:177 actions/register.php:394
-msgid "Sorry, only invited people can register."
-msgstr "Przepraszamy, tylko zaproszone osoby mogą się rejestrować."
-
-#: actions/register.php:149
-msgid "You can't register if you don't "
-msgstr "Nie możesz się zarejestrować, jeśli nie "
-
-#: actions/register.php:286
-msgid "With this form you can create "
-msgstr "Za pomocą tego formularza można utworzyć "
-
-#: actions/register.php:368
-msgid "1-64 lowercase letters or numbers, "
-msgstr "1-64 małe litery lub liczby, "
-
-#: actions/register.php:382 actions/register.php:386
-msgid "Used only for updates, announcements, "
-msgstr "Używane tylko do aktualizacji, ogłoszeń, "
-
-#: actions/register.php:398
-msgid "URL of your homepage, blog, "
-msgstr "Adres URL strony domowej, bloga, "
-
-#: actions/register.php:404
-msgid "Describe yourself and your "
-msgstr "Opisz się i swoje "
-
-#: actions/register.php:410
-msgid "Where you are, like \"City, "
-msgstr "Gdzie jesteś, np. \"miasto, "
-
-#: actions/register.php:432
-msgid " except this private data: password, "
-msgstr " poza tymi prywatnymi danymi: hasło, "
+msgid "FOAF for %s"
+msgstr "FOAF dla %s"
 
-#: actions/register.php:471
+#: actions/showstream.php:191
 #, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
-msgstr "Gratulacje, %s! Witaj na %%%%site.name%%%%. "
-
-#: actions/register.php:495
-msgid "(You should receive a message by email "
-msgstr "(Powinieneś otrzymać wiadomość przez e-mail "
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+"To jest oś czasu dla użytkownika %s, ale %s nie nic jeszcze nie wysłał."
 
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
-msgstr "To jest profil lokalny! Zaloguj się, aby zasubskrybować."
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+"Widziałeś ostatnio coś interesującego? Nie wysłałeś jeszcze żadnych wpisów, "
+"teraz jest dobry czas, aby zacząć. :)"
 
-#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/showstream.php:198
 #, php-format
-msgid "Replies to %s, page %d"
-msgstr "Odpowiedzi na %s, strona %d"
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+"Możesz spróbować szturchnąć użytkownika %s lub [wysłać coś, co wymaga jego "
+"uwagi](%%%%action.newnotice%%%%?status_textarea=%s)."
 
-#: actions/showfavorites.php:79
+#: actions/showstream.php:234
 #, php-format
-msgid "%s favorite notices, page %d"
-msgstr "Ulubione wpisy użytkownika %s, strona %d"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+"**%s** posiada konto na %%%%site.name%%%%, usłudze [mikroblogowania](http://"
+"pl.wikipedia.org/wiki/Mikroblog) opartej na wolnym narzędziu [StatusNet]"
+"(http://status.net/). [Dołącz teraz](%%%%action.register%%%%), aby "
+"obserwować wpisy użytkownika **%s** i wiele więcej! ([Przeczytaj więcej](%%%%"
+"doc.help%%%%))"
 
-#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
+#: actions/showstream.php:239
 #, php-format
-msgid "%s group"
-msgstr "Grupa %s"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
+msgstr ""
+"**%s** posiada konto na %%%%site.name%%%%, usłudze [mikroblogowania](http://"
+"pl.wikipedia.org/wiki/Mikroblog) opartej na wolnym narzędziu [StatusNet]"
+"(http://status.net/). "
 
-#: actions/showgroup.php:79 actions/showgroup.php:84
-#, php-format
-msgid "%s group, page %d"
-msgstr "Grupa %s, strona %d"
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "Ustawienia SMS"
 
-#: actions/showgroup.php:206 actions/showgroup.php:208
-#: actions/showgroup.php:213
-msgid "Group profile"
-msgstr "Profil grupy"
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr "Można otrzymywać wiadomości SMS przez e-mail od %%site.name%%."
 
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
-#: actions/showgroup.php:253 actions/showstream.php:271
-#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
-#: actions/showstream.php:236 actions/userauthorization.php:137
-#: lib/profilelist.php:197
-msgid "URL"
-msgstr "Adres URL"
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Ta strona nie jest dostępna w "
 
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
-#: actions/showgroup.php:264 actions/showstream.php:282
-#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
-#: actions/showstream.php:247 actions/userauthorization.php:149
-#: lib/profilelist.php:212
-msgid "Note"
-msgstr "Wpis"
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Obecnie potwierdzone numery telefonów z włączoną usługą SMS."
 
-#: actions/showgroup.php:270 actions/showgroup.php:272
-#: actions/showgroup.php:288
-msgid "Group actions"
-msgstr "Działania grupy"
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
+msgstr "Oczekiwanie na potwierdzenie tego numeru telefonu."
 
-#: actions/showgroup.php:323 actions/showgroup.php:304
-#, php-format
-msgid "Notice feed for %s group"
-msgstr "Kanał wpisów dla grupy %s"
+#: actions/smssettings.php:130
+msgid "Confirmation code"
+msgstr "Kod potwierdzający"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
-#: actions/showgroup.php:384 actions/showgroup.php:373
-#: actions/showgroup.php:430
-msgid "Members"
-msgstr "Członkowie"
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
+msgstr "Podaj kod, który otrzymałeś na telefonie."
 
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71 actions/showgroup.php:344
-#: actions/showgroup.php:378 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226
-msgid "(None)"
-msgstr "(Brak)"
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
+msgstr "Numer telefonu SMS"
 
-#: actions/showgroup.php:370 actions/showgroup.php:350
-#: actions/showgroup.php:384
-msgid "All members"
-msgstr "Wszyscy członkowie"
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "Numer telefonu, bez znaków przestankowych i spacji, z kodem państwa"
 
-#: actions/showgroup.php:378
-#, php-format
+#: actions/smssettings.php:174
 msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
 msgstr ""
-"**%s** jest grupą użytkowników na %%%%site.name%%%%, usłudze "
-"[mikroblogowania](http://pl.wikipedia.org/wiki/Mikroblog) "
-
-#: actions/showmessage.php:98
-msgid "Only the sender and recipient "
-msgstr "Tylko nadawca i odbiorca "
+"Wyślij mi wpisy przez SMS. Rozumiem, że mogę otrzymywać większe rachunki od "
+"swojego operatora."
 
-#: actions/showstream.php:73 actions/showstream.php:78
-#, php-format
-msgid "%s, page %d"
-msgstr "%s, strona %d"
+#: actions/smssettings.php:306
+msgid "No phone number."
+msgstr "Brak numeru telefonu."
 
-#: actions/showstream.php:143
-msgid "'s profile"
-msgstr " - profil"
+#: actions/smssettings.php:311
+msgid "No carrier selected."
+msgstr "Nie wybrano operatora."
 
-#: actions/showstream.php:236 actions/tagother.php:77
-#: actions/showstream.php:220 actions/showstream.php:185
-msgid "User profile"
-msgstr "Profil użytkownika"
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
+msgstr "Ten numer telefonu jest już Twój."
 
-#: actions/showstream.php:240 actions/tagother.php:81
-#: actions/showstream.php:224 actions/showstream.php:189
-msgid "Photo"
-msgstr "Zdjęcie"
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
+msgstr "Ten numer telefonu należy już do innego użytkownika."
 
-#: actions/showstream.php:317 actions/showstream.php:309
-#: actions/showstream.php:274
-msgid "User actions"
-msgstr "Działania użytkownika"
+#: actions/smssettings.php:347
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"Kod potwierdzający został wysłany na dodany numer telefonu. Sprawdź telefon, "
+"czy otrzymałeś kod i instrukcje jak go użyć."
 
-#: actions/showstream.php:342 actions/showstream.php:307
-msgid "Send a direct message to this user"
-msgstr "Wyślij bezpośrednią wiadomość do tego użytkownika"
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
+msgstr "To jest błędny numer potwierdzenia."
 
-#: actions/showstream.php:343 actions/showstream.php:308
-msgid "Message"
-msgstr "Wiadomość"
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
+msgstr "To nie jest Twój numer telefonu."
 
-#: actions/showstream.php:451 lib/profileaction.php:157
-msgid "All subscribers"
-msgstr "Wszyscy subskrybenci"
+#: actions/smssettings.php:465
+msgid "Mobile carrier"
+msgstr "Operator komórkowy"
 
-#: actions/showstream.php:533 lib/profileaction.php:235
-msgid "All groups"
-msgstr "Wszystkie grupy"
+#: actions/smssettings.php:469
+msgid "Select a carrier"
+msgstr "Wybierz operatora"
 
-#: actions/showstream.php:542
+#: actions/smssettings.php:476
 #, php-format
 msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"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 ""
-"**%s** posiada konto na %%%%site.name%%%%, usłudze [mikroblogowania](http://"
-"pl.wikipedia.org/wiki/Mikroblog) "
-
-#: actions/smssettings.php:128
-msgid "Phone number, no punctuation or spaces, "
-msgstr "Numer telefonu, bez znaków przestankowych i spacji, "
-
-#: actions/smssettings.php:162
-msgid "Send me notices through SMS; "
-msgstr "Wyślij mi wpisy przez SMS; "
-
-#: actions/smssettings.php:335
-msgid "A confirmation code was sent to the phone number you added. "
-msgstr "Kod potwierdzający został wysłany na dodany numer telefonu. "
+"Operator komórkowy Twojego telefonu. Jeśli znasz operatora, który akceptuje "
+"wiadomości SMS przez e-mail, a nie znajduje się na liście, wyślij wiadomość "
+"e-mail na %s (w języku angielskim), aby nam o tym powiedzieć."
 
-#: actions/smssettings.php:453
-msgid "Mobile carrier"
-msgstr "Operator komórkowy"
+#: actions/smssettings.php:498
+msgid "No code entered"
+msgstr "Nie podano kodu"
 
 #: actions/subedit.php:70
 msgid "You are not subscribed to that profile."
@@ -4700,13 +3072,35 @@ msgid "%s subscribers, page %d"
 msgstr "Subskrybenci użytkownika %s, strona %d"
 
 #: actions/subscribers.php:63
-msgid "These are the people who listen to "
-msgstr "Osoby obserwujące "
+msgid "These are the people who listen to your notices."
+msgstr "Osoby obserwujący Twoje wpisy."
 
 #: actions/subscribers.php:67
 #, php-format
-msgid "These are the people who "
-msgstr "Osoby, które "
+msgid "These are the people who listen to %s's notices."
+msgstr "Osoby obserwujące wpisy użytkownika %s."
+
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
+msgstr ""
+"Nie masz żadnych subskrybentów. Spróbuj zasubskrybować osoby, które znasz, a "
+"oni mogą się odwdzięczyć"
+
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr "Użytkownik %s nie posiada subskrybentów. Chcesz być pierwszym?"
+
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+"Użytkownik %s nie posiada subskrybentów. Dlaczego nie [zarejestrujesz konta]"
+"(%%%%action.register%%%%) i zostaniesz pierwszym?"
 
 #: actions/subscriptions.php:52
 #, php-format
@@ -4719,28 +3113,42 @@ msgid "%s subscriptions, page %d"
 msgstr "Subskrypcje użytkownika %s, strona %d"
 
 #: actions/subscriptions.php:65
-msgid "These are the people whose notices "
-msgstr "Osoby, których wpisy "
+msgid "These are the people whose notices you listen to."
+msgstr "Osoby, których wpisy obserwujesz."
 
 #: actions/subscriptions.php:69
 #, php-format
-msgid "These are the people whose "
-msgstr "Osoby, których "
-
-#: actions/subscriptions.php:122 actions/subscriptions.php:124
-#: actions/subscriptions.php:183
-msgid "Jabber"
-msgstr "Jabber"
+msgid "These are the people whose notices %s listens to."
+msgstr "Osoby, których wpisy obserwuje użytkownik %s."
 
-#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59
+#: actions/subscriptions.php:121
 #, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Wpisy ze znacznikiem %s, strona %d"
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
+msgstr ""
+"Nie obserwujesz teraz wpisów innych użytkowników. Spróbuj zasubskrybować "
+"osoby, które znasz. Spróbuj [znaleźć kogoś](%%action.peoplesearch%%), "
+"poszukać członków grup, które Cię interesują, a także [znanych użytkowników]"
+"(%%action.featured%%). Jeśli jesteś [użytkownikiem Twittera](%%action."
+"twittersettings%%), możesz automatycznie zasubskrybowć osoby, które tam już "
+"obserwujesz."
 
-#: actions/tag.php:66 actions/tag.php:73
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
 #, php-format
-msgid "Messages tagged \"%s\", most recent first"
-msgstr "Wiadomości ze znacznikiem \"%s\", najpierw najnowsze"
+msgid "%s is not listening to anyone."
+msgstr "Użytkownik %s nie obserwuje nikogo."
+
+#: actions/subscriptions.php:194
+msgid "Jabber"
+msgstr "Jabber"
+
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
+msgstr "SMS"
 
 #: actions/tagother.php:33
 msgid "Not logged in"
@@ -4755,11 +3163,19 @@ msgstr "Brak parametru identyfikatora."
 msgid "Tag %s"
 msgstr "Znacznik %s"
 
+#: actions/tagother.php:77 lib/userprofile.php:75
+msgid "User profile"
+msgstr "Profil użytkownika"
+
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
+msgstr "Zdjęcie"
+
 #: actions/tagother.php:141
 msgid "Tag user"
 msgstr "Znacznik użytkownika"
 
-#: actions/tagother.php:149 actions/tagother.php:151
+#: actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4767,904 +3183,723 @@ msgstr ""
 "Znaczniki dla tego użytkownika (litery, liczby, -, . i _), oddzielone "
 "przecinkami lub spacjami"
 
-#: actions/tagother.php:164
-msgid "There was a problem with your session token."
-msgstr "Wystąpił problem z tokenem sesji."
-
-#: actions/tagother.php:191 actions/tagother.php:193
+#: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Można nadawać znaczniki tylko osobom, których subskrybujesz lub którzy "
 "subskrybują Ciebie."
 
-#: actions/tagother.php:198 actions/tagother.php:200
+#: actions/tagother.php:200
 msgid "Could not save tags."
 msgstr "Nie można zapisać znaczników."
 
-#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
+#: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Użyj tego formularza, aby dodać znaczniki subskrybentom lub subskrypcjom."
 
-#: actions/tagrss.php:35
-msgid "No such tag."
-msgstr "Nie ma takiego znacznika."
-
-#: actions/tagrss.php:66 actions/tagrss.php:64
+#: actions/tag.php:68
 #, php-format
-msgid "Microblog tagged with %s"
-msgstr "Mikroblogi ze znacznikiem %s"
-
-#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
-msgid "Block user failed."
-msgstr "Zablokowanie użytkownika nie powiodło się."
-
-#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
-msgid "Unblock user failed."
-msgstr "Odblokowanie użytkownika nie powiodło się."
-
-#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
-#: actions/twitapiusers.php:50
-msgid "Not found."
-msgstr "Nie znaleziono."
-
-#: actions/twittersettings.php:71
-msgid "Add your Twitter account to automatically send "
-msgstr "Dodaj konto Twittera, aby automatycznie wysyłać "
-
-#: actions/twittersettings.php:119 actions/twittersettings.php:122
-msgid "Twitter user name"
-msgstr "Nazwa użytkownika Twittera"
-
-#: actions/twittersettings.php:126 actions/twittersettings.php:129
-msgid "Twitter password"
-msgstr "Hasło Twittera"
+msgid "Notices tagged with %s, page %d"
+msgstr "Wpisy ze znacznikiem %s, strona %d"
 
-#: actions/twittersettings.php:228 actions/twittersettings.php:232
-#: actions/twittersettings.php:248
-msgid "Twitter Friends"
-msgstr "Przyjaciele z Twittera"
+#: actions/tag.php:86
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Kanał wpisów dla znacznika %s (RSS 1.0)"
 
-#: actions/twittersettings.php:327
-msgid "Username must have only numbers, "
-msgstr "Nazwa użytkownika może zawierać tylko liczby, "
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Kanał wpisów dla znacznika %s (RSS 1.0)"
 
-#: actions/twittersettings.php:341
+#: actions/tag.php:98
 #, php-format
-msgid "Unable to retrieve account information "
-msgstr "Nie można pobrać informacji o koncie "
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Kanał wpisów dla znacznika %s (Atom)"
 
-#: actions/unblock.php:108 actions/groupunblock.php:128
-msgid "Error removing the block."
-msgstr "Błąd podczas usuwania blokady."
+#: actions/tagrss.php:35
+msgid "No such tag."
+msgstr "Nie ma takiego znacznika."
 
-#: actions/unsubscribe.php:50
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
+msgstr "Metoda API jest w trakcie tworzenia."
+
+#: actions/unsubscribe.php:77
 msgid "No profile id in request."
 msgstr "Brak identyfikatora profilu w żądaniu."
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:84
 msgid "No profile with that id."
 msgstr "Brak profilu z tym identyfikatorem."
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Zrezygnowano z subskrypcji"
 
-#: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
 #, php-format
-msgid "%s groups"
-msgstr "Grupy %s"
-
-#: actions/usergroups.php:65 actions/usergroups.php:64
-#, php-format
-msgid "%s groups, page %d"
-msgstr "Grupy %s, strona %d"
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
 
-#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
-msgid "Problem saving notice. Unknown user."
-msgstr "Problem podczas zapisywania wpisu. Nieznany użytkownik."
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "Upoważnij subskrypcję"
 
-#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: actions/userauthorization.php:110
+#, fuzzy
 msgid ""
-"Too many notices too fast; take a breather and post again in a few minutes."
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
 msgstr ""
-"Za dużo wpisów w za krótkim czasie, weź głęboki oddech i wyślij ponownie za "
-"kilka minut."
-
-#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
-msgid "You are banned from posting notices on this site."
-msgstr "Zabroniono Ci wysyłania wpisów na tej stronie."
-
-#: lib/accountsettingsaction.php:108
-msgid "Upload an avatar"
-msgstr "Wyślij awatar"
-
-#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
-msgid "Other"
-msgstr "Inne"
-
-#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
-msgid "Other options"
-msgstr "Inne opcje"
-
-#: lib/action.php:130 lib/action.php:132 lib/action.php:142
-#, php-format
-msgid "%s - %s"
-msgstr "%s - %s"
-
-#: lib/action.php:145 lib/action.php:147 lib/action.php:157
-msgid "Untitled page"
-msgstr "Strona bez nazwy"
+"Sprawdź te szczegóły, aby upewnić się, czy na pewno chcesz zasubskrybować "
+"wpisy tego użytkownika. Jeżeli nie prosiłeś o subskrypcję czyichś wpisów, "
+"naciśnij \"Odrzuć\"."
 
-#: lib/action.php:316 lib/action.php:387 lib/action.php:411
-msgid "Primary site navigation"
-msgstr "Główna nawigacja strony"
+#: actions/userauthorization.php:188
+msgid "License"
+msgstr "Licencja"
 
-#: lib/action.php:322 lib/action.php:393 lib/action.php:417
-msgid "Personal profile and friends timeline"
-msgstr "Profil osobisty i oś czasu przyjaciół"
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "Zaakceptuj"
 
-#: lib/action.php:325 lib/action.php:396 lib/action.php:448
-msgid "Search for people or text"
-msgstr "Znajdź osoby lub tekst"
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Zasubskrybuj tego użytkownika"
 
-#: lib/action.php:328 lib/action.php:399 lib/action.php:419
-msgid "Account"
-msgstr "Konto"
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "Odrzuć"
 
-#: lib/action.php:328 lib/action.php:399 lib/action.php:419
-msgid "Change your email, avatar, password, profile"
-msgstr "Zmień adres e-mail, awatar, hasło, profil"
+#: actions/userauthorization.php:212
+msgid "Reject this subscription"
+msgstr "Odrzuć tę subskrypcję"
 
-#: lib/action.php:330 lib/action.php:403 lib/action.php:422
-msgid "Connect to IM, SMS, Twitter"
-msgstr "Połącz z komunikatorem, SMS, Twitterem"
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
+msgstr "Brak żądania upoważnienia!"
 
-#: lib/action.php:332 lib/action.php:409 lib/action.php:435
-msgid "Logout from the site"
-msgstr "Wyloguj się ze strony"
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+msgstr "Upoważniono subskrypcję"
 
-#: lib/action.php:335 lib/action.php:412 lib/action.php:443
-msgid "Login to the site"
-msgstr "Zaloguj się na stronę"
+#: actions/userauthorization.php:249
+#, fuzzy
+msgid ""
+"The subscription has been authorized, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to authorize the "
+"subscription. Your subscription token is:"
+msgstr ""
+"Subskrypcja została upoważniona, ale nie przekazano zwrotnego adresu URL. "
+"Sprawdź w instrukcjach strony, jak upoważnić subskrypcję. Token subskrypcji:"
 
-#: lib/action.php:338 lib/action.php:415 lib/action.php:440
-msgid "Create an account"
-msgstr "Utwórz konto"
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
+msgstr "Odrzucono subskrypcję"
 
-#: lib/action.php:341 lib/action.php:418
-msgid "Login with OpenID"
-msgstr "Zaloguj się za pomocą OpenID"
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"Subskrypcja została odrzucona, ale nie przekazano zwrotnego adresu URL. "
+"Sprawdź w instrukcjach strony, jak w pełni odrzucić subskrypcję."
 
-#: lib/action.php:344 lib/action.php:421 lib/action.php:446
-msgid "Help me!"
-msgstr "Pomóż mi!"
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
 
-#: lib/action.php:362 lib/action.php:441 lib/action.php:468
-msgid "Site notice"
-msgstr "Wpis strony"
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
 
-#: lib/action.php:417 lib/action.php:504 lib/action.php:531
-msgid "Local views"
-msgstr "Lokalne widoki"
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
 
-#: lib/action.php:472 lib/action.php:559 lib/action.php:597
-msgid "Page notice"
-msgstr "Wpis strony"
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
 
-#: lib/action.php:562 lib/action.php:654 lib/action.php:699
-msgid "Secondary site navigation"
-msgstr "Druga nawigacja strony"
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
 
-#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
-#: lib/action.php:749 lib/action.php:770
-msgid "StatusNet software license"
-msgstr "Licencja oprogramowania StatusNet"
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Nie można odczytać adresu URL awatara \"%s\""
 
-#: lib/action.php:630 lib/action.php:727 lib/action.php:779
-msgid "All "
-msgstr "Wszystko "
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Błędny typ obrazu dla \"%s\""
 
-#: lib/action.php:635 lib/action.php:732 lib/action.php:784
-msgid "license."
-msgstr "licencja."
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr "Brak identyfikatora."
 
-#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
-msgid "Block this user"
-msgstr "Zablokuj tego użytkownika"
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+msgid "Profile design"
+msgstr "Wygląd profilu"
 
-#: lib/blockform.php:153 actions/groupmembers.php:343
-msgid "Block"
-msgstr "Zablokuj"
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+"Dostosuj wygląd profilu za pomocą wybranego obrazu tła i palety kolorów."
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
-msgid "Disfavor this notice"
-msgstr "Usuń ten wpis z ulubionych"
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr "Smacznego hot-doga!"
 
-#: lib/facebookaction.php:268
+#: actions/usergroups.php:64
 #, php-format
-msgid "To use the %s Facebook Application you need to login "
-msgstr "Aby używać aplikacji Facebook %s, musisz się zalogować "
+msgid "%s groups, page %d"
+msgstr "Grupy %s, strona %d"
 
-#: lib/facebookaction.php:271 lib/facebookaction.php:273
-#: lib/facebookaction.php:275
-msgid " a new account."
-msgstr " nowe konto."
+#: actions/usergroups.php:130
+msgid "Search for more groups"
+msgstr "Znajdź więcej grup"
 
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
-#: lib/mailbox.php:217 lib/noticelist.php:361
-msgid "Published"
-msgstr "Opublikowano"
+#: actions/usergroups.php:153
+#, php-format
+msgid "%s is not a member of any group."
+msgstr "Użytkownik %s nie jest członkiem żadnej grupy."
 
-#: lib/favorform.php:114 lib/favorform.php:140
-msgid "Favor this notice"
-msgstr "Dodaj ten wpis do ulubionych"
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr "Spróbuj [wyszukać grupy](%%action.groupsearch%%) i dołączyć do nich."
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Wyeksportuj dane"
+#: classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+"Żaden plik nie może być większy niż %d bajty, a wysłany plik miał %d bajty. "
+"Spróbuj wysłać mniejszą wersję."
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "Filtruj znaczniki"
+#: classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+"Plik tej wielkości przekroczyłby przydział użytkownika wynoszący %d bajty."
 
-#: lib/galleryaction.php:131
-msgid "All"
-msgstr "Wszystko"
+#: classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+"Plik tej wielkości przekroczyłby miesięczny przydział użytkownika wynoszący %"
+"d bajty."
 
-#: lib/galleryaction.php:137 lib/galleryaction.php:138
-msgid "Tag"
-msgstr "Znacznik"
+#: classes/Message.php:55
+msgid "Could not insert message."
+msgstr "Nie można wprowadzić wiadomości."
 
-#: lib/galleryaction.php:138 lib/galleryaction.php:139
-msgid "Choose a tag to narrow list"
-msgstr "Wybierz znacznik do ograniczonej listy"
+#: classes/Message.php:65
+msgid "Could not update message with new URI."
+msgstr "Nie można zaktualizować wiadomości za pomocą nowego adresu URL."
 
-#: lib/galleryaction.php:139 lib/galleryaction.php:141
-msgid "Go"
-msgstr "Przejdź"
+#: classes/Notice.php:164
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "Błąd bazy danych podczas wprowadzania znacznika hasha: %s"
 
-#: lib/groupeditform.php:148 lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
-msgstr "Adres URL strony domowej lub bloga grupy, albo temat"
+#: classes/Notice.php:179
+msgid "Problem saving notice. Too long."
+msgstr "Problem podczas zapisywania wpisu. Za długi."
 
-#: lib/groupeditform.php:151 lib/groupeditform.php:166
-msgid "Description"
-msgstr "Opis"
+#: classes/Notice.php:183
+msgid "Problem saving notice. Unknown user."
+msgstr "Problem podczas zapisywania wpisu. Nieznany użytkownik."
 
-#: lib/groupeditform.php:153 lib/groupeditform.php:168
-msgid "Describe the group or topic in 140 chars"
-msgstr "Opisz grupę lub temat w 140 znakach"
+#: classes/Notice.php:188
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+"Za dużo wpisów w za krótkim czasie, weź głęboki oddech i wyślij ponownie za "
+"kilka minut."
 
-#: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: classes/Notice.php:194
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
 msgstr ""
-"Położenie grupy, jeśli istnieje, np. \"miasto, województwo (lub region), kraj"
-"\""
+"Za dużo takich samych wiadomości w za krótkim czasie, weź głęboki oddech i "
+"wyślij ponownie za kilka minut."
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
-msgid "Group"
-msgstr "Grupa"
+#: classes/Notice.php:202
+msgid "You are banned from posting notices on this site."
+msgstr "Zabroniono Ci wysyłania wpisów na tej stronie."
 
-#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
-msgid "Admin"
-msgstr "Administrator"
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
+msgstr "Problem podczas zapisywania wpisu."
 
-#: lib/groupnav.php:101 lib/groupnav.php:107
+#: classes/Notice.php:1120
 #, php-format
-msgid "Edit %s group properties"
-msgstr "Edytuj właściwości grupy %s"
-
-#: lib/groupnav.php:106 lib/groupnav.php:112
-msgid "Logo"
-msgstr "Logo"
+msgid "DB error inserting reply: %s"
+msgstr "Błąd bazy danych podczas wprowadzania odpowiedzi: %s"
 
-#: lib/groupnav.php:107 lib/groupnav.php:113
+#: classes/User.php:347
 #, php-format
-msgid "Add or edit %s logo"
-msgstr "Dodaj lub edytuj logo grupy %s"
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Witaj w %1$s, @%2$s!"
 
-#: lib/groupsbymemberssection.php:71
-msgid "Groups with most members"
-msgstr "Grupy z największą liczbą członków"
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Profil"
 
-#: lib/groupsbypostssection.php:71
-msgid "Groups with most posts"
-msgstr "Grupy z największą ilością wpisów"
+#: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
+msgstr "Zmień ustawienia profilu"
 
-#: lib/grouptagcloudsection.php:56
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "Znaczniki we wpisach grupy %s"
+#: lib/accountsettingsaction.php:112
+msgid "Upload an avatar"
+msgstr "Wyślij awatar"
 
-#: lib/htmloutputter.php:104
-msgid "This page is not available in a "
-msgstr "Ta strona nie jest dostępna w "
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr "Zmień hasło"
 
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "Dołącz"
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
+msgstr "Zmień obsługę adresu e-mail"
 
-#: lib/leaveform.php:114
-msgid "Leave"
-msgstr "Opuść"
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
+msgstr "Wygląd"
 
-#: lib/logingroupnav.php:76
-msgid "Login with a username and password"
-msgstr "Zaloguj się za pomocą nazwy użytkownika i hasła"
+#: lib/accountsettingsaction.php:124
+msgid "Design your profile"
+msgstr "Wygląd profilu"
 
-#: lib/logingroupnav.php:79
-msgid "Sign up for a new account"
-msgstr "Załóż nowe konto"
+#: lib/accountsettingsaction.php:128
+msgid "Other"
+msgstr "Inne"
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
-msgstr "Zaloguj się lub zarejestruj za pomocą OpenID"
+#: lib/accountsettingsaction.php:128
+msgid "Other options"
+msgstr "Inne opcje"
 
-#: lib/mail.php:175
+#: lib/action.php:144
 #, php-format
-msgid ""
-"Hey, %s.\n"
-"\n"
-msgstr ""
-"Cześć, %s.\n"
-"\n"
+msgid "%s - %s"
+msgstr "%s - %s"
 
-#: lib/mail.php:236
-#, php-format
-msgid "%1$s is now listening to "
-msgstr "%1$s obserwuje teraz "
+#: lib/action.php:159
+msgid "Untitled page"
+msgstr "Strona bez nazwy"
 
-#: lib/mail.php:254 lib/mail.php:253
-#, php-format
-msgid "Location: %s\n"
-msgstr "Położenie: %s\n"
+#: lib/action.php:424
+msgid "Primary site navigation"
+msgstr "Główna nawigacja strony"
 
-#: lib/mail.php:256 lib/mail.php:255
-#, php-format
-msgid "Homepage: %s\n"
-msgstr "Strona domowa: %s\n"
+#: lib/action.php:430
+msgid "Home"
+msgstr "Strona główna"
 
-#: lib/mail.php:258 lib/mail.php:257
-#, php-format
-msgid ""
-"Bio: %s\n"
-"\n"
-msgstr ""
-"O mnie: %s\n"
-"\n"
+#: lib/action.php:430
+msgid "Personal profile and friends timeline"
+msgstr "Profil osobisty i oś czasu przyjaciół"
 
-#: lib/mail.php:461 lib/mail.php:462
-#, php-format
-msgid "You've been nudged by %s"
-msgstr "Zostałeś szturchnięty przez %s"
+#: lib/action.php:432
+msgid "Account"
+msgstr "Konto"
 
-#: lib/mail.php:465
-#, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
-msgstr "%1$s (%2$s) zastanawia się, co zamierzasz "
+#: lib/action.php:432
+msgid "Change your email, avatar, password, profile"
+msgstr "Zmień adres e-mail, awatar, hasło, profil"
 
-#: lib/mail.php:555
-#, php-format
-msgid "%1$s just added your notice from %2$s"
-msgstr "%1$s właśnie dodał Twój wpis z %2$s"
+#: lib/action.php:435
+msgid "Connect"
+msgstr "Połącz"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
-#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
-msgid "From"
-msgstr "Od"
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Nie można przekierować do serwera: %s"
 
-#: lib/messageform.php:110 lib/messageform.php:109
-msgid "Send a direct notice"
-msgstr "Wyślij bezpośredni wpis"
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
+msgstr "Zaproś"
 
-#: lib/noticeform.php:125 lib/noticeform.php:128
-msgid "Send a notice"
-msgstr "Wyślij wpis"
+#: lib/action.php:440 lib/subgroupnav.php:106
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr "Zaproś przyjaciół i kolegów do dołączenia do Ciebie na %s"
 
-#: lib/noticeform.php:152 lib/noticeform.php:149
-msgid "Available characters"
-msgstr "Dostępne znaki"
+#: lib/action.php:445
+msgid "Logout"
+msgstr "Wyloguj się"
 
-#: lib/noticelist.php:426 lib/noticelist.php:429
-msgid "in reply to"
-msgstr "w odpowiedzi na"
+#: lib/action.php:445
+msgid "Logout from the site"
+msgstr "Wyloguj się ze strony"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
-#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
-msgid "Reply to this notice"
-msgstr "Odpowiedz na ten wpis"
+#: lib/action.php:450
+msgid "Create an account"
+msgstr "Utwórz konto"
 
-#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
-msgid "Reply"
-msgstr "Odpowiedz"
+#: lib/action.php:453
+msgid "Login to the site"
+msgstr "Zaloguj się na stronę"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
-#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
-#: lib/noticelist.php:486
-msgid "Delete this notice"
-msgstr "Usuń ten wpis"
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
+msgstr "Pomoc"
 
-#: lib/noticelist.php:474 actions/avatarsettings.php:148
-#: lib/noticelist.php:479 lib/noticelist.php:486
-msgid "Delete"
-msgstr "Usuń"
+#: lib/action.php:456
+msgid "Help me!"
+msgstr "Pomóż mi!"
 
-#: lib/nudgeform.php:116
-msgid "Nudge this user"
-msgstr "Szturchnij tego użytkownika"
+#: lib/action.php:459
+msgid "Search"
+msgstr "Znajdź"
 
-#: lib/nudgeform.php:128
-msgid "Nudge"
-msgstr "Szturchnij"
+#: lib/action.php:459
+msgid "Search for people or text"
+msgstr "Znajdź osoby lub tekst"
 
-#: lib/nudgeform.php:128
-msgid "Send a nudge to this user"
-msgstr "Wyślij szturchnięcie do tego użytkownika"
+#: lib/action.php:480
+msgid "Site notice"
+msgstr "Wpis strony"
 
-#: lib/personaltagcloudsection.php:56
-#, php-format
-msgid "Tags in %s's notices"
-msgstr "Znaczniki we wpisach użytkownika %s"
+#: lib/action.php:546
+msgid "Local views"
+msgstr "Lokalne widoki"
 
-#: lib/profilelist.php:182 lib/profilelist.php:180
-#: lib/subscriptionlist.php:126
-msgid "(none)"
-msgstr "(brak)"
+#: lib/action.php:612
+msgid "Page notice"
+msgstr "Wpis strony"
 
-#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "Publiczny"
+#: lib/action.php:714
+msgid "Secondary site navigation"
+msgstr "Druga nawigacja strony"
 
-#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
-msgid "User groups"
-msgstr "Grupy użytkowników"
+#: lib/action.php:721
+msgid "About"
+msgstr "O usłudze"
 
-#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
-msgid "Recent tags"
-msgstr "Ostatnie znaczniki"
+#: lib/action.php:723
+msgid "FAQ"
+msgstr "FAQ"
 
-#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
-msgid "Featured"
-msgstr "Znane"
+#: lib/action.php:727
+msgid "TOS"
+msgstr "TOS"
 
-#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
-msgid "Popular"
-msgstr "Popularne"
+#: lib/action.php:730
+msgid "Privacy"
+msgstr "Prywatność"
 
-#: lib/searchgroupnav.php:82
-msgid "Notice"
-msgstr "Wpis"
+#: lib/action.php:732
+msgid "Source"
+msgstr "Kod źródłowy"
 
-#: lib/searchgroupnav.php:85
-msgid "Find groups on this site"
-msgstr "Znajdź grupy na tej stronie"
+#: lib/action.php:734
+msgid "Contact"
+msgstr "Kontakt"
 
-#: lib/section.php:89
-msgid "Untitled section"
-msgstr "Sekcja bez nazwy"
+#: lib/action.php:736
+msgid "Badge"
+msgstr "Odznaka"
 
-#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
-#, php-format
-msgid "People %s subscribes to"
-msgstr "Osoby %s zasubskrybowane do"
+#: lib/action.php:764
+msgid "StatusNet software license"
+msgstr "Licencja oprogramowania StatusNet"
 
-#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
+#: lib/action.php:767
 #, php-format
-msgid "People subscribed to %s"
-msgstr "Osoby zasubskrybowane do %s"
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
+msgstr ""
+"**%%site.name%%** jest usługą mikroblogowania prowadzoną przez [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
 
-#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
+#: lib/action.php:769
 #, php-format
-msgid "Groups %s is a member of"
-msgstr "Grupy %s są członkiem"
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** jest usługą mikroblogowania. "
 
-#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:771
 #, php-format
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Zaproś przyjaciół i kolegów do dołączenia do Ciebie na %s"
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+"Działa pod kontrolą oprogramowania do mikroblogowania [StatusNet](http://"
+"status.net/) w wersji %s, dostępnego na [Powszechnej Licencji Publicznej GNU "
+"Affero](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#: lib/subs.php:53 lib/subs.php:52
-msgid "User has blocked you."
-msgstr "Użytkownik zablokował Cię."
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "Licencja oprogramowania StatusNet"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-#: actions/userauthorization.php:178
-msgid "Subscribe to this user"
-msgstr "Zasubskrybuj tego użytkownika"
+#: lib/action.php:794
+msgid "All "
+msgstr "Wszystko "
 
-#: lib/tagcloudsection.php:56
-msgid "None"
-msgstr "Brak"
+#: lib/action.php:799
+msgid "license."
+msgstr "licencja."
 
-#: lib/topposterssection.php:74
-msgid "Top posters"
-msgstr "Najczęściej wysyłający wpisy"
+#: lib/action.php:1052
+msgid "Pagination"
+msgstr "Paginacja"
 
-#: lib/unblockform.php:120 lib/unblockform.php:150
-#: actions/blockedfromgroup.php:313
-msgid "Unblock this user"
-msgstr "Odblokuj tego użytkownika"
+#: lib/action.php:1061
+msgid "After"
+msgstr "Następne"
 
-#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
-msgid "Unblock"
-msgstr "Odblokuj"
+#: lib/action.php:1069
+msgid "Before"
+msgstr "Wcześniej"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
-msgid "Unsubscribe from this user"
-msgstr "Zrezygnuj z subskrypcji tego użytkownika"
+#: lib/action.php:1117
+msgid "There was a problem with your session token."
+msgstr "Wystąpił problem z tokenem sesji."
 
-#: actions/all.php:77 actions/all.php:59
-#, php-format
-msgid "Feed for friends of %s (RSS 1.0)"
-msgstr "Kanał dla znajomych użytkownika %s (RSS 1.0)"
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr "Załączniki"
 
-#: actions/all.php:82 actions/all.php:64
-#, php-format
-msgid "Feed for friends of %s (RSS 2.0)"
-msgstr "Kanał dla znajomych użytkownika %s (RSS 2.0)"
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr "Autor"
 
-#: actions/all.php:87 actions/all.php:69
-#, php-format
-msgid "Feed for friends of %s (Atom)"
-msgstr "Kanał dla znajomych użytkownika %s (Atom)"
+#: lib/attachmentlist.php:278
+msgid "Provider"
+msgstr "Dostawca"
 
-#: actions/all.php:112 actions/all.php:125
-msgid "You and friends"
-msgstr "Ty i przyjaciele"
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr "Powiadamia, kiedy pojawia się ten załącznik"
 
-#: actions/avatarsettings.php:78
-#, php-format
-msgid "You can upload your personal avatar. The maximum file size is %s."
-msgstr "Można wysłać swój osobisty awatar. Maksymalny rozmiar pliku to %s."
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr "Znaczniki dla tego załącznika"
 
-#: actions/avatarsettings.php:373
-msgid "Avatar deleted."
-msgstr "Usunięto awatar."
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
+msgstr "Wyniki polecenia"
 
-#: actions/block.php:129 actions/block.php:136
-msgid ""
-"Are you sure you want to block this user? Afterwards, they will be "
-"unsubscribed from you, unable to subscribe to you in the future, and you "
-"will not be notified of any @-replies from them."
-msgstr ""
-"Jesteś pewny, że chcesz zablokować tego użytkownika. Po tym jego subskrypcja "
-"do Ciebie zostanie usunięta, nie będzie mógł Cię zasubskrybować w "
-"przyszłości i nie będziesz powiadamiany o żadnych odpowiedziach @ od niego."
+#: lib/channel.php:210
+msgid "Command complete"
+msgstr "Zakończono polecenie"
 
-#: actions/deletenotice.php:73
-msgid ""
-"You are about to permanently delete a notice. Once this is done, it cannot "
-"be undone."
-msgstr ""
-"Za chwilę wpis zostanie trwale usunięty. Kiedy to się stanie, to już się nie "
-"odstanie."
+#: lib/channel.php:221
+msgid "Command failed"
+msgstr "Polecenie nie powiodło się"
 
-#: actions/deletenotice.php:127
-msgid "There was a problem with your session token.  Try again, please."
-msgstr "Wystąpił problem z tokenem sesji. Spróbuj ponownie."
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr "Przepraszamy, te polecenie nie zostało jeszcze zaimplementowane."
 
-#: actions/emailsettings.php:168
-msgid "Send me email when someone sends me an \"@-reply\"."
-msgstr "Wyślij mi wiadomość e-mail, kiedy ktoś wyśle mi odpowiedź \"@\"."
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Nie można zaktualizować użytkownika z potwierdzonym adresem e-mail."
 
-#: actions/facebookhome.php:193 actions/facebookhome.php:187
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
-"Jeśli chcesz, aby aplikacja %s automatycznie aktualizowała status na "
-"Facebook najnowszym wpisem, musisz dać jej pozwolenie."
 
-#: actions/facebookhome.php:217 actions/facebookhome.php:211
-#, php-format
-msgid "Okay, do it!"
-msgstr "OK, zrób to!"
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "Wysłano szturchnięcie"
 
-#: actions/facebooksettings.php:124
+#: lib/command.php:126
 #, php-format
 msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
 msgstr ""
-"Jeśli chcesz, aby %s automatycznie aktualizowało status na Facebook "
-"najnowszym wpisem, musisz dać mu pozwolenie."
-
-#: actions/grouplogo.php:155
-#, php-format
-msgid ""
-"You can upload a logo image for your group. The maximum file size is %s."
-msgstr "Można wysłać obraz logo grupy. Maksymalny rozmiar pliku to %s."
-
-#: actions/grouplogo.php:367
-msgid "Pick a square area of the image to be the logo."
-msgstr "Wybierz kwadratowy obszar obrazu, który będzie logo."
-
-#: actions/grouprss.php:136 actions/grouprss.php:137
-#, php-format
-msgid "Microblog by %s group"
-msgstr "Mikroblog grupy %s"
+"Subskrypcje: %1$s\n"
+"Subskrybenci: %2$s\n"
+"Wpisy: %3$s"
 
-#: actions/groupsearch.php:57 actions/groupsearch.php:52
-#, php-format
-msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-"Separate the terms by spaces; they must be 3 characters or more."
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
 msgstr ""
-"Znajdź grupy na %%site.name%% według ich nazwy, położenia lub opisu. Oddziel "
-"terminy spacjami; muszą mieć trzy znaki lub więcej."
 
-#: actions/groups.php:90
-#, php-format
-msgid ""
-"%%%%site.name%%%% groups let you find and talk with people of similar "
-"interests. After you join a group you can send messages to all other members "
-"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
-msgstr ""
-"Grupy %%%%site.name%%%% umożliwiają znalezienie i rozmawianie z osobami o "
-"podobnych zainteresowaniach. Po dołączeniu do grupy można wysyłać wiadomości "
-"do wszystkich członków używając składni \"!nazwagrupy\". Nie widzisz grupy, "
-"która Cię interesuje? Spróbuj ją [znaleźć](%%%%action.groupsearch%%%%) lub "
-"[założyć własną!](%%%%action.newgroup%%%%)"
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
+msgstr "Użytkownik nie posiada ostatniego wpisu"
 
-#: actions/newmessage.php:102
-msgid "Only logged-in users can send direct messages."
-msgstr "Tylko zalogowani użytkownicy mogą wysyłać bezpośrednie wiadomości."
+#: lib/command.php:190
+msgid "Notice marked as fave."
+msgstr "Zaznaczono wpis jako ulubiony."
 
-#: actions/noticesearch.php:91
+#: lib/command.php:315
 #, php-format
-msgid "Search results for \"%s\" on %s"
-msgstr "Wyniki wyszukiwania dla \"%s\" na %s"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
 
-#: actions/openidlogin.php:66
+#: lib/command.php:318
 #, php-format
-msgid ""
-"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
-"before changing your settings."
-msgstr ""
-"Z powodów bezpieczeństwa przed zmienianiem ustawień zaloguj się ponownie za "
-"pomocą identyfikatora [OpenID](%%doc.openid%%)."
-
-#: actions/public.php:125 actions/public.php:133
-msgid "Public Stream Feed (RSS 1.0)"
-msgstr "Kanał publicznego strumienia (RSS 1.0)"
-
-#: actions/public.php:130 actions/public.php:138
-msgid "Public Stream Feed (RSS 2.0)"
-msgstr "Kanał publicznego strumienia (RSS 2.0)"
+msgid "Fullname: %s"
+msgstr "Imię i nazwisko: %s"
 
-#: actions/public.php:135 actions/public.php:143
-msgid "Public Stream Feed (Atom)"
-msgstr "Kanał publicznego strumienia (Atom)"
+#: lib/command.php:321
+#, php-format
+msgid "Location: %s"
+msgstr "Położenie: %s"
 
-#: actions/public.php:210 actions/public.php:241
+#: lib/command.php:324
 #, php-format
-msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service based on the Free Software [StatusNet](http://status.net/) "
-"tool. [Join now](%%action.register%%) to share notices about yourself with "
-"friends, family, and colleagues! ([Read more](%%doc.help%%))"
-msgstr ""
-"To jest %%site.name%%, usługa [mikroblogowania](http://pl.wikipedia.org/wiki/"
-"Mikroblog) oparta na wolnym narzędziu [StatusNet](http://status.net/). "
-"[Dołącz teraz](%%action.register%%), aby dzielić się wpisami o sobie z "
-"przyjaciółmi, rodziną i kolegami! ([Przeczytaj więcej](%%doc.help%%))"
+msgid "Homepage: %s"
+msgstr "Strona domowa: %s"
 
-#: actions/register.php:286 actions/register.php:329
+#: lib/command.php:327
 #, php-format
-msgid ""
-"With this form you can create  a new account. You can then post notices and "
-"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
-"Try our [OpenID registration](%%action.openidlogin%%)!)"
-msgstr ""
-"Za pomocą tego formularza można utworzyć nowe konto. Można wtedy wysyłać "
-"wpisy i połączyć się z przyjaciółmi i kolegami. (Posiadasz identyfikator "
-"[OpenID](http://openid.net/)? Wypróbuj [rejestracji OpenID](%%action."
-"openidlogin%%)!)"
+msgid "About: %s"
+msgstr "O mnie: %s"
 
-#: actions/register.php:432 actions/register.php:479
-msgid "Creative Commons Attribution 3.0"
-msgstr "Creative Commons Uznanie Autorstwa 3.0"
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr "Wiadomość jest za długa - maksymalnie 140 znaków, wysłano %d"
 
-#: actions/register.php:433 actions/register.php:480
-msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
-msgstr ""
-" poza tymi prywatnymi danymi: hasło, adres e-mail, adres komunikatora i "
-"numer telefonu."
+#: lib/command.php:377
+msgid "Error sending direct message."
+msgstr "Błąd podczas wysyłania bezpośredniej wiadomości."
 
-#: actions/showgroup.php:378 actions/showgroup.php:424
-msgid "Created"
-msgstr "Utworzono"
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "Wiadomość jest za długa - maksymalnie 140 znaków, wysłano %d"
 
-#: actions/showgroup.php:393 actions/showgroup.php:440
-#, php-format
-msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. [Join now](%%%%action.register%%%%) to become part "
-"of this group and many more! ([Read more](%%%%doc.help%%%%))"
-msgstr ""
-"**%s** jest grupą użytkowników na %%%%site.name%%%%, usłudze "
-"[mikroblogowania](http://pl.wikipedia.org/wiki/Mikroblog) opartej na wolnym "
-"narzędziu [StatusNet](http://status.net/). Jej członkowie dzielą się "
-"krótkimi wiadomościami o swoim życiu i zainteresowaniach. [Dołącz teraz](%%%%"
-"action.register%%%%), aby stać się częścią tej grupy i wiele więcej! "
-"([Przeczytaj więcej](%%%%doc.help%%%%))"
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Odpowiedz na ten wpis"
 
-#: actions/showstream.php:147
-msgid "Your profile"
-msgstr "Twój profil"
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Problem podczas zapisywania wpisu."
 
-#: actions/showstream.php:149
-#, php-format
-msgid "%s's profile"
-msgstr "Profil użytkownika %s"
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
+msgstr "Podaj nazwę użytkownika do zasubskrybowania"
 
-#: actions/showstream.php:163 actions/showstream.php:128
+#: lib/command.php:502
 #, php-format
-msgid "Notice feed for %s (RSS 1.0)"
-msgstr "Kanał wpisów dla %s (RSS 1.0)"
+msgid "Subscribed to %s"
+msgstr "Zasubskrybowano użytkownika %s"
 
-#: actions/showstream.php:170 actions/showstream.php:135
-#, php-format
-msgid "Notice feed for %s (RSS 2.0)"
-msgstr "Kanał wpisów dla %s (RSS 2.0)"
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
+msgstr "Podaj nazwę użytkownika do usunięcia subskrypcji"
 
-#: actions/showstream.php:177 actions/showstream.php:142
+#: lib/command.php:530
 #, php-format
-msgid "Notice feed for %s (Atom)"
-msgstr "Kanał wpisów dla %s (Atom)"
+msgid "Unsubscribed from %s"
+msgstr "Usunięto subskrypcję użytkownika %s"
 
-#: actions/showstream.php:182 actions/showstream.php:147
-#, php-format
-msgid "FOAF for %s"
-msgstr "FOAF dla %s"
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
+msgstr "Nie zaimplementowano polecenia."
 
-#: actions/showstream.php:237 actions/showstream.php:202
-msgid "Edit Avatar"
-msgstr "Edytuj awatar"
+#: lib/command.php:551
+msgid "Notification off."
+msgstr "Wyłączono powiadomienia."
 
-#: actions/showstream.php:316 actions/showstream.php:281
-msgid "Edit profile settings"
-msgstr "Edytuj ustawienia profilu"
+#: lib/command.php:553
+msgid "Can't turn off notification."
+msgstr "Nie można wyłączyć powiadomień."
 
-#: actions/showstream.php:317 actions/showstream.php:282
-msgid "Edit"
-msgstr "Edytuj"
+#: lib/command.php:574
+msgid "Notification on."
+msgstr "Włączono powiadomienia."
 
-#: actions/showstream.php:542 actions/showstream.php:388
-#, php-format
-msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
-"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
-msgstr ""
-"**%s** posiada konto na %%%%site.name%%%%, usłudze [mikroblogowania](http://"
-"pl.wikipedia.org/wiki/Mikroblog) opartej na wolnym narzędziu [StatusNet]"
-"(http://status.net/). [Dołącz teraz](%%%%action.register%%%%), aby "
-"obserwować wpisy użytkownika **%s** i wiele więcej! ([Przeczytaj więcej](%%%%"
-"doc.help%%%%))"
+#: lib/command.php:576
+msgid "Can't turn on notification."
+msgstr "Nie można włączyć powiadomień."
 
-#: actions/smssettings.php:335
-msgid ""
-"A confirmation code was sent to the phone number you added. Check your phone "
-"for the code and instructions on how to use it."
-msgstr ""
-"Kod potwierdzający został wysłany na dodany numer telefonu. Sprawdź telefon, "
-"czy otrzymałeś kod i instrukcje jak go użyć."
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Nie można utworzyć formularza OpenID: %s"
 
-#: actions/twitapifavorites.php:171 lib/mail.php:556
-#: actions/twitapifavorites.php:222
+#: lib/command.php:602
 #, php-format
-msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
-"In case you forgot, you can see the text of your notice here:\n"
-"\n"
-"%3$s\n"
-"\n"
-"You can see the list of %1$s's favorites here:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Faithfully yours,\n"
-"%5$s\n"
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
-"%1$s właśnie dodał Twój wpis z %2$s jako jeden ze swoich ulubionych.\n"
-"\n"
-"Jeśli go zapomniałeś, tutaj możesz zobaczyć tekst wpisu:\n"
-"\n"
-"%3$s\n"
-"\n"
-"Tutaj możesz zobaczyć listę ulubionych wpisów użytkownika %1$s:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Z poważaniem,\n"
-"%5$s\n"
-
-#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
-#: actions/twitapistatuses.php:314
-msgid "No such user!"
-msgstr "Nie ma takiego użytkownika!"
-
-#: actions/twittersettings.php:72
-msgid ""
-"Add your Twitter account to automatically send  your notices to Twitter, and "
-"subscribe to Twitter friends already here."
-msgstr ""
-"Dodaj konto Twittera, aby automatycznie wysyłać wpisy do Twittera i "
-"zasubskrybować przyjaciół z Twittera, którzy już tu są."
 
-#: actions/twittersettings.php:345 actions/twittersettings.php:362
-#, php-format
-msgid "Unable to retrieve account information For \"%s\" from Twitter."
-msgstr "Nie można pobrać informacji o koncie dla \"%s\" z Twittera."
-
-#: actions/userauthorization.php:86 actions/userauthorization.php:81
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user's notices. If you didn't just ask to subscribe to someone's notices, "
-"click \"Reject\"."
-msgstr ""
-"Sprawdź te szczegóły, aby upewnić się, czy na pewno chcesz zasubskrybować "
-"wpisy tego użytkownika. Jeżeli nie prosiłeś o subskrypcję czyichś wpisów, "
-"naciśnij \"Odrzuć\"."
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Nie jesteś zasubskrybowany do tego profilu."
 
-#: actions/usergroups.php:131 actions/usergroups.php:130
-msgid "Search for more groups"
-msgstr "Znajdź więcej grup"
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Nie jesteś zasubskrybowany do tego profilu."
 
-#: classes/Notice.php:138 classes/Notice.php:154
-msgid ""
-"Too many duplicate messages too quickly; take a breather and post again in a "
-"few minutes."
-msgstr ""
-"Za dużo takich samych wiadomości w za krótkim czasie, weź głęboki oddech i "
-"wyślij ponownie za kilka minut."
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Nie można zasubskrybować innych do Ciebie."
 
-#: lib/action.php:406 lib/action.php:425
-msgid "Connect to SMS, Twitter"
-msgstr "Połącz z SMS, Twitterem"
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Osoby zasubskrybowane do %s"
 
-#: lib/action.php:671 lib/action.php:721
-msgid "Badge"
-msgstr "Odznaka"
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Nie jesteś członkiem tej grupy."
 
-#: lib/command.php:113 lib/command.php:106
-#, php-format
-msgid ""
-"Subscriptions: %1$s\n"
-"Subscribers: %2$s\n"
-"Notices: %3$s"
-msgstr ""
-"Subskrypcje: %1$s\n"
-"Subskrybenci: %2$s\n"
-"Wpisy: %3$s"
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "Nie jesteś członkiem tej grupy."
 
-#: lib/command.php:392 lib/command.php:385
+#: lib/command.php:670
+#, fuzzy
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
 "whois <nickname> - get profile info on user\n"
 "fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
 "stats - get your stats\n"
 "stop - same as 'off'\n"
 "quit - same as 'off'\n"
@@ -5673,7 +3908,7 @@ msgid ""
 "last <nickname> - same as 'get'\n"
 "on <nickname> - not yet implemented.\n"
 "off <nickname> - not yet implemented.\n"
-"nudge <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
 "invite <phone number> - not yet implemented.\n"
 "track <word> - not yet implemented.\n"
 "untrack <word> - not yet implemented.\n"
@@ -5709,18 +3944,132 @@ msgstr ""
 "tracks - jeszcze nie zaimplementowano.\n"
 "tracking - jeszcze nie zaimplementowano.\n"
 
+#: lib/common.php:192
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Brak kodu potwierdzającego."
+
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:195
+#, fuzzy
+msgid "Go to the installer."
+msgstr "Zaloguj się na stronę"
+
+#: lib/connectsettingsaction.php:110
+msgid "IM"
+msgstr "Komunikator"
+
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Aktualizacje przez komunikator"
+
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
+msgstr "Aktualizacje przez wiadomości SMS"
+
 #: lib/dberroraction.php:60
 msgid "Database error"
 msgstr "Błąd bazy danych"
 
-#: lib/facebookaction.php:271 lib/facebookaction.php:273
-#, php-format
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr "Zmień obraz tłas"
+
+#: lib/designsettings.php:105
+msgid "Upload file"
+msgstr "Wyślij plik"
+
+#: lib/designsettings.php:109
 msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet? "
-msgstr ""
-"Aby użyć aplikacji Facebook %s, musisz się zalogować za pomocą nazwy "
-"użytkownika i hasła. Nie masz jeszcze nazwy użytkownika? "
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr "Można wysłać swój osobisty obraz. Maksymalny rozmiar pliku to 2 MB."
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr "Włączone"
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr "Wyłączone"
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr "Włącz lub wyłącz obraz tła."
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr "Kafelkowy obraz tła"
+
+#: lib/designsettings.php:170
+msgid "Change colours"
+msgstr "Zmień kolory"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr "Tło"
+
+#: lib/designsettings.php:191
+msgid "Content"
+msgstr "Zawartość"
+
+#: lib/designsettings.php:204
+msgid "Sidebar"
+msgstr "Panel boczny"
+
+#: lib/designsettings.php:217
+msgid "Text"
+msgstr "Tekst"
+
+#: lib/designsettings.php:230
+msgid "Links"
+msgstr "Odnośniki"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr "Użyj domyślnych"
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr "Przywróć domyślny wygląd"
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr "Przywróć domyślne ustawienia"
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr "Zapisz wygląd"
+
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
+msgstr "Błędne domyślne ustawienia koloru: "
+
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
+msgstr "Przywrócono domyślny wygląd."
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
+msgstr "Usuń ten wpis z ulubionych"
+
+#: lib/favorform.php:114 lib/favorform.php:140
+msgid "Favor this notice"
+msgstr "Dodaj ten wpis do ulubionych"
+
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr "Dodaj do ulubionych"
+
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr "Wyeksportuj dane"
 
 #: lib/feed.php:85
 msgid "RSS 1.0"
@@ -5738,12 +4087,185 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
-#: lib/imagefile.php:75
+#: lib/galleryaction.php:121
+msgid "Filter tags"
+msgstr "Filtruj znaczniki"
+
+#: lib/galleryaction.php:131
+msgid "All"
+msgstr "Wszystko"
+
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Wybierz operatora"
+
+#: lib/galleryaction.php:140
+msgid "Tag"
+msgstr "Znacznik"
+
+#: lib/galleryaction.php:141
+msgid "Choose a tag to narrow list"
+msgstr "Wybierz znacznik do ograniczonej listy"
+
+#: lib/galleryaction.php:143
+msgid "Go"
+msgstr "Przejdź"
+
+#: lib/groupeditform.php:163
+msgid "URL of the homepage or blog of the group or topic"
+msgstr "Adres URL strony domowej lub bloga grupy, albo temat"
+
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Opisz grupę lub temat w 140 znakach"
+
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "Opisz grupę lub temat w 140 znakach"
+
+#: lib/groupeditform.php:172
+msgid "Description"
+msgstr "Opis"
+
+#: lib/groupeditform.php:179
+msgid ""
+"Location for the group, if any, like \"City, State (or Region), Country\""
+msgstr ""
+"Położenie grupy, jeśli istnieje, np. \"miasto, województwo (lub region), kraj"
+"\""
+
+#: lib/groupeditform.php:187
 #, php-format
-msgid "That file is too big. The maximum file size is %d."
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+"Dodatkowe pseudonimy grupy, oddzielone przecinkami lub spacjami, maksymalnie "
+"%d"
+
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+msgid "Group"
+msgstr "Grupa"
+
+#: lib/groupnav.php:101
+msgid "Blocked"
+msgstr "Zablokowano"
+
+#: lib/groupnav.php:102
+#, php-format
+msgid "%s blocked users"
+msgstr "%s zablokowani użytkownicy"
+
+#: lib/groupnav.php:108
+#, php-format
+msgid "Edit %s group properties"
+msgstr "Edytuj właściwości grupy %s"
+
+#: lib/groupnav.php:113
+msgid "Logo"
+msgstr "Logo"
+
+#: lib/groupnav.php:114
+#, php-format
+msgid "Add or edit %s logo"
+msgstr "Dodaj lub edytuj logo grupy %s"
+
+#: lib/groupnav.php:120
+#, php-format
+msgid "Add or edit %s design"
+msgstr "Dodaj lub edytuj wygląd %s"
+
+#: lib/groupsbymemberssection.php:71
+msgid "Groups with most members"
+msgstr "Grupy z największą liczbą członków"
+
+#: lib/groupsbypostssection.php:71
+msgid "Groups with most posts"
+msgstr "Grupy z największą ilością wpisów"
+
+#: lib/grouptagcloudsection.php:56
+#, php-format
+msgid "Tags in %s group's notices"
+msgstr "Znaczniki we wpisach grupy %s"
+
+#: lib/htmloutputter.php:104
+msgid "This page is not available in a media type you accept"
+msgstr "Ta strona jest niedostępna dla akceptowanego typu medium"
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
 msgstr "Ten plik jest za duży. Maksymalny rozmiar pliku to %d."
 
-#: lib/mail.php:175 lib/mail.php:174
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr "Częściowo wysłano."
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr "Błąd systemu podczas wysyłania pliku."
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr "To nie jest obraz lub lub plik jest uszkodzony."
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr "Nieobsługiwany format pliku obrazu."
+
+#: lib/imagefile.php:118
+msgid "Lost our file."
+msgstr "Utracono plik."
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr "Nieznany typ pliku"
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr ""
+
+#: lib/joinform.php:114
+msgid "Join"
+msgstr "Dołącz"
+
+#: lib/leaveform.php:114
+msgid "Leave"
+msgstr "Opuść"
+
+#: lib/logingroupnav.php:80
+msgid "Login with a username and password"
+msgstr "Zaloguj się za pomocą nazwy użytkownika i hasła"
+
+#: lib/logingroupnav.php:86
+msgid "Sign up for a new account"
+msgstr "Załóż nowe konto"
+
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "Tylko użytkownik może czytać swoje skrzynki pocztowe."
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+"Brak prywatnych wiadomości. Można wysłać prywatną wiadomość, aby nawiązać "
+"rozmowę z innymi użytkownikami. Inni mogą wysyłać Ci wiadomości tylko dla "
+"Twoich oczu."
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr " z "
+
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "Potwierdzenie adresu e-mail"
+
+#: lib/mail.php:174
 #, php-format
 msgid ""
 "Hey, %s.\n"
@@ -5773,7 +4295,12 @@ msgstr ""
 "Dziękujemy za Twój czas, \n"
 "%s\n"
 
-#: lib/mail.php:241 lib/mail.php:240
+#: lib/mail.php:235
+#, php-format
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr "Użytkownik %1$s obserwuje teraz Twoje wpisy na %2$s."
+
+#: lib/mail.php:240
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -5798,6 +4325,65 @@ msgstr ""
 "----\n"
 "Zmień adres e-mail lub opcje powiadamiania na %8$s\n"
 
+#: lib/mail.php:253
+#, php-format
+msgid "Location: %s\n"
+msgstr "Położenie: %s\n"
+
+#: lib/mail.php:255
+#, php-format
+msgid "Homepage: %s\n"
+msgstr "Strona domowa: %s\n"
+
+#: lib/mail.php:257
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
+msgstr ""
+"O mnie: %s\n"
+"\n"
+
+#: lib/mail.php:285
+#, php-format
+msgid "New email address for posting to %s"
+msgstr "Nowy adres e-mail do wysyłania do %s"
+
+#: lib/mail.php:288
+#, 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 ""
+"Posiadasz nowy adres wysyłania na %1$s.\n"
+"\n"
+"Wyślij wiadomość e-mail na %2$s, aby wysłać nowe wpisy.\n"
+"\n"
+"Więcej instrukcji dotyczących poczty e-mail można znaleźć na %3$s.\n"
+"\n"
+"Z poważaniem,\n"
+"%4$s"
+
+#: lib/mail.php:412
+#, php-format
+msgid "%s status"
+msgstr "Status użytkownika %s"
+
+#: lib/mail.php:438
+msgid "SMS confirmation"
+msgstr "Potwierdzenie SMS"
+
+#: lib/mail.php:462
+#, php-format
+msgid "You've been nudged by %s"
+msgstr "Zostałeś szturchnięty przez %s"
+
 #: lib/mail.php:466
 #, php-format
 msgid ""
@@ -5825,6 +4411,11 @@ msgstr ""
 "Z poważaniem,\n"
 "%4$s\n"
 
+#: lib/mail.php:509
+#, php-format
+msgid "New private message from %s"
+msgstr "Nowa prywatna wiadomość od użytkownika %s"
+
 #: lib/mail.php:513
 #, php-format
 msgid ""
@@ -5858,1100 +4449,454 @@ msgstr ""
 "Z poważaniem,\n"
 "%5$s\n"
 
-#: lib/mail.php:598 lib/mail.php:600
-#, php-format
-msgid "%s sent a notice to your attention"
-msgstr "Użytkownik %s wysłał wpis wymagający Twojej uwagi"
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "Użytkownik %s dodał Twój wpis jako ulubiony"
 
-#: lib/mail.php:600 lib/mail.php:602
-#, php-format
+#: lib/mail.php:556
+#, fuzzy, php-format
 msgid ""
-"%1$s just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
 "\n"
-"The notice is here:\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"It reads:\n"
+"The URL of your notice is:\n"
 "\n"
-"\t%4$s\n"
+"%3$s\n"
 "\n"
-"You can reply back here:\n"
+"The text of your notice is:\n"
 "\n"
-"\t%5$s\n"
+"%4$s\n"
 "\n"
-"The list of all @-replies for you here:\n"
+"You can see the list of %1$s's favorites here:\n"
 "\n"
-"%6$s\n"
+"%5$s\n"
 "\n"
 "Faithfully yours,\n"
-"%2$s\n"
-"\n"
-"P.S. You can turn off these email notifications here: %7$s\n"
+"%6$s\n"
 msgstr ""
-"Użytkownik %1$s właśnie wysłał wpis wymagający Twojej uwagi (odpowiedź \"@"
-"\") na %2$s.\n"
-"\n"
-"Twój wpis znajduje się tutaj:\n"
-"\n"
-"\t%3$s\n"
+"%1$s właśnie dodał Twój wpis z %2$s jako jeden ze swoich ulubionych.\n"
 "\n"
-"Zawiera tekst:\n"
+"Adres URL Twojego wpisu:\n"
 "\n"
-"\t%4$s\n"
+"%3$s\n"
 "\n"
-"Tutaj możesz odpowiedzieć:\n"
+"Tekst Twojego wpisu:\n"
 "\n"
-"\t%5$s\n"
+"%4$s\n"
 "\n"
-"Lista wszystkich odpowiedzi \"@\" do Ciebie znajduje się tutaj:\n"
+"Tutaj możesz zobaczyć listę ulubionych wpisów użytkownika %1$s:\n"
 "\n"
-"%6$s\n"
+"%5$s\n"
 "\n"
 "Z poważaniem,\n"
-"%2$s\n"
-"\n"
-"PS Tutaj możesz wyłączyć te powiadomienia przez e-mail: %7$s\n"
-
-#: lib/searchaction.php:122 lib/searchaction.php:120
-msgid "Search site"
-msgstr "Znajdź stronę"
-
-#: lib/section.php:106
-msgid "More..."
-msgstr "Więcej..."
-
-#: actions/all.php:80
-#, php-format
-msgid ""
-"This is the timeline for %s and friends but no one has posted anything yet."
-msgstr ""
-"To jest oś czasu użytkownika %s i przyjaciół, ale nikt jeszcze nic nie "
-"wysłał."
-
-#: actions/all.php:85
-#, php-format
-msgid ""
-"Try subscribing to more people, [join a group](%%action.groups%%) or post "
-"something yourself."
-msgstr ""
-"Spróbuj zasubskrybować więcej osób, [dołączyć do grupy](%%action.groups%%) "
-"lub wysłać coś samemu."
-
-#: actions/all.php:87
-#, php-format
-msgid ""
-"You can try to [nudge %s](../%s) from his profile or [post something to his "
-"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
-msgstr ""
-"Możesz spróbować [szturchnąć użytkownika %s](../%s) z jego profilu lub "
-"[wysłać coś wymagającego jego uwagi](%%%%action.newnotice%%%%?"
-"status_textarea=%s)."
-
-#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
-#, php-format
-msgid ""
-"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
-"post a notice to his or her attention."
-msgstr ""
-"Dlaczego nie [zarejestrujesz konta](%%%%action.register%%%%) i wtedy "
-"szturchniesz użytkownika %s lub wyślesz wpis wymagającego jego uwagi."
-
-#: actions/attachment.php:73
-msgid "No such attachment."
-msgstr "Nie ma takiego załącznika."
-
-#: actions/block.php:149
-msgid "Do not block this user from this group"
-msgstr "Nie blokuj tego użytkownika w tej grupie"
-
-#: actions/block.php:150
-msgid "Block this user from this group"
-msgstr "Zablokuj tego użytkownika w tej grupie"
-
-#: actions/blockedfromgroup.php:90
-#, php-format
-msgid "%s blocked profiles"
-msgstr "%s zablokowane profile"
-
-#: actions/blockedfromgroup.php:93
-#, php-format
-msgid "%s blocked profiles, page %d"
-msgstr "%s zablokowane profile, strona %d"
-
-#: actions/blockedfromgroup.php:108
-msgid "A list of the users blocked from joining this group."
-msgstr "Lista użytkowników zablokowanych w tej grupie."
-
-#: actions/blockedfromgroup.php:281
-msgid "Unblock user from group"
-msgstr "Odblokuj użytkownika w tej grupie"
-
-#: actions/conversation.php:99
-msgid "Conversation"
-msgstr "Rozmowa"
-
-#: actions/deletenotice.php:115
-msgid "Do not delete this notice"
-msgstr "Nie usuwaj tego wpisu"
-
-#: actions/editgroup.php:214 actions/newgroup.php:164
-#, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "Za dużo aliasów! Maksymalnie %d."
-
-#: actions/editgroup.php:223 actions/newgroup.php:173
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Nieprawidłowy alias: \"%s\""
-
-#: actions/editgroup.php:227 actions/newgroup.php:177
-#, php-format
-msgid "Alias \"%s\" already in use. Try another one."
-msgstr "Alias \"%s\" jest już używany. Spróbuj innego."
-
-#: actions/editgroup.php:233 actions/newgroup.php:183
-msgid "Alias can't be the same as nickname."
-msgstr "Alias nie może być taki sam jak pseudonim."
-
-#: actions/editgroup.php:259 actions/newgroup.php:215
-msgid "Could not create aliases."
-msgstr "Nie można utworzyć aliasów."
-
-#: actions/favorited.php:150
-msgid "Favorite notices appear on this page but no one has favorited one yet."
-msgstr ""
-"Ulubione wpisy są widoczne na tej stronie, ale nikt nie oznaczył jeszcze "
-"żadnego jako ulubiony."
-
-#: actions/favorited.php:153
-msgid ""
-"Be the first to add a notice to your favorites by clicking the fave button "
-"next to any notice you like."
-msgstr ""
-"Bądź pierwszym, który doda wpis do ulubionych naciskając przycisk ulubionego "
-"obok wpisu, który Ci się podoba."
-
-#: actions/favorited.php:156
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to add a "
-"notice to your favorites!"
-msgstr ""
-"Dlaczego nie [zarejestrujesz konta](%%action.register%%) i zostaniesz "
-"pierwszym, który doda wpis do ulubionych!"
-
-#: actions/file.php:34
-msgid "No notice id"
-msgstr "Brak identyfikatora wpisu"
-
-#: actions/file.php:38
-msgid "No notice"
-msgstr "Brak wpisu"
-
-#: actions/file.php:42
-msgid "No attachments"
-msgstr "Brak załączników"
-
-#: actions/file.php:51
-msgid "No uploaded attachments"
-msgstr "Nie wysłano załączników"
-
-#: actions/finishopenidlogin.php:211
-msgid "Not a valid invitation code."
-msgstr "To nie jest prawidłowy kod zaproszenia."
-
-#: actions/groupblock.php:81 actions/groupunblock.php:81
-#: actions/makeadmin.php:81
-msgid "No group specified."
-msgstr "Nie podano grupy."
-
-#: actions/groupblock.php:91
-msgid "Only an admin can block group members."
-msgstr "Tylko administrator może blokować członków grupy."
-
-#: actions/groupblock.php:95
-msgid "User is already blocked from group."
-msgstr "Użytkownik został już zablokował w grupie."
-
-#: actions/groupblock.php:100
-msgid "User is not a member of group."
-msgstr "Użytkownik nie jest członkiem grupy."
-
-#: actions/groupblock.php:136 actions/groupmembers.php:311
-msgid "Block user from group"
-msgstr "Zablokuj użytkownika w grupie"
-
-#: actions/groupblock.php:155
-#, php-format
-msgid ""
-"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
-"be removed from the group, unable to post, and unable to subscribe to the "
-"group in the future."
-msgstr ""
-"Jesteś pewny, że chcesz zablokować użytkownika \"%s\" w grupie \"%s\"? "
-"Zostanie usunięty z grupy, nie będzie mógł wysyłać wpisów i zasubskrybować "
-"grupy w przyszłości."
-
-#: actions/groupblock.php:193
-msgid "Database error blocking user from group."
-msgstr "Błąd bazy danych podczas blokowania użytkownika w grupie."
-
-#: actions/groupdesignsettings.php:73
-msgid "You must be logged in to edit a group."
-msgstr "Musisz być zalogowany, aby zmodyfikować grupę."
-
-#: actions/groupdesignsettings.php:146
-msgid "Group design"
-msgstr "Wygląd grupy"
-
-#: actions/groupdesignsettings.php:157
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr "Dostosuj wygląd grupy za pomocą wybranego obrazu tła i palety kolorów."
-
-#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
-#: lib/designsettings.php:440 lib/designsettings.php:470
-msgid "Couldn't update your design."
-msgstr "Nie można zaktualizować wyglądu."
-
-#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
-msgid "Unable to save your design settings!"
-msgstr "Nie można zapisać ustawień wyglądu!"
-
-#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
-msgid "Design preferences saved."
-msgstr "Zapisano preferencje wyglądu."
-
-#: actions/groupmembers.php:438
-msgid "Make user an admin of the group"
-msgstr "Uczyń użytkownika administratorem grupy"
-
-#: actions/groupmembers.php:470
-msgid "Make Admin"
-msgstr "Uczyń administratorem"
-
-#: actions/groupmembers.php:470
-msgid "Make this user an admin"
-msgstr "Uczyń tego użytkownika administratorem"
-
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
-msgid "No results."
-msgstr "Brak wyników."
-
-#: actions/groupsearch.php:82
-#, php-format
-msgid ""
-"If you can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
-msgstr ""
-"Jeśli nie możesz znaleźć grupy, której szukasz, możesz sam [ją utworzyć](%%"
-"action.newgroup%%)."
-
-#: actions/groupsearch.php:85
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and [create the group](%%"
-"action.newgroup%%) yourself!"
-msgstr ""
-"Dlaczego nie [zarejestrujesz konta](%%action.register%%) i sam [utworzysz "
-"grupę](%%action.newgroup%%)!"
-
-#: actions/groupunblock.php:91
-msgid "Only an admin can unblock group members."
-msgstr "Tylko administrator może odblokowywać członków grupy."
-
-#: actions/groupunblock.php:95
-msgid "User is not blocked from group."
-msgstr "Użytkownik nie został zablokowany w grupie."
-
-#: actions/invite.php:39
-msgid "Invites have been disabled."
-msgstr "Zaproszenia zostały wyłączone."
-
-#: actions/joingroup.php:100
-msgid "You have been blocked from that group by the admin."
-msgstr "Zostałeś zablokowany w tej grupie przez administratora."
-
-#: actions/makeadmin.php:91
-msgid "Only an admin can make another user an admin."
-msgstr "Tylko administrator może uczynić innego użytkownika administratorem."
-
-#: actions/makeadmin.php:95
-#, php-format
-msgid "%s is already an admin for group \"%s\"."
-msgstr "Użytkownika %s jest już administratorem grupy \"%s\"."
-
-#: actions/makeadmin.php:132
-#, php-format
-msgid "Can't get membership record for %s in group %s"
-msgstr "Nie można uzyskać wpisu członkostwa użytkownika %s w grupie %s"
-
-#: actions/makeadmin.php:145
-#, php-format
-msgid "Can't make %s an admin for group %s"
-msgstr "Nie można uczynić %s administratorem grupy %s"
+"%6$s\n"
 
-#: actions/newmessage.php:178
-msgid "Message sent"
-msgstr "Wysłano wiadomość"
+#: lib/mail.php:611
+#, fuzzy, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr "Użytkownik %s wysłał wpis wymagający Twojej uwagi"
 
-#: actions/newnotice.php:93 lib/designsettings.php:281
+#: lib/mail.php:613
 #, php-format
 msgid ""
-"The server was unable to handle that much POST data (%s bytes) due to its "
-"current configuration."
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
 msgstr ""
-"Serwer nie może obsłużyć aż tyle danych POST (%s bajty) z powodu bieżącej "
-"konfiguracji."
 
-#: actions/newnotice.php:128 scripts/maildaemon.php:185
-#, php-format
-msgid " Try using another %s format."
-msgstr " Spróbuj innego formatu %s."
-
-#: actions/newnotice.php:133 scripts/maildaemon.php:190
-#, php-format
-msgid "%s is not a supported filetype on this server."
-msgstr "%s nie jest obsługiwanym typem pliku na tym serwerze."
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr "Wystąpił błąd bazy danych podczas zapisywania pliku. Spróbuj ponownie."
 
-#: actions/newnotice.php:205
+#: lib/mediafile.php:142
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr "Wysłany plik przekracza dyrektywę upload_max_filesize w php.ini."
 
-#: actions/newnotice.php:208
+#: lib/mediafile.php:147
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 "Wysłany plik przekracza dyrektywę MAX_FILE_SIZE podaną w formularzu HTML."
 
-#: actions/newnotice.php:211
+#: lib/mediafile.php:152
 msgid "The uploaded file was only partially uploaded."
 msgstr "Plik został tylko częściowo wysłany."
 
-#: actions/newnotice.php:214
+#: lib/mediafile.php:159
 msgid "Missing a temporary folder."
 msgstr "Brak folderu tymczasowego."
 
-#: actions/newnotice.php:217
+#: lib/mediafile.php:162
 msgid "Failed to write file to disk."
 msgstr "Zapisanie pliku na dysku nie powiodło się."
 
-#: actions/newnotice.php:220
+#: lib/mediafile.php:165
 msgid "File upload stopped by extension."
 msgstr "Wysłanie pliku zostało zatrzymane przez rozszerzenie."
 
-#: actions/newnotice.php:230 scripts/maildaemon.php:85
-msgid "Couldn't save file."
-msgstr "Nie można zapisać pliku."
-
-#: actions/newnotice.php:246 scripts/maildaemon.php:101
-msgid "Max notice size is 140 chars, including attachment URL."
-msgstr "Maksymalny rozmiar wpisu to 140 znaków, w tym adres URL załącznika."
-
-#: actions/newnotice.php:297
-msgid "Somehow lost the login in saveFile"
-msgstr "W jakiś sposób zgubiono login w saveFile"
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
 
-#: actions/newnotice.php:309 scripts/maildaemon.php:127
+#: lib/mediafile.php:196 lib/mediafile.php:233
 msgid "File could not be moved to destination directory."
 msgstr "Nie można przenieść pliku do katalogu docelowego."
 
-#: actions/newnotice.php:336 actions/newnotice.php:360
-#: scripts/maildaemon.php:148 scripts/maildaemon.php:167
-msgid "There was a database error while saving your file. Please try again."
-msgstr "Wystąpił błąd bazy danych podczas zapisywania pliku. Spróbuj ponownie."
-
-#: actions/noticesearch.php:121
-#, php-format
-msgid ""
-"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
-"status_textarea=%s)!"
-msgstr ""
-"Zostań pierwszym, który [wyśle coś na ten temat](%%%%action.newnotice%%%%?"
-"status_textarea=%s)!"
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "Nie można określić użytkownika źródłowego."
 
-#: actions/noticesearch.php:124
+#: lib/mediafile.php:270
 #, php-format
-msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to  "
-"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
-msgstr ""
-"Dlaczego nie [zarejestrujesz konta](%%%%action.register%%%%) i zostaniesz "
-"pierwszym, który [wyśle coś na ten temat](%%%%action.newnotice%%%%?"
-"status_textarea=%s)!"
+msgid " Try using another %s format."
+msgstr " Spróbuj innego formatu %s."
 
-#: actions/openidsettings.php:70
+#: lib/mediafile.php:275
 #, php-format
-msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
-"account. Manage your associated OpenIDs from here."
-msgstr ""
-"[OpenID](%%doc.openid%%) umożliwia logowanie się do wielu stron za pomocą "
-"tego samego konta użytkownika. Tu można zarządzać powiązanymi "
-"identyfikatorami OpenID."
+msgid "%s is not a supported filetype on this server."
+msgstr "%s nie jest obsługiwanym typem pliku na tym serwerze."
 
-#: actions/othersettings.php:110
-msgid "Shorten URLs with"
-msgstr "Skracaj adresy URL za pomocą"
+#: lib/messageform.php:120
+msgid "Send a direct notice"
+msgstr "Wyślij bezpośredni wpis"
 
-#: actions/othersettings.php:115
-msgid "View profile designs"
-msgstr "Wyświetl ustawienia wyglądu profilu"
+#: lib/messageform.php:146
+msgid "To"
+msgstr "Do"
 
-#: actions/othersettings.php:116
-msgid "Show or hide profile designs."
-msgstr "Wyświetl lub ukryj ustawienia wyglądu profilu."
+#: lib/messageform.php:162 lib/noticeform.php:173
+msgid "Available characters"
+msgstr "Dostępne znaki"
 
-#: actions/public.php:82
-#, php-format
-msgid "Beyond the page limit (%s)"
-msgstr "Poza ograniczeniem strony (%s)"
+#: lib/noticeform.php:145
+msgid "Send a notice"
+msgstr "Wyślij wpis"
 
-#: actions/public.php:179
+#: lib/noticeform.php:158
 #, php-format
-msgid ""
-"This is the public timeline for %%site.name%% but no one has posted anything "
-"yet."
-msgstr ""
-"To jest publiczna oś czasu dla %%site.name%%, ale nikt jeszcze nic nie "
-"wysłał."
-
-#: actions/public.php:182
-msgid "Be the first to post!"
-msgstr "Zostań pierwszym, który coś wyśle!"
+msgid "What's up, %s?"
+msgstr "Co słychać, %s?"
 
-#: actions/public.php:186
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to post!"
-msgstr ""
-"Dlaczego nie [zarejestrujesz konta](%%action.register%%) i zostaniesz "
-"pierwszym, który coś wyśle!"
+#: lib/noticeform.php:180
+msgid "Attach"
+msgstr "Załącz"
 
-#: actions/public.php:245
-#, php-format
-msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service based on the Free Software [StatusNet](http://status.net/) "
-"tool."
-msgstr ""
-"To jest %%site.name%%, usługa [mikroblogowania](http://pl.wikipedia.org/wiki/"
-"Mikroblog) oparta na wolnym narzędziu [StatusNet](http://status.net/)."
+#: lib/noticeform.php:184
+msgid "Attach a file"
+msgstr "Załącz plik"
 
-#: actions/publictagcloud.php:69
-#, php-format
-msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
-msgstr ""
-"Nikt jeszcze nie wysłał wpisu za pomocą [znacznika hasha](%%doc.tags%%)."
+#: lib/noticelist.php:478
+msgid "in context"
+msgstr "w rozmowie"
 
-#: actions/publictagcloud.php:72
-msgid "Be the first to post one!"
-msgstr "Zostań pierwszym, który go wyśle!"
+#: lib/noticelist.php:498
+msgid "Reply to this notice"
+msgstr "Odpowiedz na ten wpis"
 
-#: actions/publictagcloud.php:75
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to post "
-"one!"
-msgstr ""
-"Dlaczego nie [zarejestrujesz konta](%%action.register%%) i zostaniesz "
-"pierwszym, który go wyśle!"
+#: lib/noticelist.php:499
+msgid "Reply"
+msgstr "Odpowiedz"
 
-#: actions/recoverpassword.php:152
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored in your account."
-msgstr ""
-"Jeśli zapomniałeś lub zgubiłeś swoje hasło, możesz otrzymać nowe, wysłane na "
-"adres e-mail, który podałeś."
+#: lib/nudgeform.php:116
+msgid "Nudge this user"
+msgstr "Szturchnij tego użytkownika"
 
-#: actions/recoverpassword.php:158
-msgid "You've been identified. Enter a new password below. "
-msgstr "Zostałeś zidentyfikowany. Podaj poniżej nowe hasło. "
+#: lib/nudgeform.php:128
+msgid "Nudge"
+msgstr "Szturchnij"
 
-#: actions/recoverpassword.php:188
-msgid "Password recover"
-msgstr "Przywrócenie hasła"
+#: lib/nudgeform.php:128
+msgid "Send a nudge to this user"
+msgstr "Wyślij szturchnięcie do tego użytkownika"
 
-#: actions/register.php:86
-msgid "Sorry, invalid invitation code."
-msgstr "Przepraszamy, nieprawidłowy kod zaproszenia."
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "Błąd podczas wprowadzania nowego profilu"
 
-#: actions/remotesubscribe.php:100
-msgid "Subscribe to a remote user"
-msgstr "Zasubskrybuj zdalnego użytkownika"
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "Błąd podczas wprowadzania awatara"
 
-#: actions/replies.php:179
-#, php-format
-msgid ""
-"This is the timeline showing replies to %s but %s hasn't received a notice "
-"to his attention yet."
-msgstr ""
-"To jest oś czasu wyświetlająca odpowiedzi na wpisy użytkownika %s, ale %s "
-"nie otrzymał jeszcze wpisów wymagających jego uwagi."
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "Błąd podczas wprowadzania zdalnego profilu"
 
-#: actions/replies.php:184
-#, php-format
-msgid ""
-"You can engage other users in a conversation, subscribe to more people or "
-"[join groups](%%action.groups%%)."
-msgstr ""
-"Możesz nawiązać rozmowę z innymi użytkownikami, zasubskrybować więcej osób "
-"lub [dołączyć do grup](%%action.groups%%)."
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Usuń wpis"
 
-#: actions/replies.php:186
-#, php-format
-msgid ""
-"You can try to [nudge %s](../%s) or [post something to his or her attention]"
-"(%%%%action.newnotice%%%%?status_textarea=%s)."
-msgstr ""
-"Możesz spróbować [szturchnąć użytkownika %s](../%s) lub [wysłać coś "
-"wymagającego jego uwagi](%%%%action.newnotice%%%%?status_textarea=%s)."
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
+msgstr "Nie można wprowadzić nowej subskrypcji."
 
-#: actions/showfavorites.php:79
-#, php-format
-msgid "%s's favorite notices, page %d"
-msgstr "Ulubione wpisy użytkownika %s, strona %d"
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "Osobiste"
 
-#: actions/showfavorites.php:170
-msgid ""
-"You haven't chosen any favorite notices yet. Click the fave button on "
-"notices you like to bookmark them for later or shed a spotlight on them."
-msgstr ""
-"Nie wybrałeś jeszcze żadnych ulubionych wpisów. Naciśnij przycisk ulubionego "
-"na wpisach, które chciałbyś dodać do zakładek na później lub rzucić na nie "
-"trochę światła."
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "Odpowiedzi"
 
-#: actions/showfavorites.php:172
-#, php-format
-msgid ""
-"%s hasn't added any notices to his favorites yet. Post something interesting "
-"they would add to their favorites :)"
-msgstr ""
-"Użytkownik %s nie dodał jeszcze żadnych wpisów do ulubionych. Wyślij coś "
-"interesującego, aby chcieli dodać to do swoich ulubionych. :)"
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr "Ulubione"
 
-#: actions/showfavorites.php:176
-#, php-format
-msgid ""
-"%s hasn't added any notices to his favorites yet. Why not [register an "
-"account](%%%%action.register%%%%) and then post something interesting they "
-"would add to thier favorites :)"
-msgstr ""
-"Użytkownik %s nie dodał jeszcze żadnych wpisów do ulubionych. Dlaczego nie "
-"[zarejestrujesz konta](%%%%action.register%%%%) i wyślesz coś "
-"interesującego, aby chcieli dodać to do swoich ulubionych. :)"
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr "Użytkownik"
 
-#: actions/showfavorites.php:226
-msgid "This is a way to share what you like."
-msgstr "To jest sposób na współdzielenie tego, co chcesz."
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr "Odebrane"
 
-#: actions/showgroup.php:279 lib/groupeditform.php:178
-msgid "Aliases"
-msgstr "Aliasy"
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr "Wiadomości przychodzące"
 
-#: actions/showgroup.php:323
-#, php-format
-msgid "Notice feed for %s group (RSS 1.0)"
-msgstr "Kanał wpisów dla grupy %s (RSS 1.0)"
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr "Wysłane"
 
-#: actions/showgroup.php:330 actions/tag.php:84
-#, php-format
-msgid "Notice feed for %s group (RSS 2.0)"
-msgstr "Kanał wpisów dla grupy %s (RSS 2.0)"
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr "Wysłane wiadomości"
 
-#: actions/showgroup.php:337
+#: lib/personaltagcloudsection.php:56
 #, php-format
-msgid "Notice feed for %s group (Atom)"
-msgstr "Kanał wpisów dla grupy %s (Atom)"
+msgid "Tags in %s's notices"
+msgstr "Znaczniki we wpisach użytkownika %s"
 
-#: actions/showgroup.php:446
-#, php-format
-msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
-msgstr ""
-"**%s** jest grupą użytkowników na %%%%site.name%%%%, usłudze "
-"[mikroblogowania](http://pl.wikipedia.org/wiki/Mikroblog) opartej na wolnym "
-"narzędziu [StatusNet](http://status.net/). Jej członkowie dzielą się "
-"krótkimi wiadomościami o swoim życiu i zainteresowaniach. "
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "Subskrypcje"
 
-#: actions/showgroup.php:474
-msgid "Admins"
-msgstr "Administratorzy"
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "Wszystkie subskrypcje"
 
-#: actions/shownotice.php:101
-msgid "Not a local notice"
-msgstr "Nie jest lokalnym wpisem"
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "Subskrybenci"
 
-#: actions/showstream.php:72
-#, php-format
-msgid " tagged %s"
-msgstr " ze znacznikiem %s"
+#: lib/profileaction.php:157
+msgid "All subscribers"
+msgstr "Wszyscy subskrybenci"
 
-#: actions/showstream.php:121
-#, php-format
-msgid "Notice feed for %s tagged %s (RSS 1.0)"
-msgstr "Kanał wpisów dla %s ze znacznikiem %s (RSS 1.0)"
+#: lib/profileaction.php:177
+msgid "User ID"
+msgstr "Identyfikator użytkownika"
 
-#: actions/showstream.php:350
-#, php-format
-msgid "This is the timeline for %s but %s hasn't posted anything yet."
-msgstr ""
-"To jest oś czasu dla użytkownika %s, ale %s nie nic jeszcze nie wysłał."
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "Członek od"
 
-#: actions/showstream.php:355
-msgid ""
-"Seen anything interesting recently? You haven't posted any notices yet, now "
-"would be a good time to start :)"
-msgstr ""
-"Widziałeś ostatnio coś interesującego? Nie wysłałeś jeszcze żadnych wpisów, "
-"teraz jest dobry czas, aby zacząć. :)"
+#: lib/profileaction.php:235
+msgid "All groups"
+msgstr "Wszystkie grupy"
 
-#: actions/showstream.php:357
-#, php-format
-msgid ""
-"You can try to nudge %s or [post something to his or her attention](%%%%"
-"action.newnotice%%%%?status_textarea=%s)."
-msgstr ""
-"Możesz spróbować szturchnąć użytkownika %s lub [wysłać coś, co wymaga jego "
-"uwagi](%%%%action.newnotice%%%%?status_textarea=%s)."
+#: lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Publiczny"
 
-#: actions/showstream.php:393
-#, php-format
-msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
-msgstr ""
-"**%s** posiada konto na %%%%site.name%%%%, usłudze [mikroblogowania](http://"
-"pl.wikipedia.org/wiki/Mikroblog) opartej na wolnym narzędziu [StatusNet]"
-"(http://status.net/). "
+#: lib/publicgroupnav.php:82
+msgid "User groups"
+msgstr "Grupy użytkowników"
 
-#: actions/subscribers.php:108
-msgid ""
-"You have no subscribers. Try subscribing to people you know and they might "
-"return the favor"
-msgstr ""
-"Nie masz żadnych subskrybentów. Spróbuj zasubskrybować osoby, które znasz, a "
-"oni mogą się odwdzięczyć"
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
+msgid "Recent tags"
+msgstr "Ostatnie znaczniki"
 
-#: actions/subscribers.php:110
-#, php-format
-msgid "%s has no subscribers. Want to be the first?"
-msgstr "Użytkownik %s nie posiada subskrybentów. Chcesz być pierwszym?"
+#: lib/publicgroupnav.php:88
+msgid "Featured"
+msgstr "Znane"
 
-#: actions/subscribers.php:114
-#, php-format
-msgid ""
-"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
-"%) and be the first?"
-msgstr ""
-"Użytkownik %s nie posiada subskrybentów. Dlaczego nie [zarejestrujesz konta]"
-"(%%%%action.register%%%%) i zostaniesz pierwszym?"
+#: lib/publicgroupnav.php:92
+msgid "Popular"
+msgstr "Popularne"
 
-#: actions/subscriptions.php:115
-#, php-format
-msgid ""
-"You're not listening to anyone's notices right now, try subscribing to "
-"people you know. Try [people search](%%action.peoplesearch%%), look for "
-"members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
-msgstr ""
-"Nie obserwujesz teraz wpisów innych użytkowników. Spróbuj zasubskrybować "
-"osoby, które znasz. Spróbuj [znaleźć kogoś](%%action.peoplesearch%%), "
-"poszukać członków grup, które Cię interesują, a także [znanych użytkowników]"
-"(%%action.featured%%). Jeśli jesteś [użytkownikiem Twittera](%%action."
-"twittersettings%%), możesz automatycznie zasubskrybowć osoby, które tam już "
-"obserwujesz."
+#: lib/searchaction.php:120
+msgid "Search site"
+msgstr "Znajdź stronę"
 
-#: actions/subscriptions.php:117 actions/subscriptions.php:121
-#, php-format
-msgid "%s is not listening to anyone."
-msgstr "Użytkownik %s nie obserwuje nikogo."
+#: lib/searchaction.php:162
+msgid "Search help"
+msgstr "Znajdź w pomocy"
 
-#: actions/tag.php:77
-#, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Kanał wpisów dla znacznika %s (RSS 1.0)"
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "Osoby"
 
-#: actions/tag.php:91
-#, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "Kanał wpisów dla znacznika %s (Atom)"
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr "Znajdź osoby na tej stronie"
 
-#: actions/twitapifavorites.php:125
-msgid "This status is already a favorite!"
-msgstr "Ten status jest już ulubiony!"
+#: lib/searchgroupnav.php:82
+msgid "Notice"
+msgstr "Wpis"
 
-#: actions/twitapifavorites.php:179
-msgid "That status is not a favorite!"
-msgstr "Ten status nie jest ulubiony!"
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr "Przeszukaj zawartość wpisów"
 
-#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
-msgid "Could not determine source user."
-msgstr "Nie można określić użytkownika źródłowego."
+#: lib/searchgroupnav.php:85
+msgid "Find groups on this site"
+msgstr "Znajdź grupy na tej stronie"
 
-#: actions/twitapifriendships.php:215
-msgid "Target user not specified."
-msgstr "Nie podano użytkownika docelowego."
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr "Sekcja bez nazwy"
 
-#: actions/twitapifriendships.php:221
-msgid "Could not find target user."
-msgstr "Nie można znaleźć użytkownika docelowego."
+#: lib/section.php:106
+msgid "More..."
+msgstr "Więcej..."
 
-#: actions/twitapistatuses.php:322
+#: lib/subgroupnav.php:83
 #, php-format
-msgid "%1$s / Updates mentioning %2$s"
-msgstr "%1$s/aktualizacje wspominające %2$s"
+msgid "People %s subscribes to"
+msgstr "Osoby %s zasubskrybowane do"
 
-#: actions/twitapitags.php:74
+#: lib/subgroupnav.php:91
 #, php-format
-msgid "Updates tagged with %1$s on %2$s!"
-msgstr "Aktualizacje ze znacznikiem %1$s na %2$s!"
-
-#: actions/twittersettings.php:165
-msgid "Import my Friends Timeline."
-msgstr "Zaimportuj oś czasu przyjaciół."
-
-#: actions/userauthorization.php:158
-msgid "License"
-msgstr "Licencja"
-
-#: actions/userauthorization.php:179
-msgid "Reject this subscription"
-msgstr "Odrzuć tę subskrypcję"
-
-#: actions/userdesignsettings.php:76 lib/designsettings.php:65
-msgid "Profile design"
-msgstr "Wygląd profilu"
-
-#: actions/userdesignsettings.php:87 lib/designsettings.php:76
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Dostosuj wygląd profilu za pomocą wybranego obrazu tła i palety kolorów."
-
-#: actions/userdesignsettings.php:282
-msgid "Enjoy your hotdog!"
-msgstr "Smacznego hot-doga!"
+msgid "People subscribed to %s"
+msgstr "Osoby zasubskrybowane do %s"
 
-#: actions/usergroups.php:153
+#: lib/subgroupnav.php:99
 #, php-format
-msgid "%s is not a member of any group."
-msgstr "Użytkownik %s nie jest członkiem żadnej grupy."
+msgid "Groups %s is a member of"
+msgstr "Grupy %s są członkiem"
 
-#: actions/usergroups.php:158
-#, php-format
-msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
-msgstr "Spróbuj [wyszukać grupy](%%action.groupsearch%%) i dołączyć do nich."
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr "Chmura znaczników osób, które same sobie nadały znaczniki"
 
-#: classes/File.php:127
-#, php-format
-msgid ""
-"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
-"to upload a smaller version."
-msgstr ""
-"Żaden plik nie może być większy niż %d bajty, a wysłany plik miał %d bajty. "
-"Spróbuj wysłać mniejszą wersję."
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr "Chmura znaczników osób ze znacznikami"
 
-#: classes/File.php:137
-#, php-format
-msgid "A file this large would exceed your user quota of %d bytes."
-msgstr ""
-"Plik tej wielkości przekroczyłby przydział użytkownika wynoszący %d bajty."
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(brak)"
 
-#: classes/File.php:145
-#, php-format
-msgid "A file this large would exceed your monthly quota of %d bytes."
+#: lib/subs.php:48
+msgid "Already subscribed!"
 msgstr ""
-"Plik tej wielkości przekroczyłby miesięczny przydział użytkownika wynoszący %"
-"d bajty."
-
-#: classes/Notice.php:139
-msgid "Problem saving notice. Too long."
-msgstr "Problem podczas zapisywania wpisu. Za długi."
 
-#: classes/User.php:319
-#, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr "Witaj w %1$s, @%2$s!"
-
-#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
-msgid "Design"
-msgstr "Wygląd"
-
-#: lib/accountsettingsaction.php:120
-msgid "Design your profile"
-msgstr "Wygląd profilu"
-
-#: lib/action.php:712
-msgid "TOS"
-msgstr "TOS"
-
-#: lib/attachmentlist.php:87
-msgid "Attachments"
-msgstr "Załączniki"
-
-#: lib/attachmentlist.php:265
-msgid "Author"
-msgstr "Autor"
-
-#: lib/attachmentlist.php:278
-msgid "Provider"
-msgstr "Dostawca"
-
-#: lib/attachmentnoticesection.php:67
-msgid "Notices where this attachment appears"
-msgstr "Powiadamia, kiedy pojawia się ten załącznik"
-
-#: lib/attachmenttagcloudsection.php:48
-msgid "Tags for this attachment"
-msgstr "Znaczniki dla tego załącznika"
-
-#: lib/designsettings.php:101
-msgid "Change background image"
-msgstr "Zmień obraz tłas"
-
-#: lib/designsettings.php:105
-msgid "Upload file"
-msgstr "Wyślij plik"
-
-#: lib/designsettings.php:109
-msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
-msgstr "Można wysłać swój osobisty obraz. Maksymalny rozmiar pliku to 2 MB."
-
-#: lib/designsettings.php:139
-msgid "On"
-msgstr "Włączone"
+#: lib/subs.php:52
+msgid "User has blocked you."
+msgstr "Użytkownik zablokował Cię."
 
-#: lib/designsettings.php:155
-msgid "Off"
-msgstr "Wyłączone"
+#: lib/subs.php:56
+msgid "Could not subscribe."
+msgstr "Nie można zasubskrybować."
 
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr "Włącz lub wyłącz obraz tła."
+#: lib/subs.php:75
+msgid "Could not subscribe other to you."
+msgstr "Nie można zasubskrybować innych do Ciebie."
 
-#: lib/designsettings.php:161
-msgid "Tile background image"
-msgstr "Kafelkowy obraz tła"
+#: lib/subs.php:124
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Nie zasubskrybowane!"
 
-#: lib/designsettings.php:170
-msgid "Change colours"
-msgstr "Zmień kolory"
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
+msgstr "Nie można usunąć subskrypcji."
 
-#: lib/designsettings.php:178
-msgid "Background"
-msgstr "Tło"
+#: lib/tagcloudsection.php:56
+msgid "None"
+msgstr "Brak"
 
-#: lib/designsettings.php:191
-msgid "Content"
-msgstr "Zawartość"
+#: lib/topposterssection.php:74
+msgid "Top posters"
+msgstr "Najczęściej wysyłający wpisy"
 
-#: lib/designsettings.php:204
-msgid "Sidebar"
-msgstr "Panel boczny"
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+msgid "Unsubscribe from this user"
+msgstr "Zrezygnuj z subskrypcji tego użytkownika"
 
-#: lib/designsettings.php:230
-msgid "Links"
-msgstr "Odnośniki"
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "Zrezygnuj z subskrypcji"
 
-#: lib/designsettings.php:247
-msgid "Use defaults"
-msgstr "Użyj domyślnych"
+#: lib/userprofile.php:116
+msgid "Edit Avatar"
+msgstr "Edytuj awatar"
 
-#: lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr "Przywróć domyślny wygląd"
+#: lib/userprofile.php:236
+msgid "User actions"
+msgstr "Działania użytkownika"
 
-#: lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr "Przywróć domyślne ustawienia"
+#: lib/userprofile.php:248
+msgid "Edit profile settings"
+msgstr "Edytuj ustawienia profilu"
 
-#: lib/designsettings.php:257
-msgid "Save design"
-msgstr "Zapisz wygląd"
+#: lib/userprofile.php:249
+msgid "Edit"
+msgstr "Edytuj"
 
-#: lib/designsettings.php:378
-msgid "Bad default color settings: "
-msgstr "Błędne domyślne ustawienia koloru: "
+#: lib/userprofile.php:272
+msgid "Send a direct message to this user"
+msgstr "Wyślij bezpośrednią wiadomość do tego użytkownika"
 
-#: lib/designsettings.php:474
-msgid "Design defaults restored."
-msgstr "Przywrócono domyślny wygląd."
+#: lib/userprofile.php:273
+msgid "Message"
+msgstr "Wiadomość"
 
-#: lib/groupeditform.php:181
-#, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
-"Dodatkowe pseudonimy grupy, oddzielone przecinkami lub spacjami, maksymalnie "
-"%d"
+#: lib/util.php:821
+msgid "a few seconds ago"
+msgstr "kilka sekund temu"
 
-#: lib/groupnav.php:100
-msgid "Blocked"
-msgstr "Zablokowano"
+#: lib/util.php:823
+msgid "about a minute ago"
+msgstr "około minutę temu"
 
-#: lib/groupnav.php:101
+#: lib/util.php:825
 #, php-format
-msgid "%s blocked users"
-msgstr "%s zablokowani użytkownicy"
+msgid "about %d minutes ago"
+msgstr "około %d minut temu"
 
-#: lib/groupnav.php:119
-#, php-format
-msgid "Add or edit %s design"
-msgstr "Dodaj lub edytuj wygląd %s"
+#: lib/util.php:827
+msgid "about an hour ago"
+msgstr "około godzinę temu"
 
-#: lib/mail.php:556
+#: lib/util.php:829
 #, php-format
-msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
-"The URL of your notice is:\n"
-"\n"
-"%3$s\n"
-"\n"
-"The text of your notice is:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see the list of %1$s's favorites here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"Faithfully yours,\n"
-"%6$s\n"
-msgstr ""
-"%1$s właśnie dodał Twój wpis z %2$s jako jeden ze swoich ulubionych.\n"
-"\n"
-"Adres URL Twojego wpisu:\n"
-"\n"
-"%3$s\n"
-"\n"
-"Tekst Twojego wpisu:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Tutaj możesz zobaczyć listę ulubionych wpisów użytkownika %1$s:\n"
-"\n"
-"%5$s\n"
-"\n"
-"Z poważaniem,\n"
-"%6$s\n"
+msgid "about %d hours ago"
+msgstr "około %d godzin temu"
 
-#: lib/mail.php:646
-#, php-format
-msgid "Your Twitter bridge has been disabled."
-msgstr "Mostek Twittera został wyłączony."
+#: lib/util.php:831
+msgid "about a day ago"
+msgstr "blisko dzień temu"
 
-#: lib/mail.php:648
+#: lib/util.php:833
 #, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
-"disabled. Your Twitter credentials have either changed (did you recently "
-"change your Twitter password?) or you have otherwise revoked our access to "
-"your Twitter account.\n"
-"\n"
-"You can re-enable your Twitter bridge by visiting your Twitter settings "
-"page:\n"
-"\n"
-"\t%2$s\n"
-"\n"
-"Regards,\n"
-"%3$s\n"
-msgstr ""
-"Witaj, %1$s. Przykro nam poinformować, że Twój odnośnik do Twittera został "
-"wyłączony. Albo zmieniłeś dane uwierzytelniające Twittera (zmieniałeś "
-"ostatnio hasło?), albo w inny sposób zablokowałeś nam dostęp do swojego "
-"konta.\n"
-"\n"
-"Można ponownie włączyć mostek Twittera odwiedzając stronę ustawień "
-"Twittera:\n"
-"\n"
-"\t%2$s\n"
-"\n"
-"Z poważaniem,\n"
-"%3$s\n"
+msgid "about %d days ago"
+msgstr "około %d dni temu"
 
-#: lib/mail.php:682
-#, php-format
-msgid "Your %s Facebook application access has been disabled."
-msgstr "Dostęp do aplikacji Facebooka %s został wyłączony."
+#: lib/util.php:835
+msgid "about a month ago"
+msgstr "około miesiąc temu"
 
-#: lib/mail.php:685
+#: lib/util.php:837
 #, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %s, and have disabled the Facebook application for your "
-"account. This may be because you have removed the Facebook application's "
-"authorization, or have deleted your Facebook account.  You can re-enable the "
-"Facebook application and automatic status updating by re-installing the %1$s "
-"Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%1$s"
-msgstr ""
-"Witaj, %1$s. Przykro nam poinformować, że nie możemy zaktualizować Twojego "
-"statusu Facebook z %s i wyłączyliśmy aplikację Facebooka dla Twojego konta. "
-"Mogło to być spowodowane usunięciem przez Ciebie upoważnienia aplikacji "
-"Facebook lub usunięciem Twojego konta Facebook. Można ponownie włączyć "
-"aplikację Facebook i automatyczne aktualizowanie statusu przez ponowne "
-"zainstalowanie aplikacji Facebooka %1$s.\n"
-"\n"
-"Z poważaniem,\n"
-"\n"
-"%1$s"
-
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-"Brak prywatnych wiadomości. Można wysłać prywatną wiadomość, aby nawiązać "
-"rozmowę z innymi użytkownikami. Inni mogą wysyłać Ci wiadomości tylko dla "
-"Twoich oczu."
-
-#: lib/noticeform.php:154
-msgid "Attach"
-msgstr "Załącz"
-
-#: lib/noticeform.php:158
-msgid "Attach a file"
-msgstr "Załącz plik"
-
-#: lib/noticelist.php:436
-msgid "in context"
-msgstr "w rozmowie"
-
-#: lib/profileaction.php:177
-msgid "User ID"
-msgstr "Identyfikator użytkownika"
-
-#: lib/searchaction.php:156
-msgid "Search help"
-msgstr "Znajdź w pomocy"
-
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
-msgid "People Tagcloud as self-tagged"
-msgstr "Chmura znaczników osób, które same sobie nadały znaczniki"
+msgid "about %d months ago"
+msgstr "około %d miesięcy temu"
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
-msgid "People Tagcloud as tagged"
-msgstr "Chmura znaczników osób ze znacznikami"
+#: lib/util.php:839
+msgid "about a year ago"
+msgstr "około rok temu"
 
 #: lib/webcolor.php:82
 #, php-format
@@ -6964,3 +4909,19 @@ msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr ""
 "%s nie jest prawidłowym kolorem! Użyj trzech lub sześciu znaków "
 "szesnastkowych."
+
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr "Nie można przeanalizować wiadomości."
+
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr "To nie jest zarejestrowany użytkownik."
+
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr "Przepraszamy, to nie jest twój przychodzący adres e-mail."
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr "Przepraszamy, przychodzący e-mail nie jest dozwolony."
diff --git a/locale/pt/LC_MESSAGES/statusnet.mo b/locale/pt/LC_MESSAGES/statusnet.mo
index e6168a340..9d79df32c 100644
--- a/locale/pt/LC_MESSAGES/statusnet.mo
+++ b/locale/pt/LC_MESSAGES/statusnet.mo
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 779d7489e..4577be669 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -1,3 +1,6 @@
+# Translation of StatusNet to Portuguese
+#
+# --
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -5,4757 +8,4665 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-05-28 14:56+0000\n"
-"Last-Translator: Rui de Brito Mendes <rbritomendes@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:44:05+0000\n"
+"Language-Team: Portuguese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
-
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
-#, php-format
-msgid " Search Stream for \"%s\""
-msgstr "Procurar por \"%s\" no fluxo de mensagens"
-
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-#: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
-msgid ""
-" except this private data: password, email address, IM address, phone number."
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: out-statusnet\n"
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+msgid "No such page"
+msgstr ""
+
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
 msgstr ""
-"excepto estes dados privados: palavra chave, endereço de email, endereço de "
-"mensageiro instantâneo, número de telefone."
 
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr "de"
+#: actions/all.php:84
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s e amigos"
 
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr "%1$s / Actualizações em resposta a %2$s"
+msgid "%s and friends"
+msgstr "%s e amigos"
 
-#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s convidou-o a juntar-se a ele no %2$s"
+#: actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Feed para os amigos de %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 convidou-o a juntar-se a ele no %2$s (%3$s).\n"
-"\n"
-"%2$s é um serviço de micro-blogging que o deixa actualizado com pessoas que "
-"conhece e que lhe interessam.\n"
-"\n"
-"Também pode partilhar notícias suas, pensamentos, ou a sua vida online com "
-"pessoas que o conheça. É também ideal para conhecer pessoas com interesses "
-"semelhantes aos seus.\n"
-"\n"
-"%1$s disse:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Pode ver o perfil de %1$s no %2$s aqui:\n"
-"\n"
-"%5$s\n"
-"\n"
-"Se gostaria de experimentar este serviço visite o endereço a baixo para "
-"aceitar este convite.\n"
-"\n"
-"%6$s\n"
-"\n"
-"Se não, pode ignorar esta mensagem. Obrigado pelo seu tempo e paciência.\n"
-"\n"
-"Sinceramente, %2$s\n"
+#: actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Feed para os amigos de %s"
 
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s está agora a ouvir os seus comunicados em %2$s."
+#: actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Feed para os amigos de %s"
 
-#: ../lib/mail.php:126
+#: actions/all.php:127
 #, 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"
+"This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
-"%1$s está agora a ouvir os seus comunicados em %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Sinceramente,\n"
-"%4$s.\n"
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "Updates de %1$s como resposta às actualizações de %2$s / %3$s."
 
-#: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/all.php:132
 #, php-format
-msgid "%1$s's status on %2$s"
-msgstr "%1$s's estado em %2$s"
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
 
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/all.php:134
 #, php-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
 
-#: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
 #, php-format
-msgid "%s Public Stream"
-msgstr "Fluxo Público de %s"
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+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
-#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
-#, php-format
-msgid "%s and friends"
+#: actions/all.php:165
+#, fuzzy
+msgid "You and friends"
 msgstr "%s e amigos"
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
-#, php-format
-msgid "%s public timeline"
-msgstr "Mensagens públicas de %s"
-
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
 #, php-format
-msgid "%s status"
-msgstr "Estado de %s"
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
 
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
-#, php-format
-msgid "%s timeline"
-msgstr "Mensagens de %s"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
+msgstr "Método da API não encontrado!"
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
-#, php-format
-msgid "%s updates from everyone!"
-msgstr "%s actualizações de todos!"
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
+msgstr ""
 
-#: ../actions/register.php:213
+#: actions/apiaccountupdatedeliverydevice.php:105
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
 msgstr ""
-"(Deverá receber uma mensagem por email dentro de momentos, com instrucções "
-"sobre como confirmar o seu endereço de email.)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Não foi possível actualizar o utilizador."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
 msgstr ""
-"**%%site.name%%*** é um serviço de microblogging trazido até sí por [%%site."
-"broughtby%%](%%site.broughtbyurl%%)."
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
-#, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** é um serviço de microblogging. "
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
+msgstr ""
 
-#: ../lib/util.php:274 lib/util.php:290
-msgid ". Contributors should be attributed by full name or nickname."
-msgstr ". Os colaboradores devem ser citados usando nome completo ou apelido."
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Não foi possível actualizar o utilizador."
 
-#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
-#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 letras minúsculas ou números, sem pontuação ou espaços"
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr ""
 
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 letras ou números, sem pontuação ou espaços. Obrigatório."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Não foi possível salvar o perfil."
 
-#: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr "6 ou mais caracteres"
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
+msgstr ""
 
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
-msgid "6 or more characters, and don't forget it!"
-msgstr "6 ou mais caracteres, e não a esqueça!"
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
+msgstr ""
 
-#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
-msgid "6 or more characters. Required."
-msgstr "6 ou mais caracteres. Obrigatório."
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr ""
 
-#: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
 #, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+msgid "That's too long. Max message size is %d chars."
 msgstr ""
-"Um código de confirmação foi enviado para o endereço fornecido. Tem que "
-"aprovar que %s envie mensagens para 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."
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
 msgstr ""
-"Um código de confirmação foi enviado para o endereço de email fornecido. "
-"Procure na sua 'Caixa de Entrada' (e caixa de spam) pelo email com o código "
-"e instrucções de utilização."
 
-#: ../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."
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
-"Um código de confirmação foi enviado para o número de telefone fornecido. "
-"Procure na sua 'Caixa de Entrada' (e caixa de spam) pelo email com o código "
-"e instrucções de utilização."
-
-#: ../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 actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
-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/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 actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
-msgid "API method under construction."
-msgstr "Método da API em construcção."
-
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
-msgid "About"
-msgstr "Sobre"
-
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
-msgid "Accept"
-msgstr "Aceitar"
-
-#: ../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 actions/emailsettings.php:120
-#: actions/imsettings.php:127 actions/openidsettings.php:111
-#: actions/smssettings.php:133 actions/twittersettings.php:163
-msgid "Add"
-msgstr "Adicionar"
-
-#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
-msgstr "Adicionar OpenID"
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-msgid "Add or remove OpenIDs"
-msgstr "Adicionar ou remover 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
-#: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
-msgstr "Endereço"
-
-#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-msgid "Addresses of friends to invite (one per line)"
-msgstr "Endereços dos amigos a convidar (um por linha)"
-
-#: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
-msgid "All subscriptions"
-msgstr "Todas as subscrições"
+#: actions/apidirectmessage.php:89
+#, php-format
+msgid "Direct messages from %s"
+msgstr ""
 
-#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/apidirectmessage.php:93
 #, php-format
-msgid "All updates for %s"
-msgstr "Todas as actualizações de %s"
+msgid "All the direct messages sent from %s"
+msgstr ""
 
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/apidirectmessage.php:101
 #, php-format
-msgid "All updates matching search term \"%s\""
-msgstr "Todas as actualizações com o termo \"%s\""
+msgid "Direct messages to %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
-#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
-msgid "Already logged in."
-msgstr "Login já efectuado."
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
-msgid "Already subscribed!."
-msgstr "Já subscrito!."
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "Método da API não encontrado!"
 
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
-msgid "Are you sure you want to delete this notice?"
-msgstr "Tem a certeza que permite remover esta mensagem?"
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
+msgstr "Nenhum estado encontrado com esse ID."
 
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
-msgid "Authorize subscription"
-msgstr "Autorizar subscrição"
+#: actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
+msgstr ""
 
-#: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
-msgid "Automatically login in the future; not for shared computers!"
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
 msgstr ""
-"Efectuar login automático; não utilizar em computadores de uso partilhado!"
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+#: actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
 msgstr ""
-"Subscrever automaticamente a quem se subscrever a mim (recomendado para não-"
-"humanos)"
 
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34 actions/avatarsettings.php:65
-#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
-msgid "Avatar"
-msgstr "Avatar"
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr ""
 
-#: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
-msgid "Avatar updated."
-msgstr "Avatar actualizado."
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
+msgstr "Não foi possível seguir utilizador: Utilizador não encontrado."
 
-#: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/apifriendshipscreate.php:118
 #, 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?)"
+msgid "Could not follow user: %s is already on your list."
+msgstr "Não foi possível seguir utilizador: %s já está na sua lista."
+
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "Não foi possível seguir utilizador: Utilizador não encontrado."
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
 msgstr ""
-"A aguardar confirmação deste endereço. Verifique as instrucções enviadas "
-"para a sua conta de Jabber/GTalk. (Adicionou %s à sua lista de amigos?)"
 
-#: ../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."
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
 msgstr ""
-"A aguardar confirmação deste endereço. Procure na sua 'Caixa de Entrada' (e "
-"caixa de spam) pela mensagem com as instrucções."
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
-msgid "Awaiting confirmation on this phone number."
-msgstr "A aguardar confirmação deste número de telefone."
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Não foi possível actualizar o utilizador."
 
-#: ../lib/util.php:1318 lib/util.php:1452
+#: actions/apifriendshipsshow.php:143
 #, fuzzy
-msgid "Before »"
-msgstr "Antes »"
+msgid "Could not find target user."
+msgstr "Não foi possivel encontrar algum estado."
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
-#: actions/profilesettings.php:82 actions/register.php:184
-#: actions/profilesettings.php:112 actions/register.php:402
-msgid "Bio"
-msgstr "Bio"
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
+msgid "Could not create group."
+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
-#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
-msgid "Bio is too long (max 140 chars)."
-msgstr "Bio é demasiada extensa (máx 140 car)."
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Não foi possível criar o formulário de OpenID: %s"
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
-msgid "Can't delete this notice."
-msgstr "Não é possível remover a mensagem."
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+msgid "Could not set group membership."
+msgstr ""
 
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
-#, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr "Não é possível ler o URL do avatar '%s'"
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "Alcunha só deve conter letras minúsculas e números. Sem espaços."
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404 actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-msgid "Can't save new password."
-msgstr "Não é possível guardar a nova password."
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr "Alcunha já em uso. Tente outra diferente."
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62 actions/emailsettings.php:58
-#: actions/imsettings.php:59 actions/smssettings.php:62
-#: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
-msgstr "Cancelar"
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr ""
 
-#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Não é possível instanciar um objecto do OpenID."
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "A Homepage inserida não é um URL válido."
 
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
-msgstr "Não é possível normalizar esse ID de Jabber"
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "Nome completo é demasiado longo (máx. 255 caracteres)."
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
-msgid "Cannot normalize that email address"
-msgstr "Não é possível normalizar esse endereço de email"
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "Bio é demasiada extensa (máx 140 car)."
 
-#: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
-msgstr "Modificar"
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "Localidade é muito longa (máx. 255 caracteres)."
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
-msgstr "Alterar email handling"
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
 
-#: ../actions/password.php:32 actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr "Modificar palavra-passe"
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Endereço de email inválido: %s"
 
-#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
-msgid "Change your password"
-msgstr "Modificar a sua palavra-passe"
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Alcunha já em uso. Tente outra diferente."
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-msgid "Change your profile settings"
-msgstr "Modificar as suas definições de perfil"
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+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
-#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
-#: actions/register.php:376 actions/smssettings.php:122
-msgid "Confirm"
-msgstr "Confirmar"
+#: actions/apigroupjoin.php:110
+msgid "You are already a member of that group."
+msgstr ""
 
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "Confirmar Endereço"
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+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
-#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
-msgid "Confirmation cancelled."
-msgstr "Confirmação cancelada."
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Não foi possível seguir utilizador: Utilizador não encontrado."
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
-msgid "Confirmation code"
-msgstr "Código de confirmação"
+#: actions/apigroupleave.php:114
+msgid "You are not a member of this group."
+msgstr ""
 
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-msgid "Confirmation code not found."
-msgstr "Código de confirmação não encontrado"
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Não foi possível seguir utilizador: Utilizador não encontrado."
 
-#: ../actions/register.php:202
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
 #, 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."
+msgid "%s groups"
 msgstr ""
-"Parabéns, %s! Bemvindo ao %%%%site.name%%%%. A partir de agora deverá...\n"
-"\n"
-"* Ir ao [seu perfil](%s) e enviar a primeira mensagem.\n"
-"* Adicionar uma [Endereço Jabber/GTalk](%%%%action.imsettings%%%%) de forma "
-"a poder enviar notações através de mensagens instantâneas.\n"
-"* [Procurar por pessoas](%%%%action.peoplesearch%%%%) que conheça ou "
-"partilhem os seus interesses. \n"
-"* Actualizar o seu perfil [Opções de perfil](%%%%action.profilesettings%%%%) "
-"para contar mais acerca de si aos outros. \n"
-"* Ler os [documentos online](%%%%doc.help%%%%) para conhecer todas as "
-"funcionalidades que tenha perdido. \n"
-"\n"
-"Obrigado por se registar e esperamos que se divirta usando este serviço."
-
-#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
-msgid "Connect"
-msgstr "Ligar"
-
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
-msgid "Connect existing account"
-msgstr "Ligar conta existente"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
-msgid "Contact"
-msgstr "Contacto"
-
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: actions/apigrouplistall.php:94
 #, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "Não foi possível criar o formulário de OpenID: %s"
+msgid "groups on %s"
+msgstr ""
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/apigrouplist.php:95
 #, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr "Não foi possível seguir utilizador: %s já está na sua lista."
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
-msgid "Could not follow user: User not found."
-msgstr "Não foi possível seguir utilizador: Utilizador não encontrado."
+msgid "%s's groups"
+msgstr ""
 
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: actions/apigrouplist.php:103
 #, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Não foi possível redireccionar para o servidor: %s"
-
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
-msgid "Could not save avatar info"
-msgstr "Não foi possível guardar a info do avatar "
-
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
-msgid "Could not save new profile info"
-msgstr "Não foi possível guardar a nova info do perfil"
-
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
-msgid "Could not subscribe other to you."
-msgstr "Não foi possível subscrever outros a si."
-
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
-msgid "Could not subscribe."
-msgstr "Não foi possível subscrever. "
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
+msgid "Groups %s is a member of on %s."
 msgstr ""
-"Não foi possivel actualizar utilizador com endereço de email confirmado."
-
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-msgid "Couldn't convert request tokens to access tokens."
-msgstr "Não foi possível converter os tokens de requisição em tokens de acesso."
-
-#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
-#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
-#: actions/confirmaddress.php:84 actions/emailsettings.php:252
-#: actions/imsettings.php:226 actions/smssettings.php:249
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-msgid "Couldn't delete email confirmation."
-msgstr "Não foi possível apagar a confirmação do email."
-
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
-msgid "Couldn't delete subscription."
-msgstr "Não foi possível apagar a subscrição."
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
-msgid "Couldn't find any statuses."
-msgstr "Não foi possivel encontrar algum estado."
-
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-msgid "Couldn't get a request token."
-msgstr "Não foi possível obter um token de requisição."
-
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206 actions/emailsettings.php:223
-#: actions/imsettings.php:195 actions/smssettings.php:214
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
-msgid "Couldn't insert confirmation code."
-msgstr "Não foi possível inserir o código de confirmação."
-
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
-msgstr "Não foi possível inserir nova subscrição."
-
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-msgid "Couldn't save profile."
-msgstr "Não foi possível salvar o perfil."
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
-msgstr "Não foi possível actualizar o utilizador para auto-subscrição."
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
-msgid "Couldn't update user record."
-msgstr "Não foi possível actualizar o registo do utilizador."
-
-#: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
-#: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
-#: ../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
-#: actions/confirmaddress.php:114 actions/emailsettings.php:280
-#: actions/emailsettings.php:411 actions/imsettings.php:252
-#: actions/imsettings.php:395 actions/othersettings.php:162
-#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
-msgid "Couldn't update user."
-msgstr "Não foi possível actualizar o utilizador."
 
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
-msgid "Create"
-msgstr "Criar"
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
-msgid "Create a new user with this nickname."
-msgstr "Criar um novo utilizador com esta alcunha."
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
-msgid "Create new account"
-msgstr "Criar nova conta"
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "Avatar actualizado."
 
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
-msgid "Creating new account for OpenID that already has a user."
-msgstr "Criar nova conta para OpenID que já possui um utilizador."
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
+msgstr "Nenhum estado com esse ID encontrado."
 
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "Endereço do Jabber/GTalk já confirmado."
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr ""
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "Número de telefone com serviço SMS activo já confirmado."
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
+msgstr ""
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-msgid "Current confirmed email address."
-msgstr "Endereço de email já confirmado."
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
 
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
-msgstr "Actualmente"
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+msgid "Unsupported format."
+msgstr ""
 
-#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: actions/apitimelinefavorites.php:107
 #, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "Ocorreu um erro na base de dados ao inserir a hashtag: %s"
+msgid "%s / Favorites from %s"
+msgstr ""
 
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: actions/apitimelinefavorites.php:119
 #, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Ocorreu um erro na base de dados ao inserir a resposta: %s"
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
-msgid "Delete notice"
-msgstr "Apagar mensagem"
+msgid "%s updates favorited by %s / %s."
+msgstr ""
 
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "Descreva-se e aos seus interesses em 140 caracteres"
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
+#, php-format
+msgid "%s timeline"
+msgstr "Mensagens de %s"
 
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87 actions/register.php:172
-#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
-#: actions/register.php:385 lib/accountsettingsaction.php:113
-msgid "Email"
-msgstr "Email"
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-msgid "Email Address"
-msgstr "Endereço de Email"
+#: actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Actualizações em resposta a %2$s"
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
-msgstr "Definições do Email"
+#: actions/apitimelinementions.php:126
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr "Updates de %1$s como resposta às actualizações de %2$s / %3$s."
 
-#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-msgid "Email address already exists."
-msgstr "Endereço de Email já existe."
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#, php-format
+msgid "%s public timeline"
+msgstr "Mensagens públicas de %s"
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
-msgid "Email address confirmation"
-msgstr "Confirmação do Endereço de Email"
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#, php-format
+msgid "%s updates from everyone!"
+msgstr "%s actualizações de todos!"
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
-msgstr "Endereço de Email, como \"nomedeutilizador@exemplo.org\""
+#: actions/apitimelinetag.php:101 actions/tag.php:66
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
 
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-msgid "Email addresses"
-msgstr "Endereços de Email"
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr ""
 
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
-msgid "Enter a nickname or email address."
-msgstr "Introduza uma alcunha ou um endereço de email"
+#: actions/apiusershow.php:96
+msgid "Not found."
+msgstr ""
 
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
-msgstr "Introduza o código que recebeu no seu telefone."
+#: actions/attachment.php:73
+msgid "No such attachment."
+msgstr ""
 
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
-msgid "Error authorizing token"
-msgstr "Erro ao autorizar token"
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+msgstr "Nenhuma alcunha."
 
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
-msgid "Error connecting user to OpenID."
-msgstr "Erro ao ligar utilizador ao OpenID."
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr ""
 
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
-msgstr "Erro ao ligar utilizador."
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "Tamanho inválido."
 
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
-msgstr "Erro ao inserir avatar"
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "Avatar"
 
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
-msgstr "Erro ao inserir novo perfil"
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
-msgstr "Erro ao inserir perfil remoto"
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
+msgstr ""
 
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
-msgid "Error saving address confirmation."
-msgstr "Erro ao guardar confirmação do endereço."
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+msgid "Avatar settings"
+msgstr ""
 
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
-msgid "Error saving remote profile"
-msgstr "Erro ao guardar perfil remoto"
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr ""
 
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-msgid "Error saving the profile."
-msgstr "Erro ao guardar o perfil."
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr ""
 
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-msgid "Error saving the user."
-msgstr "Erro ao guardar o utilizador."
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+msgid "Delete"
+msgstr ""
 
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
-msgid "Error saving user; invalid."
-msgstr "Erro ao guardar utilizador; inválido."
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+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 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-msgid "Error setting user."
-msgstr "Erro ao configurar utilizador."
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
+msgstr ""
 
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr "Erro ao actualizar o perfil."
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
-msgstr "Erro ao actualizar o perfil remoto"
+#: actions/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr ""
 
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr "Erro no código de confirmação."
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
-msgid "Existing nickname"
-msgstr "Alcunha já existente"
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
+msgstr ""
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
-msgid "FAQ"
-msgstr "FAQ"
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+msgstr "Avatar actualizado."
 
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Falha ao actualizar avatar."
 
-#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
-#, php-format
-msgid "Feed for friends of %s"
-msgstr "Feed para os amigos de %s"
-
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
-#, php-format
-msgid "Feed for replies to %s"
-msgstr "Feed para as respostas a %s"
-
-#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
-#, php-format
-msgid "Feed for tag %s"
-msgstr "Feed para a tag %s"
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
-msgstr "Encontrar conteúdo dos mensagens"
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
-msgstr "Encontrar pessoas neste site"
+#: actions/avatarsettings.php:387
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Avatar actualizado."
 
-#: ../actions/login.php:122
-msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+msgid "No nickname"
 msgstr ""
-"Por razões de segurança, por favor reintroduza o seu nome de utilizador e "
-"palavra-passe antes de alterar as suas configurações."
-
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
-#: actions/profilesettings.php:77 actions/register.php:178
-#: actions/profilesettings.php:103 actions/register.php:391
-#: actions/showgroup.php:235 actions/showstream.php:262
-#: actions/tagother.php:105 lib/groupeditform.php:142
-msgid "Full name"
-msgstr "Nome Completo"
 
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
-#: actions/register.php:86 actions/updateprofile.php:94
-#: actions/editgroup.php:195 actions/newgroup.php:146
-#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
-msgid "Full name is too long (max 255 chars)."
-msgstr "Nome completo é demasiado longo (máx. 255 caracteres)."
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
+msgstr ""
 
-#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
-msgid "Help"
-msgstr "Ajuda"
+#: actions/blockedfromgroup.php:90
+#, php-format
+msgid "%s blocked profiles"
+msgstr ""
 
-#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
-msgid "Home"
-msgstr "Início"
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s e amigos"
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
-msgid "Homepage"
-msgstr "Página Principal"
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr ""
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
-msgid "Homepage is not a valid URL."
-msgstr "A Homepage inserida não é um URL válido."
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Desbloquear este utilizador"
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
-msgid "I want to post notices by email."
-msgstr "Quero postar mensagens por email."
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
+msgstr "Desbloquear"
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
-msgstr "IM"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+msgid "Unblock this user"
+msgstr "Desbloquear este utilizador"
 
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
-msgstr "Endereço IM"
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr ""
 
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
-msgstr "Definições de IM"
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
 msgstr ""
-"Se já tem uma conta, inicie sessão com o seu nome de utilizador e palavra-"
-"passe para a ligar ao seu OpenID."
 
-#: ../actions/openidsettings.php:45
-msgid ""
-"If you want to add an OpenID to your account, enter it in the box below and "
-"click \"Add\"."
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+msgid "Block user"
 msgstr ""
-"Se quiser adicionar um OpenID à sua conta, introduza-o na caixa a baixo e "
-"clique em \"Adicionar\"."
 
-#: ../actions/recoverpassword.php:137
+#: actions/block.php:136
 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."
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
 msgstr ""
-"Se você se esqueceu ou perdeu a sua palavra-passe, você pode receber uma "
-"nova que será enviada para o endereço de email que tem configurado na sua "
-"conta."
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-#: actions/emailsettings.php:127 actions/smssettings.php:140
-msgid "Incoming email"
-msgstr "Email a receber"
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
-msgid "Incoming email address removed."
-msgstr "O endereço de email de recepção removido."
-
-#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
-msgid "Incorrect old password"
-msgstr "Palavra-passe antiga incorrecta"
+#: actions/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
+msgid "No"
+msgstr "Não"
 
-#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
-msgid "Incorrect username or password."
-msgstr "Nome de utilizador ou palavra-passe incorrecta"
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Desbloquear este utilizador"
 
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
 msgstr ""
-"As instruções para a recuperação da palavra-passe foram enviadas para o "
-"endereço de email registado na sua conta."
 
-#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "URL do avatar inválido '%s'"
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+msgid "Block this user"
+msgstr ""
 
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
-#, php-format
-msgid "Invalid email address: %s"
-msgstr "Endereço de email inválido: %s"
+#: actions/block.php:165
+msgid "You have already blocked this user."
+msgstr ""
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
-#, php-format
-msgid "Invalid homepage '%s'"
-msgstr "Página principal inválida '%s'"
+#: actions/block.php:170
+msgid "Failed to save block information."
+msgstr ""
 
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
-#, php-format
-msgid "Invalid license URL '%s'"
-msgstr "URL de licença inválido '%s'"
+#: actions/bookmarklet.php:50
+msgid "Post to "
+msgstr ""
 
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
-msgstr "Conteúdo da mensagem inválido"
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+msgstr ""
 
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
-msgstr "URI da mensagem inválido"
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "Código de confirmação não encontrado"
 
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
-msgstr "URL da mensagem inválido"
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr ""
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: actions/confirmaddress.php:90
 #, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "URL do perfil inválido '%s'."
-
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
-msgstr "URL de perfil inválido (formato incorrecto)"
-
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
-msgstr "URL do perfil devolvido pelo servidor inválido."
-
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
-#: actions/avatarbynickname.php:69
-msgid "Invalid size."
-msgstr "Tamanho inválido."
-
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111 actions/finishopenidlogin.php:241
-#: actions/register.php:103 actions/register.php:121
-#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
-msgid "Invalid username or password."
-msgstr "Nome de utilizador ou palavra-passe inválido."
+msgid "Unrecognized address type %s"
+msgstr ""
 
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-msgid "Invitation(s) sent"
-msgstr "Contive(s) enviado(s)"
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr ""
 
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-msgid "Invitation(s) sent to the following people:"
-msgstr "Convite(s) enviado(s) para as seguintes pessoas:"
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "Não foi possível actualizar o utilizador."
 
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
-msgid "Invite"
-msgstr "Convidar"
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr "Não foi possível apagar a confirmação do email."
 
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-msgid "Invite new users"
-msgstr "Convidar novos utilizadores"
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "Confirmar Endereço"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#: actions/confirmaddress.php:159
 #, php-format
-msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
+msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
 
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
-msgstr "O Jabber ID introduzido já pertence a outro utilizador."
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Código de confirmação"
 
-#: ../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."
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
 msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
-msgid "Language"
-msgstr "Linguagem"
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
+msgstr ""
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
-msgid "Language is too long (max 50 chars)."
-msgstr "Linguagem introduzida é muito longa (máx. 50 caracteres)."
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "Não é possível remover a mensagem."
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
-msgid "Location"
-msgstr "Localidade"
+#: actions/deletenotice.php:103
+#, fuzzy
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr "Tem a certeza que permite remover esta mensagem?"
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
-#: actions/register.php:92 actions/updateprofile.php:109
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
-msgid "Location is too long (max 255 chars)."
-msgstr "Localidade é muito longa (máx. 255 caracteres)."
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr "Apagar mensagem"
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
-#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
-#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
-#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
-#, php-format
-msgid "Login"
-msgstr "Entrar"
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr "Tem a certeza que permite remover esta mensagem?"
 
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Entrar com conta [OpenID](%%doc.openid%%)"
+#: actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "Não é possível remover a mensagem."
 
-#: ../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 ""
-"Entrar com o seu nome de utilizador e palavra passe. Não está registado "
-"ainda?[Registe-se](%%action.register%%), ou tente entrar com "
-"[OpenID](%%action.openidlogin%%). "
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+#, fuzzy
+msgid "Delete this notice"
+msgstr "Não é possível remover a mensagem."
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
-msgid "Logout"
-msgstr "Sair"
+#: actions/deletenotice.php:157
+msgid "There was a problem with your session token.  Try again, please."
+msgstr ""
 
-#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
-msgid "Longer name, preferably your \"real\" name"
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
 msgstr ""
 
-#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
-msgid "Lost or forgotten password?"
-msgstr "Perdeu ou esqueceu-se da palavra-passe?"
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+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."
+#: actions/doc.php:69
+msgid "No such document."
 msgstr ""
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#: actions/emailsettings.php:71
+#: actions/editgroup.php:56
 #, php-format
-msgid "Manage how you get email from %%site.name%%."
+msgid "Edit %s group"
 msgstr ""
 
-#: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
-msgid "Member since"
-msgstr "Membro desde"
-
-#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
-#, php-format
-msgid "Microblog by %s"
-msgstr "Microblog por %s"
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
+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."
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+msgid "You must be an admin to edit the group"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-msgid "My text and files are available under "
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
 msgstr ""
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#: actions/emailsettings.php:142 actions/smssettings.php:152
-msgid "New"
-msgstr "Novo"
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Bio é demasiada extensa (máx 140 car)."
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
-#, php-format
-msgid "New email address for posting to %s"
+#: actions/editgroup.php:253
+msgid "Could not update group."
 msgstr ""
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
-msgid "New incoming email address added."
+#: actions/editgroup.php:269
+msgid "Options saved."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
-msgid "New nickname"
-msgstr "Nova alcunha"
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "Definições do Email"
 
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
+#: actions/emailsettings.php:71
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-msgid "New password"
-msgstr "Nova palavra-passe"
-
-#: ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
-msgstr "Nova palavra-passe foi guardada com sucesso. Está agora conectado."
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "Endereço"
 
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151 actions/login.php:101
-#: actions/profilesettings.php:74 actions/register.php:165
-#: actions/login.php:228 actions/profilesettings.php:98
-#: actions/register.php:367 actions/showgroup.php:224
-#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
-msgid "Nickname"
-msgstr "Alcunha"
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr "Endereço de email já confirmado."
 
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69 actions/finishopenidlogin.php:181
-#: actions/profilesettings.php:225 actions/register.php:76
-#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
-msgid "Nickname already in use. Try another one."
-msgstr "Alcunha já em uso. Tente outra diferente."
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+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
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "Alcunha só deve conter letras minúsculas e números. Sem espaços."
+#: actions/emailsettings.php:113
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
+"A aguardar confirmação deste endereço. Procure na sua 'Caixa de Entrada' (e "
+"caixa de spam) pela mensagem com as instrucções."
 
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
-msgid "Nickname not allowed."
-msgstr "Alcunha não permitida."
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
-msgstr "Alcunha do utilizador que pretende seguir"
+#: actions/emailsettings.php:121
+msgid "Email Address"
+msgstr "Endereço de Email"
 
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
-msgid "Nickname or email"
-msgstr "Alcunha ou email"
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr "Endereço de Email, como \"nomedeutilizador@exemplo.org\""
 
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
-msgid "No"
-msgstr "Não"
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "Adicionar"
 
-#: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
-msgstr ""
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+msgstr "Email a receber"
 
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
-msgid "No authorization request!"
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
 msgstr ""
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
-msgid "No carrier selected."
+#: actions/emailsettings.php:145 actions/smssettings.php:162
+msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
-msgstr "Nenhum código introduzido"
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
+msgstr "Novo"
 
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
-#: actions/confirmaddress.php:75
-msgid "No confirmation code."
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
 msgstr ""
 
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
-#: actions/newnotice.php:126 classes/Command.php:223
-msgid "No content!"
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
-msgid "No email address."
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
-#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
-msgid "No id."
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
-msgid "No incoming email address."
+#: actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr "Nenhuma alcunha fornecida pelo servidor remoto."
-
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
-msgid "No nickname."
-msgstr "Nenhuma alcunha."
-
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229 actions/emailsettings.php:240
-#: actions/imsettings.php:214 actions/smssettings.php:237
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
-msgid "No pending confirmation to cancel."
-msgstr "Nenhuma confirmação pendente para cancelar."
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
-msgstr "Nenhum numero de telefone."
-
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
-msgid "No registered email address for that user."
-msgstr "Nenhum endereço de email registado para esse utilizador."
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
+msgstr "Quero postar mensagens por email."
 
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr "Nenhum pedido encontrado!"
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
+msgstr ""
 
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
-msgid "No results"
-msgstr "Nenhum resultado"
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr ""
 
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
-msgid "No status found with that ID."
-msgstr "Nenhum estado encontrado com esse ID."
+#: actions/emailsettings.php:319
+msgid "No email address."
+msgstr ""
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
-msgid "No status with that ID found."
-msgstr "Nenhum estado com esse ID encontrado."
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
+msgstr "Não é possível normalizar esse endereço de email"
 
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
+#: actions/emailsettings.php:330
+msgid "Not a valid email address"
 msgstr ""
 
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
-msgid "No such document."
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
 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 actions/shownotice.php:87
-#: lib/deleteaction.php:51
-msgid "No such notice."
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another user."
 msgstr ""
 
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr ""
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+msgstr "Não foi possível inserir o código de confirmação."
 
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-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 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
-msgid "No such user."
+#: actions/emailsettings.php:358
+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 fornecido. "
+"Procure na sua 'Caixa de Entrada' (e caixa de spam) pelo email com o código "
+"e instrucções de utilização."
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-msgid "No user with that email address or username."
-msgstr ""
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
+msgstr "Nenhuma confirmação pendente para cancelar."
 
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
 msgstr ""
 
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr ""
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "Confirmação cancelada."
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
 msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
-msgid "Not a supported data format."
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
 msgstr ""
 
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
 msgstr ""
 
-#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-msgid "Not a valid OpenID."
-msgstr ""
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
+msgstr "Não foi possível actualizar o registo do utilizador."
 
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
-msgid "Not a valid email address"
-msgstr ""
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
+msgstr "O endereço de email de recepção removido."
 
-#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-msgid "Not a valid email address."
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
 msgstr ""
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-#: actions/editgroup.php:186 actions/newgroup.php:137
-#: actions/profilesettings.php:195 actions/register.php:161
-msgid "Not a valid nickname."
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+msgid "Popular notices"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
+#: actions/favorited.php:67
+#, php-format
+msgid "Popular notices, page %d"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
-msgid "Not an image or corrupt file."
+#: actions/favorited.php:153
+msgid ""
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
-msgid "Not authorized."
+#: actions/favorited.php:156
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
-msgid "Not expecting this response!"
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
-msgid "Not found"
+#: actions/favoritesrss.php:115
+#, php-format
+msgid "Updates favored by %1$s on %2$s!"
 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 actions/block.php:59 actions/disfavor.php:61
-#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
-#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
-#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
-#: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
-msgid "Not logged in."
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
 msgstr ""
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
-msgid "Not subscribed!."
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
 msgstr ""
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
 msgstr ""
 
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
+#: actions/featured.php:71
 #, php-format
-msgid "Notice feed for %s"
+msgid "Featured users, page %d"
 msgstr ""
 
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
-msgid "Notices"
-msgstr ""
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "URI da mensagem inválido"
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
-#, php-format
-msgid "Notices tagged with %s"
-msgstr ""
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Nenhuma alcunha."
 
-#: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
+#: actions/file.php:42
+msgid "No attachments"
 msgstr ""
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
-msgid "OpenID"
+#: actions/file.php:51
+msgid "No uploaded attachments"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
-msgid "OpenID Account Setup"
+#: actions/finishremotesubscribe.php:69
+msgid "Not expecting this response!"
 msgstr ""
 
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-msgid "OpenID Auto-Submit"
+#: actions/finishremotesubscribe.php:80
+msgid "User being listened to does not exist."
 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
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-msgid "OpenID Login"
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
 msgstr ""
 
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-#: actions/openidlogin.php:102 actions/openidsettings.php:101
-msgid "OpenID URL"
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
-msgid "OpenID authentication cancelled."
+#: actions/finishremotesubscribe.php:106
+msgid "You are not authorized."
 msgstr ""
 
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
-#, php-format
-msgid "OpenID authentication failed: %s"
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
 msgstr ""
+"Não foi possível converter os tokens de requisição em tokens de acesso."
 
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
-#, php-format
-msgid "OpenID failure: %s"
+#: actions/finishremotesubscribe.php:114
+msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
 
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr ""
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "Erro ao actualizar o perfil remoto"
 
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+msgid "No such group."
 msgstr ""
 
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-msgid "Optionally add a personal message to the invitation."
+#: actions/getfile.php:75
+msgid "No such file."
 msgstr ""
 
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
-msgid "Partial upload."
-msgstr ""
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Não foi possível salvar o perfil."
 
-#: ../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 actions/finishopenidlogin.php:118
-#: actions/login.php:231 actions/register.php:372
-#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-msgid "Password"
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
 msgstr ""
 
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
-msgid "Password and confirmation do not match."
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
 msgstr ""
 
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
-msgid "Password must be 6 chars or more."
-msgstr ""
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "O utilizador bloqueou-o."
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-msgid "Password recovery requested"
+#: actions/groupblock.php:100
+msgid "User is not a member of group."
 msgstr ""
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-msgid "Password saved."
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+msgid "Block user from group"
 msgstr ""
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-msgid "Passwords don't match."
+#: actions/groupblock.php:162
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
 msgstr ""
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
+#: actions/groupblock.php:178
+msgid "Do not block this user from this group"
 msgstr ""
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
+#: actions/groupblock.php:179
+msgid "Block this user from this group"
 msgstr ""
 
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
 msgstr ""
 
-#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
-msgid "Personal"
+#: actions/groupbyid.php:74
+msgid "No ID"
 msgstr ""
 
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-msgid "Personal message"
+#: actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
 msgstr ""
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
+#: actions/groupdesignsettings.php:141
+msgid "Group design"
 msgstr ""
 
-#: ../actions/userauthorization.php:78
+#: actions/groupdesignsettings.php:152
 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\"."
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
 msgstr ""
 
-#: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr ""
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Não foi possível actualizar o utilizador."
 
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94 actions/emailsettings.php:86
-#: actions/imsettings.php:68 actions/smssettings.php:94
-#: actions/twittersettings.php:70 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
-msgid "Preferences"
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+msgid "Unable to save your design settings!"
 msgstr ""
 
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163 actions/emailsettings.php:180
-#: actions/imsettings.php:152 actions/smssettings.php:171
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
-msgid "Preferences saved."
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+msgid "Design preferences saved."
 msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
-msgid "Preferred language"
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
 msgstr ""
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
-msgid "Privacy"
+#: actions/grouplogo.php:150
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
 msgstr ""
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-msgid "Problem saving notice."
+#: actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
-msgid "Profile"
-msgstr ""
+#: actions/grouplogo.php:396
+#, fuzzy
+msgid "Logo updated."
+msgstr "Avatar actualizado."
 
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
+#: actions/grouplogo.php:398
+msgid "Failed updating logo."
 msgstr ""
 
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
+#: actions/groupmembers.php:93 lib/groupnav.php:92
+#, php-format
+msgid "%s group members"
 msgstr ""
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-msgid "Profile unknown"
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
 msgstr ""
 
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
-msgid "Public Stream Feed"
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
 msgstr ""
 
-#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
-msgid "Public timeline"
+#: actions/groupmembers.php:175 lib/groupnav.php:107
+msgid "Admin"
 msgstr ""
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
+#: actions/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
+msgstr "Bloquear"
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
-msgid "Publish a MicroID for my email address."
+#: actions/groupmembers.php:441
+msgid "Make user an admin of the group"
 msgstr ""
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
+#: actions/groupmembers.php:473
+msgid "Make Admin"
 msgstr ""
 
-#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
-msgid "Recover"
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
 msgstr ""
 
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
-msgid "Recover password"
+#: actions/grouprss.php:133
+#, php-format
+msgid "Updates from members of %1$s on %2$s!"
 msgstr ""
 
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-msgid "Recovery code for unknown user."
+#: actions/groupsearch.php:52
+#, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
-#: actions/register.php:152 actions/register.php:207 lib/util.php:328
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-msgid "Register"
+#: actions/groupsearch.php:58
+msgid "Group search"
 msgstr ""
 
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
-msgid "Registration not allowed."
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "Nenhum resultado"
+
+#: actions/groupsearch.php:82
+#, php-format
+msgid ""
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
 msgstr ""
 
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
-msgid "Registration successful"
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
 msgstr ""
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
-msgid "Reject"
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
 msgstr ""
 
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
-msgid "Remember me"
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
 msgstr ""
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
-msgid "Remote profile with no matching profile"
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
 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 actions/emailsettings.php:101
-#: actions/emailsettings.php:134 actions/imsettings.php:102
-#: actions/openidsettings.php:166 actions/smssettings.php:103
-#: actions/smssettings.php:146 actions/twittersettings.php:115
-msgid "Remove"
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
 msgstr ""
 
-#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "O utilizador bloqueou-o."
+
+#: actions/groupunblock.php:128 actions/unblock.php:108
+msgid "Error removing the block."
 msgstr ""
 
-#: ../actions/openidsettings.php:73
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "Definições de IM"
+
+#: actions/imsettings.php:70
+#, php-format
 msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 msgstr ""
 
-#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
-msgid "Replies"
+#: actions/imsettings.php:89
+msgid "IM is not available."
 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
-#: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Endereço do Jabber/GTalk já confirmado."
+
+#: actions/imsettings.php:114
 #, php-format
-msgid "Replies to %s"
+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 ""
+"A aguardar confirmação deste endereço. Verifique as instrucções enviadas "
+"para a sua conta de Jabber/GTalk. (Adicionou %s à sua lista de amigos?)"
 
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
-msgid "Reset"
-msgstr ""
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "Endereço IM"
 
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
-msgid "Reset password"
+#: actions/imsettings.php:126
+#, 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 ""
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-msgid "SMS"
+#: actions/imsettings.php:143
+msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
-msgid "SMS Phone number"
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
+#: actions/imsettings.php:153
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
-msgid "SMS confirmation"
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
-msgid "Same as password above"
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
 msgstr ""
 
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
-msgid "Same as password above. Required."
-msgstr ""
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr "Não é possível normalizar esse ID de Jabber"
 
-#: ../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 actions/emailsettings.php:182
-#: actions/facebooksettings.php:114 actions/imsettings.php:157
-#: actions/othersettings.php:117 actions/profilesettings.php:150
-#: actions/smssettings.php:169 actions/subscriptions.php:124
-#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
-msgid "Save"
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
 msgstr ""
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
-msgid "Search"
+#: actions/imsettings.php:299
+msgid "That is already your Jabber ID."
 msgstr ""
 
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
-msgstr ""
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr "O Jabber ID introduzido já pertence a outro utilizador."
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/imsettings.php:327
 #, php-format
 msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
+"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 fornecido. Tem que "
+"aprovar que %s envie mensagens para sí."
+
+#: actions/imsettings.php:387
+msgid "That is not your Jabber ID."
 msgstr ""
 
-#: ../actions/peoplesearch.php:28
+#: actions/inbox.php:59
 #, 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."
+msgid "Inbox for %s - page %d"
 msgstr ""
 
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
-msgid "Select a carrier"
+#: actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
 msgstr ""
 
-#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
-#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
-msgid "Send"
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
+#: actions/invite.php:39
+msgid "Invites have been disabled."
 msgstr ""
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
+#: actions/invite.php:41
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
 msgstr ""
 
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
-msgid "Send me notices through Jabber/GTalk."
+#: actions/invite.php:72
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "Endereço de email inválido: %s"
+
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
+msgstr "Contive(s) enviado(s)"
+
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr "Convidar novos utilizadores"
+
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
 msgstr ""
 
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/invite.php:131 actions/invite.php:139
+#, php-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: actions/invite.php:136
 msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
+"These people are already users and you were automatically subscribed to them:"
 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/invite.php:144
+msgid "Invitation(s) sent to the following people:"
+msgstr "Convite(s) enviado(s) para as seguintes pessoas:"
 
-#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
-msgid "Settings"
+#: actions/invite.php:150
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 msgstr ""
 
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
-msgid "Settings saved."
+#: actions/invite.php:162
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "Endereços de Email"
 
-#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:114
-msgid "Someone else already has this OpenID."
-msgstr ""
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr "Endereços dos amigos a convidar (um por linha)"
 
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
+#: actions/invite.php:192
+msgid "Personal message"
 msgstr ""
 
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
 msgstr ""
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
-msgid "Source"
-msgstr ""
+#: actions/invite.php:226
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s convidou-o a juntar-se a ele no %2$s"
 
-#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
-msgid "Statistics"
+#: actions/invite.php:228
+#, 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 convidou-o a juntar-se a ele no %2$s (%3$s).\n"
+"\n"
+"%2$s é um serviço de micro-blogging que o deixa actualizado com pessoas que "
+"conhece e que lhe interessam.\n"
+"\n"
+"Também pode partilhar notícias suas, pensamentos, ou a sua vida online com "
+"pessoas que o conheça. É também ideal para conhecer pessoas com interesses "
+"semelhantes aos seus.\n"
+"\n"
+"%1$s disse:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Pode ver o perfil de %1$s no %2$s aqui:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Se gostaria de experimentar este serviço visite o endereço a baixo para "
+"aceitar este convite.\n"
+"\n"
+"%6$s\n"
+"\n"
+"Se não, pode ignorar esta mensagem. Obrigado pelo seu tempo e paciência.\n"
+"\n"
+"Sinceramente, %2$s\n"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-msgid "Stored OpenID not found."
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
 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
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
-msgid "Subscribe"
+#: actions/joingroup.php:90 lib/command.php:217
+msgid "You are already a member of that group"
 msgstr ""
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
-msgid "Subscribers"
+#: actions/joingroup.php:128 lib/command.php:234
+#, php-format
+msgid "Could not join user %s to group %s"
 msgstr ""
 
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
-msgid "Subscription authorized"
+#: actions/joingroup.php:135 lib/command.php:239
+#, php-format
+msgid "%s joined group %s"
 msgstr ""
 
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
-msgid "Subscription rejected"
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
 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
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
-msgid "Subscriptions"
+#: actions/leavegroup.php:90 lib/command.php:268
+msgid "You are not a member of that group."
 msgstr ""
 
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
-msgid "System error uploading file."
+#: actions/leavegroup.php:119 lib/command.php:278
+msgid "Could not find membership record."
 msgstr ""
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
-#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
-msgid "Tags"
+#: actions/leavegroup.php:127 lib/command.php:284
+#, php-format
+msgid "Could not remove user %s to group %s"
 msgstr ""
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
+#: actions/leavegroup.php:134 lib/command.php:289
+#, php-format
+msgid "%s left group %s"
 msgstr ""
 
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
-msgid "Text search"
-msgstr ""
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "Login já efectuado."
 
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
-msgstr ""
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Conteúdo da mensagem inválido"
 
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
+#: actions/login.php:143
+msgid "Incorrect username or password."
+msgstr "Nome de utilizador ou palavra-passe incorrecta"
+
+#: actions/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
+msgstr "Erro ao configurar utilizador."
+
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "Entrar"
+
+#: actions/login.php:243
+msgid "Login to site"
 msgstr ""
 
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Alcunha"
+
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
 msgstr ""
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
 msgstr ""
 
-#: ../actions/avatar.php:80 actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
+#: actions/login.php:253 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
+"Efectuar login automático; não utilizar em computadores de uso partilhado!"
 
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
-msgid "That is already your Jabber ID."
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "Perdeu ou esqueceu-se da palavra-passe?"
+
+#: actions/login.php:282
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
 msgstr ""
+"Por razões de segurança, por favor reintroduza o seu nome de utilizador e "
+"palavra-passe antes de alterar as suas configurações."
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
-msgid "That is already your email address."
+#: actions/login.php:286
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
 msgstr ""
+"Entrar com o seu nome de utilizador e palavra passe. Não está registado "
+"ainda?[Registe-se](%%action.register%%), ou tente entrar com [OpenID](%%"
+"action.openidlogin%%). "
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
-msgid "That is already your phone number."
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
 msgstr ""
 
-#: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
-msgid "That is not your Jabber ID."
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
 msgstr ""
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
-msgid "That is not your email address."
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
 msgstr ""
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
 msgstr ""
 
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-#: actions/emailsettings.php:367 actions/imsettings.php:349
-msgid "That is the wrong IM address."
+#: actions/microsummary.php:69
+msgid "No current status"
 msgstr ""
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
+#: actions/newgroup.php:53
+msgid "New group"
 msgstr ""
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-msgid "That phone number already belongs to another user."
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
 msgstr ""
 
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49 actions/twitapistatuses.php:330
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-msgid "That's too long. Max notice size is 140 chars."
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
 msgstr ""
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
-msgid "That's too long. Max notice size is 255 chars."
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
 msgstr ""
 
-#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
-#, php-format
-msgid "The address \"%s\" has been confirmed for your account."
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
 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
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
-msgid "The address was removed."
+#: actions/newmessage.php:158
+msgid "No recipient specified."
 msgstr ""
 
-#: ../actions/userauthorization.php:312
+#: actions/newmessage.php:164 lib/command.php:370
 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:"
+"Don't send a message to yourself; just say it to yourself quietly instead."
 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."
+#: actions/newmessage.php:181
+msgid "Message sent"
 msgstr ""
 
-#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/newmessage.php:185 lib/command.php:375
 #, php-format
-msgid "These are the people who listen to %s's notices."
+msgid "Direct message to %s sent"
 msgstr ""
 
-#: ../actions/subscribers.php:33 actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
 msgstr ""
 
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
-#, php-format
-msgid "These are the people whose notices %s listens to."
+#: actions/newnotice.php:69
+msgid "New notice"
 msgstr ""
 
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
+#: actions/newnotice.php:199
+msgid "Notice posted"
 msgstr ""
 
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/noticesearch.php:68
+#, php-format
 msgid ""
-"These people are already users and you were automatically subscribed to them:"
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
 msgstr ""
 
-#: ../actions/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
+#: actions/noticesearch.php:78
+msgid "Text search"
 msgstr ""
 
-#: ../lib/openid.php:195
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "Procurar por \"%s\" no fluxo de mensagens"
+
+#: actions/noticesearch.php:121
+#, php-format
 msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/noticesearch.php:124
 #, 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."
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-msgid "This method requires a POST or DELETE."
+#: actions/noticesearchrss.php:89
+#, php-format
+msgid "Updates with \"%s\""
 msgstr ""
 
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
-msgid "This method requires a POST."
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Todas as actualizações com o termo \"%s\""
+
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
 
-#: ../lib/util.php:164 lib/util.php:246
-msgid "This page is not available in a media type you accept"
+#: actions/nudge.php:94
+msgid "Nudge sent"
 msgstr ""
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
-msgid "Timezone"
+#: actions/nudge.php:97
+msgid "Nudge sent!"
 msgstr ""
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
-msgid "Timezone not selected."
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:43
+#: actions/oembed.php:86 actions/shownotice.php:180
 #, 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 ""
+msgid "%1$s's status on %2$s"
+msgstr "%1$s's estado em %2$s"
 
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Ligar"
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
-msgid "URL of your homepage, blog, or profile on another site"
+#: actions/oembed.php:160
+msgid "Only "
 msgstr ""
 
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-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 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-msgid "Unexpected form submission."
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
 msgstr ""
 
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
-msgid "Unexpected password reset."
+#: actions/opensearch.php:64
+msgid "People Search"
 msgstr ""
 
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-msgid "Unknown action"
+#: actions/opensearch.php:67
+msgid "Notice Search"
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-msgid "Unknown version of OMB protocol."
+#: actions/othersettings.php:60
+msgid "Other Settings"
 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 "
+#: actions/othersettings.php:71
+msgid "Manage various other options."
 msgstr ""
 
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
-#, php-format
-msgid "Unrecognized address type %s"
+#: actions/othersettings.php:108
+msgid " (free service)"
 msgstr ""
 
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
 msgstr ""
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-msgid "Unsupported OMB version"
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
 msgstr ""
 
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
-msgid "Unsupported image file format."
+#: actions/othersettings.php:122
+msgid "View profile designs"
 msgstr ""
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
 msgstr ""
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
+#: actions/othersettings.php:153
+msgid "URL shortening service is too long (max 50 chars)."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/outbox.php:58
 #, php-format
-msgid "Updates from %1$s and friends on %2$s!"
+msgid "Outbox for %s - page %d"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/outbox.php:61
 #, php-format
-msgid "Updates from %1$s on %2$s!"
+msgid "Outbox for %s"
 msgstr ""
 
-#: ../actions/avatar.php:68 actions/profilesettings.php:161
-#: actions/avatarsettings.php:162 actions/grouplogo.php:232
-msgid "Upload"
+#: actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
 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/passwordsettings.php:58
+msgid "Change password"
+msgstr "Modificar palavra-passe"
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr ""
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "Modificar a sua palavra-passe"
 
-#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+msgid "Password change"
 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"
+#: actions/passwordsettings.php:104
+msgid "Old password"
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
-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
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-msgid "User has no profile."
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "Nova palavra-passe"
+
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6 ou mais caracteres"
+
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "Confirmar"
+
+#: actions/passwordsettings.php:113
+msgid "same as password above"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "Modificar"
+
+#: actions/passwordsettings.php:154 actions/register.php:230
+msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
 msgstr ""
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
-msgid "What timezone are you normally in?"
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "Palavra-passe antiga incorrecta"
+
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "Erro ao guardar utilizador; inválido."
+
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "Não é possível guardar a nova password."
+
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
 msgstr ""
 
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: actions/peoplesearch.php:52
 #, php-format
-msgid "What's up, %s?"
+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/profilesettings.php:54 ../actions/register.php:175
-#: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
-msgid "Where you are, like \"City, State (or Region), Country\""
+#: actions/peoplesearch.php:58
+msgid "People search"
 msgstr ""
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/peopletag.php:70
 #, php-format
-msgid "Wrong image type for '%s'"
+msgid "Not a valid people tag: %s"
 msgstr ""
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/peopletag.php:144
 #, php-format
-msgid "Wrong size image at '%s'"
+msgid "Users self-tagged with %s - page %d"
 msgstr ""
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
-msgid "Yes"
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "Conteúdo da mensagem inválido"
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-msgid "You already have this OpenID!"
+#: actions/profilesettings.php:60
+msgid "Profile settings"
 msgstr ""
 
-#: ../actions/deletenotice.php:37 actions/deletenotice.php:37
+#: actions/profilesettings.php:71
 msgid ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
+"You can update your personal profile info here so people know more about you."
 msgstr ""
 
-#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
+#: actions/profilesettings.php:99
+msgid "Profile information"
 msgstr ""
 
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-msgid "You are already subscribed to these users:"
-msgstr ""
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64 letras minúsculas ou números, sem pontuação ou espaços"
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
-msgid "You are not friends with the specified user."
-msgstr ""
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full name"
+msgstr "Nome Completo"
+
+#: actions/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "Página Principal"
 
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
-#: ../actions/register.php:135 actions/register.php:145
-msgid "You can create a new account to start posting notices."
+#: actions/profilesettings.php:122 actions/register.php:460
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Descreva-se e aos seus interesses em 140 caracteres"
+
+#: actions/profilesettings.php:125 actions/register.php:463
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Descreva-se e aos seus interesses em 140 caracteres"
+
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "Bio"
+
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "Localidade"
+
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
 msgstr ""
 
-#: ../actions/openidsettings.php:86
+#: actions/profilesettings.php:140
 msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 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."
+#: actions/profilesettings.php:144
+msgid "Language"
+msgstr "Linguagem"
+
+#: actions/profilesettings.php:145
+msgid "Preferred language"
 msgstr ""
 
-#: ../actions/profilesettings.php:27
-msgid ""
-"You can update your personal profile info here so people know more about you."
+#: actions/profilesettings.php:154
+msgid "Timezone"
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
-msgid "You can't register if you don't agree to the license."
+#: actions/profilesettings.php:160
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
+"Subscrever automaticamente a quem se subscrever a mim (recomendado para não-"
+"humanos)"
+
+#: actions/profilesettings.php:221 actions/register.php:223
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Bio é demasiada extensa (máx 140 car)."
 
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
-msgid "You did not send us that profile"
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
 msgstr ""
 
-#: ../lib/mail.php:147
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr "Linguagem introduzida é muito longa (máx. 50 caracteres)."
+
+#: actions/profilesettings.php:246 actions/tagother.php:178
 #, 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"
+msgid "Invalid tag: \"%s\""
 msgstr ""
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
-msgid "You may not delete another user's status."
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
+msgstr "Não foi possível actualizar o utilizador para auto-subscrição."
+
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+msgstr "Não foi possível salvar o perfil."
+
+#: actions/profilesettings.php:336
+msgid "Couldn't save tags."
+msgstr ""
+
+#: actions/profilesettings.php:344
+msgid "Settings saved."
 msgstr ""
 
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/public.php:83
 #, php-format
-msgid "You must be logged in to invite other users to use %s"
+msgid "Beyond the page limit (%s)"
 msgstr ""
 
-#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
 msgstr ""
 
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
+#: actions/public.php:129
+#, fuzzy, php-format
+msgid "Public timeline, page %d"
+msgstr "Mensagens públicas de %s"
+
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
 msgstr ""
 
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
-msgid "Your OpenID URL"
+#: actions/public.php:151
+msgid "Public Stream Feed (RSS 1.0)"
 msgstr ""
 
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
+#: actions/public.php:155
+msgid "Public Stream Feed (RSS 2.0)"
 msgstr ""
 
-#: ../actions/openidsettings.php:28
+#: actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Fluxo Público de %s"
+
+#: actions/public.php:179
 #, php-format
 msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
-"account.  Manage your associated OpenIDs from here."
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
 msgstr ""
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
-msgid "a few seconds ago"
+#: actions/public.php:182
+msgid "Be the first to post!"
 msgstr ""
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: actions/public.php:186
 #, php-format
-msgid "about %d days ago"
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: actions/public.php:233
 #, php-format
-msgid "about %d hours ago"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: actions/public.php:238
 #, php-format
-msgid "about %d minutes ago"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
 msgstr ""
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
-#, php-format
-msgid "about %d months ago"
+#: actions/publictagcloud.php:57
+msgid "Public tag cloud"
 msgstr ""
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
-msgid "about a day ago"
+#: actions/publictagcloud.php:63
+#, php-format
+msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
-msgid "about a minute ago"
+#: actions/publictagcloud.php:69
+#, php-format
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
-msgid "about a month ago"
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
 msgstr ""
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
-msgid "about a year ago"
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
 msgstr ""
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
-msgid "about an hour ago"
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
 msgstr ""
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
 msgstr ""
 
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117 actions/noticesearch.php:136
-#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
-msgid "in reply to..."
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
 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 actions/noticesearch.php:194
-msgid "reply"
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
 msgstr ""
 
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-msgid "same as password above"
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
-msgid "unsupported file type"
-msgstr ""
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "Erro no código de confirmação."
 
-#: ../lib/util.php:1309 lib/util.php:1443
-msgid "« After"
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
 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
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-msgid "There was a problem with your session token. Try again, please."
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
 msgstr ""
+"Não foi possivel actualizar utilizador com endereço de email confirmado."
 
-#: actions/disfavor.php:55 actions/disfavor.php:81
-msgid "This notice is not a favorite!"
+#: actions/recoverpassword.php:152
+msgid ""
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
 msgstr ""
 
-#: actions/disfavor.php:63 actions/disfavor.php:87
-msgid "Could not delete favorite."
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
-#: actions/disfavor.php:72 lib/favorform.php:140
-msgid "Favor"
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
 msgstr ""
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
 msgstr ""
 
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-msgid "Send me email when someone sends me a private message."
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
-msgid "This notice is already a favorite!"
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
 msgstr ""
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132 actions/favor.php:86
-#: actions/twitapifavorites.php:125 classes/Command.php:152
-msgid "Could not create favorite."
+#: actions/recoverpassword.php:208
+msgid "Reset password"
 msgstr ""
 
-#: actions/favor.php:70
-msgid "Disfavor"
+#: actions/recoverpassword.php:209
+msgid "Recover password"
 msgstr ""
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
-#, php-format
-msgid "%s favorite notices"
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
 msgstr ""
 
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
-#, php-format
-msgid "Feed of favorite notices of %s"
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
 msgstr ""
 
-#: actions/inbox.php:28 actions/inbox.php:59
-#, php-format
-msgid "Inbox for %s - page %d"
-msgstr ""
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 ou mais caracteres, e não a esqueça!"
 
-#: actions/inbox.php:30 actions/inbox.php:62
-#, php-format
-msgid "Inbox for %s"
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
 msgstr ""
 
-#: actions/inbox.php:53 actions/inbox.php:115
-msgid "This is your inbox, which lists your incoming private messages."
+#: actions/recoverpassword.php:243
+msgid "Reset"
 msgstr ""
 
-#: actions/invite.php:178 actions/invite.php:213
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-msgstr ""
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "Introduza uma alcunha ou um endereço de email"
 
-#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-msgid "Automatically login in the future; "
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
 msgstr ""
 
-#: actions/login.php:122 actions/login.php:264
-msgid "For security reasons, please re-enter your "
-msgstr ""
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr "Nenhum endereço de email registado para esse utilizador."
 
-#: actions/login.php:126 actions/login.php:268
-msgid "Login with your username and password. "
-msgstr ""
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "Erro ao guardar confirmação do endereço."
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
-msgid "That's too long. Max message size is 140 chars."
+#: actions/recoverpassword.php:325
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
 msgstr ""
+"As instruções para a recuperação da palavra-passe foram enviadas para o "
+"endereço de email registado na sua conta."
 
-#: actions/newmessage.php:65 actions/newmessage.php:128
-msgid "No recipient specified."
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
 msgstr ""
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206 actions/newmessage.php:131
-#: actions/newmessage.php:168 classes/Command.php:237
-msgid "You can't send a message to this user."
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
 msgstr ""
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
 msgstr ""
 
-#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
-msgid "No such user"
-msgstr ""
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
+msgstr "Nova palavra-passe foi guardada com sucesso. Está agora conectado."
 
-#: actions/newmessage.php:117 actions/newmessage.php:67
-msgid "New message"
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/noticesearch.php:95 actions/noticesearch.php:146
-msgid "Notice without matching profile"
-msgstr ""
+#: actions/register.php:92
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "Erro no código de confirmação."
 
-#: actions/openidsettings.php:28 actions/openidsettings.php:70
-#, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+#: actions/register.php:112
+msgid "Registration successful"
 msgstr ""
 
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
 msgstr ""
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
+#: actions/register.php:135
+msgid "Registration not allowed."
 msgstr ""
 
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-msgid "You can remove an OpenID from your account "
+#: actions/register.php:198
+msgid "You can't register if you don't agree to the license."
 msgstr ""
 
-#: actions/outbox.php:28 actions/outbox.php:58
-#, php-format
-msgid "Outbox for %s - page %d"
+#: actions/register.php:201
+msgid "Not a valid email address."
 msgstr ""
 
-#: actions/outbox.php:30 actions/outbox.php:61
-#, php-format
-msgid "Outbox for %s"
-msgstr ""
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "Endereço de Email já existe."
 
-#: actions/outbox.php:53 actions/outbox.php:116
-msgid "This is your outbox, which lists private messages you have sent."
-msgstr ""
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "Nome de utilizador ou palavra-passe inválido."
 
-#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
-#, php-format
+#: actions/register.php:342
 msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
 msgstr ""
 
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
-msgid "You can update your personal profile info here "
-msgstr ""
+#: actions/register.php:424
+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."
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
-msgid "User without matching profile"
-msgstr ""
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr "6 ou mais caracteres. Obrigatório."
 
-#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
+#: actions/register.php:433
+msgid "Same as password above. Required."
 msgstr ""
 
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
-msgstr ""
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "Email"
 
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a "
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-msgid "Your nickname on this server, "
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-msgid "Instructions for recovering your password "
+#: actions/register.php:493
+msgid "My text and files are available under "
 msgstr ""
 
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
-msgid "New password successfully saved. "
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
-#: actions/register.php:95 actions/register.php:180
-msgid "Password must be 6 or more characters."
+#: actions/register.php:496
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
 msgstr ""
+"excepto estes dados privados: palavra chave, endereço de email, endereço de "
+"mensageiro instantâneo, número de telefone."
 
-#: actions/register.php:216
+#: actions/register.php:537
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
+"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 ""
+"Parabéns, %s! Bemvindo ao %%%%site.name%%%%. A partir de agora deverá...\n"
+"\n"
+"* Ir ao [seu perfil](%s) e enviar a primeira mensagem.\n"
+"* Adicionar uma [Endereço Jabber/GTalk](%%%%action.imsettings%%%%) de forma "
+"a poder enviar notações através de mensagens instantâneas.\n"
+"* [Procurar por pessoas](%%%%action.peoplesearch%%%%) que conheça ou "
+"partilhem os seus interesses. \n"
+"* Actualizar o seu perfil [Opções de perfil](%%%%action.profilesettings%%%%) "
+"para contar mais acerca de si aos outros. \n"
+"* Ler os [documentos online](%%%%doc.help%%%%) para conhecer todas as "
+"funcionalidades que tenha perdido. \n"
+"\n"
+"Obrigado por se registar e esperamos que se divirta usando este serviço."
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
+#: actions/register.php:561
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
 msgstr ""
+"(Deverá receber uma mensagem por email dentro de momentos, com instrucções "
+"sobre como confirmar o seu endereço de email.)"
 
-#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
+#: actions/remotesubscribe.php:98
 #, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
+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/showfavorites.php:61 actions/showfavorites.php:145
-#, php-format
-msgid "Feed for favorites of %s"
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
 msgstr ""
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-msgid "Could not retrieve favorite notices."
-msgstr ""
+#: actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Subscrever este utilizador"
 
-#: actions/showmessage.php:33 actions/showmessage.php:81
-msgid "No such message."
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
 msgstr ""
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr "Alcunha do utilizador que pretende seguir"
+
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
 msgstr ""
 
-#: actions/showmessage.php:61 actions/showmessage.php:108
-#, php-format
-msgid "Message to %1$s on %2$s"
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
-#: actions/showmessage.php:66 actions/showmessage.php:113
-#, php-format
-msgid "Message from %1$s on %2$s"
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
 msgstr ""
 
-#: actions/showstream.php:154
-msgid "Send a message"
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr "URL de perfil inválido (formato incorrecto)"
+
+#: actions/remotesubscribe.php:168
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
 msgstr ""
 
-#: actions/smssettings.php:312 actions/smssettings.php:464
-#, php-format
-msgid "Mobile carrier for your phone. "
+#: actions/remotesubscribe.php:176
+msgid "That’s a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "Não foi possível obter um token de requisição."
+
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
 #, php-format
-msgid "Direct messages to %s"
+msgid "Replies to %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/replies.php:127
 #, php-format
-msgid "All the direct messages sent to %s"
+msgid "Replies to %s, page %d"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-msgid "Direct Messages You've Sent"
-msgstr ""
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Feed para os amigos de %s"
 
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
-#, php-format
-msgid "All the direct messages sent from %s"
-msgstr ""
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Feed para os amigos de %s"
 
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-msgid "No message text!"
-msgstr ""
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Feed para a tag %s"
 
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-msgid "Recipient user not found."
+#: actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
 msgstr ""
 
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-msgid "Can't send direct messages to users who aren't your friend."
+#: actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
 msgstr ""
 
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/replies.php:205
 #, php-format
-msgid "%s / Favorites from %s"
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/repliesrss.php:72
 #, php-format
-msgid "%s updates favorited by %s / %s."
+msgid "Replies to %1$s on %2$s!"
 msgstr ""
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
-#, php-format
-msgid "%s added your notice as a favorite"
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "%s e amigos"
+
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
 msgstr ""
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
-#, php-format
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Feed para os amigos de %s"
+
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Feed para os amigos de %s"
+
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Feed para os amigos de %s"
+
+#: actions/showfavorites.php:205
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/showfavorites.php:207
+#, php-format
 msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
 msgstr ""
 
-#: actions/twittersettings.php:41 actions/twittersettings.php:60
-msgid "Twitter settings"
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
 msgstr ""
 
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-msgid "Twitter Account"
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
 msgstr ""
 
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-msgid "Current verified Twitter account."
+#: actions/showgroup.php:82 lib/groupnav.php:86
+#, php-format
+msgid "%s group"
 msgstr ""
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
+#: actions/showgroup.php:84
+#, php-format
+msgid "%s group, page %d"
 msgstr ""
 
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-msgid "No spaces, please."
+#: actions/showgroup.php:218
+msgid "Group profile"
 msgstr ""
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
+msgid "URL"
 msgstr ""
 
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-msgid "Automatically send my notices to Twitter."
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
+msgid "Note"
 msgstr ""
 
-#: actions/twittersettings.php:75 actions/twittersettings.php:146
-msgid "Send local \"@\" replies to Twitter."
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
 msgstr ""
 
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-msgid "Subscribe to my Twitter friends here."
+#: actions/showgroup.php:293
+msgid "Group actions"
 msgstr ""
 
-#: actions/twittersettings.php:122
-msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+#: actions/showgroup.php:328
+#, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
 msgstr ""
 
-#: actions/twittersettings.php:128 actions/twittersettings.php:334
-msgid "Could not verify your Twitter credentials!"
+#: actions/showgroup.php:334
+#, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/showgroup.php:340
 #, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-msgid "Unable to save your Twitter settings!"
-msgstr ""
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "Feed para a tag %s"
 
-#: actions/twittersettings.php:174 actions/twittersettings.php:376
-msgid "Twitter settings saved."
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
+msgid "Members"
 msgstr ""
 
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-msgid "That is not your Twitter account."
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/tagcloudsection.php:71
+msgid "(None)"
 msgstr ""
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
-msgid "Couldn't remove Twitter user."
+#: actions/showgroup.php:392
+msgid "All members"
 msgstr ""
 
-#: actions/twittersettings.php:212 actions/twittersettings.php:407
-msgid "Twitter account removed."
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
 msgstr ""
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
-msgid "Couldn't save Twitter preferences."
-msgstr ""
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Criar"
 
-#: actions/twittersettings.php:245 actions/twittersettings.php:461
-msgid "Twitter preferences saved."
+#: actions/showgroup.php:448
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/userauthorization.php:84 actions/userauthorization.php:86
-msgid "Please check these details to make sure "
+#: actions/showgroup.php:454
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
 msgstr ""
 
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
-msgid "The subscription has been authorized, but no "
+#: actions/showgroup.php:482
+msgid "Admins"
 msgstr ""
 
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-msgid "The subscription has been rejected, but no "
+#: actions/showmessage.php:81
+msgid "No such message."
 msgstr ""
 
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-msgid "Command results"
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: classes/Channel.php:148 classes/Channel.php:204
-msgid "Command complete"
+#: actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: classes/Channel.php:158 classes/Channel.php:215
-msgid "Command failed"
+#: actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: classes/Command.php:39 classes/Command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr ""
+#: actions/shownotice.php:90
+msgid "Notice deleted."
+msgstr "Avatar actualizado."
 
-#: classes/Command.php:96 classes/Command.php:113
+#: actions/showstream.php:73
 #, php-format
-msgid "Subscriptions: %1$s\n"
+msgid " tagged %s"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
-msgid "User has no last notice"
+#: actions/showstream.php:79
+#, php-format
+msgid "%s, page %d"
 msgstr ""
 
-#: classes/Command.php:146 classes/Command.php:166
-msgid "Notice marked as fave."
+#: actions/showstream.php:122
+#, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
 msgstr ""
 
-#: classes/Command.php:166 classes/Command.php:189
+#: actions/showstream.php:129
 #, php-format
-msgid "%1$s (%2$s)"
+msgid "Notice feed for %s (RSS 1.0)"
 msgstr ""
 
-#: classes/Command.php:169 classes/Command.php:192
+#: actions/showstream.php:136
 #, php-format
-msgid "Fullname: %s"
+msgid "Notice feed for %s (RSS 2.0)"
 msgstr ""
 
-#: classes/Command.php:172 classes/Command.php:195
+#: actions/showstream.php:143
 #, php-format
-msgid "Location: %s"
+msgid "Notice feed for %s (Atom)"
 msgstr ""
 
-#: classes/Command.php:175 classes/Command.php:198
+#: actions/showstream.php:148
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Feed para a tag %s"
+
+#: actions/showstream.php:191
 #, php-format
-msgid "Homepage: %s"
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
 msgstr ""
 
-#: classes/Command.php:178 classes/Command.php:201
-#, php-format
-msgid "About: %s"
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
 msgstr ""
 
-#: classes/Command.php:200 classes/Command.php:228
+#: actions/showstream.php:198
 #, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: classes/Command.php:214 classes/Command.php:245
+#: actions/showstream.php:234
 #, php-format
-msgid "Direct message to %s sent"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: classes/Command.php:216 classes/Command.php:247
-msgid "Error sending direct message."
+#: actions/showstream.php:239
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
 msgstr ""
 
-#: classes/Command.php:263 classes/Command.php:300
-msgid "Specify the name of the user to subscribe to"
+#: actions/smssettings.php:58
+msgid "SMS Settings"
 msgstr ""
 
-#: classes/Command.php:270 classes/Command.php:307
+#: actions/smssettings.php:69
 #, php-format
-msgid "Subscribed to %s"
+msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: classes/Command.php:288 classes/Command.php:328
-msgid "Specify the name of the user to unsubscribe from"
+#: actions/smssettings.php:91
+msgid "SMS is not available."
 msgstr ""
 
-#: classes/Command.php:295 classes/Command.php:335
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr ""
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Número de telefone com serviço SMS activo já confirmado."
 
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
-msgid "Command not yet implemented."
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
+msgstr "A aguardar confirmação deste número de telefone."
+
+#: actions/smssettings.php:130
+msgid "Confirmation code"
+msgstr "Código de confirmação"
+
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
+msgstr "Introduza o código que recebeu no seu telefone."
+
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
 msgstr ""
 
-#: classes/Command.php:313 classes/Command.php:356
-msgid "Notification off."
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
-#: classes/Command.php:315 classes/Command.php:358
-msgid "Can't turn off notification."
+#: actions/smssettings.php:174
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
 msgstr ""
 
-#: classes/Command.php:333 classes/Command.php:379
-msgid "Notification on."
+#: actions/smssettings.php:306
+msgid "No phone number."
+msgstr "Nenhum numero de telefone."
+
+#: actions/smssettings.php:311
+msgid "No carrier selected."
 msgstr ""
 
-#: classes/Command.php:335 classes/Command.php:381
-msgid "Can't turn on notification."
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
 msgstr ""
 
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
 msgstr ""
 
-#: classes/Message.php:53 classes/Message.php:56
-msgid "Could not insert message."
+#: actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
 msgstr ""
+"Um código de confirmação foi enviado para o número de telefone fornecido. "
+"Procure na sua 'Caixa de Entrada' (e caixa de spam) pelo email com o código "
+"e instrucções de utilização."
 
-#: classes/Message.php:63 classes/Message.php:66
-msgid "Could not update message with new URI."
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
 msgstr ""
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
 msgstr ""
 
-#: lib/mail.php:147 lib/mail.php:289
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+#: actions/smssettings.php:465
+msgid "Mobile carrier"
 msgstr ""
 
-#: lib/mail.php:249 lib/mail.php:508
-#, php-format
-msgid "New private message from %s"
+#: actions/smssettings.php:469
+msgid "Select a carrier"
 msgstr ""
 
-#: lib/mail.php:253 lib/mail.php:512
+#: actions/smssettings.php:476
 #, php-format
 msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+"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 ""
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr ""
+#: actions/smssettings.php:498
+msgid "No code entered"
+msgstr "Nenhum código introduzido"
 
-#: lib/openid.php:195 lib/openid.php:203
-msgid "This form should automatically submit itself. "
+#: actions/subedit.php:70
+msgid "You are not subscribed to that profile."
 msgstr ""
 
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-msgid "Favorites"
+#: actions/subedit.php:83
+msgid "Could not save subscription."
 msgstr ""
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-#, php-format
-msgid "%s's favorite notices"
+#: actions/subscribe.php:55
+msgid "Not a local user."
 msgstr ""
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-msgid "User"
+#: actions/subscribe.php:69
+msgid "Subscribed"
 msgstr ""
 
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-msgid "Inbox"
+#: actions/subscribers.php:50
+#, php-format
+msgid "%s subscribers"
 msgstr ""
 
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-msgid "Your incoming messages"
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %d"
 msgstr ""
 
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-msgid "Outbox"
+#: actions/subscribers.php:63
+msgid "These are the people who listen to your notices."
 msgstr ""
 
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-msgid "Your sent messages"
+#: actions/subscribers.php:67
+#, php-format
+msgid "These are the people who listen to %s's notices."
 msgstr ""
 
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-msgid "Twitter"
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
 msgstr ""
 
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
 
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-msgid "To"
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
 msgstr ""
 
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-msgid "Could not parse message."
-msgstr ""
+#: actions/subscriptions.php:52
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "Todas as subscrições"
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/subscriptions.php:54
 #, fuzzy, php-format
-msgid "%s and friends, page %d"
-msgstr "%s e amigos"
+msgid "%s subscriptions, page %d"
+msgstr "Todas as subscrições"
 
-#: actions/avatarsettings.php:76
-msgid "You can upload your personal avatar."
+#: actions/subscriptions.php:65
+msgid "These are the people whose notices you listen to."
 msgstr ""
 
-#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
-msgid "Avatar settings"
+#: actions/subscriptions.php:69
+#, php-format
+msgid "These are the people whose notices %s listens to."
 msgstr ""
 
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-msgid "Original"
+#: actions/subscriptions.php:121
+#, php-format
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
 msgstr ""
 
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-msgid "Preview"
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s está agora a ouvir os seus comunicados em %2$s."
+
+#: actions/subscriptions.php:194
+msgid "Jabber"
 msgstr ""
 
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
-msgid "Crop"
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
 msgstr ""
 
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-msgid "There was a problem with your session token. "
+#: actions/tagother.php:33
+msgid "Not logged in"
 msgstr ""
 
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-msgid "Pick a square area of the image to be your avatar"
+#: actions/tagother.php:39
+msgid "No id argument."
 msgstr ""
 
-#: actions/avatarsettings.php:327 actions/grouplogo.php:384
-msgid "Lost our file data."
+#: actions/tagother.php:65
+#, php-format
+msgid "Tag %s"
 msgstr ""
 
-#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
-msgid "Lost our file."
+#: actions/tagother.php:77 lib/userprofile.php:75
+msgid "User profile"
 msgstr ""
 
-#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
-#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
-msgid "Unknown file type"
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
 msgstr ""
 
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
+#: actions/tagother.php:141
+msgid "Tag user"
 msgstr ""
 
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
+#: actions/tagother.php:151
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
 msgstr ""
 
-#: actions/block.php:111
-msgid "Block user"
+#: actions/tagother.php:193
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/block.php:129
-msgid "Are you sure you want to block this user? "
+#: actions/tagother.php:200
+msgid "Could not save tags."
 msgstr ""
 
-#: actions/block.php:162
-msgid "You have already blocked this user."
+#: actions/tagother.php:236
+msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/block.php:167
-msgid "Failed to save block information."
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
 msgstr ""
 
-#: actions/confirmaddress.php:159
+#: actions/tag.php:86
 #, php-format
-msgid "The address \"%s\" has been "
+msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr ""
 
-#: actions/deletenotice.php:73
-#, fuzzy
-msgid "You are about to permanently delete a notice. "
-msgstr "Tem a certeza que permite remover esta mensagem?"
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Feed para a tag %s"
 
-#: actions/disfavor.php:94
-msgid "Add to favorites"
-msgstr ""
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Feed para a tag %s"
 
-#: actions/editgroup.php:54
-#, php-format
-msgid "Edit %s group"
+#: actions/tagrss.php:35
+msgid "No such tag."
 msgstr ""
 
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-msgid "Inboxes must be enabled for groups to work"
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
+msgstr "Método da API em construcção."
+
+#: actions/unsubscribe.php:77
+msgid "No profile id in request."
 msgstr ""
 
-#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-msgid "You must be logged in to create a group."
+#: actions/unsubscribe.php:84
+msgid "No profile with that id."
 msgstr ""
 
-#: actions/editgroup.php:87 actions/grouplogo.php:87
-#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
-msgid "No nickname"
+#: actions/unsubscribe.php:98
+msgid "Unsubscribed"
 msgstr ""
 
-#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
-#: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
-msgid "No such group"
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
-msgid "You must be an admin to edit the group"
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "Autorizar subscrição"
+
+#: actions/userauthorization.php:110
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
 msgstr ""
 
-#: actions/editgroup.php:157
-msgid "Use this form to edit the group."
+#: actions/userauthorization.php:188
+msgid "License"
 msgstr ""
 
-#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
-msgid "Nickname must have only lowercase letters "
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "Aceitar"
+
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Subscrever este utilizador"
+
+#: actions/userauthorization.php:211
+msgid "Reject"
 msgstr ""
 
-#: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/userauthorization.php:212
 #, fuzzy
-msgid "description is too long (max 140 chars)."
-msgstr "Bio é demasiada extensa (máx 140 car)."
+msgid "Reject this subscription"
+msgstr "Todas as subscrições"
 
-#: actions/editgroup.php:218
-msgid "Could not update group."
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
 msgstr ""
 
-#: actions/editgroup.php:226
-msgid "Options saved."
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
 msgstr ""
 
-#: actions/emailsettings.php:107 actions/imsettings.php:108
-#, fuzzy, php-format
-msgid "Awaiting confirmation on this address. "
-msgstr "A aguardar confirmação deste número de telefone."
-
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-msgid "Make a new email address for posting to; "
+#: actions/userauthorization.php:249
+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/emailsettings.php:157
-msgid "Send me email when someone "
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
 msgstr ""
 
-#: actions/emailsettings.php:168
-msgid "Allow friends to nudge me and send me an email."
+#: actions/userauthorization.php:261
+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/emailsettings.php:321
-msgid "That email address already belongs "
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
 msgstr ""
 
-#: actions/emailsettings.php:343
-#, fuzzy
-msgid "A confirmation code was sent to the email address you added. "
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
 msgstr ""
-"Um código de confirmação foi enviado para o endereço fornecido. Tem que "
-"aprovar que %s envie mensagens para sí."
 
-#: actions/facebookhome.php:110
-msgid "Server error - couldn't get user!"
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr ""
 
-#: actions/facebookhome.php:196
+#: actions/userauthorization.php:322
 #, php-format
-msgid "If you would like the %s app to automatically update "
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr ""
 
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#: actions/userauthorization.php:338
 #, php-format
-msgid "Allow %s to update my Facebook status"
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr ""
 
-#: actions/facebookhome.php:218
-msgid "Skip"
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Não é possível ler o URL do avatar '%s'"
+
+#: actions/userauthorization.php:348
+#, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr ""
 
-#: actions/facebookhome.php:235
-msgid "No notice content!"
+#: actions/userbyid.php:70
+msgid "No id."
 msgstr ""
 
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-msgid "Pagination"
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+msgid "Profile design"
 msgstr ""
 
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-msgid "After"
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
 msgstr ""
 
-#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
-#, fuzzy
-msgid "Before"
-msgstr "Antes »"
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
 
-#: actions/facebookinvite.php:70
+#: actions/usergroups.php:64
 #, php-format
-msgid "Thanks for inviting your friends to use %s"
+msgid "%s groups, page %d"
 msgstr ""
 
-#: actions/facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
+#: actions/usergroups.php:130
+msgid "Search for more groups"
 msgstr ""
 
-#: actions/facebookinvite.php:96
+#: actions/usergroups.php:153
 #, php-format
-msgid "You have been invited to %s"
+msgid "%s is not a member of any group."
 msgstr ""
 
-#: actions/facebookinvite.php:105
+#: actions/usergroups.php:158
 #, php-format
-msgid "Invite your friends to use %s"
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
 
-#: actions/facebookinvite.php:113
+#: classes/File.php:137
 #, php-format
-msgid "Friends already using %s:"
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
 msgstr ""
 
-#: actions/facebookinvite.php:130
+#: classes/File.php:147
 #, php-format
-msgid "Send invitations"
+msgid "A file this large would exceed your user quota of %d bytes."
 msgstr ""
 
-#: actions/facebookremove.php:56
-msgid "Couldn't remove Facebook user."
+#: classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
-#: actions/facebooksettings.php:65
-msgid "There was a problem saving your sync preferences!"
+#: classes/Message.php:55
+msgid "Could not insert message."
 msgstr ""
 
-#: actions/facebooksettings.php:67
-msgid "Sync preferences saved."
+#: classes/Message.php:65
+msgid "Could not update message with new URI."
 msgstr ""
 
-#: actions/facebooksettings.php:90
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
+#: classes/Notice.php:164
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "Ocorreu um erro na base de dados ao inserir a hashtag: %s"
 
-#: actions/facebooksettings.php:97
-msgid "Send \"@\" replies to Facebook."
+#: classes/Notice.php:179
+msgid "Problem saving notice. Too long."
 msgstr ""
 
-#: actions/facebooksettings.php:106
-msgid "Prefix"
+#: classes/Notice.php:183
+msgid "Problem saving notice. Unknown user."
 msgstr ""
 
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
+#: classes/Notice.php:188
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: actions/facebooksettings.php:124
-#, php-format
-msgid "If you would like %s to automatically update "
+#: classes/Notice.php:194
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
 msgstr ""
 
-#: actions/facebooksettings.php:147
-msgid "Sync preferences"
+#: classes/Notice.php:202
+msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: actions/favor.php:94 lib/disfavorform.php:140
-msgid "Disfavor favorite"
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
 msgstr ""
 
-#: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
-msgid "Popular notices"
-msgstr ""
+#: classes/Notice.php:1120
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "Ocorreu um erro na base de dados ao inserir a resposta: %s"
 
-#: actions/favorited.php:67
+#: classes/User.php:347
 #, php-format
-msgid "Popular notices, page %d"
+msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 
-#: actions/favorited.php:79
-msgid "The most popular notices on the site right now."
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
 msgstr ""
 
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
-msgid "Featured users"
+#: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
+msgstr "Modificar as suas definições de perfil"
+
+#: lib/accountsettingsaction.php:112
+msgid "Upload an avatar"
 msgstr ""
 
-#: actions/featured.php:71
-#, php-format
-msgid "Featured users, page %d"
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr "Modificar a sua palavra-passe"
+
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
+msgstr "Alterar email handling"
+
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
 msgstr ""
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some of the great users on %s"
+#: lib/accountsettingsaction.php:124
+msgid "Design your profile"
 msgstr ""
 
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
+#: lib/accountsettingsaction.php:128
+msgid "Other"
 msgstr ""
 
-#: actions/groupbyid.php:79
-msgid "No ID"
+#: lib/accountsettingsaction.php:128
+msgid "Other options"
 msgstr ""
 
-#: actions/grouplogo.php:138 actions/grouplogo.php:191
-msgid "Group logo"
+#: lib/action.php:144
+#, fuzzy, php-format
+msgid "%s - %s"
+msgstr "%s (%s)"
+
+#: lib/action.php:159
+msgid "Untitled page"
 msgstr ""
 
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
+#: lib/action.php:424
+msgid "Primary site navigation"
 msgstr ""
 
-#: actions/grouplogo.php:448
-#, fuzzy
-msgid "Logo updated."
-msgstr "Avatar actualizado."
+#: lib/action.php:430
+msgid "Home"
+msgstr "Início"
 
-#: actions/grouplogo.php:450
-msgid "Failed updating logo."
+#: lib/action.php:430
+msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: actions/groupmembers.php:93 lib/groupnav.php:91
+#: lib/action.php:432
+#, fuzzy
+msgid "Account"
+msgstr "Sobre"
+
+#: lib/action.php:432
+#, fuzzy
+msgid "Change your email, avatar, password, profile"
+msgstr "Modificar a sua palavra-passe"
+
+#: lib/action.php:435
+msgid "Connect"
+msgstr "Ligar"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Não foi possível redireccionar para o servidor: %s"
+
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
+msgstr "Convidar"
+
+#: lib/action.php:440 lib/subgroupnav.php:106
 #, php-format
-msgid "%s group members"
+msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: actions/groupmembers.php:96
-#, php-format
-msgid "%s group members, page %d"
+#: lib/action.php:445
+msgid "Logout"
+msgstr "Sair"
+
+#: lib/action.php:445
+msgid "Logout from the site"
 msgstr ""
 
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
+#: lib/action.php:450
+#, fuzzy
+msgid "Create an account"
+msgstr "Ligar conta existente"
+
+#: lib/action.php:453
+msgid "Login to the site"
 msgstr ""
 
-#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
-msgid "Groups"
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
+msgstr "Ajuda"
+
+#: lib/action.php:456
+msgid "Help me!"
 msgstr ""
 
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
+#: lib/action.php:459
+msgid "Search"
 msgstr ""
 
-#: actions/groups.php:90
-#, php-format
-msgid "%%%%site.name%%%% groups let you find and talk with "
+#: lib/action.php:459
+msgid "Search for people or text"
 msgstr ""
 
-#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-msgid "Create a new group"
+#: lib/action.php:480
+msgid "Site notice"
 msgstr ""
 
-#: actions/groupsearch.php:57
-#, php-format
-msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
+#: lib/action.php:546
+msgid "Local views"
 msgstr ""
 
-#: actions/groupsearch.php:63
-msgid "Group search"
+#: lib/action.php:612
+msgid "Page notice"
 msgstr ""
 
-#: actions/imsettings.php:70
-msgid "You can send and receive notices through "
+#: lib/action.php:714
+msgid "Secondary site navigation"
 msgstr ""
 
-#: actions/imsettings.php:120
-#, php-format
-msgid "Jabber or GTalk address, "
+#: lib/action.php:721
+msgid "About"
+msgstr "Sobre"
+
+#: lib/action.php:723
+msgid "FAQ"
+msgstr "FAQ"
+
+#: lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/action.php:730
+msgid "Privacy"
 msgstr ""
 
-#: actions/imsettings.php:147
-msgid "Send me replies through Jabber/GTalk "
+#: lib/action.php:732
+msgid "Source"
 msgstr ""
 
-#: actions/imsettings.php:321
-#, fuzzy, php-format
-msgid "A confirmation code was sent "
-msgstr "Código de confirmação não encontrado"
+#: lib/action.php:734
+msgid "Contact"
+msgstr "Contacto"
 
-#: actions/joingroup.php:65
-msgid "You must be logged in to join a group."
+#: lib/action.php:736
+msgid "Badge"
 msgstr ""
 
-#: actions/joingroup.php:95
-msgid "You are already a member of that group"
+#: lib/action.php:764
+msgid "StatusNet software license"
 msgstr ""
 
-#: actions/joingroup.php:128
+#: lib/action.php:767
 #, php-format
-msgid "Could not join user %s to group %s"
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
+"**%%site.name%%*** é um serviço de microblogging trazido até sí por [%%site."
+"broughtby%%](%%site.broughtbyurl%%)."
 
-#: actions/joingroup.php:135
+#: lib/action.php:769
 #, php-format
-msgid "%s joined group %s"
-msgstr ""
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** é um serviço de microblogging. "
 
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
+#: lib/action.php:771
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 
-#: actions/leavegroup.php:65
-msgid "You must be logged in to leave a group."
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "Encontrar conteúdo dos mensagens"
+
+#: lib/action.php:794
+msgid "All "
 msgstr ""
 
-#: actions/leavegroup.php:88
-msgid "No such group."
+#: lib/action.php:799
+msgid "license."
 msgstr ""
 
-#: actions/leavegroup.php:95
-msgid "You are not a member of that group."
+#: lib/action.php:1052
+msgid "Pagination"
 msgstr ""
 
-#: actions/leavegroup.php:100
-msgid "You may not leave a group while you are its administrator."
+#: lib/action.php:1061
+msgid "After"
 msgstr ""
 
-#: actions/leavegroup.php:130
-msgid "Could not find membership record."
+#: lib/action.php:1069
+#, fuzzy
+msgid "Before"
+msgstr "Antes »"
+
+#: lib/action.php:1117
+msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/leavegroup.php:138
-#, php-format
-msgid "Could not remove user %s to group %s"
+#: lib/attachmentlist.php:87
+msgid "Attachments"
 msgstr ""
 
-#: actions/leavegroup.php:145
-#, php-format
-msgid "%s left group %s"
+#: lib/attachmentlist.php:265
+msgid "Author"
 msgstr ""
 
-#: actions/login.php:225 lib/facebookaction.php:304
-msgid "Login to site"
+#: lib/attachmentlist.php:278
+msgid "Provider"
 msgstr ""
 
-#: actions/microsummary.php:69
-msgid "No current status"
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
 msgstr ""
 
-#: actions/newgroup.php:53
-msgid "New group"
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
 msgstr ""
 
-#: actions/newgroup.php:115
-msgid "Use this form to create a new group."
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
 msgstr ""
 
-#: actions/newgroup.php:177
-msgid "Could not create group."
+#: lib/channel.php:210
+msgid "Command complete"
 msgstr ""
 
-#: actions/newgroup.php:191
-msgid "Could not set group membership."
+#: lib/channel.php:221
+msgid "Command failed"
 msgstr ""
 
-#: actions/newmessage.php:119 actions/newnotice.php:132
-msgid "That's too long. "
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: actions/newmessage.php:134
-msgid "Don't send a message to yourself; "
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
 msgstr ""
+"Não foi possivel actualizar utilizador com endereço de email confirmado."
 
-#: actions/newnotice.php:166
-msgid "Notice posted"
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: actions/newnotice.php:200 classes/Channel.php:163
-msgid "Ajax Error"
+#: lib/command.php:99
+#, php-format
+msgid "Nudge sent to %s"
 msgstr ""
 
-#: actions/nudge.php:85
+#: lib/command.php:126
+#, php-format
 msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
 msgstr ""
 
-#: actions/nudge.php:94
-msgid "Nudge sent"
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
 msgstr ""
 
-#: actions/nudge.php:97
-msgid "Nudge sent!"
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
 msgstr ""
 
-#: actions/openidlogin.php:97
-msgid "OpenID login"
+#: lib/command.php:190
+msgid "Notice marked as fave."
 msgstr ""
 
-#: actions/openidsettings.php:128
-msgid "Removing your only OpenID "
+#: lib/command.php:315
+#, php-format
+msgid "%1$s (%2$s)"
 msgstr ""
 
-#: actions/othersettings.php:60
-msgid "Other Settings"
+#: lib/command.php:318
+#, php-format
+msgid "Fullname: %s"
 msgstr ""
 
-#: actions/othersettings.php:71
-msgid "Manage various other options."
+#: lib/command.php:321
+#, php-format
+msgid "Location: %s"
 msgstr ""
 
-#: actions/othersettings.php:93
-msgid "URL Auto-shortening"
+#: lib/command.php:324
+#, php-format
+msgid "Homepage: %s"
 msgstr ""
 
-#: actions/othersettings.php:112
-msgid "Service"
+#: lib/command.php:327
+#, php-format
+msgid "About: %s"
 msgstr ""
 
-#: actions/othersettings.php:113
-msgid "Automatic shortening service to use."
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: actions/othersettings.php:144
-msgid "URL shortening service is too long (max 50 chars)."
+#: lib/command.php:377
+msgid "Error sending direct message."
 msgstr ""
 
-#: actions/passwordsettings.php:69
+#: lib/command.php:431
+#, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr ""
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Não é possível remover a mensagem."
+
+#: lib/command.php:441
 #, fuzzy
-msgid "Change your password."
-msgstr "Modificar a sua palavra-passe"
+msgid "Error saving notice."
+msgstr "Erro ao guardar o utilizador."
 
-#: actions/passwordsettings.php:89
-msgid "Password change"
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: actions/peopletag.php:35
+#: lib/command.php:502
 #, php-format
-msgid "Not a valid people tag: %s"
+msgid "Subscribed to %s"
 msgstr ""
 
-#: actions/peopletag.php:47
-#, php-format
-msgid "Users self-tagged with %s - page %d"
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: actions/peopletag.php:91
+#: lib/command.php:530
 #, php-format
-msgid "These are users who have tagged themselves \"%s\" "
+msgid "Unsubscribed from %s"
 msgstr ""
 
-#: actions/profilesettings.php:91
-msgid "Profile information"
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
 msgstr ""
 
-#: actions/profilesettings.php:124
-msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+#: lib/command.php:551
+msgid "Notification off."
 msgstr ""
 
-#: actions/profilesettings.php:144
-#, fuzzy
-msgid "Automatically subscribe to whoever "
+#: lib/command.php:553
+msgid "Can't turn off notification."
 msgstr ""
-"Subscrever automaticamente a quem se subscrever a mim (recomendado para não-"
-"humanos)"
 
-#: actions/profilesettings.php:229 actions/tagother.php:176
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: lib/command.php:574
+msgid "Notification on."
 msgstr ""
 
-#: actions/profilesettings.php:311
-msgid "Couldn't save tags."
+#: lib/command.php:576
+msgid "Can't turn on notification."
 msgstr ""
 
-#: actions/public.php:107
+#: lib/command.php:597
 #, fuzzy, php-format
-msgid "Public timeline, page %d"
-msgstr "Mensagens públicas de %s"
+msgid "Could not create login token for %s"
+msgstr "Não foi possível criar o formulário de OpenID: %s"
 
-#: actions/public.php:173
-msgid "Could not retrieve public stream."
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: actions/public.php:220
-#, php-format
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Não foi possível subscrever outros a si."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Já subscrito!."
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Não foi possível subscrever outros a si."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Já subscrito!."
+
+#: lib/command.php:656
+msgid "You are not a member of any groups."
+msgstr ""
+
+#: lib/command.php:658
+msgid "You are a member of these groups: "
+msgstr ""
+
+#: lib/command.php:670
 msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+
+#: lib/common.php:192
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Código de confirmação não encontrado"
+
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: actions/publictagcloud.php:57
-msgid "Public tag cloud"
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: actions/publictagcloud.php:63
-#, php-format
-msgid "These are most popular recent tags on %s "
+#: lib/common.php:195
+msgid "Go to the installer."
 msgstr ""
 
-#: actions/publictagcloud.php:119
-msgid "Tag cloud"
+#: lib/connectsettingsaction.php:110
+msgid "IM"
+msgstr "IM"
+
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
 msgstr ""
 
-#: actions/register.php:139 actions/register.php:349
-msgid "Sorry, only invited people can register."
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
 msgstr ""
 
-#: actions/register.php:149
-msgid "You can't register if you don't "
+#: lib/dberroraction.php:60
+msgid "Database error"
 msgstr ""
 
-#: actions/register.php:286
-msgid "With this form you can create "
+#: lib/designsettings.php:101
+msgid "Change background image"
 msgstr ""
 
-#: actions/register.php:368
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, "
-msgstr "1-64 letras ou números, sem pontuação ou espaços"
+#: lib/designsettings.php:105
+msgid "Upload file"
+msgstr ""
 
-#: actions/register.php:382 actions/register.php:386
-msgid "Used only for updates, announcements, "
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 
-#: actions/register.php:398
-msgid "URL of your homepage, blog, "
+#: lib/designsettings.php:139
+msgid "On"
 msgstr ""
 
-#: actions/register.php:404
-msgid "Describe yourself and your "
+#: lib/designsettings.php:155
+msgid "Off"
 msgstr ""
 
-#: actions/register.php:410
-msgid "Where you are, like \"City, "
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
 msgstr ""
 
-#: actions/register.php:432
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
 #, fuzzy
-msgid " except this private data: password, "
+msgid "Change colours"
+msgstr "Modificar a sua palavra-passe"
+
+#: lib/designsettings.php:178
+msgid "Background"
 msgstr ""
-"excepto estes dados privados: palavra chave, endereço de email, endereço de "
-"mensageiro instantâneo, número de telefone."
 
-#: actions/register.php:471
-#, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Ligar"
+
+#: lib/designsettings.php:204
+msgid "Sidebar"
 msgstr ""
 
-#: actions/register.php:495
-msgid "(You should receive a message by email "
+#: lib/designsettings.php:217
+msgid "Text"
 msgstr ""
 
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Entrar"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
 msgstr ""
 
-#: actions/replies.php:118
-#, php-format
-msgid "Replies to %s, page %d"
+#: lib/designsettings.php:248
+msgid "Restore default designs"
 msgstr ""
 
-#: actions/showfavorites.php:79
-#, php-format
-msgid "%s favorite notices, page %d"
+#: lib/designsettings.php:254
+msgid "Reset back to default"
 msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
-#, php-format
-msgid "%s group"
+#: lib/designsettings.php:257
+msgid "Save design"
 msgstr ""
 
-#: actions/showgroup.php:79
-#, php-format
-msgid "%s group, page %d"
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
 msgstr ""
 
-#: actions/showgroup.php:206
-msgid "Group profile"
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
 msgstr ""
 
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
-msgid "URL"
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
 msgstr ""
 
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
-msgid "Note"
+#: lib/favorform.php:114 lib/favorform.php:140
+#, fuzzy
+msgid "Favor this notice"
+msgstr "Não é possível remover a mensagem."
+
+#: lib/favorform.php:140
+msgid "Favor"
 msgstr ""
 
-#: actions/showgroup.php:270
-msgid "Group actions"
+#: lib/feedlist.php:64
+msgid "Export data"
 msgstr ""
 
-#: actions/showgroup.php:323
-#, php-format
-msgid "Notice feed for %s group"
+#: lib/feed.php:85
+msgid "RSS 1.0"
 msgstr ""
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
-msgid "Members"
+#: lib/feed.php:87
+msgid "RSS 2.0"
 msgstr ""
 
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
-msgid "(None)"
+#: lib/feed.php:89
+msgid "Atom"
 msgstr ""
 
-#: actions/showgroup.php:370
-msgid "All members"
+#: lib/feed.php:91
+msgid "FOAF"
 msgstr ""
 
-#: actions/showgroup.php:378
-#, php-format
-msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+#: lib/galleryaction.php:121
+msgid "Filter tags"
 msgstr ""
 
-#: actions/showmessage.php:98
-msgid "Only the sender and recipient "
+#: lib/galleryaction.php:131
+msgid "All"
 msgstr ""
 
-#: actions/showstream.php:73
-#, php-format
-msgid "%s, page %d"
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
 msgstr ""
 
-#: actions/showstream.php:143
-msgid "'s profile"
+#: lib/galleryaction.php:140
+msgid "Tag"
 msgstr ""
 
-#: actions/showstream.php:236 actions/tagother.php:77
-msgid "User profile"
+#: lib/galleryaction.php:141
+msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: actions/showstream.php:240 actions/tagother.php:81
-msgid "Photo"
+#: lib/galleryaction.php:143
+msgid "Go"
 msgstr ""
 
-#: actions/showstream.php:317
-msgid "User actions"
+#: lib/groupeditform.php:163
+msgid "URL of the homepage or blog of the group or topic"
 msgstr ""
 
-#: actions/showstream.php:342
-msgid "Send a direct message to this user"
+#: lib/groupeditform.php:168
+msgid "Describe the group or topic"
 msgstr ""
 
-#: actions/showstream.php:343
-msgid "Message"
+#: lib/groupeditform.php:170
+#, php-format
+msgid "Describe the group or topic in %d characters"
 msgstr ""
 
-#: actions/showstream.php:451
+#: lib/groupeditform.php:172
 #, fuzzy
-msgid "All subscribers"
+msgid "Description"
 msgstr "Todas as subscrições"
 
-#: actions/showstream.php:533
-msgid "All groups"
+#: lib/groupeditform.php:179
+msgid ""
+"Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr ""
 
-#: actions/showstream.php:542
+#: lib/groupeditform.php:187
 #, php-format
-msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: actions/smssettings.php:128
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, "
-msgstr "1-64 letras ou números, sem pontuação ou espaços"
-
-#: actions/smssettings.php:162
-msgid "Send me notices through SMS; "
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+msgid "Group"
 msgstr ""
 
-#: actions/smssettings.php:335
+#: lib/groupnav.php:101
 #, fuzzy
-msgid "A confirmation code was sent to the phone number you added. "
-msgstr "A aguardar confirmação deste número de telefone."
+msgid "Blocked"
+msgstr "Bloquear"
 
-#: actions/smssettings.php:453
-msgid "Mobile carrier"
+#: lib/groupnav.php:102
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Desbloquear este utilizador"
+
+#: lib/groupnav.php:108
+#, php-format
+msgid "Edit %s group properties"
 msgstr ""
 
-#: actions/subedit.php:70
-msgid "You are not subscribed to that profile."
+#: lib/groupnav.php:113
+msgid "Logo"
 msgstr ""
 
-#: actions/subedit.php:83
-msgid "Could not save subscription."
+#: lib/groupnav.php:114
+#, php-format
+msgid "Add or edit %s logo"
 msgstr ""
 
-#: actions/subscribe.php:55
-msgid "Not a local user."
+#: lib/groupnav.php:120
+#, php-format
+msgid "Add or edit %s design"
 msgstr ""
 
-#: actions/subscribe.php:69
-msgid "Subscribed"
+#: lib/groupsbymemberssection.php:71
+msgid "Groups with most members"
 msgstr ""
 
-#: actions/subscribers.php:50
-#, php-format
-msgid "%s subscribers"
+#: lib/groupsbypostssection.php:71
+msgid "Groups with most posts"
 msgstr ""
 
-#: actions/subscribers.php:52
+#: lib/grouptagcloudsection.php:56
 #, php-format
-msgid "%s subscribers, page %d"
+msgid "Tags in %s group's notices"
 msgstr ""
 
-#: actions/subscribers.php:63
-msgid "These are the people who listen to "
+#: lib/htmloutputter.php:104
+msgid "This page is not available in a media type you accept"
 msgstr ""
 
-#: actions/subscribers.php:67
+#: lib/imagefile.php:75
 #, php-format
-msgid "These are the people who "
+msgid "That file is too big. The maximum file size is %s."
 msgstr ""
 
-#: actions/subscriptions.php:52
-#, fuzzy, php-format
-msgid "%s subscriptions"
-msgstr "Todas as subscrições"
-
-#: actions/subscriptions.php:54
-#, fuzzy, php-format
-msgid "%s subscriptions, page %d"
-msgstr "Todas as subscrições"
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr ""
 
-#: actions/subscriptions.php:65
-msgid "These are the people whose notices "
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
 msgstr ""
 
-#: actions/subscriptions.php:69
-#, php-format
-msgid "These are the people whose "
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
 msgstr ""
 
-#: actions/subscriptions.php:122
-msgid "Jabber"
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
 msgstr ""
 
-#: actions/tag.php:43
-#, php-format
-msgid "Notices tagged with %s, page %d"
+#: lib/imagefile.php:118
+msgid "Lost our file."
 msgstr ""
 
-#: actions/tag.php:66
-#, php-format
-msgid "Messages tagged \"%s\", most recent first"
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
 msgstr ""
 
-#: actions/tagother.php:33
-msgid "Not logged in"
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
 msgstr ""
 
-#: actions/tagother.php:39
-msgid "No id argument."
+#: lib/joinform.php:114
+msgid "Join"
 msgstr ""
 
-#: actions/tagother.php:65
-#, php-format
-msgid "Tag %s"
+#: lib/leaveform.php:114
+msgid "Leave"
 msgstr ""
 
-#: actions/tagother.php:141
-msgid "Tag user"
+#: lib/logingroupnav.php:80
+msgid "Login with a username and password"
 msgstr ""
 
-#: actions/tagother.php:149
-msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+#: lib/logingroupnav.php:86
+msgid "Sign up for a new account"
 msgstr ""
 
-#: actions/tagother.php:164
-msgid "There was a problem with your session token."
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
 msgstr ""
 
-#: actions/tagother.php:191
+#: lib/mailbox.php:139
 msgid ""
-"You can only tag people you are subscribed to or who are subscribed to you."
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: actions/tagother.php:198
-msgid "Could not save tags."
-msgstr ""
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr "de"
 
-#: actions/tagother.php:233
-msgid "Use this form to add tags to your subscribers or subscriptions."
-msgstr ""
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "Confirmação do Endereço de Email"
 
-#: actions/tagrss.php:35
-msgid "No such tag."
+#: lib/mail.php:174
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%s\n"
+"\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
 msgstr ""
 
-#: actions/tagrss.php:66
+#: lib/mail.php:235
 #, php-format
-msgid "Microblog tagged with %s"
-msgstr ""
+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."
 
-#: actions/twitapiblocks.php:47
-msgid "Block user failed."
+#: lib/mail.php:240
+#, fuzzy, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
 msgstr ""
+"%1$s está agora a ouvir os seus comunicados em %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Sinceramente,\n"
+"%4$s.\n"
 
-#: actions/twitapiblocks.php:69
-msgid "Unblock user failed."
+#: lib/mail.php:253
+#, php-format
+msgid "Location: %s\n"
 msgstr ""
 
-#: actions/twitapiusers.php:48
-msgid "Not found."
+#: lib/mail.php:255
+#, php-format
+msgid "Homepage: %s\n"
 msgstr ""
 
-#: actions/twittersettings.php:71
-msgid "Add your Twitter account to automatically send "
+#: lib/mail.php:257
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
 msgstr ""
 
-#: actions/twittersettings.php:119
-msgid "Twitter user name"
+#: lib/mail.php:285
+#, php-format
+msgid "New email address for posting to %s"
 msgstr ""
 
-#: actions/twittersettings.php:126
-msgid "Twitter password"
+#: lib/mail.php:288
+#, 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/twittersettings.php:228
-msgid "Twitter Friends"
-msgstr ""
+#: lib/mail.php:412
+#, php-format
+msgid "%s status"
+msgstr "Estado de %s"
 
-#: actions/twittersettings.php:327
-msgid "Username must have only numbers, "
+#: lib/mail.php:438
+msgid "SMS confirmation"
 msgstr ""
 
-#: actions/twittersettings.php:341
+#: lib/mail.php:462
 #, php-format
-msgid "Unable to retrieve account information "
+msgid "You've been nudged by %s"
 msgstr ""
 
-#: actions/unblock.php:108
-msgid "Error removing the block."
+#: lib/mail.php:466
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
 msgstr ""
 
-#: actions/unsubscribe.php:50
-msgid "No profile id in request."
+#: lib/mail.php:509
+#, php-format
+msgid "New private message from %s"
 msgstr ""
 
-#: actions/unsubscribe.php:57
-msgid "No profile with that id."
+#: lib/mail.php:513
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%5$s\n"
 msgstr ""
 
-#: actions/unsubscribe.php:71
-msgid "Unsubscribed"
-msgstr ""
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%1$s está agora a ouvir os seus comunicados em %2$s."
 
-#: actions/usergroups.php:63
+#: lib/mail.php:556
 #, php-format
-msgid "%s groups"
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
 msgstr ""
 
-#: actions/usergroups.php:65
+#: lib/mail.php:611
 #, php-format
-msgid "%s groups, page %d"
-msgstr ""
-
-#: classes/Notice.php:104
-msgid "Problem saving notice. Unknown user."
+msgid "%s (@%s) sent a notice to your attention"
 msgstr ""
 
-#: classes/Notice.php:109
+#: lib/mail.php:613
+#, php-format
 msgid ""
-"Too many notices too fast; take a breather and post again in a few minutes."
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
 msgstr ""
 
-#: classes/Notice.php:116
-msgid "You are banned from posting notices on this site."
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#: lib/accountsettingsaction.php:108
-msgid "Upload an avatar"
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
-#: lib/accountsettingsaction.php:119
-msgid "Other"
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
 msgstr ""
 
-#: lib/accountsettingsaction.php:120
-msgid "Other options"
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
-#: lib/action.php:130
-#, fuzzy, php-format
-msgid "%s - %s"
-msgstr "%s (%s)"
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
 
-#: lib/action.php:145
-msgid "Untitled page"
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
 msgstr ""
 
-#: lib/action.php:316
-msgid "Primary site navigation"
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
 msgstr ""
 
-#: lib/action.php:322
-msgid "Personal profile and friends timeline"
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
 msgstr ""
 
-#: lib/action.php:325
-msgid "Search for people or text"
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
 msgstr ""
 
-#: lib/action.php:328
+#: lib/mediafile.php:201 lib/mediafile.php:237
 #, fuzzy
-msgid "Account"
-msgstr "Sobre"
+msgid "Could not determine file's mime-type!"
+msgstr "Não foi possível actualizar o utilizador."
 
-#: lib/action.php:328
-#, fuzzy
-msgid "Change your email, avatar, password, profile"
-msgstr "Modificar a sua palavra-passe"
+#: lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
 
-#: lib/action.php:330
-msgid "Connect to IM, SMS, Twitter"
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
 msgstr ""
 
-#: lib/action.php:332
-msgid "Logout from the site"
+#: lib/messageform.php:120
+msgid "Send a direct notice"
 msgstr ""
 
-#: lib/action.php:335
-msgid "Login to the site"
+#: lib/messageform.php:146
+msgid "To"
 msgstr ""
 
-#: lib/action.php:338
+#: lib/messageform.php:162 lib/noticeform.php:173
 #, fuzzy
-msgid "Create an account"
-msgstr "Ligar conta existente"
+msgid "Available characters"
+msgstr "6 ou mais caracteres"
 
-#: lib/action.php:341
-msgid "Login with OpenID"
+#: lib/noticeform.php:145
+msgid "Send a notice"
 msgstr ""
 
-#: lib/action.php:344
-msgid "Help me!"
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
 msgstr ""
 
-#: lib/action.php:362
-msgid "Site notice"
+#: lib/noticeform.php:180
+msgid "Attach"
 msgstr ""
 
-#: lib/action.php:417
-msgid "Local views"
+#: lib/noticeform.php:184
+msgid "Attach a file"
 msgstr ""
 
-#: lib/action.php:472
-msgid "Page notice"
+#: lib/noticelist.php:478
+msgid "in context"
 msgstr ""
 
-#: lib/action.php:562
-msgid "Secondary site navigation"
-msgstr ""
+#: lib/noticelist.php:498
+#, fuzzy
+msgid "Reply to this notice"
+msgstr "Não é possível remover a mensagem."
 
-#: lib/action.php:602 lib/action.php:623
-msgid "StatusNet software license"
+#: lib/noticelist.php:499
+msgid "Reply"
 msgstr ""
 
-#: lib/action.php:630
-msgid "All "
+#: lib/nudgeform.php:116
+msgid "Nudge this user"
 msgstr ""
 
-#: lib/action.php:635
-msgid "license."
+#: lib/nudgeform.php:128
+msgid "Nudge"
 msgstr ""
 
-#: lib/blockform.php:123 lib/blockform.php:153
-msgid "Block this user"
+#: lib/nudgeform.php:128
+msgid "Send a nudge to this user"
 msgstr ""
 
-#: lib/blockform.php:153
-msgid "Block"
-msgstr "Bloquear"
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "Erro ao inserir novo perfil"
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
-msgid "Disfavor this notice"
-msgstr ""
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "Erro ao inserir avatar"
 
-#: lib/facebookaction.php:268
-#, php-format
-msgid "To use the %s Facebook Application you need to login "
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "Erro ao inserir perfil remoto"
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Apagar mensagem"
+
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
+msgstr "Não foi possível inserir nova subscrição."
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
 msgstr ""
 
-#: lib/facebookaction.php:271
-msgid " a new account."
+#: lib/personalgroupnav.php:104
+msgid "Replies"
 msgstr ""
 
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-msgid "Published"
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
 msgstr ""
 
-#: lib/favorform.php:114 lib/favorform.php:140
-#, fuzzy
-msgid "Favor this notice"
-msgstr "Não é possível remover a mensagem."
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr ""
 
-#: lib/feedlist.php:64
-msgid "Export data"
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
 msgstr ""
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
 msgstr ""
 
-#: lib/galleryaction.php:131
-msgid "All"
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
 msgstr ""
 
-#: lib/galleryaction.php:137
-msgid "Tag"
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
 msgstr ""
 
-#: lib/galleryaction.php:138
-msgid "Choose a tag to narrow list"
+#: lib/personaltagcloudsection.php:56
+#, php-format
+msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/galleryaction.php:139
-msgid "Go"
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
 msgstr ""
 
-#: lib/groupeditform.php:148
-msgid "URL of the homepage or blog of the group or topic"
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "Todas as subscrições"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
 msgstr ""
 
-#: lib/groupeditform.php:151
+#: lib/profileaction.php:157
 #, fuzzy
-msgid "Description"
+msgid "All subscribers"
 msgstr "Todas as subscrições"
 
-#: lib/groupeditform.php:153
-msgid "Describe the group or topic in 140 chars"
+#: lib/profileaction.php:177
+msgid "User ID"
 msgstr ""
 
-#: lib/groupeditform.php:158
-msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr ""
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "Membro desde"
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
-msgid "Group"
+#: lib/profileaction.php:235
+msgid "All groups"
 msgstr ""
 
-#: lib/groupnav.php:100
-msgid "Admin"
+#: lib/publicgroupnav.php:78
+msgid "Public"
 msgstr ""
 
-#: lib/groupnav.php:101
-#, php-format
-msgid "Edit %s group properties"
+#: lib/publicgroupnav.php:82
+msgid "User groups"
 msgstr ""
 
-#: lib/groupnav.php:106
-msgid "Logo"
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
+msgid "Recent tags"
 msgstr ""
 
-#: lib/groupnav.php:107
-#, php-format
-msgid "Add or edit %s logo"
+#: lib/publicgroupnav.php:88
+msgid "Featured"
 msgstr ""
 
-#: lib/groupsbymemberssection.php:71
-msgid "Groups with most members"
+#: lib/publicgroupnav.php:92
+msgid "Popular"
 msgstr ""
 
-#: lib/groupsbypostssection.php:71
-msgid "Groups with most posts"
+#: lib/searchaction.php:120
+msgid "Search site"
 msgstr ""
 
-#: lib/grouptagcloudsection.php:56
-#, php-format
-msgid "Tags in %s group's notices"
+#: lib/searchaction.php:162
+msgid "Search help"
 msgstr ""
 
-#: lib/htmloutputter.php:104
-msgid "This page is not available in a "
+#: lib/searchgroupnav.php:80
+msgid "People"
 msgstr ""
 
-#: lib/joinform.php:114
-msgid "Join"
-msgstr ""
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr "Encontrar pessoas neste site"
 
-#: lib/leaveform.php:114
-msgid "Leave"
+#: lib/searchgroupnav.php:82
+msgid "Notice"
 msgstr ""
 
-#: lib/logingroupnav.php:76
-msgid "Login with a username and password"
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr "Encontrar conteúdo dos mensagens"
+
+#: lib/searchgroupnav.php:85
+msgid "Find groups on this site"
 msgstr ""
 
-#: lib/logingroupnav.php:79
-msgid "Sign up for a new account"
+#: lib/section.php:89
+msgid "Untitled section"
 msgstr ""
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
+#: lib/section.php:106
+msgid "More..."
 msgstr ""
 
-#: lib/mail.php:175
+#: lib/subgroupnav.php:83
 #, php-format
-msgid ""
-"Hey, %s.\n"
-"\n"
+msgid "People %s subscribes to"
 msgstr ""
 
-#: lib/mail.php:236
+#: lib/subgroupnav.php:91
 #, fuzzy, php-format
-msgid "%1$s is now listening to "
-msgstr "%1$s está agora a ouvir os seus comunicados em %2$s."
+msgid "People subscribed to %s"
+msgstr "Já subscrito!."
 
-#: lib/mail.php:254
+#: lib/subgroupnav.php:99
 #, php-format
-msgid "Location: %s\n"
+msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/mail.php:256
-#, php-format
-msgid "Homepage: %s\n"
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
 msgstr ""
 
-#: lib/mail.php:258
-#, php-format
-msgid ""
-"Bio: %s\n"
-"\n"
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
 msgstr ""
 
-#: lib/mail.php:461
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/subscriptionlist.php:126
+msgid "(none)"
 msgstr ""
 
-#: lib/mail.php:465
-#, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
+#: lib/subs.php:48
+msgid "Already subscribed!"
 msgstr ""
 
-#: lib/mail.php:555
-#, fuzzy, php-format
-msgid "%1$s just added your notice from %2$s"
-msgstr "%1$s está agora a ouvir os seus comunicados em %2$s."
-
-#: lib/mailbox.php:229 lib/noticelist.php:380
-#, fuzzy
-msgid "From"
-msgstr "de"
+#: lib/subs.php:52
+msgid "User has blocked you."
+msgstr "O utilizador bloqueou-o."
 
-#: lib/messageform.php:110
-msgid "Send a direct notice"
-msgstr ""
+#: lib/subs.php:56
+msgid "Could not subscribe."
+msgstr "Não foi possível subscrever. "
 
-#: lib/noticeform.php:125
-msgid "Send a notice"
-msgstr ""
+#: lib/subs.php:75
+msgid "Could not subscribe other to you."
+msgstr "Não foi possível subscrever outros a si."
 
-#: lib/noticeform.php:152
+#: lib/subs.php:124
 #, fuzzy
-msgid "Available characters"
-msgstr "6 ou mais caracteres"
+msgid "Not subscribed!"
+msgstr "Não foi possível subscrever. "
 
-#: lib/noticelist.php:426
-msgid "in reply to"
-msgstr ""
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
+msgstr "Não foi possível apagar a subscrição."
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
-#, fuzzy
-msgid "Reply to this notice"
-msgstr "Não é possível remover a mensagem."
+#: lib/tagcloudsection.php:56
+msgid "None"
+msgstr "Nenhum"
 
-#: lib/noticelist.php:451
-msgid "Reply"
+#: lib/topposterssection.php:74
+msgid "Top posters"
+msgstr "Top posters"
+
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+msgid "Unsubscribe from this user"
+msgstr "Des-Subscrever deste utilizador"
+
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
 msgstr ""
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
+#: lib/userprofile.php:116
 #, fuzzy
-msgid "Delete this notice"
-msgstr "Não é possível remover a mensagem."
+msgid "Edit Avatar"
+msgstr "Avatar"
 
-#: lib/noticelist.php:474
-msgid "Delete"
+#: lib/userprofile.php:236
+msgid "User actions"
 msgstr ""
 
-#: lib/nudgeform.php:116
-msgid "Nudge this user"
-msgstr ""
+#: lib/userprofile.php:248
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Modificar as suas definições de perfil"
 
-#: lib/nudgeform.php:128
-msgid "Nudge"
+#: lib/userprofile.php:249
+msgid "Edit"
 msgstr ""
 
-#: lib/nudgeform.php:128
-msgid "Send a nudge to this user"
+#: lib/userprofile.php:272
+msgid "Send a direct message to this user"
 msgstr ""
 
-#: lib/personaltagcloudsection.php:56
-#, php-format
-msgid "Tags in %s's notices"
+#: lib/userprofile.php:273
+msgid "Message"
 msgstr ""
 
-#: lib/profilelist.php:182
-msgid "(none)"
+#: lib/util.php:821
+msgid "a few seconds ago"
 msgstr ""
 
-#: lib/publicgroupnav.php:76
-msgid "Public"
+#: lib/util.php:823
+msgid "about a minute ago"
 msgstr ""
 
-#: lib/publicgroupnav.php:80
-msgid "User groups"
+#: lib/util.php:825
+#, php-format
+msgid "about %d minutes ago"
 msgstr ""
 
-#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
-msgid "Recent tags"
+#: lib/util.php:827
+msgid "about an hour ago"
 msgstr ""
 
-#: lib/publicgroupnav.php:86
-msgid "Featured"
+#: lib/util.php:829
+#, php-format
+msgid "about %d hours ago"
 msgstr ""
 
-#: lib/publicgroupnav.php:90
-msgid "Popular"
+#: lib/util.php:831
+msgid "about a day ago"
 msgstr ""
 
-#: lib/searchgroupnav.php:82
-msgid "Notice"
+#: lib/util.php:833
+#, php-format
+msgid "about %d days ago"
 msgstr ""
 
-#: lib/searchgroupnav.php:85
-msgid "Find groups on this site"
+#: lib/util.php:835
+msgid "about a month ago"
 msgstr ""
 
-#: lib/section.php:89
-msgid "Untitled section"
+#: lib/util.php:837
+#, php-format
+msgid "about %d months ago"
 msgstr ""
 
-#: lib/subgroupnav.php:81
-#, php-format
-msgid "People %s subscribes to"
+#: lib/util.php:839
+msgid "about a year ago"
 msgstr ""
 
-#: lib/subgroupnav.php:89
+#: lib/webcolor.php:82
 #, fuzzy, php-format
-msgid "People subscribed to %s"
-msgstr "Já subscrito!."
+msgid "%s is not a valid color!"
+msgstr "A Homepage inserida não é um URL válido."
 
-#: lib/subgroupnav.php:97
+#: lib/webcolor.php:123
 #, php-format
-msgid "Groups %s is a member of"
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr ""
 
-#: lib/subgroupnav.php:104
-#, php-format
-msgid "Invite friends and colleagues to join you on %s"
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
 msgstr ""
 
-#: lib/subs.php:53
-msgid "User has blocked you."
-msgstr "O utilizador bloqueou-o."
-
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Subscrever este utilizador"
-
-#: lib/tagcloudsection.php:56
-msgid "None"
-msgstr "Nenhum"
-
-#: lib/topposterssection.php:74
-msgid "Top posters"
-msgstr "Top posters"
-
-#: lib/unblockform.php:120 lib/unblockform.php:150
-msgid "Unblock this user"
-msgstr "Desbloquear este utilizador"
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr ""
 
-#: lib/unblockform.php:150
-msgid "Unblock"
-msgstr "Desbloquear"
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
-msgid "Unsubscribe from this user"
-msgstr "Des-Subscrever deste utilizador"
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr ""
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.mo b/locale/pt_BR/LC_MESSAGES/statusnet.mo
index a5a6f2725..634c68c24 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.mo
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.mo
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index 7fae3f5f3..73b63476b 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -1,4316 +1,3046 @@
 # Translation of StatusNet to Brazilian Portuguese
+#
+# Author@translatewiki.net: Ewout
+# --
 # Frederico Goncalves Guimaraes <frederico@teia.bio.br>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: statusnet\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-07-14 11:24+0000\n"
-"Last-Translator: Jose Martinho <martinho.com@gmail.com>\n"
-"Language-Team: Português do Brasil\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:44:09+0000\n"
+"Language-Team: Brazilian Portuguese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt-br\n"
+"X-Message-Group: out-statusnet\n"
 
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
-#, php-format
-msgid " Search Stream for \"%s\""
-msgstr " Procurar por \"%s\" no fluxo de mensagens"
-
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-#: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
-msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr ""
-" exceto estes dados privados: senha, endereço de e-mail, endereço de IM, "
-"número de telefone."
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr " de "
-
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr "%1$s / Atualizações respondendo à %2$s"
-
-#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s convidou você para se juntar ao %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 convidou você para se juntar ao %2$s (%3$s).\n"
-"\n"
-"%2$s é um serviço de microblogagem que lhe permite manter-se atualizado com "
-"as pessoas que você conhece e com as que lhe interessam.\n"
-"\n"
-"Você também pode compartilhar notícias sobre você mesmo, seus pensamentos, "
-"ou sua vida on-line com as pessoas que lhe conhecem. Também é ótimo para "
-"encontrar novas pessoas que compartilham os mesmos interesses que você.\n"
-"\n"
-"%1$s disse:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Você pode ver o perfil de %1$s no %2$s aqui:\n"
-"\n"
-"%5$s\n"
-"\n"
-"Se você quiser experimentar o serviço, clique no link abaixo para aceitar o "
-"convite.\n"
-"\n"
-"%6$s\n"
-"\n"
-"Se não, você pode ignorar esta mensagem. Obrigado por sua paciência e seu "
-"tempo.\n"
-"\n"
-"Cordialmente, %2$s\n"
-
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s agora está acompanhando suas mensagens em %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 agora está acompanhando suas mensagens em %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Cordialmente,\n"
-"%4$s.\n"
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "%1$s atualizações 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 actions/shownotice.php:45
-#: actions/shownotice.php:161
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr "Mensagem de %1$s em %2$s"
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "Essa etiqueta não existe."
 
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
-#, php-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
+msgstr "Usuário não encontrado."
 
-#: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/all.php:84
 #, php-format
-msgid "%s Public Stream"
-msgstr "Fluxo Público de %s"
+msgid "%s and friends, page %d"
+msgstr "%s e amigos, página %d"
 
-#: ../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
-#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amigos"
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
-#, php-format
-msgid "%s public timeline"
-msgstr "Mensagens públicas de %s"
+#: actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Feed para os amigos de %s"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
-#, php-format
-msgid "%s status"
-msgstr "Status de %s"
+#: actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Feed para os amigos de %s"
 
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
-#, php-format
-msgid "%s timeline"
-msgstr "Mensagens de %s"
+#: actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Feed para os amigos de %s"
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/all.php:127
 #, php-format
-msgid "%s updates from everyone!"
-msgstr "%s atualizações de todo mundo!"
-
-#: ../actions/register.php:213
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
-"(Você receberá uma mensagem por e-mail a qualquer momento, com instruções "
-"sobre como confirmar seu endereço.)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: actions/all.php:132
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
 msgstr ""
-"**%%site.name%%** é um serviço de microblogagem disponibilizado por [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
-
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
-#, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** é um serviço de microblogagem. "
-
-#: ../lib/util.php:274 lib/util.php:290
-msgid ". Contributors should be attributed by full name or nickname."
-msgstr ""
-". Os colaboradores devem ser citados usando seu nome completo ou apelido."
-
-#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
-#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 letras minúsculas ou números, sem pontuações ou espaços"
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 letras minúsculas ou números, sem pontuação ou espaços. Obrigatório."
-
-#: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr "No mínimo 6 caracteres"
-
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
-msgid "6 or more characters, and don't forget it!"
-msgstr "No mínimo 6 caracteres. E não se esqueça dela!"
-
-#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
-msgid "6 or more characters. Required."
-msgstr "No mínimo 6 caracteres. Obrigatório."
 
-#: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/all.php:134
 #, php-format
 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 permitir que %s envie mensagens para você."
-
-#: ../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."
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
-"Um código de confirmação foi enviado para o endereço de e-mail que você "
-"informou. Verifique a sua caixa de entrada (e de spam!) para o código e "
-"instruções sobre como usá-lo."
 
-#: ../actions/smssettings.php:216 actions/smssettings.php:224
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#, php-format
 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."
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
 msgstr ""
-"Um código de confirmação foi enviado para o número de telefone 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/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 actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
-msgid "API method not found!"
-msgstr "O método da API não foi 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/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 actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
-msgid "API method under construction."
-msgstr "O método da API está em construção."
-
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
-msgid "About"
-msgstr "Sobre"
-
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
-msgid "Accept"
-msgstr "Aceitar"
-
-#: ../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 actions/emailsettings.php:120
-#: actions/imsettings.php:127 actions/openidsettings.php:111
-#: actions/smssettings.php:133 actions/twittersettings.php:163
-msgid "Add"
-msgstr "Adicionar"
-
-#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
-msgstr "Adicionar OpenID"
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-msgid "Add or remove OpenIDs"
-msgstr "Adicionar ou remover OpenIDs"
-
-#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39 actions/emailsettings.php:39
-#: actions/imsettings.php:40 actions/smssettings.php:39
-#: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
-msgstr "Endereço"
-
-#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-msgid "Addresses of friends to invite (one per line)"
-msgstr "Endereços dos seus amigos que serão convidados (um por linha)"
-
-#: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
-msgid "All subscriptions"
-msgstr "Todas as assinaturas"
-
-#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
-#, php-format
-msgid "All updates for %s"
-msgstr "Todas as atualizações para %s"
+#: actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s e amigos"
 
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
 #, php-format
-msgid "All updates matching search term \"%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
-#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
-msgid "Already logged in."
-msgstr "Já está logado."
-
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
-msgid "Already subscribed!."
-msgstr "Já foi assinado!"
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
-msgid "Are you sure you want to delete this notice?"
-msgstr "Você tem certeza que deseja excluir esta mensagem?"
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr "Atualizações de %1$s e amigos no %2$s!"
 
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
-msgid "Authorize subscription"
-msgstr "Autorizar a assinatura"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
+msgstr "O método da API não foi encontrado!"
 
-#: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
-msgid "Automatically login in the future; not for shared computers!"
-msgstr ""
-"Entrar automaticamente sem pedir a senha. Não use em computadores "
-"compartilhados!"
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
+msgstr "Este método requer um POST."
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/apiaccountupdatedeliverydevice.php:105
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr "Assinar automaticamente à quem me assinar"
-
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34 actions/avatarsettings.php:65
-#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
-msgid "Avatar"
-msgstr "Avatar"
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
 
-#: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
-msgid "Avatar updated."
-msgstr "O avatar foi atualizado."
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Não foi possível atualizar o usuário."
 
-#: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
 #, 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?)"
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
 msgstr ""
-"Aguardando a confirmação deste endereço. Procure em sua conta de Jabber/"
-"GTalk por uma mensagem com mais instruções (Você adicionou %s à sua lista de "
-"contatos?)"
-
-#: ../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 ""
-"Aguardando a confirmação deste endereço. Procure em sua caixa de entrada (e "
-"de spam!) por uma mensagem com mais instruções."
-
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
-msgid "Awaiting confirmation on this phone number."
-msgstr "Aguardando a confirmação deste número de telefone."
 
-#: ../lib/util.php:1318 lib/util.php:1452
-msgid "Before »"
-msgstr "Anteriores »"
-
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
-#: actions/profilesettings.php:82 actions/register.php:184
-#: actions/profilesettings.php:112 actions/register.php:402
-msgid "Bio"
-msgstr "Descrição"
-
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
-#: actions/register.php:89 actions/updateprofile.php:104
-#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
-msgid "Bio is too long (max 140 chars)."
-msgstr "Descrição muito extensa (máximo 140 caracteres)."
-
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
-msgid "Can't delete this notice."
-msgstr "Não é possível excluir esta mensagem."
-
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
-#, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr "Não é possível ler a URL '%s' do avatar"
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "Não foi possível salvar suas configurações do Twitter!"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404 actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-msgid "Can't save new password."
-msgstr "Não é possível salvar a nova senha."
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Não foi possível atualizar o usuário."
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62 actions/emailsettings.php:58
-#: actions/imsettings.php:59 actions/smssettings.php:62
-#: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
-msgstr "Cancelar"
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "O usuário não tem perfil."
 
-#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Não foi possível instanciar um objeto do OpenID."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Não foi possível salvar o perfil."
 
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
-msgstr "Não foi possível normalizar essa ID do Jabber"
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
+msgstr "Não foi possível bloquear o usuário."
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
-msgid "Cannot normalize that email address"
-msgstr "Não foi possível normalizar este endereço de e-mail"
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
+msgstr "Não foi possível desbloquear o usuário."
 
-#: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
-msgstr "Alterar"
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "Nenhuma mensagem de texto!"
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
-msgstr "Configurações de uso do e-mail"
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Muito extenso. O tamanho máximo das mensagens é 140 caracteres."
 
-#: ../actions/password.php:32 actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr "Alterar a senha"
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "O usuário destinatário não foi encontrado."
 
-#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
-msgid "Change your password"
-msgstr "Altere a sua senha"
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+"Não é possível enviar mensagens diretas para usuários que não são seus "
+"amigos."
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-msgid "Change your profile settings"
-msgstr "Alterar as suas configurações de perfil"
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "Mensagem direta para %s"
 
-#: ../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
-#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
-#: actions/register.php:376 actions/smssettings.php:122
-msgid "Confirm"
-msgstr "Confirmar"
+#: actions/apidirectmessage.php:93
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr "Todas as mensagens diretas enviadas por %s"
 
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "Confirme o endereço"
+#: actions/apidirectmessage.php:101
+#, php-format
+msgid "Direct messages to %s"
+msgstr "Mensagem direta para %s"
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245 actions/emailsettings.php:256
-#: actions/imsettings.php:230 actions/smssettings.php:253
-#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
-msgid "Confirmation cancelled."
-msgstr "Confirmação cancelada."
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr "Todas as mensagens diretas enviadas para %s"
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
-msgid "Confirmation code"
-msgstr "Código de confirmação"
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "O método da API não foi encontrado!"
 
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-msgid "Confirmation code not found."
-msgstr "O código de confirmação não foi encontrado."
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
+msgstr "Não foi encontrado nenhum status com esse ID."
 
-#: ../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 ""
-"Parabéns, %s! E bem-vindo(a) ao %%%%site.name%%%%. A partir daqui, você pode "
-"querer...\n"
-"\n"
-"* Acessar [seu perfil](%s) e publicar sua primeira mensagem.\n"
-"* Adicionar um [endereço de Jabber/GTalk](%%%%action.imsettings%%%%) para "
-"que você possa publicar via mensagens instantâneas.\n"
-"* [Procurar por pessoas](%%%%action.peoplesearch%%%%) que você conheça ou "
-"que tenham os mesmos interesses que você. \n"
-"* Atualizar suas [configurações de perfil](%%%%action.profilesettings%%%%) "
-"para que outras pessoas saibam mais sobre você. \n"
-"* Ler a [documentação on-line](%%%%doc.help%%%%) para conhecer os recursos "
-"disponíveis. \n"
-"\n"
-"Obrigado por se registrar e esperamos que você aproveite o serviço."
+#: actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+msgstr "Essa mensagem já é uma favorita!"
 
-#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
-msgid "Connect"
-msgstr "Conectar"
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+msgstr "Não foi possível criar a favorita."
 
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
-msgid "Connect existing account"
-msgstr "Conectar-se a uma conta já existente"
+#: actions/apifavoritedestroy.php:122
+#, fuzzy
+msgid "That status is not a favorite!"
+msgstr "Essa mensagem não é uma favorita!"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
-msgid "Contact"
-msgstr "Contato"
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr "Não foi possível excluir a favorita."
 
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
-#, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "Não foi possível criar o formulário OpenID: %s"
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
+msgstr "Não é possível seguir o usuário: Usuário não encontrado."
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Não é possível seguir o usuário: %s já está na sua lista."
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
-msgid "Could not follow user: User not found."
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
 msgstr "Não é possível seguir o usuário: Usuário não encontrado."
 
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Não foi possível redirecionar para o servidor: %s"
-
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
-msgid "Could not save avatar info"
-msgstr "Não foi possível salvar as informações do avatar"
-
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
-msgid "Could not save new profile info"
-msgstr "Não foi possível salvar as novas informações do perfil"
-
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
-msgid "Could not subscribe other to you."
-msgstr "Não foi possível fazer com que o outros o sigam."
-
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
-msgid "Could not subscribe."
-msgstr "Não foi possível assinar."
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
-msgstr ""
-"Não foi possível atualizar o usuário com o endereço de e-mail confirmado."
-
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-msgid "Couldn't convert request tokens to access tokens."
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
 msgstr ""
-"Não foi possível converter os tokens de requisição para tokens de acesso."
 
-#: ../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
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-msgid "Couldn't delete email confirmation."
-msgstr "Não foi possível excluir a confirmação de e-mail."
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
+msgstr "Duas IDs de usuário ou screen_names devem ser informados."
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
-msgid "Couldn't delete subscription."
-msgstr "Não foi possível excluir a assinatura."
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Não foi possível recuperar o fluxo público."
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
-msgid "Couldn't find any statuses."
+#: actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
 msgstr "Não foi possível encontrar nenhum status."
 
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-msgid "Couldn't get a request token."
-msgstr "Não foi possível obter um token de requisição."
-
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206 actions/emailsettings.php:223
-#: actions/imsettings.php:195 actions/smssettings.php:214
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
-msgid "Couldn't insert confirmation code."
-msgstr "Não foi possível inserir o código de confirmação."
-
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
-msgstr "Não foi possível inserir a nova assinatura."
-
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-msgid "Couldn't save profile."
-msgstr "Não foi possível salvar o perfil."
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
-msgstr "Não foi possível atualizar o usuário para assinar automaticamente."
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
-msgid "Couldn't update user record."
-msgstr "Não foi possível atualizar o registro 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
-#: 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
-#: actions/confirmaddress.php:114 actions/emailsettings.php:280
-#: actions/emailsettings.php:411 actions/imsettings.php:252
-#: actions/imsettings.php:395 actions/othersettings.php:162
-#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
-msgid "Couldn't update user."
-msgstr "Não foi possível atualizar o usuário."
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
+#, fuzzy
+msgid "Could not create group."
+msgstr "Não foi possível criar a favorita."
 
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
-msgid "Create"
-msgstr "Criar"
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Não foi possível criar a favorita."
 
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
-msgid "Create a new user with this nickname."
-msgstr "Criar um novo usuário com este apelido."
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Não foi possível salvar a assinatura."
 
-#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
-msgid "Create new account"
-msgstr "Criar uma nova conta"
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"O apelido deve conter apenas letras minúsculas e/ou números e não pode ter "
+"acentuação e espaços."
 
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
-msgid "Creating new account for OpenID that already has a user."
-msgstr "Criando uma nova conta para um OpenID que já tem um usuário."
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr "Este apelido já está em uso. Tente outro."
 
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "Endereço de Jabber/GTalk já confirmado."
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "Não é um apelido válido."
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "Número de telefone já habilitado para receber SMS."
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "A URL do site informada não é válida."
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-msgid "Current confirmed email address."
-msgstr "Endereço de e-mail já confirmado."
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "O nome completo é muito extenso (máx. 255 caracteres)"
 
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
-msgstr "Neste momento"
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "descrição muito extensa (máximo 140 caracteres)."
 
-#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "Erro no banco de dados durante a inserção de hashtag: %s"
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "A localização é muito extensa (máx. 255 caracteres)."
 
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
 #, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Erro no banco de dados na inserção da reposta: %s"
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
-msgid "Delete notice"
-msgstr "Excluir a mensagem"
-
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "Descreva a si mesmo e seus interesses em 140 caracteres."
-
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87 actions/register.php:172
-#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
-#: actions/register.php:385 lib/accountsettingsaction.php:113
-msgid "Email"
-msgstr "E-mail"
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-msgid "Email Address"
-msgstr "Endereço de e-mail"
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
-msgstr "Configurações do e-mail"
-
-#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-msgid "Email address already exists."
-msgstr "O endereço de e-mail já existe."
-
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
-msgid "Email address confirmation"
-msgstr "Confirmação do endereço de e-mail"
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
-msgstr "Endereço de e-mail, ex: \"usuario@exemplo.org\""
-
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-msgid "Email addresses"
-msgstr "Endereços de e-mail"
+msgid "Too many aliases! Maximum %d."
+msgstr ""
 
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
-msgid "Enter a nickname or email address."
-msgstr "Entre com o apelido ou endereço de e-mail."
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Etiqueta inválida: \"%s\""
 
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
-msgstr "Informe o código que você recebeu no seu telefone."
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Este apelido já está em uso. Tente outro."
 
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
-msgid "Error authorizing token"
-msgstr "Erro na autorização do token"
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
-msgid "Error connecting user to OpenID."
-msgstr "Erro na conexão do usuário ao OpenID."
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Você já está assinando esses usuários:"
 
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
-msgstr "Erro na conexão do usuário."
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
-msgstr "Erro na inserção do avatar"
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Não é possível acompanhar o usuário: Usuário não encontrado."
 
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
-msgstr "Erro na inserção do novo perfil"
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Você não está assinando esse perfil."
 
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
-msgstr "Erro na inserção do perfil remoto"
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Não é possível acompanhar o usuário: Usuário não encontrado."
 
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
-msgid "Error saving address confirmation."
-msgstr "Erro ao salvar o endereço de confirmação"
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "Grupos de %s"
 
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
-msgid "Error saving remote profile"
-msgstr "Erro ao salvar o perfil remoto"
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Outras opções"
 
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-msgid "Error saving the profile."
-msgstr "Erro ao salvar o perfil."
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "Grupos de %s"
 
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-msgid "Error saving the user."
-msgstr "Erro ao salvar o usuário."
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "O grupo %s é membro de"
 
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
-msgid "Error saving user; invalid."
-msgstr "Erro ao salvar usuário; inválido."
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
+msgstr "Este método requer POSTAGEM ou EXCLUSÃO."
 
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
-#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
-#: actions/register.php:108 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-msgid "Error setting user."
-msgstr "Erro na configuração do usuário."
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
+msgstr "Você não pode apagar o status de outro usuário."
 
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr "Erro na atualização do perfil"
+#: actions/apistatusesshow.php:138
+msgid "Status deleted."
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
-msgstr "Erro na atualização do perfil remoto"
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
+msgstr "Não foi encontrado nenhum status com esse ID."
 
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr "Erro com o código de confirmação."
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "Está muito extenso. O tamanho máximo é de 140 caracteres."
 
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
-msgid "Existing nickname"
-msgstr "Apelido já existe"
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
+msgstr "Não encontrado"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
-msgid "FAQ"
-msgstr "FAQ"
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
 
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
-msgid "Failed updating avatar."
-msgstr "Não foi possível atualizar o avatar."
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Formato de imagem não suportado."
 
-#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/apitimelinefavorites.php:107
 #, php-format
-msgid "Feed for friends of %s"
-msgstr "Feed para os amigos de %s"
+msgid "%s / Favorites from %s"
+msgstr "%s / Favoritas de %s"
 
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/apitimelinefavorites.php:119
 #, php-format
-msgid "Feed for replies to %s"
-msgstr "Feed para respostas para %s"
+msgid "%s updates favorited by %s / %s."
+msgstr "%s atualizações de favoritas por %s / %s."
 
-#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
-msgid "Feed for tag %s"
-msgstr "Feed para tag %s"
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
-msgstr "Procure no conteúdo das mensagens"
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
-msgstr "Procure por 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, 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:77 actions/register.php:178
-#: actions/profilesettings.php:103 actions/register.php:391
-#: actions/showgroup.php:235 actions/showstream.php:262
-#: actions/tagother.php:105 lib/groupeditform.php:142
-msgid "Full name"
-msgstr "Nome completo"
-
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
-#: actions/register.php:86 actions/updateprofile.php:94
-#: actions/editgroup.php:195 actions/newgroup.php:146
-#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
-msgid "Full name is too long (max 255 chars)."
-msgstr "O nome completo é muito extenso (máx. 255 caracteres)"
-
-#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
-msgid "Help"
-msgstr "Ajuda"
-
-#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
-msgid "Home"
-msgstr "Início"
-
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
-msgid "Homepage"
-msgstr "Site"
-
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
-msgid "Homepage is not a valid URL."
-msgstr "A URL do site informada não é válida."
-
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
-msgid "I want to post notices by email."
-msgstr "Eu quero publicar mensagens por e-mail."
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
-msgstr "IM"
-
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
-msgstr "Endereço do IM"
-
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
-msgstr "Configurações do IM"
-
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
-msgstr ""
-"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 à sua conta, informe-a na caixa abaixo e "
-"clique em \"Adicionar\"."
-
-#: ../actions/recoverpassword.php:137
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
-msgstr ""
-"Se você esqueceu ou perdeu sua senha, você pode receber uma nova no endereço "
-"de e-mail que armazenou em sua conta."
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-#: actions/emailsettings.php:127 actions/smssettings.php:140
-msgid "Incoming email"
-msgstr "E-mail de recebimento"
-
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
-msgid "Incoming email address removed."
-msgstr "O endereço de e-mail de recebimento foi removido."
-
-#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
-msgid "Incorrect old password"
-msgstr "A senha antiga está incorreta"
+msgid "%s timeline"
+msgstr "Mensagens de %s"
 
-#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
-msgid "Incorrect username or password."
-msgstr "Nome de usuário e/ou senha incorreto(s)."
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "Atualizações de %1$s no %2$s!"
 
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
-msgstr ""
-"As instruções para recuperar a sua senha foram enviadas para o endereço de e-"
-"mail informado no seu cadastro."
+#: actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Atualizações respondendo à %2$s"
 
-#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/apitimelinementions.php:126
 #, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "A URL '%s' para o avatar é inválida"
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr "%1$s atualizações que respondem a mensagens de %2$s / %3$s."
 
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
 #, php-format
-msgid "Invalid email address: %s"
-msgstr "Não é um endereço de e-mail válido: %s"
+msgid "%s public timeline"
+msgstr "Mensagens públicas de %s"
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
 #, php-format
-msgid "Invalid homepage '%s'"
-msgstr "O site '%s' é inválido"
+msgid "%s updates from everyone!"
+msgstr "%s atualizações de todo mundo!"
 
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/apitimelinetag.php:101 actions/tag.php:66
 #, php-format
-msgid "Invalid license URL '%s'"
-msgstr "A URL '%s' da licença é inválida"
-
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
-msgstr "O conteúdo da mensagem é inválido"
+msgid "Notices tagged with %s"
+msgstr "Mensagens etiquetadas com %s"
 
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
-msgstr "A URI da mensagem é inválida"
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Atualizações de %1$s no %2$s!"
 
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
-msgstr "A URL da mensagem é inválida"
+#: actions/apiusershow.php:96
+msgid "Not found."
+msgstr "Não encontrado."
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "A URL '%s' do perfil é inválida."
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "Esse documento não existe."
 
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
-msgstr "A URL do perfil é inválida (formato inválido)"
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+msgstr "Nenhum apelido."
 
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
-msgstr "A URL do perfil retornada pelo servidor é inválida."
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "Sem tamanho definido."
 
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 #: actions/avatarbynickname.php:69
 msgid "Invalid size."
 msgstr "Tamanho inválido."
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111 actions/finishopenidlogin.php:241
-#: actions/register.php:103 actions/register.php:121
-#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
-msgid "Invalid username or password."
-msgstr "Nome de usuário e/ou senha inválido(s)"
-
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-msgid "Invitation(s) sent"
-msgstr "Convite(s) enviado(s)"
-
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-msgid "Invitation(s) sent to the following people:"
-msgstr "Convite(s) enviado(s) para as seguintes pessoas:"
-
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
-msgid "Invite"
-msgstr "Convidar"
-
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-msgid "Invite new users"
-msgstr "Convidar novos usuários"
-
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
-#, php-format
-msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
-msgstr ""
-"Ele funciona sob o software de microblogagem [StatusNet](http://status.net/), "
-"versão %s, disponível sob a [GNU Affero General Public License] (http://www."
-"fsf.org/licensing/licenses/agpl-3.0.html)."
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "Avatar"
 
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
-msgstr "Esta ID do Jabber já pertence à outro usuário."
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "Você pode enviar seu avatar pessoal."
 
-#: ../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 ""
-"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."
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
+msgstr "Usuário sem um perfil correspondente"
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
-msgid "Language"
-msgstr "Idioma"
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+msgid "Avatar settings"
+msgstr "Configurações do avatar"
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
-msgid "Language is too long (max 50 chars)."
-msgstr "O nome do idioma é muito extenso (máx. 50 caracteres)."
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr "Original"
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
-msgid "Location"
-msgstr "Localização"
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr "Visualização"
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
-#: actions/register.php:92 actions/updateprofile.php:109
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
-msgid "Location is too long (max 255 chars)."
-msgstr "A localização é muito extensa (máx. 255 caracteres)."
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+msgid "Delete"
+msgstr "Excluir"
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
-#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
-#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
-#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
-#, php-format
-msgid "Login"
-msgstr "Logar"
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+msgstr "Enviar"
 
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Logar-se com uma conta [OpenID](%%doc.openid%%)."
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
+msgstr "Cortar"
 
-#: ../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%"
-"%). "
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
 msgstr ""
-"Logar-se com seu nome de usuário e senha. Não tem um nome de usuário ainda? "
-"[Registre](%%action.register%%) uma nova conta, ou use uma "
-"[OpenID](%%action.openidlogin%%)."
-
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
-msgid "Logout"
-msgstr "Sair"
+"Ocorreu um problema com o seu token de sessão. Tente novamente, por favor."
 
-#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
-msgid "Longer name, preferably your \"real\" name"
-msgstr "Nome completo (nome e sobrenome), de preferência seu nome \"real\""
+#: actions/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Submissão inesperada de formulário."
 
-#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
-msgid "Lost or forgotten password?"
-msgstr "Perdeu ou esqueceu sua senha?"
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
+msgstr "Selecione uma área quadrada da imagem para ser seu avatar"
 
-#: ../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 "Cria um novo endereço de e-mail para publicar e cancela o antigo."
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
+msgstr "Nossos dados do arquivo foi perdido."
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#: actions/emailsettings.php:71
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr "Configure o recebimento de e-mails do %%site.name%%."
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+msgstr "O avatar foi atualizado."
 
-#: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
-msgid "Member since"
-msgstr "Membro desde"
+#: actions/avatarsettings.php:363
+msgid "Failed updating avatar."
+msgstr "Não foi possível atualizar o avatar."
 
-#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
-#, php-format
-msgid "Microblog by %s"
-msgstr "Microblog por %s"
+#: actions/avatarsettings.php:387
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "O avatar foi atualizado."
 
-#: ../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 ""
-"A operadora móvel do seu celular. Se você conhece uma operadora que aceita "
-"SMS via e-mail que não está listada aqui, informe-nos enviando uma mensagem "
-"para %s."
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+msgid "No nickname"
+msgstr "Nenhum apelido"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-msgid "My text and files are available under "
-msgstr "Meus textos e arquivos estão disponíveis sob "
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
+msgstr "Esse grupo não existe"
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#: actions/emailsettings.php:142 actions/smssettings.php:152
-msgid "New"
-msgstr "Novo"
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "O usuário não tem perfil."
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
-#, php-format
-msgid "New email address for posting to %s"
-msgstr "Novo endereço de e-mail para postar para %s"
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s e amigos, página %d"
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
-msgid "New incoming email address added."
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
 msgstr ""
-"Foi adicionado um novo endereço de e-mail para recebimento de mensagens."
-
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
-msgid "New nickname"
-msgstr "Novo apelido"
-
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
-msgstr "Nova mensagem"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-msgid "New password"
-msgstr "Nova senha"
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Não foi possível desbloquear o usuário."
 
-#: ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
-msgstr ""
-"A nova senha foi salva com sucesso. A partir de agora você já está logado."
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
+msgstr "Desbloquear"
 
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151 actions/login.php:101
-#: actions/profilesettings.php:74 actions/register.php:165
-#: actions/login.php:228 actions/profilesettings.php:98
-#: actions/register.php:367 actions/showgroup.php:224
-#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
-msgid "Nickname"
-msgstr "Apelido"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+msgid "Unblock this user"
+msgstr "Desbloquear este usuário"
 
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69 actions/finishopenidlogin.php:181
-#: actions/profilesettings.php:225 actions/register.php:76
-#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
-msgid "Nickname already in use. Try another one."
-msgstr "Este apelido já está em uso. Tente outro."
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Você não está logado."
 
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:67 ../actions/updateprofile.php:77
-#: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
-#: actions/register.php:74 actions/updateprofile.php:78
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"O apelido deve conter apenas letras minúsculas e/ou números e não pode ter "
-"acentuação e espaços."
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
+msgstr "Não foi especificado nenhum perfil."
 
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
-msgid "Nickname not allowed."
-msgstr "Este apelido não é permitido."
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
+msgstr "Não foi encontrado nenhum perfil com esse ID."
 
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
-msgstr "Apelido do usuário que você quer seguir"
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Bloquear usuário"
 
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
-msgid "Nickname or email"
-msgstr "Apelido ou e-mail"
+#: actions/block.php:136
+msgid ""
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
+msgstr ""
 
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
+#: actions/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
 msgid "No"
 msgstr "Não"
 
-#: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
-msgstr "Nenhuma ID de Jabber."
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Desbloquear este usuário"
 
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
-msgid "No authorization request!"
-msgstr "Nenhum pedido de autorização!"
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
+msgstr "Sim"
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
-msgid "No carrier selected."
-msgstr "Não foi selecionada nenhuma operadora."
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "Bloquear usuário"
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
-msgstr "Não foi digitado nenhum código"
+#: actions/block.php:165
+msgid "You have already blocked this user."
+msgstr "Você já bloqueou esse usuário."
+
+#: actions/block.php:170
+msgid "Failed to save block information."
+msgstr "Não foi possível salvar a informação de bloqueio."
+
+#: actions/bookmarklet.php:50
+msgid "Post to "
+msgstr ""
 
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 #: actions/confirmaddress.php:75
 msgid "No confirmation code."
 msgstr "Nenhum código de confirmação."
 
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
-#: actions/newnotice.php:126 classes/Command.php:223
-msgid "No content!"
-msgstr "Nenhum conteúdo!"
-
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
-msgid "No email address."
-msgstr "Nenhum endereço de e-mail."
-
-#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
-msgid "No id."
-msgstr "Nenhuma ID."
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
-msgid "No incoming email address."
-msgstr "Nenhum endereço de e-mail para recebimentos."
-
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr "Nenhum apelido fornecido pelo servidor remoto."
-
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
-msgid "No nickname."
-msgstr "Nenhum apelido."
-
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229 actions/emailsettings.php:240
-#: actions/imsettings.php:214 actions/smssettings.php:237
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
-msgid "No pending confirmation to cancel."
-msgstr "Nenhuma confirmação pendente para cancelar."
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
-msgstr "Nenhum número de telefone."
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "O código de confirmação não foi encontrado."
 
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
-msgstr "Nenhuma URL de perfil retornada pelo servidor."
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "Esse código de confirmação não é seu!"
 
-#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
-msgid "No registered email address for that user."
-msgstr "Nenhum endereço de e-mail registrado para esse usuário."
+#: actions/confirmaddress.php:90
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr "Tipo de endereço %s desconhecido"
 
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr "Não foi encontrada nenhuma requisição!"
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr "Esse endereço já foi confirmado."
 
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
-msgid "No results"
-msgstr "Nenhum resultado"
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "Não foi possível atualizar o usuário."
 
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
-msgstr "Sem tamanho definido."
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr "Não foi possível excluir a confirmação de e-mail."
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
-msgid "No status found with that ID."
-msgstr "Não foi encontrado nenhum status com esse ID."
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "Confirme o endereço"
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
-msgid "No status with that ID found."
-msgstr "Não foi encontrado nenhum status com esse ID."
+#: actions/confirmaddress.php:159
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "O endereço \"%s\" foi confirmado para sua conta."
 
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
-msgstr "Essa OpenID não existe."
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Código de confirmação"
 
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
-msgid "No such document."
-msgstr "Esse documento não existe."
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
+msgstr "Mensagens"
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30 actions/shownotice.php:32
-#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Essa mensagem não existe."
 
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr "Esse código de recuperação não existe."
-
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-msgid "No such subscription"
-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 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 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
-msgid "No such user."
-msgstr "Usuário não encontrado."
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "Não é possível excluir esta mensagem."
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-msgid "No user with that email address or username."
+#: actions/deletenotice.php:103
+#, fuzzy
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
 msgstr ""
-"Não foi encontrado nenhum usuário com essa identificação ou endereço de "
-"email."
-
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
-msgstr "Ninguém para exibir!"
-
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr "Não é um código de recuperação"
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
-msgstr "Não é um usuário registrado."
-
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
-msgid "Not a supported data format."
-msgstr "Formato de dados não suportado."
-
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
-msgstr "Não é uma ID de Jabber válida"
-
-#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-msgid "Not a valid OpenID."
-msgstr "Não é uma OpenID válida."
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
-msgid "Not a valid email address"
-msgstr "Não é um endereço de e-mail válido"
-
-#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-msgid "Not a valid email address."
-msgstr "Não é um endereço de e-mail válido."
-
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-#: actions/editgroup.php:186 actions/newgroup.php:137
-#: actions/profilesettings.php:195 actions/register.php:161
-msgid "Not a valid nickname."
-msgstr "Não é um apelido válido."
-
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
-msgstr "Não é uma URL de perfil válida (serviço incorreto)."
-
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr "Não é uma URL de perfil válida (nenhum XRDS definido)."
+"Você está prestes a apagar permanentemente uma mensagem. Isso não poderá ser "
+"desfeito."
 
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr "Não é uma URL de perfil válida (nenhum documento YADIS)."
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr "Excluir a mensagem"
 
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
-msgid "Not an image or corrupt file."
-msgstr "Imagem inválida ou arquivo corrompido."
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr "Você tem certeza que deseja excluir esta mensagem?"
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
-msgid "Not authorized."
-msgstr "Não autorizado."
+#: actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "Não é possível excluir esta mensagem."
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
-msgid "Not expecting this response!"
-msgstr "Não esperava por esta resposta!"
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+msgid "Delete this notice"
+msgstr "Excluir esta mensagem"
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
-msgid "Not found"
-msgstr "Não encontrado"
+#: actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
+msgstr ""
+"Ocorreu um problema com o seu token de sessão. Tente novamente, por favor."
 
-#: ../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 actions/block.php:59 actions/disfavor.php:61
-#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
-#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
-#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
-#: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Você não está logado."
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr "Essa mensagem não é uma favorita!"
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
-msgid "Not subscribed!."
-msgstr "Não é seguido!"
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "Adicionar aos favoritos"
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
-msgstr "Procurar mensagem"
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "Esse documento não existe."
 
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
+#: actions/editgroup.php:56
 #, php-format
-msgid "Notice feed for %s"
-msgstr "Feed de mensagens de %s"
+msgid "Edit %s group"
+msgstr "Editar o grupo %s"
 
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
-msgstr "A mensagem não está associada a nenhum perfil"
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
+msgstr "Você deve estar logado para criar um grupo."
 
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
-msgid "Notices"
-msgstr "Mensagens"
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+msgid "You must be an admin to edit the group"
+msgstr "Você deve ser o administrador do grupo para editá-lo"
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
-#, php-format
-msgid "Notices tagged with %s"
-msgstr "Mensagens etiquetadas com %s"
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
+msgstr "Use esse formulário para editar o grupo."
 
-#: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
-msgstr "Senha antiga"
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "descrição muito extensa (máximo 140 caracteres)."
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
-msgid "OpenID"
-msgstr "OpenID"
-
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
-msgid "OpenID Account Setup"
-msgstr "Configuração da conta OpenID"
-
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-msgid "OpenID Auto-Submit"
-msgstr "Submissão automática da OpenID"
-
-#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
-#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-msgid "OpenID Login"
-msgstr "Logar-se via OpenID"
-
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-#: actions/openidlogin.php:102 actions/openidsettings.php:101
-msgid "OpenID URL"
-msgstr "URL da OpenID"
-
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
-msgid "OpenID authentication cancelled."
-msgstr "A autenticação pela OpenID foi cancelada."
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr "Não foi possível logar via OpenID: %s"
-
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "Falha na OpenID: %s"
-
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr "A OpenID foi removida."
-
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
-msgstr "Configurações da OpenID"
-
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-msgid "Optionally add a personal message to the invitation."
-msgstr "Você pode, opcionalmente, adicionar uma mensagem pessoal ao convite."
+#: actions/editgroup.php:253
+msgid "Could not update group."
+msgstr "Não foi possível atualizar o grupo."
 
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
-msgid "Partial upload."
-msgstr "Envio parcial."
+#: actions/editgroup.php:269
+msgid "Options saved."
+msgstr "As configurações foram salvas."
 
-#: ../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 actions/finishopenidlogin.php:118
-#: actions/login.php:231 actions/register.php:372
-#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-msgid "Password"
-msgstr "Senha"
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "Configurações do e-mail"
 
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
-msgid "Password and confirmation do not match."
-msgstr "A senha e a confirmação não coincidem."
+#: actions/emailsettings.php:71
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr "Configure o recebimento de e-mails do %%site.name%%."
 
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
-msgid "Password must be 6 chars or more."
-msgstr "A senha deve ter 6 caracteres ou mais."
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "Endereço"
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-msgid "Password recovery requested"
-msgstr "Foi solicitada a recuperação da senha"
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr "Endereço de e-mail já confirmado."
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-msgid "Password saved."
-msgstr "A senha foi salva."
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "Remover"
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-msgid "Passwords don't match."
-msgstr "As senhas não coincidem."
+#: actions/emailsettings.php:113
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
+"Aguardando a confirmação deste endereço. Procure em sua caixa de entrada (e "
+"de spam!) por uma mensagem com mais instruções."
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
-msgstr "Pessoas"
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
-msgstr "Procurar Pessoas"
+#: actions/emailsettings.php:121
+msgid "Email Address"
+msgstr "Endereço de e-mail"
 
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
-msgstr "Procurar pessoas"
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr "Endereço de e-mail, ex: \"usuario@exemplo.org\""
 
-#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
-msgid "Personal"
-msgstr "Pessoal"
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "Adicionar"
 
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-msgid "Personal message"
-msgstr "Mensagem pessoal"
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+msgstr "E-mail de recebimento"
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "Número de telefone, sem pontuação ou espaços, com código de área"
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
+msgstr "Envie e-mails para esse endereço para publicar novas mensagens."
 
-#: ../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 ""
-"Por favor, verifique estes detalhes para ter certeza que você quer seguir as "
-"mensagens deste usuário. Se você não solicitou seguir as mensagens de "
-"alguém, clique em \"Cancelar\"."
+#: actions/emailsettings.php:145 actions/smssettings.php:162
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr "Cria um novo endereço de e-mail para publicar e cancela o antigo."
 
-#: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Publicar uma mensagem quando eu mudar de status no Jabber/GTalk."
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
+msgstr "Novo"
 
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94 actions/emailsettings.php:86
-#: actions/imsettings.php:68 actions/smssettings.php:94
-#: actions/twittersettings.php:70 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163 actions/emailsettings.php:180
-#: actions/imsettings.php:152 actions/smssettings.php:171
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
-msgid "Preferences saved."
-msgstr "As preferências foram salvas."
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
-msgid "Preferred language"
-msgstr "Idioma preferencial"
-
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
-msgid "Privacy"
-msgstr "Privacidade"
-
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-msgid "Problem saving notice."
-msgstr "Problema ao salvar a mensagem."
-
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
-msgid "Profile"
-msgstr "Perfil"
-
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
-msgstr "URL do Perfil"
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
+msgstr "Envie-me notificações de novos assinantes por e-mail."
 
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
-msgstr "Configurações do perfil"
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+"Envie-me um e-mail quando alguém adicionar alguma mensagem minha como "
+"favorita."
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-msgid "Profile unknown"
-msgstr "Perfil desconhecido"
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
+msgstr "Envie-me um e-mail quando alguém enviar-me uma mensagem particular."
 
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
-msgid "Public Stream Feed"
-msgstr "Feed de mensagens públicas"
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "Envie-me um e-mail quando alguém enviar-me uma mensagem particular."
 
-# Just for me.
-#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
-msgid "Public timeline"
-msgstr "Mensagens públicas"
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
+msgstr "Permitir que meus amigos chamem minha atenção e enviem-me um e-mail."
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Publique um MicroID para meu endereço de Jabber/Gtalk."
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
+msgstr "Eu quero publicar mensagens por e-mail."
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr "Publique um MicroID para meu endereço de e-mail."
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr "Tags recentes"
-
-#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
-msgid "Recover"
-msgstr "Recuperar"
-
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
-msgid "Recover password"
-msgstr "Recuperar a senha"
-
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-msgid "Recovery code for unknown user."
-msgstr "Código de recuperação para usuário desconhecido."
-
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
-#: actions/register.php:152 actions/register.php:207 lib/util.php:328
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-msgid "Register"
-msgstr "Registrar"
-
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
-msgid "Registration not allowed."
-msgstr "Não é permitido o registro."
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Salvar"
 
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
-msgid "Registration successful"
-msgstr "Registro realizado com sucesso"
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+msgstr "As preferências foram salvas."
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
-msgid "Reject"
-msgstr "Recusar"
+#: actions/emailsettings.php:319
+msgid "No email address."
+msgstr "Nenhum endereço de e-mail."
 
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
-msgid "Remember me"
-msgstr "Lembrar neste computador"
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
+msgstr "Não foi possível normalizar este endereço de e-mail"
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
-msgid "Remote profile with no matching profile"
-msgstr "Perfil remoto sem referencia local"
+#: actions/emailsettings.php:330
+msgid "Not a valid email address"
+msgstr "Não é um endereço de e-mail válido"
 
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
-msgstr "Assinatura remota"
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
+msgstr "Esse já é seu endereço de e-mail."
 
-#: ../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 actions/emailsettings.php:101
-#: actions/emailsettings.php:134 actions/imsettings.php:102
-#: actions/openidsettings.php:166 actions/smssettings.php:103
-#: actions/smssettings.php:146 actions/twittersettings.php:115
-msgid "Remove"
-msgstr "Remover"
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another user."
+msgstr "Esse endereço de e-mail já pertence à outro usuário."
 
-#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
-msgstr "Remover OpenID"
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+msgstr "Não foi possível inserir o código de confirmação."
 
-#: ../actions/openidsettings.php:73
+#: actions/emailsettings.php:358
 msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+"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 ""
-"Remover a sua única OpenID pode fazer com que seja impossível você logar-se "
-"novamente! Se deseja realmente removê-la, adicione outra OpenID antes."
+"Um código de confirmação foi enviado para o endereço de e-mail que você "
+"informou. Verifique a sua caixa de entrada (e de spam!) para o código e "
+"instruções sobre como usá-lo."
 
-#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
-msgid "Replies"
-msgstr "Respostas"
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
+msgstr "Nenhuma confirmação pendente para cancelar."
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
-#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
-#: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
-#, php-format
-msgid "Replies to %s"
-msgstr "Respostas para %s"
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "Isso é um endereço de IM errado."
 
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
-msgid "Reset"
-msgstr "Restaurar"
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "Confirmação cancelada."
 
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
-msgid "Reset password"
-msgstr "Restaurar a senha"
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
+msgstr "Esse não é seu endereço de email."
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-msgid "SMS"
-msgstr "SMS"
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "O endereço foi removido."
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
-msgid "SMS Phone number"
-msgstr "Telefone para SMS"
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
+msgstr "Nenhum endereço de e-mail para recebimentos."
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
-msgstr "Configuração de SMS"
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
+msgstr "Não foi possível atualizar o registro do usuário."
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
-msgid "SMS confirmation"
-msgstr "Confirmação de SMS"
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
+msgstr "O endereço de e-mail de recebimento foi removido."
 
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
-msgid "Same as password above"
-msgstr "Igual à senha acima"
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
+msgstr ""
+"Foi adicionado um novo endereço de e-mail para recebimento de mensagens."
 
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
-msgid "Same as password above. Required."
-msgstr "Igual à senha acima. Obrigatório."
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+msgid "Popular notices"
+msgstr "Mensagens populares"
 
-#: ../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 actions/emailsettings.php:182
-#: actions/facebooksettings.php:114 actions/imsettings.php:157
-#: actions/othersettings.php:117 actions/profilesettings.php:150
-#: actions/smssettings.php:169 actions/subscriptions.php:124
-#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
-msgid "Save"
-msgstr "Salvar"
+#: actions/favorited.php:67
+#, php-format
+msgid "Popular notices, page %d"
+msgstr "Mensagens populares, pág. %d"
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
-msgid "Search"
-msgstr "Procurar"
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
+msgstr "As etiquetas mais populares no site agora."
 
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
-msgstr "Procurar no fluxo de mensagens"
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
-#, php-format
+#: actions/favorited.php:153
 msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
 msgstr ""
-"Procurar 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
+#: actions/favorited.php:156
 #, 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."
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
 msgstr ""
-"Procurar 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."
 
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
-msgid "Select a carrier"
-msgstr "Selecione uma operadora"
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
+msgstr "Mensagens favoritas de %s"
 
-#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
-#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
-msgid "Send"
-msgstr "Enviar"
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Atualizações de %1$s no %2$s!"
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
-msgstr "Envie e-mails para esse endereço para publicar novas mensagens."
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Essa mensagem já é uma favorita!"
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
-msgstr "Envie-me notificações de novos assinantes por e-mail."
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Excluir a favorita"
 
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
-msgid "Send me notices through Jabber/GTalk."
-msgstr "Envie-me as mensagens via Jabber/GTalk."
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr "Usuários de destaque"
 
-#: ../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 ""
-"Envie-me mensagens via SMS. Eu compreendo que isso pode gerar cobranças "
-"exorbitantes da minha operadora."
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr "Usuários de destaque, pág. %d"
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
 msgstr ""
-"Envie-me respostas de pessoas que eu não estou seguindo através do "
-"Jabber/GTalk."
 
-#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
-msgid "Settings"
-msgstr "Configurações"
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "Nova mensagem"
 
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
-msgid "Settings saved."
-msgstr "As configurações foram salvas."
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Nova mensagem"
 
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr "Exibindo as tags mais populares da última semana"
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
 
-#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:114
-msgid "Someone else already has this OpenID."
-msgstr "Alguém já está usando esta OpenID."
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
-msgstr "Aconteceu alguma coisa estranha..."
+#: actions/finishremotesubscribe.php:69
+msgid "Not expecting this response!"
+msgstr "Não esperava por esta resposta!"
 
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
-msgstr "Desculpe-me, mas não é permitido o recebimento de emails."
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "O usuário que está está sendo acompanhado não existe."
 
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
-msgstr "Desculpe-me, mas este não é seu endereço de e-mail para recebimento."
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+msgstr "Você pode usar a assinatura local!"
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
-msgid "Source"
-msgstr "Fonte"
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
+msgstr "Esse usuário bloqueou o seu pedido de assinatura."
 
-#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
-msgid "Statistics"
-msgstr "Estatísticas"
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "Não autorizado."
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-msgid "Stored OpenID not found."
-msgstr "O OpenID armazenado não foi encontrado."
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr ""
+"Não foi possível converter os tokens de requisição para tokens de acesso."
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
-#: actions/showstream.php:197 actions/showstream.php:206
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
-msgid "Subscribe"
-msgstr "Assinar"
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Versão desconhecida do protocolo OMB."
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
-msgid "Subscribers"
-msgstr "Assinantes"
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "Erro na atualização do perfil remoto"
 
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
-msgid "Subscription authorized"
-msgstr "A assinatura foi autorizada"
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+#, fuzzy
+msgid "No such group."
+msgstr "Essa etiqueta não existe."
 
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
-msgid "Subscription rejected"
-msgstr "A assinatura foi recusada"
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "Essa mensagem não existe."
 
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27 actions/showstream.php:240
-#: actions/showstream.php:322 actions/subscriptions.php:27
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
-msgid "Subscriptions"
-msgstr "Assinaturas"
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Nosso arquivo foi perdido."
 
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
-msgid "System error uploading file."
-msgstr "Erro no sistema durante o envio do arquivo."
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "Não foi especificado nenhum perfil."
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
-#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
-msgid "Tags"
-msgstr "Tags"
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "Texto"
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "O usuário bloqueou você."
 
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
-msgid "Text search"
-msgstr "Procurar por texto"
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "Você não está assinando esse perfil."
 
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
-msgstr "Essa OpenID não pertence à você."
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "Bloquear usuário"
 
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
-msgstr "Esse endereço já foi confirmado."
+#: actions/groupblock.php:162
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
 
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
-msgstr "Esse código de confirmação não é seu!"
+#: actions/groupblock.php:178
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "Não é possível acompanhar o usuário: Usuário não encontrado."
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr "Esse endereço de e-mail já pertence à outro usuário."
+#: actions/groupblock.php:179
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "Bloquear usuário"
 
-#: ../actions/avatar.php:80 actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
-msgstr "Esse arquivo é muito grande."
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
+msgstr ""
 
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
-msgid "That is already your Jabber ID."
-msgstr "Essa já é sua ID do Jabber."
+#: actions/groupbyid.php:74
+msgid "No ID"
+msgstr ""
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
-msgid "That is already your email address."
-msgstr "Esse já é seu endereço de e-mail."
+#: actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "Você deve estar logado para criar um grupo."
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
-msgid "That is already your phone number."
-msgstr "Esse já é seu número de telefone."
+#: actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "Outras opções"
 
-#: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
-msgid "That is not your Jabber ID."
-msgstr "Essa não é sua ID do Jabber."
+#: actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
-msgid "That is not your email address."
-msgstr "Esse não é seu endereço de email."
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Não foi possível atualizar o usuário."
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
-msgstr "Esse não é seu número de telefone."
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "Não foi possível salvar suas configurações do Twitter!"
 
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-#: actions/emailsettings.php:367 actions/imsettings.php:349
-msgid "That is the wrong IM address."
-msgstr "Isso é um endereço de IM errado."
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "As preferências de sincronização foram salvas."
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
-msgstr "Isso é um número de confirmação errado."
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
+msgstr "Logo do grupo"
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-msgid "That phone number already belongs to another user."
-msgstr "Esse número de telefone já pertence à outro usuário."
+#: actions/grouplogo.php:150
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
 
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49 actions/twitapistatuses.php:330
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-msgid "That's too long. Max notice size is 140 chars."
-msgstr "Está muito extenso. O tamanho máximo é de 140 caracteres."
+#: actions/grouplogo.php:362
+#, fuzzy
+msgid "Pick a square area of the image to be the logo."
+msgstr "Selecione uma área quadrada da imagem para ser seu avatar"
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "Está muito extenso. O tamanho máximo é de 255 caracteres."
+#: actions/grouplogo.php:396
+#, fuzzy
+msgid "Logo updated."
+msgstr "O avatar foi atualizado."
 
-#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
-#, php-format
-msgid "The address \"%s\" has been confirmed for your account."
-msgstr "O endereço \"%s\" foi confirmado para sua conta."
+#: actions/grouplogo.php:398
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "Não foi possível atualizar o avatar."
 
-#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274 actions/emailsettings.php:282
-#: actions/imsettings.php:258 actions/smssettings.php:282
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
-msgid "The address was removed."
-msgstr "O endereço foi removido."
+#: actions/groupmembers.php:93 lib/groupnav.php:92
+#, php-format
+msgid "%s group members"
+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:"
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
 msgstr ""
-"A assinatura foi autorizada, mas não foi informada nenhuma URL de retorno. "
-"Verifique as instruções do site para detalhes sobre como autorizar a "
-"assinatura. Seu token de assinatura é:"
 
-#: ../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."
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
 msgstr ""
-"A assinatura foi rejeitada, mas não foi informada nenhuma URL de retorno. "
-"Verifique as instruções do site para maiores detalhes em como rejeitar "
-"completamente a assinatura."
 
-#: ../actions/subscribers.php:35 actions/subscribers.php:35
-#, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr "Estas são as pessoas que acompanham as mensagens de %s."
+#: actions/groupmembers.php:175 lib/groupnav.php:107
+msgid "Admin"
+msgstr "Admin"
 
-#: ../actions/subscribers.php:33 actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr "Estas são as pessoas que acompanham as suas mensagens."
+#: actions/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
+msgstr "Bloquear"
 
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
-#, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr "Estas são as pessoas cujas mensagens %s acompanha."
+#: actions/groupmembers.php:441
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "Você deve ser o administrador do grupo para editá-lo"
 
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr "Estas são as pessoas cujas mensagens você acompanha."
+#: actions/groupmembers.php:473
+#, fuzzy
+msgid "Make Admin"
+msgstr "Admin"
 
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
-msgid ""
-"These people are already users and you were automatically subscribed to them:"
-msgstr "Estas pessoas já são usuárias e você as acompanha automaticamente:"
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
 
-#: ../actions/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
-msgstr "Este código de confirmação é muito antigo. Por favor inicie novamente."
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Atualizações de %1$s no %2$s!"
 
-#: ../lib/openid.php:195
+#: actions/groupsearch.php:52
+#, fuzzy, php-format
 msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
-"Este formulário deve enviar-se automaticamente. Caso isso não ocorra, clique "
-"no botão \"Enviar\" para ir para seu provedor de OpenID."
+"Procurar 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."
 
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/groupsearch.php:58
+#, fuzzy
+msgid "Group search"
+msgstr "Procurar pessoas"
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "Nenhum resultado"
+
+#: actions/groupsearch.php:82
 #, 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 ""
-"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/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-msgid "This method requires a POST or DELETE."
-msgstr "Este método requer POSTAGEM ou EXCLUSÃO."
-
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
-msgid "This method requires a POST."
-msgstr "Este método requer um POST."
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
+msgstr ""
 
-#: ../lib/util.php:164 lib/util.php:246
-msgid "This page is not available in a media type you accept"
-msgstr "Esta página não está disponível em um tipo de mídia que você aceita"
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
-msgid "Timezone"
-msgstr "Fuso horário"
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
+msgstr ""
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
-msgid "Timezone not selected."
-msgstr "O fuso horário não foi selecionado."
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr ""
 
-#: ../actions/remotesubscribe.php:43
+#: actions/groups.php:90
 #, 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."
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
 msgstr ""
-"Para assinar, você pode [autenticar-se](%%action.login%%), ou "
-"[registrar](%%action.register%%) uma nova conta. Se você já tem uma conta em "
-"um [site de microblogagem compatível](%%doc.openmublog%%), informe a URL do "
-"seu perfil abaixo."
-
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
-msgid "Two user ids or screen_names must be supplied."
-msgstr "Duas IDs de usuário ou screen_names devem ser informados."
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL do seu site, blog ou perfil em outro site"
-
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-msgid "URL of your profile on another compatible microblogging service"
-msgstr "URL do seu perfil em outro serviço de microblogagem compatível"
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+#, fuzzy
+msgid "Create a new group"
+msgstr "Criar uma nova conta"
 
-#: ../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 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-msgid "Unexpected form submission."
-msgstr "Submissão inesperada de formulário."
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
 
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
-msgid "Unexpected password reset."
-msgstr "Restauração inesperada da senha."
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "O usuário bloqueou você."
 
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-msgid "Unknown action"
-msgstr "Ação desconhecida"
+#: actions/groupunblock.php:128 actions/unblock.php:108
+msgid "Error removing the block."
+msgstr "Erro na remoção do bloqueio."
 
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-msgid "Unknown version of OMB protocol."
-msgstr "Versão desconhecida do protocolo OMB."
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "Configurações do IM"
 
-#: ../lib/util.php:269 lib/util.php:285
+#: actions/imsettings.php:70
+#, php-format
 msgid ""
-"Unless otherwise specified, contents of this site are copyright by the "
-"contributors and available under the "
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 msgstr ""
-"Caso não seja especificado, os colaboradores deste site possuem direito "
-"autoral sobre seu conteúdo e ele está disponível sob"
+"Você pode enviar e receber mensagens através dos [instant messages](%%doc.im%"
+"%) Jabber/GTalk. Configure seu endereço e opções abaixo."
 
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
-#, php-format
-msgid "Unrecognized address type %s"
-msgstr "Tipo de endereço %s desconhecido"
-
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
-msgstr "Cancelar"
-
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-msgid "Unsupported OMB version"
-msgstr "Versão do OMB não suportada"
-
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
-msgid "Unsupported image file format."
-msgstr "Formato de imagem não suportado."
-
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
-msgstr "Atualizações via SMS"
-
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
-msgstr "Atualizações via instant messenger (IM)"
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Esta página não está disponível em um "
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr "Atualizações de %1$s e amigos no %2$s!"
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Endereço de Jabber/GTalk já confirmado."
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/imsettings.php:114
 #, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr "Atualizações de %1$s no %2$s!"
+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 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/avatar.php:68 actions/profilesettings.php:161
-#: actions/avatarsettings.php:162 actions/grouplogo.php:232
-msgid "Upload"
-msgstr "Enviar"
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "Endereço do IM"
 
-#: ../actions/avatar.php:27
+#: actions/imsettings.php:126
+#, php-format
 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."
+"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 ""
-"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 quadrada. Ela deve estar sob a mesma licença do site. Use uma "
-"imagem que pertença a você e que você queira compartilhar."
+"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."
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr "Envie uma nova imagem para o seu perfil"
+#: actions/imsettings.php:143
+msgid "Send me notices through Jabber/GTalk."
+msgstr "Envie-me as mensagens via Jabber/GTalk."
 
-#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr "Publicar uma mensagem quando eu mudar de status no Jabber/GTalk."
+
+#: actions/imsettings.php:153
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
-"Use esse formulário para convidar seus amigos e colegas para usar este "
-"serviço."
+"Envie-me respostas de pessoas que eu não estou seguindo através do Jabber/"
+"GTalk."
 
-#: ../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 "Usado apenas para atualizações, anúncios e recuperações de senha"
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Publique um MicroID para meu endereço de Jabber/Gtalk."
 
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
-msgid "User being listened to doesn't exist."
-msgstr "O usuário que está está sendo acompanhado não existe."
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "Nenhuma ID de Jabber."
 
-#: ../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
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-msgid "User has no profile."
-msgstr "O usuário não tem perfil."
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr "Não foi possível normalizar essa ID do Jabber"
 
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
-msgstr "Apelido do usuário"
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "Não é uma ID de Jabber válida"
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr "Usuário não encontrado."
+#: actions/imsettings.php:299
+msgid "That is already your Jabber ID."
+msgstr "Essa já é sua ID do Jabber."
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
-msgid "What timezone are you normally in?"
-msgstr "Em que fuso horário você normalmente está?"
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr "Esta ID do Jabber já pertence à outro usuário."
 
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: actions/imsettings.php:327
 #, php-format
-msgid "What's up, %s?"
-msgstr "E aí, %s?"
+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 permitir que %s envie mensagens para você."
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-#: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Onde você está, ex: \"cidade, estado (ou região), país\""
+#: actions/imsettings.php:387
+msgid "That is not your Jabber ID."
+msgstr "Essa não é sua ID do Jabber."
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/inbox.php:59
 #, php-format
-msgid "Wrong image type for '%s'"
-msgstr "Tipo de imagem errado para '%s'"
+msgid "Inbox for %s - page %d"
+msgstr "Recebidas por %s - pág. %d"
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/inbox.php:62
 #, php-format
-msgid "Wrong size image at '%s'"
-msgstr "Tamanho da imagem errada em '%s'"
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
-msgid "Yes"
-msgstr "Sim"
+msgid "Inbox for %s"
+msgstr "Recebidas por %s"
 
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-msgid "You already have this OpenID!"
-msgstr "Você já tem esta OpenID!"
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+"Essa é a sua caixa de mensagens recebidas, que lista as mensagens "
+"particulares que você recebeu."
 
-#: ../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."
+#: actions/invite.php:39
+msgid "Invites have been disabled."
 msgstr ""
-"Você está prestes a apagar permanentemente uma mensagem. Isso não poderá ser "
-"desfeito."
 
-#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
-msgstr "Você já está logado!"
+#: actions/invite.php:41
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr "Você deve estar logado para convidar outros usuários para usar o %s"
 
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-msgid "You are already subscribed to these users:"
-msgstr "Você já está assinando esses usuários:"
+#: actions/invite.php:72
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "Não é um endereço de e-mail válido: %s"
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
-msgid "You are not friends with the specified user."
-msgstr "Você não é amigo do usuário especificado."
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
+msgstr "Convite(s) enviado(s)"
 
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr "Você pode alterar sua senha aqui. Faça uma boa escolha!"
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr "Convidar novos usuários"
 
-#: ../actions/register.php:135 actions/register.php:145
-msgid "You can create a new account to start posting notices."
-msgstr "Você pode criar uma nova conta para começar a publicar mensagens."
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr "Você já está assinando esses usuários:"
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
+#: actions/invite.php:131 actions/invite.php:139
 #, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "Você pode receber mensagens SMS do %%site.name%% através do e-mail."
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../actions/openidsettings.php:86
+#: actions/invite.php:136
 msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr ""
-"Você pode remover uma OpenID da sua conta, clicando no botão \"Remover\"."
+"These people are already users and you were automatically subscribed to them:"
+msgstr "Estas pessoas já são usuárias e você as acompanha automaticamente:"
 
-#: ../actions/imsettings.php:28 actions/imsettings.php:28
-#, php-format
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
+msgstr "Convite(s) enviado(s) para as seguintes pessoas:"
+
+#: actions/invite.php:150
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 msgstr ""
-"Você pode enviar e receber mensagens através dos [instant "
-"messages](%%doc.im%%) Jabber/GTalk. Configure seu endereço e opções abaixo."
+"Você será notificado assim que seus convidados aceitarem o convite e se "
+"registrarem neste site. Obrigado por aumentar a comunidade!"
 
-#: ../actions/profilesettings.php:27
+#: actions/invite.php:162
 msgid ""
-"You can update your personal profile info here so people know more about you."
+"Use this form to invite your friends and colleagues to use this service."
 msgstr ""
-"Você pode atualizar suas informações pessoais aqui, para que as pessoas "
-"saibam mais sobre você."
+"Use esse formulário para convidar seus amigos e colegas para usar este "
+"serviço."
 
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
-msgstr "Você pode usar a assinatura local!"
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "Endereços de e-mail"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
-msgid "You can't register if you don't agree to the license."
-msgstr "Você não pode se registrar se não aceitar a licença."
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr "Endereços dos seus amigos que serão convidados (um por linha)"
+
+#: actions/invite.php:192
+msgid "Personal message"
+msgstr "Mensagem pessoal"
 
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
-msgid "You did not send us that profile"
-msgstr "Você não nos enviou esse perfil"
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
+msgstr "Você pode, opcionalmente, adicionar uma mensagem pessoal ao convite."
 
-#: ../lib/mail.php:147
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
+msgstr "Enviar"
+
+#: actions/invite.php:226
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s convidou você para se juntar ao %2$s"
+
+#: actions/invite.php:228
 #, php-format
 msgid ""
-"You have a new posting address on %1$s.\n"
+"%1$s has invited you to join them on %2$s (%3$s).\n"
 "\n"
-"Send email to %2$s to post new messages.\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"
-"More email instructions at %3$s.\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"
-"Faithfully yours,\n"
-"%4$s"
+"%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 ""
-"Você tem um novo endereço para publicação no %1$s.\n"
+"%1$s convidou você para se juntar ao %2$s (%3$s).\n"
 "\n"
-"Para publicar novas mensagens, envie e-mails para %2$s .\n"
+"%2$s é um serviço de microblogagem que lhe permite manter-se atualizado com "
+"as pessoas que você conhece e com as que lhe interessam.\n"
 "\n"
-"Mais instruções em %3$s.\n"
+"Você também pode compartilhar notícias sobre você mesmo, seus pensamentos, "
+"ou sua vida on-line com as pessoas que lhe conhecem. Também é ótimo para "
+"encontrar novas pessoas que compartilham os mesmos interesses que você.\n"
 "\n"
-"Atenciosamente,\n"
-"%4$s"
-
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
-msgid "You may not delete another user's status."
-msgstr "Você não pode apagar o status de outro usuário."
-
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr "Você deve estar logado para convidar outros usuários para usar o %s"
+"%1$s disse:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Você pode ver o perfil de %1$s no %2$s aqui:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Se você quiser experimentar o serviço, clique no link abaixo para aceitar o "
+"convite.\n"
+"\n"
+"%6$s\n"
+"\n"
+"Se não, você pode ignorar esta mensagem. Obrigado por sua paciência e seu "
+"tempo.\n"
+"\n"
+"Cordialmente, %2$s\n"
 
-#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+#: actions/joingroup.php:60
+#, fuzzy
+msgid "You must be logged in to join a group."
 msgstr ""
-"Você será notificado assim que seus convidados aceitarem o convite e se "
-"registrarem neste site. Obrigado por aumentar a comunidade!"
+"Você deve estar autenticado para convidar outros usuários para usar o %s"
 
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr "Você foi identificado. Informe uma nova senha abaixo."
+#: actions/joingroup.php:90 lib/command.php:217
+#, fuzzy
+msgid "You are already a member of that group"
+msgstr "Você já está assinando esses usuários:"
 
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
-msgid "Your OpenID URL"
-msgstr "Sua URL de OpenID"
+#: actions/joingroup.php:128 lib/command.php:234
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s"
+msgstr "Não é possível acompanhar o usuário: Usuário não encontrado."
 
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
-msgstr "Seu apelido neste servidor, ou seu e-mail registrado."
+#: actions/joingroup.php:135 lib/command.php:239
+#, fuzzy, php-format
+msgid "%s joined group %s"
+msgstr "%s / Favoritas de %s"
 
-#: ../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."
+#: actions/leavegroup.php:60
+#, fuzzy
+msgid "You must be logged in to leave a group."
 msgstr ""
-"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 lib/util.php:992 lib/util.php:945
-msgid "a few seconds ago"
-msgstr "segundos atrás"
+"Você deve estar autenticado para convidar outros usuários para usar o %s"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
-#, php-format
-msgid "about %d days ago"
-msgstr "%d dias atrás"
+#: actions/leavegroup.php:90 lib/command.php:268
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "Você não está assinando esse perfil."
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
-#, php-format
-msgid "about %d hours ago"
-msgstr "%d horas atrás"
+#: actions/leavegroup.php:119 lib/command.php:278
+#, fuzzy
+msgid "Could not find membership record."
+msgstr "Não foi possível atualizar o registro do usuário."
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
-#, php-format
-msgid "about %d minutes ago"
-msgstr "%d mins atrás"
+#: actions/leavegroup.php:127 lib/command.php:284
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "Não é possível acompanhar o usuário: Usuário não encontrado."
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
-msgid "about %d months ago"
-msgstr "%d meses atrás"
-
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
-msgid "about a day ago"
-msgstr "1 dia atrás"
+msgid "%s left group %s"
+msgstr ""
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
-msgid "about a minute ago"
-msgstr "1 min atrás"
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "Já está logado."
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
-msgid "about a month ago"
-msgstr "1 mês atrás"
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "O conteúdo da mensagem é inválido"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
-msgid "about a year ago"
-msgstr "1 ano atrás"
+#: actions/login.php:143
+msgid "Incorrect username or password."
+msgstr "Nome de usuário e/ou senha incorreto(s)."
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
-msgid "about an hour ago"
-msgstr "1 hora atrás"
+#: actions/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
+msgstr "Erro na configuração do usuário."
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
-msgstr "excluir"
-
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117 actions/noticesearch.php:136
-#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
-msgid "in reply to..."
-msgstr "em resposta à..."
-
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124 actions/noticesearch.php:143
-#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
-msgid "reply"
-msgstr "responder"
-
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-msgid "same as password above"
-msgstr "igual à senha acima"
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "Logar"
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
-msgid "unsupported file type"
-msgstr "tipo de arquivo não suportado"
-
-#: ../lib/util.php:1309 lib/util.php:1443
-msgid "« After"
-msgstr "« Posteriores"
-
-#: 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
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-msgid "There was a problem with your session token. Try again, please."
+#: actions/login.php:243
+msgid "Login to site"
 msgstr ""
-"Ocorreu um problema com o seu token de sessão. Tente novamente, por favor."
 
-#: actions/disfavor.php:55 actions/disfavor.php:81
-msgid "This notice is not a favorite!"
-msgstr "Essa mensagem não é uma favorita!"
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Apelido"
 
-#: actions/disfavor.php:63 actions/disfavor.php:87
-msgid "Could not delete favorite."
-msgstr "Não foi possível excluir a favorita."
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Senha"
 
-#: actions/disfavor.php:72 lib/favorform.php:140
-msgid "Favor"
-msgstr "Tornar favorita"
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "Lembrar neste computador"
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
+#: actions/login.php:253 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
-"Envie-me um e-mail quando alguém adicionar alguma mensagem minha como "
-"favorita."
-
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-msgid "Send me email when someone sends me a private message."
-msgstr "Envie-me um e-mail quando alguém enviar-me uma mensagem particular."
+"Entrar automaticamente sem pedir a senha. Não use em computadores "
+"compartilhados!"
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
-msgid "This notice is already a favorite!"
-msgstr "Essa mensagem já é uma favorita!"
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "Perdeu ou esqueceu sua senha?"
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132 actions/favor.php:86
-#: actions/twitapifavorites.php:125 classes/Command.php:152
-msgid "Could not create favorite."
-msgstr "Não foi possível criar a favorita."
+#: actions/login.php:282
+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, digite novamente seu nome de usuário e "
+"senha antes de alterar suas configurações."
 
-#: actions/favor.php:70
-msgid "Disfavor"
-msgstr "Eliminar favorita"
+#: actions/login.php:286
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"Logar-se com seu nome de usuário e senha. Não tem um nome de usuário ainda? "
+"[Registre](%%action.register%%) uma nova conta, ou use uma [OpenID](%%action."
+"openidlogin%%)."
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
-#, php-format
-msgid "%s favorite notices"
-msgstr "Mensagens favoritas de %s"
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
 
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/makeadmin.php:95
 #, php-format
-msgid "Feed of favorite notices of %s"
-msgstr "Feed de mensagens favoritas de %s"
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
 
-#: actions/inbox.php:28 actions/inbox.php:59
+#: actions/makeadmin.php:132
 #, php-format
-msgid "Inbox for %s - page %d"
-msgstr "Recebidas por %s - pág. %d"
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
 
-#: actions/inbox.php:30 actions/inbox.php:62
+#: actions/makeadmin.php:145
 #, php-format
-msgid "Inbox for %s"
-msgstr "Recebidas por %s"
-
-#: actions/inbox.php:53 actions/inbox.php:115
-msgid "This is your inbox, which lists your incoming private messages."
+msgid "Can't make %s an admin for group %s"
 msgstr ""
-"Essa é a sua caixa de mensagens recebidas, que lista as mensagens "
-"particulares que você recebeu."
 
-#: actions/invite.php:178 actions/invite.php:213
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr "Nenhum status atual"
+
+#: actions/newgroup.php:53
+msgid "New group"
 msgstr ""
-"%1$s convidou você para unir-se a %2$s (%3$s).\n"
-"\n"
 
-#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-msgid "Automatically login in the future; "
-msgstr "Logar-se automaticamente no futuro; "
+#: actions/newgroup.php:110
+#, fuzzy
+msgid "Use this form to create a new group."
+msgstr "Você pode criar uma nova conta usando esse formulário. "
 
-#: actions/login.php:122 actions/login.php:264
-msgid "For security reasons, please re-enter your "
-msgstr "Por questões de segurança, por favor, redigite seu "
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr "Nova mensagem"
 
-#: actions/login.php:126 actions/login.php:268
-msgid "Login with your username and password. "
-msgstr "Logue-se com o seu nome de usuário e senha. "
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
+msgstr "Você não pode enviar uma mensagem para esse usuário."
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
-msgid "That's too long. Max message size is 140 chars."
-msgstr "Muito extenso. O tamanho máximo das mensagens é 140 caracteres."
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+msgstr "Nenhum conteúdo!"
 
-#: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr "Nenhum destinatário especificado."
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206 actions/newmessage.php:131
-#: actions/newmessage.php:168 classes/Command.php:237
-msgid "You can't send a message to this user."
-msgstr "Você não pode enviar uma mensagem para esse usuário."
-
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 "Não envie uma mensagem para você mesmo(a); ao invés disso, apenas diga-a "
 "para si."
 
-#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
-msgid "No such user"
-msgstr "Esse usuário não existe"
-
-#: actions/newmessage.php:117 actions/newmessage.php:67
-msgid "New message"
+#: actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
 msgstr "Nova mensagem"
 
-#: actions/noticesearch.php:95 actions/noticesearch.php:146
-msgid "Notice without matching profile"
-msgstr "Mensagem sem um perfil correspondente"
-
-#: actions/openidsettings.php:28 actions/openidsettings.php:70
+#: actions/newmessage.php:185 lib/command.php:375
 #, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr "A [OpenID](%%doc.openid%%) permite que você logue-se em vários sites"
-
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
-msgstr "Se você quiser adicionar uma OpenID à sua conta, "
-
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr "Será impossível logar-se caso você remova a sua única OpenID! "
-
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-msgid "You can remove an OpenID from your account "
-msgstr "Você pode remover uma OpenID da sua conta "
+msgid "Direct message to %s sent"
+msgstr "A mensagem direta para %s foi enviada"
 
-#: actions/outbox.php:28 actions/outbox.php:58
-#, php-format
-msgid "Outbox for %s - page %d"
-msgstr "Enviadas para %s - pág. %d"
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
+msgstr "Erro no Ajax"
 
-#: actions/outbox.php:30 actions/outbox.php:61
-#, php-format
-msgid "Outbox for %s"
-msgstr "Envidas para %s"
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "Nova mensagem"
 
-#: actions/outbox.php:53 actions/outbox.php:116
-msgid "This is your outbox, which lists private messages you have sent."
-msgstr ""
-"Essa é a sua caixa de mensagens enviadas, que lista as mensagens "
-"particulares que você enviou."
+#: actions/newnotice.php:199
+msgid "Notice posted"
+msgstr "Mensagem publicada"
 
-#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
 msgstr ""
-"Procurar por pessoas no %%site.name%% pelo seu nome, localização ou "
-"interesses. "
-
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
-msgid "You can update your personal profile info here "
-msgstr "Você pode atualizar as informações do seu perfil pessoal aqui "
-
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
-msgid "User without matching profile"
-msgstr "Usuário sem um perfil correspondente"
-
-#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
-msgstr "Esse código de confirmação é muito antigo. "
-
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
-msgstr "Se você perdeu ou esqueceu a sua"
-
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a "
-msgstr "Você foi identificado. Digite uma"
-
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-msgid "Your nickname on this server, "
-msgstr "Seu apelido nesse servidor, "
-
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-msgid "Instructions for recovering your password "
-msgstr "Instruções para recuperar a sua senha "
+"Procurar mensagens em %%site.name%% por seu conteúdo. Separe os termos da "
+"busca com espaços; eles devem ter 3 caracteres ou mais."
 
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
-msgid "New password successfully saved. "
-msgstr "A nova senha foi salva com sucesso. "
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "Procurar por texto"
 
-#: actions/register.php:95 actions/register.php:180
-msgid "Password must be 6 or more characters."
-msgstr "A senha deve ter 6 ou mais caracteres."
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr " Procurar por \"%s\" no fluxo de mensagens"
 
-#: actions/register.php:216
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 msgstr ""
-"Parabéns, %s! E seja bem-vindo(a) ao %%%%site.name%%%%. A partir daqui, você "
-"pode querer..."
-
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
-msgstr "(Você receberá uma mensagem por e-mail a qualquer momento, com "
-
-#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
-#, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr "Para seguir alguem, você pode [autenticar-se](%%action.login%%),"
-
-#: actions/showfavorites.php:61 actions/showfavorites.php:145
-#, php-format
-msgid "Feed for favorites of %s"
-msgstr "Feed para favoritas de %s"
-
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-msgid "Could not retrieve favorite notices."
-msgstr "Não foi possível recuperar as mensagens favoritas."
-
-#: actions/showmessage.php:33 actions/showmessage.php:81
-msgid "No such message."
-msgstr "Essa mensagem não existe."
-
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
-msgstr "Apenas o remetente e o destinatário podem ler essa mensagem."
 
-#: actions/showmessage.php:61 actions/showmessage.php:108
+#: actions/noticesearch.php:124
 #, php-format
-msgid "Message to %1$s on %2$s"
-msgstr "Mensagem para %1$s no %2$s"
-
-#: actions/showmessage.php:66 actions/showmessage.php:113
-#, php-format
-msgid "Message from %1$s on %2$s"
-msgstr "Mensagem de %1$s no %2$s"
-
-#: actions/showstream.php:154
-msgid "Send a message"
-msgstr "Enviar uma mensagem"
-
-#: actions/smssettings.php:312 actions/smssettings.php:464
-#, php-format
-msgid "Mobile carrier for your phone. "
-msgstr "Operadora móvel do seu celular. "
-
-#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
-#, php-format
-msgid "Direct messages to %s"
-msgstr "Mensagem direta para %s"
-
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
-#, php-format
-msgid "All the direct messages sent to %s"
-msgstr "Todas as mensagens diretas enviadas para %s"
-
-#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-msgid "Direct Messages You've Sent"
-msgstr "Mensagens diretas que você enviou"
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
+msgstr ""
 
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/noticesearchrss.php:89
 #, php-format
-msgid "All the direct messages sent from %s"
-msgstr "Todas as mensagens diretas enviadas por %s"
-
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-msgid "No message text!"
-msgstr "Nenhuma mensagem de texto!"
+msgid "Updates with \"%s\""
+msgstr ""
 
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-msgid "Recipient user not found."
-msgstr "O usuário destinatário não foi encontrado."
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Todas as atualizações correspondentes ao termo \"%s\""
 
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-msgid "Can't send direct messages to users who aren't your friend."
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
-"Não é possível enviar mensagens diretas para usuários que não são seus "
-"amigos."
+"Esse usuário não permite ser chamado à atenção ou ainda não confirmou ou "
+"configurou seu e-mail."
 
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
-#, php-format
-msgid "%s / Favorites from %s"
-msgstr "%s / Favoritas de %s"
+#: actions/nudge.php:94
+msgid "Nudge sent"
+msgstr "Chamada de atenção enviada"
 
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
-#, php-format
-msgid "%s updates favorited by %s / %s."
-msgstr "%s atualizações de favoritas por %s / %s."
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr "Chamada de atenção enviada!"
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
-#, php-format
-msgid "%s added your notice as a favorite"
-msgstr "%s marcaram sua mensagem como favorita"
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+msgstr "A mensagem não está associada a nenhum perfil"
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
+#: actions/oembed.php:86 actions/shownotice.php:180
 #, php-format
-msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+msgid "%1$s's status on %2$s"
+msgstr "Mensagem de %1$s em %2$s"
+
+#: actions/oembed.php:157
+msgid "content type "
 msgstr ""
-"%1$s acabou de marcar sua mensagem de %2$s como uma favorita.\n"
-"\n"
 
-#: actions/twittersettings.php:27
-msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+#: actions/oembed.php:160
+msgid "Only "
 msgstr ""
-"Adicione a sua conta do Twitter para enviar suas mensagens para lá "
-"automaticamente, "
 
-#: actions/twittersettings.php:41 actions/twittersettings.php:60
-msgid "Twitter settings"
-msgstr "Configurações do Twitter"
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
+msgstr "Formato de dados não suportado."
 
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-msgid "Twitter Account"
-msgstr "Conta do Twitter"
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "Procurar Pessoas"
 
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-msgid "Current verified Twitter account."
-msgstr "Conta do Twitter já verificada."
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "Procurar mensagem"
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr "Nome de usuário do Twitter"
+#: actions/othersettings.php:60
+msgid "Other Settings"
+msgstr "Outras configurações"
 
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-msgid "No spaces, please."
-msgstr "Sem espaços, por favor."
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr "Gerenciar várias outras opções."
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
-msgstr "Senha do Twitter"
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
 
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-msgid "Automatically send my notices to Twitter."
-msgstr "Enviar minhas mensagens para o Twitter automaticamente."
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
+msgstr ""
 
-#: actions/twittersettings.php:75 actions/twittersettings.php:146
-msgid "Send local \"@\" replies to Twitter."
-msgstr "Enviar respostas \"@\" locais para o Twitter."
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
+msgstr "Serviço de encolhimento automático a ser utilizado."
 
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-msgid "Subscribe to my Twitter friends here."
-msgstr "Assinar meus amigos do Twitter aqui."
+#: actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "Configurações do perfil"
 
-#: actions/twittersettings.php:122
-msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
 msgstr ""
-"O nome de usuário pode ter, no máximo, 15 caracteres, sendo eles números, "
-"letras maiúsculas e minúsculas e sublinhado (_)."
 
-#: actions/twittersettings.php:128 actions/twittersettings.php:334
-msgid "Could not verify your Twitter credentials!"
-msgstr "Não foi possível verificar suas credenciais no Twitter!"
+#: actions/othersettings.php:153
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "O serviço de encolhimento de URL é muito extenso (máx. 50 caracteres)."
 
-#: actions/twittersettings.php:137
+#: actions/outbox.php:58
 #, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr "Não foi possível obter as informações da conta \"%s\" no Twitter."
+msgid "Outbox for %s - page %d"
+msgstr "Enviadas para %s - pág. %d"
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-msgid "Unable to save your Twitter settings!"
-msgstr "Não foi possível salvar suas configurações do Twitter!"
+#: actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
+msgstr "Envidas para %s"
 
-#: actions/twittersettings.php:174 actions/twittersettings.php:376
-msgid "Twitter settings saved."
-msgstr "As configurações do Twitter foram salvas."
+#: actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+"Essa é a sua caixa de mensagens enviadas, que lista as mensagens "
+"particulares que você enviou."
 
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-msgid "That is not your Twitter account."
-msgstr "Essa não é a sua conta no Twitter."
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "Alterar a senha"
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
-msgid "Couldn't remove Twitter user."
-msgstr "Não foi possível remover o usuário do Twitter."
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "Altera a sua senha"
 
-#: actions/twittersettings.php:212 actions/twittersettings.php:407
-msgid "Twitter account removed."
-msgstr "A conta do Twitter foi removida."
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#, fuzzy
+msgid "Password change"
+msgstr "A senha foi salva."
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
-msgid "Couldn't save Twitter preferences."
-msgstr "Não foi possível salvar as preferências do Twitter."
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "Senha antiga"
 
-#: actions/twittersettings.php:245 actions/twittersettings.php:461
-msgid "Twitter preferences saved."
-msgstr "As preferências do Twitter foram salvas."
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "Nova senha"
 
-#: actions/userauthorization.php:84 actions/userauthorization.php:86
-msgid "Please check these details to make sure "
-msgstr "Por favor, verifique estes detalhes para ter certeza que "
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "No mínimo 6 caracteres"
 
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
-msgid "The subscription has been authorized, but no "
-msgstr "A assinatura foi autorizada "
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "Confirmar"
 
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-msgid "The subscription has been rejected, but no "
-msgstr "A assinatura foi recusada, mas não "
+#: actions/passwordsettings.php:113
+msgid "same as password above"
+msgstr "igual à senha acima"
 
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-msgid "Command results"
-msgstr "Resultados do comando"
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "Alterar"
 
-#: classes/Channel.php:148 classes/Channel.php:204
-msgid "Command complete"
-msgstr "O comando foi completado"
+#: actions/passwordsettings.php:154 actions/register.php:230
+msgid "Password must be 6 or more characters."
+msgstr "A senha deve ter 6 ou mais caracteres."
 
-#: classes/Channel.php:158 classes/Channel.php:215
-msgid "Command failed"
-msgstr "O comando falhou"
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "As senhas não coincidem."
 
-#: classes/Command.php:39 classes/Command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Desculpe, mas esse comando ainda não foi implementado."
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "A senha antiga está incorreta"
 
-#: classes/Command.php:96 classes/Command.php:113
-#, php-format
-msgid "Subscriptions: %1$s\n"
-msgstr "Assinaturas: %1$s\n"
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "Erro ao salvar usuário; inválido."
 
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
-msgid "User has no last notice"
-msgstr "O usuário não tem uma \"última mensagem\""
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "Não é possível salvar a nova senha."
 
-#: classes/Command.php:146 classes/Command.php:166
-msgid "Notice marked as fave."
-msgstr "Mensagem marcada como favorita."
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "A senha foi salva."
 
-#: classes/Command.php:166 classes/Command.php:189
+#: actions/peoplesearch.php:52
 #, php-format
-msgid "%1$s (%2$s)"
-msgstr "%1$s (%2$s)"
+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 ""
+"Procurar 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."
 
-#: classes/Command.php:169 classes/Command.php:192
-#, php-format
-msgid "Fullname: %s"
-msgstr "Nome completo: %s"
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "Procurar pessoas"
 
-#: classes/Command.php:172 classes/Command.php:195
+#: actions/peopletag.php:70
 #, php-format
-msgid "Location: %s"
-msgstr "Localização: %s"
+msgid "Not a valid people tag: %s"
+msgstr "Não é uma etiqueta de pessoa válida: %s"
 
-#: classes/Command.php:175 classes/Command.php:198
+#: actions/peopletag.php:144
 #, php-format
-msgid "Homepage: %s"
-msgstr "Site: %s"
+msgid "Users self-tagged with %s - page %d"
+msgstr "Usuários auto-etiquetados com %s - pág. %d"
 
-#: classes/Command.php:178 classes/Command.php:201
-#, php-format
-msgid "About: %s"
-msgstr "Sobre: %s"
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "O conteúdo da mensagem é inválido"
 
-#: classes/Command.php:200 classes/Command.php:228
+#: actions/postnotice.php:90
 #, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
-"A mensagem é muito extensa - o máximo são 140 caracteres e você enviou %d"
-
-#: classes/Command.php:214 classes/Command.php:245
-#, php-format
-msgid "Direct message to %s sent"
-msgstr "A mensagem direta para %s foi enviada"
-
-#: classes/Command.php:216 classes/Command.php:247
-msgid "Error sending direct message."
-msgstr "Ocorreu um erro durante o envio da mensagem direta."
-
-#: classes/Command.php:263 classes/Command.php:300
-msgid "Specify the name of the user to subscribe to"
-msgstr "Especifique o nome do usuário que será assinado"
-
-#: classes/Command.php:270 classes/Command.php:307
-#, php-format
-msgid "Subscribed to %s"
-msgstr "Efetuada a assinatura de %s"
 
-#: classes/Command.php:288 classes/Command.php:328
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Especifique o nome do usuário que deixará de ser assinado"
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "Configurações do perfil"
 
-#: classes/Command.php:295 classes/Command.php:335
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "Cancelada a assinatura de %s"
+#: actions/profilesettings.php:71
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+"Você pode atualizar suas informações pessoais aqui, para que as pessoas "
+"saibam mais sobre você."
 
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
-msgid "Command not yet implemented."
-msgstr "O comando não foi implementado ainda."
+#: actions/profilesettings.php:99
+#, fuzzy
+msgid "Profile information"
+msgstr "Perfil desconhecido"
 
-#: classes/Command.php:313 classes/Command.php:356
-msgid "Notification off."
-msgstr "Notificação desligada."
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64 letras minúsculas ou números, sem pontuações ou espaços"
 
-#: classes/Command.php:315 classes/Command.php:358
-msgid "Can't turn off notification."
-msgstr "Não é possível desligar a notificação"
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full name"
+msgstr "Nome completo"
 
-#: classes/Command.php:333 classes/Command.php:379
-msgid "Notification on."
-msgstr "Notificação ligada."
+#: actions/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "Site"
 
-#: classes/Command.php:335 classes/Command.php:381
-msgid "Can't turn on notification."
-msgstr "Não é possível ligar a notificação."
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "URL do seu site, blog ou perfil em outro site"
 
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
-msgstr "Comandos:\n"
+#: actions/profilesettings.php:122 actions/register.php:460
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Descreva a si mesmo e seus interesses em 140 caracteres."
 
-#: classes/Message.php:53 classes/Message.php:56
-msgid "Could not insert message."
-msgstr "Não foi possível inserir a mensagem."
+#: actions/profilesettings.php:125 actions/register.php:463
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Descreva a si mesmo e seus interesses em 140 caracteres."
 
-#: classes/Message.php:63 classes/Message.php:66
-msgid "Could not update message with new URI."
-msgstr "Não foi possível atualizar a mensagem com a nova URI."
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "Descrição"
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
-msgstr "Usuário sem um perfil correspondente no sistema."
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "Localização"
 
-#: lib/mail.php:147 lib/mail.php:289
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-msgstr ""
-"Você tem um novo endereço para publicação no %1$s.\n"
-"\n"
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "Onde você está, ex: \"cidade, estado (ou região), país\""
 
-#: lib/mail.php:249 lib/mail.php:508
-#, php-format
-msgid "New private message from %s"
-msgstr "Nova mensagem particular de %s"
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
+msgstr "Tags"
 
-#: lib/mail.php:253 lib/mail.php:512
-#, php-format
+#: actions/profilesettings.php:140
 msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
-"%1$s (%2$s) enviou uma mensagem particular para você:\n"
-"\n"
-
-#: lib/mailbox.php:43 lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "As caixas postais são legíveis somente pelo seu próprio usuário."
-
-#: lib/openid.php:195 lib/openid.php:203
-msgid "This form should automatically submit itself. "
-msgstr "Este formulário deve enviar-se automaticamente. "
-
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-msgid "Favorites"
-msgstr "Favoritas"
-
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-#, php-format
-msgid "%s's favorite notices"
-msgstr "Mensagens favoritas de %s"
-
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-msgid "User"
-msgstr "Usuário"
+"Suas etiquetas (letras, números, -, ., e _), separadas por vírgulas ou "
+"espaços"
 
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-msgid "Inbox"
-msgstr "Recebidas"
+#: actions/profilesettings.php:144
+msgid "Language"
+msgstr "Idioma"
 
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-msgid "Your incoming messages"
-msgstr "Suas mensagens recebidas"
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr "Idioma preferencial"
 
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-msgid "Outbox"
-msgstr "Enviadas"
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr "Fuso horário"
 
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-msgid "Your sent messages"
-msgstr "Suas mensagens enviadas"
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
+msgstr "Em que fuso horário você normalmente está?"
 
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-msgid "Twitter"
-msgstr "Twitter"
+#: actions/profilesettings.php:160
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr "Assinar automaticamente à quem me assinar"
 
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
-msgstr "Opções de integração com o Twitter"
+#: actions/profilesettings.php:221 actions/register.php:223
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Descrição muito extensa (máximo 140 caracteres)."
 
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-msgid "To"
-msgstr "Para"
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr "O fuso horário não foi selecionado."
 
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-msgid "Could not parse message."
-msgstr "Não foi possível analisar a mensagem."
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr "O nome do idioma é muito extenso (máx. 50 caracteres)."
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/profilesettings.php:246 actions/tagother.php:178
 #, php-format
-msgid "%s and friends, page %d"
-msgstr "%s e amigos, página %d"
-
-#: actions/avatarsettings.php:76
-msgid "You can upload your personal avatar."
-msgstr "Você pode enviar seu avatar pessoal."
-
-#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
-msgid "Avatar settings"
-msgstr "Configurações do avatar"
-
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-msgid "Original"
-msgstr "Original"
-
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-msgid "Preview"
-msgstr "Visualização"
+msgid "Invalid tag: \"%s\""
+msgstr "Etiqueta inválida: \"%s\""
 
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
-msgid "Crop"
-msgstr "Cortar"
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
+msgstr "Não foi possível atualizar o usuário para assinar automaticamente."
 
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-msgid "There was a problem with your session token. "
-msgstr "Ocorreu um problema com o seu token de sessão. "
-
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-msgid "Pick a square area of the image to be your avatar"
-msgstr "Selecione uma área quadrada da imagem para ser seu avatar"
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+msgstr "Não foi possível salvar o perfil."
 
-#: actions/avatarsettings.php:327 actions/grouplogo.php:384
-msgid "Lost our file data."
-msgstr "Nossos dados do arquivo foi perdido."
+#: actions/profilesettings.php:336
+msgid "Couldn't save tags."
+msgstr "Não foi possível salvar as etiquetas."
 
-#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
-msgid "Lost our file."
-msgstr "Nosso arquivo foi perdido."
+#: actions/profilesettings.php:344
+msgid "Settings saved."
+msgstr "As configurações foram salvas."
 
-#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
-#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
-msgid "Unknown file type"
-msgstr "Tipo de arquivo desconhecido"
+#: actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
 
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "Não foi especificado nenhum perfil."
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
+msgstr "Não foi possível recuperar o fluxo público."
 
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "Não foi encontrado nenhum perfil com esse ID."
+#: actions/public.php:129
+#, fuzzy, php-format
+msgid "Public timeline, page %d"
+msgstr "Mensagens públicas"
 
-#: actions/block.php:111
-msgid "Block user"
-msgstr "Bloquear usuário"
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr "Mensagens públicas"
 
-#: actions/block.php:129
-msgid "Are you sure you want to block this user? "
-msgstr "Você tem certeza que deseja bloquear esse usuário?"
+#: actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Feed de mensagens públicas"
 
-#: actions/block.php:162
-msgid "You have already blocked this user."
-msgstr "Você já bloqueou esse usuário."
+#: actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Feed de mensagens públicas"
 
-#: actions/block.php:167
-msgid "Failed to save block information."
-msgstr "Não foi possível salvar a informação de bloqueio."
+#: actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Feed de mensagens públicas"
 
-#: actions/confirmaddress.php:159
+#: actions/public.php:179
 #, php-format
-msgid "The address \"%s\" has been "
-msgstr "O endereço \"%s\" foi "
-
-#: actions/deletenotice.php:73
-msgid "You are about to permanently delete a notice. "
-msgstr "Você está prestes a apagar permanentemente uma mensagem. "
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
 
-#: actions/disfavor.php:94
-msgid "Add to favorites"
-msgstr "Adicionar aos favoritos"
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
 
-#: actions/editgroup.php:54
+#: actions/public.php:186
 #, php-format
-msgid "Edit %s group"
-msgstr "Editar o grupo %s"
-
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-msgid "Inboxes must be enabled for groups to work"
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
-#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-msgid "You must be logged in to create a group."
-msgstr "Você deve estar logado para criar um grupo."
-
-#: actions/editgroup.php:87 actions/grouplogo.php:87
-#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
-msgid "No nickname"
-msgstr "Nenhum apelido"
-
-#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
-#: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
-msgid "No such group"
-msgstr "Esse grupo não existe"
-
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
-msgid "You must be an admin to edit the group"
-msgstr "Você deve ser o administrador do grupo para editá-lo"
-
-#: actions/editgroup.php:157
-msgid "Use this form to edit the group."
-msgstr "Use esse formulário para editar o grupo."
-
-#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
-msgid "Nickname must have only lowercase letters "
-msgstr "O apelido deve conter apenas letras minúsculas "
-
-#: actions/editgroup.php:198 actions/newgroup.php:149
-msgid "description is too long (max 140 chars)."
-msgstr "descrição muito extensa (máximo 140 caracteres)."
-
-#: actions/editgroup.php:218
-msgid "Could not update group."
-msgstr "Não foi possível atualizar o grupo."
-
-#: actions/editgroup.php:226
-msgid "Options saved."
-msgstr "As configurações foram salvas."
-
-#: actions/emailsettings.php:107 actions/imsettings.php:108
+#: actions/public.php:233
 #, php-format
-msgid "Awaiting confirmation on this address. "
-msgstr "Aguardando a confirmação neste endereço. "
-
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-msgid "Make a new email address for posting to; "
-msgstr "Cria um novo endereço de e-mail para publicar no; "
-
-#: actions/emailsettings.php:157
-msgid "Send me email when someone "
-msgstr "Envie-me um e-mail quando alguém "
-
-#: actions/emailsettings.php:168
-msgid "Allow friends to nudge me and send me an email."
-msgstr "Permitir que meus amigos chamem minha atenção e enviem-me um e-mail."
-
-#: actions/emailsettings.php:321
-msgid "That email address already belongs "
-msgstr "Esse endereço de e-mail já pertence "
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
+msgstr ""
 
-#: actions/emailsettings.php:343
-msgid "A confirmation code was sent to the email address you added. "
+#: actions/public.php:238
+#, fuzzy, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
 msgstr ""
-"Um código de confirmação foi enviado para o endereço de e-mail que você "
-"informou. "
+"Este é %%site.name%%, um serviço de [micro-blogging](http://pt.wikipedia.org/"
+"wiki/Microblogging)"
 
-#: actions/facebookhome.php:110
-msgid "Server error - couldn't get user!"
-msgstr "Erro no servidor - não foi possível obter o usuário!"
+#: actions/publictagcloud.php:57
+#, fuzzy
+msgid "Public tag cloud"
+msgstr "Fluxo de mensagens públicas"
 
-#: actions/facebookhome.php:196
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "If you would like the %s app to automatically update "
-msgstr "Se você deseja que o aplicativo %s atualize automaticamente "
+msgid "These are most popular recent tags on %s "
+msgstr ""
 
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#: actions/publictagcloud.php:69
 #, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "Permitir que %s atualize meu status no Facebook"
-
-#: actions/facebookhome.php:218
-msgid "Skip"
-msgstr "Pular"
-
-#: actions/facebookhome.php:235
-msgid "No notice content!"
-msgstr "Nenhum conteúdo!"
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
+msgstr ""
 
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-msgid "Pagination"
-msgstr "Paginação"
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
+msgstr ""
 
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-msgid "After"
-msgstr "Próximo"
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
 
-#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
-msgid "Before"
-msgstr "Anterior"
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
+msgstr ""
 
-#: actions/facebookinvite.php:70
-#, php-format
-msgid "Thanks for inviting your friends to use %s"
-msgstr "Obrigado por convidar seus amigos para usar o %s"
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "Você já está logado!"
 
-#: actions/facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Foram enviados convites para os seguintes usuários:"
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "Esse código de recuperação não existe."
 
-#: actions/facebookinvite.php:96
-#, php-format
-msgid "You have been invited to %s"
-msgstr "Você foi convidado por %s"
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "Não é um código de recuperação"
 
-#: actions/facebookinvite.php:105
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Convide seus amigos para usar o %s"
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr "Código de recuperação para usuário desconhecido."
 
-#: actions/facebookinvite.php:113
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Amigos que já utilizam o %s:"
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "Erro com o código de confirmação."
 
-#: actions/facebookinvite.php:130
-#, php-format
-msgid "Send invitations"
-msgstr "Enviar convites"
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
+msgstr "Este código de confirmação é muito antigo. Por favor inicie novamente."
 
-#: actions/facebookremove.php:56
-msgid "Couldn't remove Facebook user."
-msgstr "Não foi possível remover o usuário do Facebook."
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
+msgstr ""
+"Não foi possível atualizar o usuário com o endereço de e-mail confirmado."
 
-#: actions/facebooksettings.php:65
-msgid "There was a problem saving your sync preferences!"
+#: actions/recoverpassword.php:152
+msgid ""
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
 msgstr ""
-"Ocorreu um problema durante o salvamento das suas preferências de "
-"sincronização!"
 
-#: actions/facebooksettings.php:67
-msgid "Sync preferences saved."
-msgstr "As preferências de sincronização foram salvas."
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
+msgstr ""
 
-#: actions/facebooksettings.php:90
-msgid "Automatically update my Facebook status with my notices."
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
 msgstr ""
-"Atualizar meu status do Facebook automaticamente com as minhas mensagens."
 
-#: actions/facebooksettings.php:97
-msgid "Send \"@\" replies to Facebook."
-msgstr "Enviar respostas \"@\" para o Facebook."
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
+msgstr ""
 
-#: actions/facebooksettings.php:106
-msgid "Prefix"
-msgstr "Prefixo"
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
+msgstr "Seu apelido neste servidor, ou seu e-mail registrado."
 
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
-msgstr "Um prefixo para acrescentar às mensagens."
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
+msgstr "Recuperar"
 
-#: actions/facebooksettings.php:124
-#, php-format
-msgid "If you would like %s to automatically update "
-msgstr "Se você deseja que %s atualize automaticamente "
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "Restaurar a senha"
 
-#: actions/facebooksettings.php:147
-msgid "Sync preferences"
-msgstr "Preferências de sincronização"
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr "Recuperar a senha"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "Excluir a favorita"
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
+msgstr "Foi solicitada a recuperação da senha"
 
-#: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
-msgid "Popular notices"
-msgstr "Mensagens populares"
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
+msgstr "Ação desconhecida"
 
-#: actions/favorited.php:67
-#, php-format
-msgid "Popular notices, page %d"
-msgstr "Mensagens populares, pág. %d"
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "No mínimo 6 caracteres. E não se esqueça dela!"
 
-#: actions/favorited.php:79
-msgid "The most popular notices on the site right now."
-msgstr "As etiquetas mais populares no site agora."
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Igual à senha acima"
 
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
-msgid "Featured users"
-msgstr "Usuários de destaque"
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "Restaurar"
 
-#: actions/featured.php:71
-#, php-format
-msgid "Featured users, page %d"
-msgstr "Usuários de destaque, pág. %d"
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "Entre com o apelido ou endereço de e-mail."
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some of the great users on %s"
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
 msgstr ""
+"Não foi encontrado nenhum usuário com essa identificação ou endereço de "
+"email."
 
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
-msgstr "Esse usuário bloqueou o seu pedido de assinatura."
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr "Nenhum endereço de e-mail registrado para esse usuário."
 
-#: actions/groupbyid.php:79
-msgid "No ID"
-msgstr ""
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "Erro ao salvar o endereço de confirmação"
 
-#: actions/grouplogo.php:138 actions/grouplogo.php:191
-msgid "Group logo"
+#: actions/recoverpassword.php:325
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
 msgstr ""
+"As instruções para recuperar a sua senha foram enviadas para o endereço de e-"
+"mail informado no seu cadastro."
+
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
+msgstr "Restauração inesperada da senha."
+
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "A senha deve ter 6 caracteres ou mais."
+
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
+msgstr "A senha e a confirmação não coincidem."
 
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
 msgstr ""
+"A nova senha foi salva com sucesso. A partir de agora você já está logado."
 
-#: actions/grouplogo.php:448
-#, fuzzy
-msgid "Logo updated."
-msgstr "O avatar foi atualizado."
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
+msgstr "Desculpe, somente convidados podem se registrar."
 
-#: actions/grouplogo.php:450
+#: actions/register.php:92
 #, fuzzy
-msgid "Failed updating logo."
-msgstr "Não foi possível atualizar o avatar."
+msgid "Sorry, invalid invitation code."
+msgstr "Erro com o código de confirmação."
 
-#: actions/groupmembers.php:93 lib/groupnav.php:91
-#, php-format
-msgid "%s group members"
-msgstr ""
+#: actions/register.php:112
+msgid "Registration successful"
+msgstr "Registro realizado com sucesso"
 
-#: actions/groupmembers.php:96
-#, php-format
-msgid "%s group members, page %d"
-msgstr ""
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "Registrar"
 
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
-msgstr ""
+#: actions/register.php:135
+msgid "Registration not allowed."
+msgstr "Não é permitido o registro."
 
-#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
-msgid "Groups"
-msgstr ""
+#: actions/register.php:198
+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/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr ""
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "Não é um endereço de e-mail válido."
 
-#: actions/groups.php:90
-#, php-format
-msgid "%%%%site.name%%%% groups let you find and talk with "
-msgstr ""
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "O endereço de e-mail já existe."
 
-#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-#, fuzzy
-msgid "Create a new group"
-msgstr "Criar uma nova conta"
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "Nome de usuário e/ou senha inválido(s)"
 
-#: actions/groupsearch.php:57
-#, fuzzy, php-format
+#: actions/register.php:342
 msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
 msgstr ""
-"Procurar por pessoas no %%site.name%% pelo seu nome, localização ou "
-"interesses. "
-
-#: actions/groupsearch.php:63
-#, fuzzy
-msgid "Group search"
-msgstr "Procurar pessoas"
 
-#: actions/imsettings.php:70
-#, fuzzy
-msgid "You can send and receive notices through "
-msgstr "Você não pode enviar uma mensagem para esse usuário."
-
-#: actions/imsettings.php:120
-#, php-format
-msgid "Jabber or GTalk address, "
+#: actions/register.php:424
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
+"1-64 letras minúsculas ou números, sem pontuação ou espaços. Obrigatório."
 
-#: actions/imsettings.php:147
-#, fuzzy
-msgid "Send me replies through Jabber/GTalk "
-msgstr "Envie-me as mensagens via Jabber/GTalk."
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr "No mínimo 6 caracteres. Obrigatório."
 
-#: actions/imsettings.php:321
-#, fuzzy, php-format
-msgid "A confirmation code was sent "
-msgstr "Nenhum código de confirmação."
+#: actions/register.php:433
+msgid "Same as password above. Required."
+msgstr "Igual à senha acima. Obrigatório."
 
-#: actions/joingroup.php:65
-#, fuzzy
-msgid "You must be logged in to join a group."
-msgstr ""
-"Você deve estar autenticado para convidar outros usuários para usar o %s"
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "E-mail"
 
-#: actions/joingroup.php:95
-#, fuzzy
-msgid "You are already a member of that group"
-msgstr "Você já está assinando esses usuários:"
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
+msgstr "Usado apenas para atualizações, anúncios e recuperações de senha"
 
-#: actions/joingroup.php:128
-#, fuzzy, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Não é possível acompanhar o usuário: Usuário não encontrado."
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
+msgstr "Nome completo (nome e sobrenome), de preferência seu nome \"real\""
 
-#: actions/joingroup.php:135
-#, fuzzy, php-format
-msgid "%s joined group %s"
-msgstr "%s / Favoritas de %s"
+#: actions/register.php:493
+msgid "My text and files are available under "
+msgstr "Meus textos e arquivos estão disponíveis sob "
 
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
-#: actions/leavegroup.php:65
+#: actions/register.php:496
 #, fuzzy
-msgid "You must be logged in to leave a group."
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
 msgstr ""
-"Você deve estar autenticado para convidar outros usuários para usar o %s"
-
-#: actions/leavegroup.php:88
-#, fuzzy
-msgid "No such group."
-msgstr "Essa etiqueta não existe."
-
-#: actions/leavegroup.php:95
-#, fuzzy
-msgid "You are not a member of that group."
-msgstr "Você não está assinando esse perfil."
-
-#: actions/leavegroup.php:100
-#, fuzzy
-msgid "You may not leave a group while you are its administrator."
-msgstr "Você não pode apagar o status de outro usuário."
-
-#: actions/leavegroup.php:130
-#, fuzzy
-msgid "Could not find membership record."
-msgstr "Não foi possível atualizar o registro do usuário."
-
-#: actions/leavegroup.php:138
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "Não é possível acompanhar o usuário: Usuário não encontrado."
+" exceto estes dados privados: senha, endereço de e-mail, endereço de IM, "
+"número de telefone."
 
-#: actions/leavegroup.php:145
+#: actions/register.php:537
 #, php-format
-msgid "%s left group %s"
-msgstr ""
-
-#: actions/login.php:225 lib/facebookaction.php:304
-msgid "Login to site"
+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 ""
+"Parabéns, %s! E bem-vindo(a) ao %%%%site.name%%%%. A partir daqui, você pode "
+"querer...\n"
+"\n"
+"* Acessar [seu perfil](%s) e publicar sua primeira mensagem.\n"
+"* Adicionar um [endereço de Jabber/GTalk](%%%%action.imsettings%%%%) para "
+"que você possa publicar via mensagens instantâneas.\n"
+"* [Procurar por pessoas](%%%%action.peoplesearch%%%%) que você conheça ou "
+"que tenham os mesmos interesses que você. \n"
+"* Atualizar suas [configurações de perfil](%%%%action.profilesettings%%%%) "
+"para que outras pessoas saibam mais sobre você. \n"
+"* Ler a [documentação on-line](%%%%doc.help%%%%) para conhecer os recursos "
+"disponíveis. \n"
+"\n"
+"Obrigado por se registrar e esperamos que você aproveite o serviço."
 
-#: actions/microsummary.php:69
-msgid "No current status"
-msgstr "Nenhum status atual"
-
-#: actions/newgroup.php:53
-msgid "New group"
+#: actions/register.php:561
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
 msgstr ""
+"(Você receberá uma mensagem por e-mail a qualquer momento, com instruções "
+"sobre como confirmar seu endereço.)"
 
-#: actions/newgroup.php:115
-#, fuzzy
-msgid "Use this form to create a new group."
-msgstr "Você pode criar uma nova conta usando esse formulário. "
-
-#: actions/newgroup.php:177
-#, fuzzy
-msgid "Could not create group."
-msgstr "Não foi possível criar a favorita."
-
-#: actions/newgroup.php:191
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "Não foi possível salvar a assinatura."
-
-#: actions/newmessage.php:119 actions/newnotice.php:132
-#, fuzzy
-msgid "That's too long. "
-msgstr "Esse arquivo é muito grande."
-
-#: actions/newmessage.php:134
-#, fuzzy
-msgid "Don't send a message to yourself; "
-msgstr "Você não pode enviar uma mensagem para esse usuário."
-
-#: actions/newnotice.php:166
-msgid "Notice posted"
-msgstr "Mensagem publicada"
-
-#: actions/newnotice.php:200 classes/Channel.php:163
-msgid "Ajax Error"
-msgstr "Erro no Ajax"
-
-#: actions/nudge.php:85
+#: actions/remotesubscribe.php:98
+#, php-format
 msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+"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 ""
-"Esse usuário não permite ser chamado à atenção ou ainda não confirmou ou "
-"configurou seu e-mail."
+"Para assinar, você pode [autenticar-se](%%action.login%%), ou [registrar](%%"
+"action.register%%) uma nova conta. Se você já tem uma conta em um [site de "
+"microblogagem compatível](%%doc.openmublog%%), informe a URL do seu perfil "
+"abaixo."
 
-#: actions/nudge.php:94
-msgid "Nudge sent"
-msgstr "Chamada de atenção enviada"
-
-#: actions/nudge.php:97
-msgid "Nudge sent!"
-msgstr "Chamada de atenção enviada!"
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr "Assinatura remota"
 
-#: actions/openidlogin.php:97
+#: actions/remotesubscribe.php:124
 #, fuzzy
-msgid "OpenID login"
-msgstr "Autenticar-se via OpenID"
+msgid "Subscribe to a remote user"
+msgstr "Assinar este usuário"
 
-#: actions/openidsettings.php:128
-#, fuzzy
-msgid "Removing your only OpenID "
-msgstr "Remover OpenID"
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "Apelido do usuário"
 
-#: actions/othersettings.php:60
-msgid "Other Settings"
-msgstr "Outras configurações"
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr "Apelido do usuário que você quer seguir"
 
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Gerenciar várias outras opções."
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "URL do Perfil"
 
-#: actions/othersettings.php:93
-msgid "URL Auto-shortening"
-msgstr "Encolhimento automático de URL"
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "URL do seu perfil em outro serviço de microblogagem compatível"
 
-#: actions/othersettings.php:112
-msgid "Service"
-msgstr "Serviço"
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
+msgstr "Assinar"
 
-#: actions/othersettings.php:113
-msgid "Automatic shortening service to use."
-msgstr "Serviço de encolhimento automático a ser utilizado."
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr "A URL do perfil é inválida (formato inválido)"
 
-#: actions/othersettings.php:144
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "O serviço de encolhimento de URL é muito extenso (máx. 50 caracteres)."
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "Não é uma URL de perfil válida (nenhum documento YADIS)."
 
-#: actions/passwordsettings.php:69
+#: actions/remotesubscribe.php:176
 #, fuzzy
-msgid "Change your password."
-msgstr "Altera a sua senha"
+msgid "That’s a local profile! Login to subscribe."
+msgstr "Esse é um perfil local! Autentique-se para assinar."
 
-#: actions/passwordsettings.php:89
+#: actions/remotesubscribe.php:183
 #, fuzzy
-msgid "Password change"
-msgstr "A senha foi salva."
+msgid "Couldn’t get a request token."
+msgstr "Não foi possível obter um token de requisição."
 
-#: actions/peopletag.php:35
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
 #, php-format
-msgid "Not a valid people tag: %s"
-msgstr "Não é uma etiqueta de pessoa válida: %s"
+msgid "Replies to %s"
+msgstr "Respostas para %s"
 
-#: actions/peopletag.php:47
-#, php-format
-msgid "Users self-tagged with %s - page %d"
-msgstr "Usuários auto-etiquetados com %s - pág. %d"
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %s, page %d"
+msgstr "Respostas para %s"
 
-#: actions/peopletag.php:91
+#: actions/replies.php:144
 #, php-format
-msgid "These are users who have tagged themselves \"%s\" "
-msgstr "Esses são os usuários que se auto-etiquetaram como \"%s\" "
-
-#: actions/profilesettings.php:91
-#, fuzzy
-msgid "Profile information"
-msgstr "Perfil desconhecido"
-
-#: actions/profilesettings.php:124
-msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgid "Replies feed for %s (RSS 1.0)"
 msgstr ""
-"Suas etiquetas (letras, números, -, ., e _), separadas por vírgulas ou "
-"espaços"
-
-#: actions/profilesettings.php:144
-#, fuzzy
-msgid "Automatically subscribe to whoever "
-msgstr "Assinar automaticamente à quem me assinar (melhor para não humanos)"
 
-#: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/replies.php:151
 #, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Etiqueta inválida: \"%s\""
-
-#: actions/profilesettings.php:311
-msgid "Couldn't save tags."
-msgstr "Não foi possível salvar as etiquetas."
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr ""
 
-#: actions/public.php:107
+#: actions/replies.php:158
 #, fuzzy, php-format
-msgid "Public timeline, page %d"
-msgstr "Mensagens públicas"
-
-#: actions/public.php:173
-msgid "Could not retrieve public stream."
-msgstr "Não foi possível recuperar o fluxo público."
+msgid "Replies feed for %s (Atom)"
+msgstr "Mensagens de %s"
 
-#: actions/public.php:220
+#: actions/replies.php:198
 #, php-format
 msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
 msgstr ""
-"Este é %%site.name%%, um serviço de [micro-blogging](http://pt.wikipedia.org/"
-"wiki/Microblogging)"
 
-#: actions/publictagcloud.php:57
-#, fuzzy
-msgid "Public tag cloud"
-msgstr "Fluxo de mensagens públicas"
-
-#: actions/publictagcloud.php:63
+#: actions/replies.php:203
 #, php-format
-msgid "These are most popular recent tags on %s "
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
 msgstr ""
 
-#: actions/publictagcloud.php:119
-msgid "Tag cloud"
+#: actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: actions/register.php:139 actions/register.php:349
-msgid "Sorry, only invited people can register."
-msgstr "Desculpe, somente convidados podem se registrar."
-
-#: actions/register.php:149
-#, fuzzy
-msgid "You can't register if you don't "
-msgstr "Você não pode se registrar se não aceitar a licença."
-
-#: actions/register.php:286
-#, fuzzy
-msgid "With this form you can create "
-msgstr "Você pode criar uma nova conta usando esse formulário. "
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Mensagem para %1$s no %2$s"
 
-#: actions/register.php:368
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, "
-msgstr "1-64 letras minúsculas ou números, sem pontuações ou espaços"
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "Mensagens favoritas de %s"
 
-#: actions/register.php:382 actions/register.php:386
-#, fuzzy
-msgid "Used only for updates, announcements, "
-msgstr "Usado apenas para atualizações, anúncios e recuperações de senha"
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
+msgstr "Não foi possível recuperar as mensagens favoritas."
 
-#: actions/register.php:398
-#, fuzzy
-msgid "URL of your homepage, blog, "
-msgstr "URL para seu site, blog ou perfil em outro site"
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Feed para favoritas de %s"
 
-#: actions/register.php:404
-#, fuzzy
-msgid "Describe yourself and your "
-msgstr "Descreva a si mesmo e seus interesses em 140 caracteres."
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Feed para favoritas de %s"
 
-#: actions/register.php:410
-#, fuzzy
-msgid "Where you are, like \"City, "
-msgstr "Onde você está, ex: \"cidade, estado (ou região), país\""
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Feed para favoritas de %s"
 
-#: actions/register.php:432
-#, fuzzy
-msgid " except this private data: password, "
+#: actions/showfavorites.php:205
+msgid ""
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""
-" exceto estes dados privados: senha, endereço de e-mail, endereço de "
-"mensageiro instantâneo, número de telefone."
 
-#: actions/register.php:471
-#, fuzzy, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
+#: actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
 msgstr ""
-"Parabéns, %s! E seja bem-vindo(a) ao %%%%site.name%%%%. A partir daqui, você "
-"pode querer..."
-
-#: actions/register.php:495
-#, fuzzy
-msgid "(You should receive a message by email "
-msgstr "(Você receberá uma mensagem por e-mail a qualquer momento, com "
 
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
-msgstr "Esse é um perfil local! Autentique-se para assinar."
-
-#: actions/replies.php:118
-#, fuzzy, php-format
-msgid "Replies to %s, page %d"
-msgstr "Respostas para %s"
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
 
-#: actions/showfavorites.php:79
-#, fuzzy, php-format
-msgid "%s favorite notices, page %d"
-msgstr "Mensagens favoritas de %s"
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:82 lib/groupnav.php:86
 #, php-format
 msgid "%s group"
 msgstr ""
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr ""
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:218
 #, fuzzy
 msgid "Group profile"
 msgstr "Esse perfil não existe."
 
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
 msgid "URL"
 msgstr ""
 
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
 #, fuzzy
 msgid "Note"
 msgstr "Mensagens"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:293
 #, fuzzy
 msgid "Group actions"
 msgstr "Outras opções"
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:328
 #, fuzzy, php-format
-msgid "Notice feed for %s group"
+msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Mensagens de %s"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Mensagens de %s"
+
+#: actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Mensagens de %s"
+
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "Mensagens de %s"
+
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
 #, fuzzy
 msgid "Members"
 msgstr "Membro desde"
 
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
 #: lib/tagcloudsection.php:71
 #, fuzzy
 msgid "(None)"
 msgstr "(nenhum)"
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:392
 msgid "All members"
 msgstr ""
 
-#: actions/showgroup.php:378
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "Estatísticas"
+
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Criar"
+
+#: actions/showgroup.php:448
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+
+#: actions/showgroup.php:454
 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
 msgstr ""
 "Este é %%site.name%%, um serviço de [micro-blogging](http://pt.wikipedia.org/"
 "wiki/Microblogging)"
 
-#: actions/showmessage.php:98
+#: actions/showgroup.php:482
 #, fuzzy
-msgid "Only the sender and recipient "
+msgid "Admins"
+msgstr "Admin"
+
+#: actions/showmessage.php:81
+msgid "No such message."
+msgstr "Essa mensagem não existe."
+
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient may read this message."
 msgstr "Apenas o remetente e o destinatário podem ler essa mensagem."
 
+#: actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr "Mensagem para %1$s no %2$s"
+
+#: actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr "Mensagem de %1$s no %2$s"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Mensagem publicada"
+
 #: actions/showstream.php:73
 #, fuzzy, php-format
+msgid " tagged %s"
+msgstr "Mensagens etiquetadas com %s"
+
+#: actions/showstream.php:79
+#, fuzzy, php-format
 msgid "%s, page %d"
 msgstr "Recebidas por %s - pág. %d"
 
-#: actions/showstream.php:143
-#, fuzzy
-msgid "'s profile"
-msgstr "Perfil"
+#: actions/showstream.php:122
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Mensagens de %s"
 
-#: actions/showstream.php:236 actions/tagother.php:77
-#, fuzzy
-msgid "User profile"
-msgstr "O usuário não tem perfil."
+#: actions/showstream.php:129
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Feed de mensagens de %s"
 
-#: actions/showstream.php:240 actions/tagother.php:81
-msgid "Photo"
-msgstr ""
+#: actions/showstream.php:136
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Feed de mensagens de %s"
 
-#: actions/showstream.php:317
-#, fuzzy
-msgid "User actions"
-msgstr "Outras opções"
+#: actions/showstream.php:143
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Feed de mensagens de %s"
 
-#: actions/showstream.php:342
-#, fuzzy
-msgid "Send a direct message to this user"
-msgstr "Você não pode enviar uma mensagem para esse usuário."
+#: actions/showstream.php:148
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Envidas para %s"
 
-#: actions/showstream.php:343
-#, fuzzy
-msgid "Message"
-msgstr "Nova mensagem"
+#: actions/showstream.php:191
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
 
-#: actions/showstream.php:451
-#, fuzzy
-msgid "All subscribers"
-msgstr "Assinantes"
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
 
-#: actions/showstream.php:533
-msgid "All groups"
+#: actions/showstream.php:198
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:234
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/showstream.php:542
+#: actions/showstream.php:239
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
 msgstr ""
 "Este é %%site.name%%, um serviço de [micro-blogging](http://pt.wikipedia.org/"
 "wiki/Microblogging)"
 
-#: actions/smssettings.php:128
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "Configuração de SMS"
+
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr "Você pode receber mensagens SMS do %%site.name%% através do e-mail."
+
+#: actions/smssettings.php:91
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, "
+msgid "SMS is not available."
+msgstr "Esta página não está disponível em um "
+
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Número de telefone já habilitado para receber SMS."
+
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
+msgstr "Aguardando a confirmação deste número de telefone."
+
+#: actions/smssettings.php:130
+msgid "Confirmation code"
+msgstr "Código de confirmação"
+
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
+msgstr "Informe o código que você recebeu no seu telefone."
+
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
+msgstr "Telefone para SMS"
+
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Número de telefone, sem pontuação ou espaços, com código de área"
 
-#: actions/smssettings.php:162
-#, fuzzy
-msgid "Send me notices through SMS; "
-msgstr "Envie-me as mensagens via Jabber/GTalk."
+#: actions/smssettings.php:174
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+"Envie-me mensagens via SMS. Eu compreendo que isso pode gerar cobranças "
+"exorbitantes da minha operadora."
 
-#: actions/smssettings.php:335
+#: actions/smssettings.php:306
+msgid "No phone number."
+msgstr "Nenhum número de telefone."
+
+#: actions/smssettings.php:311
+msgid "No carrier selected."
+msgstr "Não foi selecionada nenhuma operadora."
+
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
+msgstr "Esse já é seu número de telefone."
+
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
+msgstr "Esse número de telefone já pertence à outro usuário."
+
+#: actions/smssettings.php:347
 #, fuzzy
-msgid "A confirmation code was sent to the phone number you added. "
-msgstr "Aguardando a confirmação deste número de telefone."
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"Um código de confirmação foi enviado para o número de telefone que você "
+"informou. Verifique sua caixa de entrada (e de spam!) para o código e "
+"instruções sobre como usá-lo."
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
+msgstr "Isso é um número de confirmação errado."
+
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
+msgstr "Esse não é seu número de telefone."
+
+#: actions/smssettings.php:465
 #, fuzzy
 msgid "Mobile carrier"
 msgstr "Selecione uma operadora"
 
+#: actions/smssettings.php:469
+msgid "Select a carrier"
+msgstr "Selecione uma operadora"
+
+#: actions/smssettings.php:476
+#, 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 ""
+"A operadora móvel do seu celular. Se você conhece uma operadora que aceita "
+"SMS via e-mail que não está listada aqui, informe-nos enviando uma mensagem "
+"para %s."
+
+#: actions/smssettings.php:498
+msgid "No code entered"
+msgstr "Não foi digitado nenhum código"
+
 #: actions/subedit.php:70
 msgid "You are not subscribed to that profile."
 msgstr "Você não está assinando esse perfil."
@@ -4338,15 +3068,32 @@ msgid "%s subscribers, page %d"
 msgstr ""
 
 #: actions/subscribers.php:63
-#, fuzzy
-msgid "These are the people who listen to "
-msgstr "Estas são as pessoas que acompanham as mensagens de %s."
+msgid "These are the people who listen to your notices."
+msgstr "Estas são as pessoas que acompanham as suas mensagens."
 
 #: actions/subscribers.php:67
-#, fuzzy, php-format
-msgid "These are the people who "
+#, php-format
+msgid "These are the people who listen to %s's notices."
 msgstr "Estas são as pessoas que acompanham as mensagens de %s."
 
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
+msgstr ""
+
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr ""
+
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
 #: actions/subscriptions.php:52
 #, php-format
 msgid "%s subscriptions"
@@ -4358,28 +3105,36 @@ msgid "%s subscriptions, page %d"
 msgstr "%s assinaturas, página %d"
 
 #: actions/subscriptions.php:65
-#, fuzzy
-msgid "These are the people whose notices "
-msgstr "Estas são as pessoas cujas mensagens %s acompanha."
+msgid "These are the people whose notices you listen to."
+msgstr "Estas são as pessoas cujas mensagens você acompanha."
 
 #: actions/subscriptions.php:69
+#, php-format
+msgid "These are the people whose notices %s listens to."
+msgstr "Estas são as pessoas cujas mensagens %s acompanha."
+
+#: actions/subscriptions.php:121
+#, php-format
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
+msgstr ""
+
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
 #, fuzzy, php-format
-msgid "These are the people whose "
-msgstr "Estas são as pessoas que acompanham as mensagens de %s."
+msgid "%s is not listening to anyone."
+msgstr "%1$s agora está acompanhando "
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:194
 msgid "Jabber"
 msgstr "Jabber"
 
-#: actions/tag.php:43
-#, fuzzy, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Mensagens etiquetadas com %s"
-
-#: actions/tag.php:66
-#, php-format
-msgid "Messages tagged \"%s\", most recent first"
-msgstr ""
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
+msgstr "SMS"
 
 #: actions/tagother.php:33
 msgid "Not logged in"
@@ -4394,12 +3149,21 @@ msgstr "Nenhum argumento de ID."
 msgid "Tag %s"
 msgstr "Tag %s"
 
+#: actions/tagother.php:77 lib/userprofile.php:75
+#, fuzzy
+msgid "User profile"
+msgstr "O usuário não tem perfil."
+
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
+msgstr ""
+
 #: actions/tagother.php:141
 #, fuzzy
 msgid "Tag user"
 msgstr "Etiquetas"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4407,246 +3171,896 @@ msgstr ""
 "Etiquetas desse usuário (letras, números, -, ., e _), separadas por vírgulas "
 "ou espaços"
 
-#: actions/tagother.php:164
-msgid "There was a problem with your session token."
-msgstr ""
-"Ocorreu um problema com o seu token de sessão. Tente novamente, por favor."
-
-#: actions/tagother.php:191
+#: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr "Você só pode etiquetar pessoas às quais assina ou que assinam você."
 
-#: actions/tagother.php:198
+#: actions/tagother.php:200
 msgid "Could not save tags."
 msgstr "Não foi possível salvar as etiquetas."
 
-#: actions/tagother.php:233
+#: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Use esse formulário para adicionar etiquetas aos seus assinantes ou "
 "assinados."
 
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Mensagens etiquetadas com %s"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Feed de mensagens de %s"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Feed de mensagens de %s"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Feed de mensagens de %s"
+
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Essa etiqueta não existe."
 
-#: actions/tagrss.php:66
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
+msgstr "O método da API está em construção."
+
+#: actions/unsubscribe.php:77
+msgid "No profile id in request."
+msgstr "Nenhuma ID de perfil na requisição."
+
+#: actions/unsubscribe.php:84
+msgid "No profile with that id."
+msgstr "Nenhum perfil com essa ID."
+
+#: actions/unsubscribe.php:98
+msgid "Unsubscribed"
+msgstr "Cancelado"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
 #, php-format
-msgid "Microblog tagged with %s"
-msgstr "Microblogs etiquetados com %s"
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
 
-#: actions/twitapiblocks.php:47
-msgid "Block user failed."
-msgstr "Não foi possível bloquear o usuário."
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "Autorizar a assinatura"
 
-#: actions/twitapiblocks.php:69
-msgid "Unblock user failed."
-msgstr "Não foi possível desbloquear o usuário."
+#: actions/userauthorization.php:110
+#, fuzzy
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
+msgstr ""
+"Por favor, verifique estes detalhes para ter certeza que você quer seguir as "
+"mensagens deste usuário. Se você não solicitou seguir as mensagens de "
+"alguém, clique em \"Cancelar\"."
 
-#: actions/twitapiusers.php:48
-msgid "Not found."
-msgstr "Não encontrado."
+#: actions/userauthorization.php:188
+msgid "License"
+msgstr ""
+
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "Aceitar"
+
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Assinar este usuário"
 
-#: actions/twittersettings.php:71
-msgid "Add your Twitter account to automatically send "
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "Recusar"
+
+#: actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "%s assinaturas"
+
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
+msgstr "Nenhum pedido de autorização!"
+
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+msgstr "A assinatura foi autorizada"
+
+#: actions/userauthorization.php:249
+#, fuzzy
+msgid ""
+"The subscription has been authorized, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to authorize the "
+"subscription. Your subscription token is:"
 msgstr ""
-"Adicione a sua conta do Twitter para enviar suas mensagens para lá "
-"automaticamente, "
+"A assinatura foi autorizada, mas não foi informada nenhuma URL de retorno. "
+"Verifique as instruções do site para detalhes sobre como autorizar a "
+"assinatura. Seu token de assinatura é:"
 
-#: actions/twittersettings.php:119
-msgid "Twitter user name"
-msgstr "Nome de usuário do Twitter"
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
+msgstr "A assinatura foi recusada"
 
-#: actions/twittersettings.php:126
-msgid "Twitter password"
-msgstr "Senha do Twitter"
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"A assinatura foi rejeitada, mas não foi informada nenhuma URL de retorno. "
+"Verifique as instruções do site para maiores detalhes em como rejeitar "
+"completamente a assinatura."
 
-#: actions/twittersettings.php:228
-msgid "Twitter Friends"
-msgstr "Amigos do Twitter"
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
 
-#: actions/twittersettings.php:327
-msgid "Username must have only numbers, "
-msgstr "Nome de usuário deve ter números,"
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
 
-#: actions/twittersettings.php:341
+#: actions/userauthorization.php:307
 #, php-format
-msgid "Unable to retrieve account information "
-msgstr "Não foi possível obter informações da conta"
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
 
-#: actions/unblock.php:108
-msgid "Error removing the block."
-msgstr "Erro na remoção do bloqueio."
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
 
-#: actions/unsubscribe.php:50
-msgid "No profile id in request."
-msgstr "Nenhuma ID de perfil na requisição."
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
 
-#: actions/unsubscribe.php:57
-msgid "No profile with that id."
-msgstr "Nenhum perfil com essa ID."
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Não é possível ler a URL '%s' do avatar"
 
-#: actions/unsubscribe.php:71
-msgid "Unsubscribed"
-msgstr "Cancelado"
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Tipo de imagem errado para '%s'"
 
-#: actions/usergroups.php:63
-#, php-format
-msgid "%s groups"
-msgstr "Grupos de %s"
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr "Nenhuma ID."
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "Configurações do perfil"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "Grupos de %s, página %d"
 
-#: classes/Notice.php:104
+#: actions/usergroups.php:130
+#, fuzzy
+msgid "Search for more groups"
+msgstr "Pesquisar por pessoa ou texto"
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "Você não está assinando esse perfil."
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Message.php:55
+msgid "Could not insert message."
+msgstr "Não foi possível inserir a mensagem."
+
+#: classes/Message.php:65
+msgid "Could not update message with new URI."
+msgstr "Não foi possível atualizar a mensagem com a nova URI."
+
+#: classes/Notice.php:164
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "Erro no banco de dados durante a inserção de hashtag: %s"
+
+#: classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Problema ao salvar a mensagem."
+
+#: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
 msgstr "Problema no salvamento da mensagem. Usuário desconhecido."
 
-#: classes/Notice.php:109
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Muitas mensagens em um período curto de tempo; dê uma respirada e publique "
 "novamente daqui a alguns minutos."
 
-#: classes/Notice.php:116
+#: classes/Notice.php:194
+#, fuzzy
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+"Muitas mensagens em um período curto de tempo; dê uma respirada e publique "
+"novamente daqui a alguns minutos."
+
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr "Você foi banido de publicar mensagens nesse site."
 
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
+msgstr "Problema ao salvar a mensagem."
+
+#: classes/Notice.php:1120
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "Erro no banco de dados na inserção da reposta: %s"
+
+#: classes/User.php:347
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Mensagem para %1$s no %2$s"
+
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Perfil"
+
 #: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
+msgstr "Alterar as suas configurações de perfil"
+
+#: lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "Enviar um avatar"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr "Altere a sua senha"
+
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
+msgstr "Configurações de uso do e-mail"
+
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:124
+#, fuzzy
+msgid "Design your profile"
+msgstr "O usuário não tem perfil."
+
+#: lib/accountsettingsaction.php:128
 msgid "Other"
 msgstr "Outras"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:128
 msgid "Other options"
 msgstr "Outras opções"
 
-#: lib/action.php:130
+#: lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: lib/action.php:145
+#: lib/action.php:159
 msgid "Untitled page"
 msgstr "Página sem título"
 
-#: lib/action.php:316
+#: lib/action.php:424
 msgid "Primary site navigation"
 msgstr "Navegação primária no site"
 
-#: lib/action.php:322
+#: lib/action.php:430
+msgid "Home"
+msgstr "Início"
+
+#: lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr "Perfil pessoal e mensagens dos amigos"
 
-#: lib/action.php:325
-msgid "Search for people or text"
-msgstr "Pesquisar por pessoa ou texto"
-
-#: lib/action.php:328
+#: lib/action.php:432
 msgid "Account"
 msgstr "Conta"
 
-#: lib/action.php:328
+#: lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr "Alterar email, avatar, senha, perfil"
 
-#: lib/action.php:330
-msgid "Connect to IM, SMS, Twitter"
-msgstr "Conectar por IM, SMS, Twitter"
+#: lib/action.php:435
+msgid "Connect"
+msgstr "Conectar"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Não foi possível redirecionar para o servidor: %s"
+
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
+msgstr "Convidar"
+
+#: lib/action.php:440 lib/subgroupnav.php:106
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr "Convide seus amigos e colegas para unir-se a você no %s"
+
+#: lib/action.php:445
+msgid "Logout"
+msgstr "Sair"
 
-#: lib/action.php:332
+#: lib/action.php:445
 msgid "Logout from the site"
 msgstr "Sair deste site"
 
-#: lib/action.php:335
-msgid "Login to the site"
-msgstr "Entrar"
-
-#: lib/action.php:338
+#: lib/action.php:450
 msgid "Create an account"
 msgstr "Criar uma nova conta"
 
-#: lib/action.php:341
-msgid "Login with OpenID"
-msgstr "Entrar com OpenID"
+#: lib/action.php:453
+msgid "Login to the site"
+msgstr "Entrar"
+
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
+msgstr "Ajuda"
 
-#: lib/action.php:344
+#: lib/action.php:456
 msgid "Help me!"
 msgstr "Ajuda"
 
-#: lib/action.php:362
+#: lib/action.php:459
+msgid "Search"
+msgstr "Procurar"
+
+#: lib/action.php:459
+msgid "Search for people or text"
+msgstr "Pesquisar por pessoa ou texto"
+
+#: lib/action.php:480
 #, fuzzy
 msgid "Site notice"
 msgstr "Nova mensagem"
 
-#: lib/action.php:417
+#: lib/action.php:546
 msgid "Local views"
 msgstr ""
 
-#: lib/action.php:472
+#: lib/action.php:612
 #, fuzzy
 msgid "Page notice"
 msgstr "Nova mensagem"
 
-#: lib/action.php:562
+#: lib/action.php:714
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "Navegação pelas assinaturas"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:721
+msgid "About"
+msgstr "Sobre"
+
+#: lib/action.php:723
+msgid "FAQ"
+msgstr "FAQ"
+
+#: lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/action.php:730
+msgid "Privacy"
+msgstr "Privacidade"
+
+#: lib/action.php:732
+msgid "Source"
+msgstr "Fonte"
+
+#: lib/action.php:734
+msgid "Contact"
+msgstr "Contato"
+
+#: lib/action.php:736
+#, fuzzy
+msgid "Badge"
+msgstr "Chamar a atenção"
+
+#: lib/action.php:764
 msgid "StatusNet software license"
 msgstr ""
 
-#: lib/action.php:630
+#: lib/action.php:767
+#, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
+msgstr ""
+"**%%site.name%%** é um serviço de microblogagem disponibilizado por [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
+
+#: lib/action.php:769
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** é um serviço de microblogagem. "
+
+#: lib/action.php:771
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+"Ele funciona sob o software de microblogagem [StatusNet](http://status."
+"net/), versão %s, disponível sob a [GNU Affero General Public License] "
+"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "Procure no conteúdo das mensagens"
+
+#: lib/action.php:794
 #, fuzzy
 msgid "All "
 msgstr "Todas"
 
-#: lib/action.php:635
+#: lib/action.php:799
 msgid "license."
+msgstr "licença"
+
+#: lib/action.php:1052
+msgid "Pagination"
+msgstr "Paginação"
+
+#: lib/action.php:1061
+msgid "After"
+msgstr "Próximo"
+
+#: lib/action.php:1069
+msgid "Before"
+msgstr "Anterior"
+
+#: lib/action.php:1117
+msgid "There was a problem with your session token."
+msgstr ""
+"Ocorreu um problema com o seu token de sessão. Tente novamente, por favor."
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
 msgstr ""
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/attachmentlist.php:278
 #, fuzzy
-msgid "Block this user"
-msgstr "Bloquear usuário"
+msgid "Provider"
+msgstr "Perfil"
 
-#: lib/blockform.php:153
-msgid "Block"
-msgstr "Bloquear"
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
-msgid "Disfavor this notice"
-msgstr "Tirar das favoritas"
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
+msgstr "Resultados do comando"
+
+#: lib/channel.php:210
+msgid "Command complete"
+msgstr "O comando foi completado"
+
+#: lib/channel.php:221
+msgid "Command failed"
+msgstr "O comando falhou"
+
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr "Desculpe, mas esse comando ainda não foi implementado."
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr ""
+"Não foi possível atualizar o usuário com o endereço de e-mail confirmado."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "Chamada de atenção enviada"
+
+#: lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
+msgstr "O usuário não tem uma \"última mensagem\""
+
+#: lib/command.php:190
+msgid "Notice marked as fave."
+msgstr "Mensagem marcada como favorita."
+
+#: lib/command.php:315
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#: lib/command.php:318
+#, php-format
+msgid "Fullname: %s"
+msgstr "Nome completo: %s"
+
+#: lib/command.php:321
+#, php-format
+msgid "Location: %s"
+msgstr "Localização: %s"
+
+#: lib/command.php:324
+#, php-format
+msgid "Homepage: %s"
+msgstr "Site: %s"
+
+#: lib/command.php:327
+#, php-format
+msgid "About: %s"
+msgstr "Sobre: %s"
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr ""
+"A mensagem é muito extensa - o máximo são 140 caracteres e você enviou %d"
+
+#: lib/command.php:377
+msgid "Error sending direct message."
+msgstr "Ocorreu um erro durante o envio da mensagem direta."
+
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr ""
+"A mensagem é muito extensa - o máximo são 140 caracteres e você enviou %d"
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Responder a esta mensagem"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Problema ao salvar a mensagem."
 
-#: lib/facebookaction.php:268
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
+msgstr "Especifique o nome do usuário que será assinado"
+
+#: lib/command.php:502
 #, php-format
-msgid "To use the %s Facebook Application you need to login "
-msgstr "Para usar a Aplicação do Facebook %s você precisa autenticar-se"
+msgid "Subscribed to %s"
+msgstr "Efetuada a assinatura de %s"
+
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
+msgstr "Especifique o nome do usuário que deixará de ser assinado"
+
+#: lib/command.php:530
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr "Cancelada a assinatura de %s"
+
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
+msgstr "O comando não foi implementado ainda."
+
+#: lib/command.php:551
+msgid "Notification off."
+msgstr "Notificação desligada."
+
+#: lib/command.php:553
+msgid "Can't turn off notification."
+msgstr "Não é possível desligar a notificação"
+
+#: lib/command.php:574
+msgid "Notification on."
+msgstr "Notificação ligada."
+
+#: lib/command.php:576
+msgid "Can't turn on notification."
+msgstr "Não é possível ligar a notificação."
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Não foi possível criar o formulário OpenID: %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Você não está assinando esse perfil."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Você não está assinando esse perfil."
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Não foi possível fazer com que o outros o sigam."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Assinantes de %s"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Você não está assinando esse perfil."
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "Você não está assinando esse perfil."
+
+#: lib/command.php:670
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+
+#: lib/common.php:192
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Nenhum código de confirmação."
+
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:195
+#, fuzzy
+msgid "Go to the installer."
+msgstr "Entrar"
+
+#: lib/connectsettingsaction.php:110
+msgid "IM"
+msgstr "IM"
+
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Atualizações via instant messenger (IM)"
+
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
+msgstr "Atualizações via SMS"
+
+#: lib/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Enviar"
 
-#: lib/facebookaction.php:271
-msgid " a new account."
-msgstr " uma nova conta."
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
 
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-msgid "Published"
-msgstr "Publicado"
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Altere a sua senha"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Conectar"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Procurar"
+
+#: lib/designsettings.php:217
+msgid "Text"
+msgstr "Texto"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Lista"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
+msgstr "Tirar das favoritas"
 
 #: lib/favorform.php:114 lib/favorform.php:140
 msgid "Favor this notice"
 msgstr "Acrescentar às favoritas"
 
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr "Tornar favorita"
+
 #: lib/feedlist.php:64
 msgid "Export data"
 msgstr "Exportar os dados"
 
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr ""
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr ""
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr ""
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Filtrar etiquetas"
@@ -4655,57 +4069,84 @@ msgstr "Filtrar etiquetas"
 msgid "All"
 msgstr "Todas"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Selecione uma operadora"
+
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Etiqueta"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "Selecione uma etiqueta para reduzir a lista"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "Ir"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "URL para seu site, blog ou perfil em outro site"
 
-#: lib/groupeditform.php:151
-msgid "Description"
-msgstr "Descrição"
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Descreva o grupo ou tópico em 140 caracteres."
 
-#: lib/groupeditform.php:153
-msgid "Describe the group or topic in 140 chars"
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
 msgstr "Descreva o grupo ou tópico em 140 caracteres."
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:172
+msgid "Description"
+msgstr "Descrição"
+
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr "Onde você está, ex: \"cidade, estado (ou região), país\""
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
 msgid "Group"
 msgstr "Grupo"
 
-#: lib/groupnav.php:100
-msgid "Admin"
-msgstr "Admin"
-
 #: lib/groupnav.php:101
+#, fuzzy
+msgid "Blocked"
+msgstr "Bloquear"
+
+#: lib/groupnav.php:102
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Bloquear usuário"
+
+#: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
 msgstr "Editar propriedades do grupo %s"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:113
 msgid "Logo"
 msgstr "Logo"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:114
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "Adicionar ou editar logo de %s"
 
+#: lib/groupnav.php:120
+#, fuzzy, php-format
+msgid "Add or edit %s design"
+msgstr "Adicionar ou editar logo de %s"
+
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Grupos com mais membros"
@@ -4720,8 +4161,42 @@ msgid "Tags in %s group's notices"
 msgstr "Etiquetas nas mensagens do grupo %s"
 
 #: lib/htmloutputter.php:104
-msgid "This page is not available in a "
-msgstr "Esta página não está disponível em um "
+msgid "This page is not available in a media type you accept"
+msgstr "Esta página não está disponível em um tipo de mídia que você aceita"
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Você pode enviar seu avatar pessoal."
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr "Envio parcial."
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr "Erro no sistema durante o envio do arquivo."
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr "Imagem inválida ou arquivo corrompido."
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr "Formato de imagem não suportado."
+
+#: lib/imagefile.php:118
+msgid "Lost our file."
+msgstr "Nosso arquivo foi perdido."
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr "Tipo de arquivo desconhecido"
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr ""
 
 #: lib/joinform.php:114
 msgid "Join"
@@ -4731,43 +4206,87 @@ msgstr "Entrar"
 msgid "Leave"
 msgstr "Sair"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr "Autentique-se com um nome de usuário e senha"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr "Cadastre-se para uma nova conta"
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
-msgstr "Autentique-se ou registre-se como um OpenID"
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "As caixas postais são legíveis somente pelo seu próprio usuário."
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
 
-#: lib/mail.php:175
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr " de "
+
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "Confirmação do endereço de e-mail"
+
+#: lib/mail.php:174
 #, php-format
 msgid ""
 "Hey, %s.\n"
 "\n"
-msgstr ""
-"Olá, %s.\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%s\n"
 "\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
+msgstr ""
 
-#: lib/mail.php:236
+#: lib/mail.php:235
 #, php-format
-msgid "%1$s is now listening to "
-msgstr "%1$s agora está acompanhando "
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr "%1$s agora está acompanhando suas mensagens em %2$s."
 
-#: lib/mail.php:254
+#: lib/mail.php:240
+#, fuzzy, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
+"%1$s agora está acompanhando suas mensagens em %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Cordialmente,\n"
+"%4$s.\n"
+
+#: lib/mail.php:253
 #, php-format
 msgid "Location: %s\n"
 msgstr "Localização: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:255
 #, php-format
 msgid "Homepage: %s\n"
 msgstr "Site: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
@@ -4776,57 +4295,227 @@ msgstr ""
 "Descrição: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:285
+#, php-format
+msgid "New email address for posting to %s"
+msgstr "Novo endereço de e-mail para postar para %s"
+
+#: lib/mail.php:288
+#, 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 ""
+"Você tem um novo endereço para publicação no %1$s.\n"
+"\n"
+"Para publicar novas mensagens, envie e-mails para %2$s .\n"
+"\n"
+"Mais instruções em %3$s.\n"
+"\n"
+"Atenciosamente,\n"
+"%4$s"
+
+#: lib/mail.php:412
+#, php-format
+msgid "%s status"
+msgstr "Status de %s"
+
+#: lib/mail.php:438
+msgid "SMS confirmation"
+msgstr "Confirmação de SMS"
+
+#: lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "Você teve a atenção chamada por %s"
 
-#: lib/mail.php:465
+#: lib/mail.php:466
 #, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
-msgstr "%1$s (%2$s) quer saber como você está "
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
+msgstr ""
 
-#: lib/mail.php:555
+#: lib/mail.php:509
 #, php-format
-msgid "%1$s just added your notice from %2$s"
-msgstr "%1$s acabou de marcar sua mensagem de %2$s"
+msgid "New private message from %s"
+msgstr "Nova mensagem particular de %s"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
-msgid "From"
-msgstr "De"
+#: lib/mail.php:513
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%5$s\n"
+msgstr ""
+
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s marcaram sua mensagem como favorita"
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
 
-#: lib/messageform.php:110
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, php-format
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+msgstr ""
+
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "Não foi possível excluir a favorita."
+
+#: lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Enviar uma mensagem direta"
 
-#: lib/noticeform.php:125
-msgid "Send a notice"
-msgstr "Enviar uma mensagem"
+#: lib/messageform.php:146
+msgid "To"
+msgstr "Para"
 
-#: lib/noticeform.php:152
+#: lib/messageform.php:162 lib/noticeform.php:173
 msgid "Available characters"
 msgstr "Caracteres disponíveis"
 
-#: lib/noticelist.php:426
-msgid "in reply to"
-msgstr "em resposta à"
+#: lib/noticeform.php:145
+msgid "Send a notice"
+msgstr "Enviar uma mensagem"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
+msgstr "E aí, %s?"
+
+#: lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "Nenhum conteúdo!"
+
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr "Responder a esta mensagem"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "Responder"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
-msgid "Delete this notice"
-msgstr "Excluir esta mensagem"
-
-#: lib/noticelist.php:474
-msgid "Delete"
-msgstr "Excluir"
-
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Chamar a atenção deste usuário"
@@ -4839,39 +4528,140 @@ msgstr "Chamar a atenção"
 msgid "Send a nudge to this user"
 msgstr "Chame a atenção deste usuário"
 
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "Erro na inserção do novo perfil"
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "Erro na inserção do avatar"
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "Erro na inserção do perfil remoto"
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Excluir a mensagem"
+
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
+msgstr "Não foi possível inserir a nova assinatura."
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "Pessoal"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "Respostas"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr "Favoritas"
+
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr "Usuário"
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr "Recebidas"
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr "Suas mensagens recebidas"
+
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr "Enviadas"
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr "Suas mensagens enviadas"
+
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Etiquetas nas mensagens de %s"
 
-#: lib/profilelist.php:182
-msgid "(none)"
-msgstr "(nenhum)"
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "Assinaturas"
+
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "Todas as assinaturas"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "Assinantes"
+
+#: lib/profileaction.php:157
+#, fuzzy
+msgid "All subscribers"
+msgstr "Assinantes"
 
-#: lib/publicgroupnav.php:76
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "Usuário"
+
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "Membro desde"
+
+#: lib/profileaction.php:235
+msgid "All groups"
+msgstr ""
+
+#: lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Público"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Grupos de usuário"
 
-#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Etiquetas recentes"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Destacada"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Popular"
 
+#: lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Procurar"
+
+#: lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Procurar"
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "Pessoas"
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr "Procure por pessoas neste site"
+
 #: lib/searchgroupnav.php:82
 msgid "Notice"
 msgstr "Mensagem"
 
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr "Procure no conteúdo das mensagens"
+
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Procurar por grupos neste site"
@@ -4880,33 +4670,63 @@ msgstr "Procurar por grupos neste site"
 msgid "Untitled section"
 msgstr "Seção sem título"
 
-#: lib/subgroupnav.php:81
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Pessoas que %s assina"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:91
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Assinantes de %s"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "O grupo %s é membro de"
 
-#: lib/subgroupnav.php:104
-#, php-format
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Convide seus amigos e colegas para unir-se a você no %s"
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(nenhum)"
 
-#: lib/subs.php:53
+#: lib/subs.php:48
+msgid "Already subscribed!"
+msgstr ""
+
+#: lib/subs.php:52
 msgid "User has blocked you."
 msgstr "O usuário bloqueou você."
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Assinar este usuário"
+#: lib/subs.php:56
+msgid "Could not subscribe."
+msgstr "Não foi possível assinar."
+
+#: lib/subs.php:75
+msgid "Could not subscribe other to you."
+msgstr "Não foi possível fazer com que o outros o sigam."
+
+#: lib/subs.php:124
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Não é seguido!"
+
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
+msgstr "Não foi possível excluir a assinatura."
 
 #: lib/tagcloudsection.php:56
 msgid "None"
@@ -4916,52 +4736,109 @@ msgstr "Nenhuma"
 msgid "Top posters"
 msgstr "Quem mais publica"
 
-#: lib/unblockform.php:120 lib/unblockform.php:150
-msgid "Unblock this user"
-msgstr "Desbloquear este usuário"
-
-#: lib/unblockform.php:150
-msgid "Unblock"
-msgstr "Desbloquear"
-
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Cancelar a assinatura deste usuário"
 
-#~ msgid "Code not yet ready."
-#~ msgstr "O código ainda não está pronto."
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "Cancelar"
+
+#: lib/userprofile.php:116
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "Avatar"
+
+#: lib/userprofile.php:236
+#, fuzzy
+msgid "User actions"
+msgstr "Outras opções"
+
+#: lib/userprofile.php:248
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Configurações do perfil"
 
-#~ msgid "Export and delete your user information."
-#~ msgstr "Exportar e excluir as informações do seu usuário."
+#: lib/userprofile.php:249
+msgid "Edit"
+msgstr ""
 
-#~ msgid "Delete my account"
-#~ msgstr "Excluir a minha conta"
+#: lib/userprofile.php:272
+#, fuzzy
+msgid "Send a direct message to this user"
+msgstr "Você não pode enviar uma mensagem para esse usuário."
 
-#~ msgid "Delete my account confirmation"
-#~ msgstr "Confirmação de exclusão da minha conta"
+#: lib/userprofile.php:273
+#, fuzzy
+msgid "Message"
+msgstr "Nova mensagem"
 
-#~ msgid "Check if you are sure you want to delete your account."
-#~ msgstr "Verifique se você deseja realmente excluir sua conta."
+#: lib/util.php:821
+msgid "a few seconds ago"
+msgstr "segundos atrás"
 
-#~ msgid "Showing recently popular notices"
-#~ msgstr "Exibir as mensagens populares recentes"
+#: lib/util.php:823
+msgid "about a minute ago"
+msgstr "1 min atrás"
 
-#~ msgid "Tag a person"
-#~ msgstr "Etiquetar uma pessoa"
+#: lib/util.php:825
+#, php-format
+msgid "about %d minutes ago"
+msgstr "%d mins atrás"
 
-#~ msgid "List"
-#~ msgstr "Lista"
+#: lib/util.php:827
+msgid "about an hour ago"
+msgstr "1 hora atrás"
 
-#~ msgid "Icons"
-#~ msgstr "Ícones"
+#: lib/util.php:829
+#, php-format
+msgid "about %d hours ago"
+msgstr "%d horas atrás"
+
+#: lib/util.php:831
+msgid "about a day ago"
+msgstr "1 dia atrás"
+
+#: lib/util.php:833
+#, php-format
+msgid "about %d days ago"
+msgstr "%d dias atrás"
 
-#~ msgid ""
-#~ "Hey, %s.\n"
-#~ "\n"
-#~ "Someone just entered this email address on %s.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Olá %s.\n"
-#~ "\n"
-#~ "Alguém acabou de digitar esse endereço de e-mail no %s.\n"
-#~ "\n"
+#: lib/util.php:835
+msgid "about a month ago"
+msgstr "1 mês atrás"
+
+#: lib/util.php:837
+#, php-format
+msgid "about %d months ago"
+msgstr "%d meses atrás"
+
+#: lib/util.php:839
+msgid "about a year ago"
+msgstr "1 ano atrás"
+
+#: lib/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "A URL do site informada não é válida."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr "Não foi possível analisar a mensagem."
+
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr "Não é um usuário registrado."
+
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr "Desculpe-me, mas este não é seu endereço de e-mail para recebimento."
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr "Desculpe-me, mas não é permitido o recebimento de emails."
diff --git a/locale/ru/LC_MESSAGES/statusnet.mo b/locale/ru/LC_MESSAGES/statusnet.mo
index c4066c65e..13d14c0f9 100644
--- a/locale/ru/LC_MESSAGES/statusnet.mo
+++ b/locale/ru/LC_MESSAGES/statusnet.mo
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 8a553a37f..521b67091 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -1,4278 +1,3045 @@
-# #-#-#-#-#  statusnet.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.
+# Translation of StatusNet to Russian
 #
+# Author@translatewiki.net: Александр Сигачёв
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-04-01 16:09+0000\n"
-"Last-Translator: motherfuker <meelana@list.ru>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:44:12+0000\n"
+"Language-Team: Russian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
-"X-Poedit-Language: Russian\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ru\n"
+"X-Message-Group: out-statusnet\n"
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+msgid "No such page"
+msgstr "Нет такой страницы"
+
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
+msgstr "Нет такого пользователя."
 
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/all.php:84
 #, php-format
-msgid " Search Stream for \"%s\""
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-#: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
-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 ""
+msgid "%s and friends, page %d"
+msgstr "%s и друзья, страница %d"
 
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
+msgid "%s and friends"
+msgstr "%s и друзья"
 
-#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/all.php:99
 #, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Лента друзей %s (RSS 1.0)"
 
-#: ../actions/invite.php:170
+#: actions/all.php:107
 #, 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 "Feed for friends of %s (RSS 2.0)"
+msgstr "Лента друзей %s (RSS 2.0)"
 
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr ""
+#: actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Лента друзей %s"
 
-#: ../lib/mail.php:126
+#: actions/all.php:127
 #, 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"
+"This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/all.php:132
 #, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
 msgstr ""
 
-#: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/all.php:134
 #, php-format
-msgid "%1$s's status on %2$s"
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
 #, php-format
-msgid "%s (%s)"
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
 msgstr ""
 
-#: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
-#, 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
-#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
-#, php-format
-msgid "%s and friends"
+#: actions/all.php:165
+#, fuzzy
+msgid "You and friends"
 msgstr "%s и друзья"
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
 #, php-format
-msgid "%s public timeline"
-msgstr "%s общая лента"
-
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
-#, php-format
-msgid "%s status"
-msgstr "%s статус"
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr "Обновлено от %1$s и его друзей на %2$s!"
 
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
-#, php-format
-msgid "%s timeline"
-msgstr "%s хронология"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
+msgstr "Метод API не найден!"
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
-#, php-format
-msgid "%s updates from everyone!"
-msgstr "%s обновлен для всех!"
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
+msgstr "Этот метод требует POST."
 
-#: ../actions/register.php:213
+#: actions/apiaccountupdatedeliverydevice.php:105
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
 msgstr ""
-"(Вам сразу же послано сообщение по электронной почте, с инструкциями по "
-"тому, как подтвердить свой электронный адрес.)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Не удаётся обновить пользователя."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
 msgstr ""
-"**%%site.name%%** это сервис микроблогинга созданный для Вас при помощи "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
-#, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** - сервис микроблогинга. "
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "Не удаётся сохранить Ваши установки по Твиттеру!"
 
-#: ../lib/util.php:274 lib/util.php:290
-msgid ". Contributors should be attributed by full name or nickname."
-msgstr ". Создатель определяется по полному имени или нику."
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Не удаётся обновить пользователя."
 
-#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
-#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 латинских строчных букв или цифр, без пробелов"
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+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/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Не удаётся сохранить профиль."
 
-#: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr "6 или больше знаков"
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
+msgstr "Неудача при блокировке пользователя."
 
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
-msgid "6 or more characters, and don't forget it!"
-msgstr "6 или более символов, и не забывайте его!"
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
+msgstr "Неудача при разблокировке пользователя."
 
-#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
-msgid "6 or more characters. Required."
-msgstr "6 или более символов. Обязательное поле."
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+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 ""
-"Код подтверждения выслан на Ваш IM-адрес, который Вы добавили. Вы должны "
-"подтвердить %s для рассылки сообщений Вам."
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Слишком длинно. Максимальная длина сообщения - 140 знаков."
 
-#: ../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/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+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."
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
 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 actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
-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 actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
-msgid "API method under construction."
-msgstr "Метод API реконструируется."
-
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
-msgid "About"
-msgstr "О проекте"
-
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
-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 actions/emailsettings.php:120
-#: actions/imsettings.php:127 actions/openidsettings.php:111
-#: actions/smssettings.php:133 actions/twittersettings.php:163
-msgid "Add"
-msgstr "Добавить"
-
-#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
-msgstr "Добавить OpenID"
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-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
-#: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
-msgstr "Адрес"
-
-#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-msgid "Addresses of friends to invite (one per line)"
-msgstr "Адреса друзей, которых ты хочешь пригласить (по одному на строчку)"
+"Не удаётся посылать прямые сообщения пользователям, которые не являются "
+"Вашими друзьями."
 
-#: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
-msgid "All subscriptions"
-msgstr "Все подписки."
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "Прямые сообщения для %s"
 
-#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/apidirectmessage.php:93
 #, php-format
-msgid "All updates for %s"
-msgstr "Все обновления для %s"
+msgid "All the direct messages sent from %s"
+msgstr "Все прямые сообщения от %s"
 
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/apidirectmessage.php:101
 #, php-format
-msgid "All updates matching search term \"%s\""
-msgstr "Все обновления соответствующие поисковому термину \"%s\""
+msgid "Direct messages to %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
-#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
-msgid "Already logged in."
-msgstr "Уже авторизован."
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr "Все прямые сообщения посланные для %s"
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
-msgid "Already subscribed!."
-msgstr "Уже подписан!"
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "Метод API не найден!"
 
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
-msgid "Are you sure you want to delete this notice?"
-msgstr "Вы уверены, что хотите удалить эту запись?"
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
+msgstr "Нет статуса с таким ID."
 
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
-msgid "Authorize subscription"
-msgstr "Авторизованная подписка"
+#: actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+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/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+msgstr "Не удаётся создать любимую запись."
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr "Автоматически подписываться на всех, кто подписался на меня"
+#: actions/apifavoritedestroy.php:122
+#, fuzzy
+msgid "That status is not a favorite!"
+msgstr "Эта запись не входит в число ваших любимых записей!"
 
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34 actions/avatarsettings.php:65
-#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
-msgid "Avatar"
-msgstr "Аватар"
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr "Не удаётся удалить любимую запись."
 
-#: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
-msgid "Avatar updated."
-msgstr "Аватар обновлён."
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
+msgstr ""
+"Не удаётся следовать за пользователем, т. к. такого пользователя не "
+"существует."
 
-#: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/apifriendshipscreate.php:118
 #, 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 в Ваш "
-"контактный список?)"
+msgid "Could not follow user: %s is already on your list."
+msgstr "Не удается включить %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."
+#: actions/apifriendshipsdestroy.php:109
+msgid "Could not unfollow user: User not found."
 msgstr ""
-"Ждём подтверждения этого адреса. Проверь свой почтовый ящик (и папку для "
-"спама!), там будут дальнейшие инструкции."
+"Не удаётся следовать за пользователем, т. к. такого пользователя не "
+"существует."
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
-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
-#: actions/profilesettings.php:112 actions/register.php:402
-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
-#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
-msgid "Bio is too long (max 140 chars)."
-msgstr "Слишком длинное био (максимум 140 символов)."
-
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
-msgid "Can't delete this notice."
-msgstr "Не удаётся удалить эту запись."
-
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
-#, 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
-#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-msgid "Can't save new password."
-msgstr "Не удаётся сохранить новый пароль."
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+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
-#: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
-msgstr "Отменить"
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
+msgstr "Надо представить два имени пользователя или кода."
 
-#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Не удаётся подтвердить OpenID."
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Не удаётся вернуть публичный поток."
 
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
-msgstr "Не удаётся стандартизировать этот Jabber ID"
+#: actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Нет статусов."
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
-msgid "Cannot normalize that email address"
-msgstr "Не удаётся стандартизировать этот электронный адрес"
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
+msgid "Could not create group."
+msgstr "Не удаётся создать группу."
 
-#: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
-msgstr "Изменить"
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Не удаётся создать любимую запись."
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
-msgstr "Изменить электронный адрес"
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+msgid "Could not set group membership."
+msgstr "Не удаётся назначить членство в группе."
 
-#: ../actions/password.php:32 actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr "Изменить пароль"
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"Имя должно состоять только из прописных букв и цифр и не иметь пробелов."
 
-#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
-msgid "Change your password"
-msgstr "Изменить Ваш пароль"
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr "Такое имя уже используется. Попробуйте какое-нибудь другое."
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-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
-#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
-#: actions/register.php:376 actions/smssettings.php:122
-msgid "Confirm"
-msgstr "Подтвердить"
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "Неверное имя."
 
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "Подтвердить адрес"
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "URL Главной страницы неверен."
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245 actions/emailsettings.php:256
-#: actions/imsettings.php:230 actions/smssettings.php:253
-#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
-msgid "Confirmation cancelled."
-msgstr "Подтверждение отменено."
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "Полное имя слишком длинное (не больше 255 знаков)."
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
-msgid "Confirmation code"
-msgstr "Код подтверждения"
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "Слишком длинное описание (максимум 140 символов)"
 
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-msgid "Confirmation code not found."
-msgstr "Код подтверждения не найден."
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "Слишком длинное месторасположение (максимум 255 знаков)."
 
-#: ../actions/register.php:202
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
 #, 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."
+msgid "Too many aliases! Maximum %d."
 msgstr ""
-"Наши поздравления, %s! И добро пожаловать на %%%%site.name%%%%. Здесь вы "
-"можете ...\n"
-"\n"
-"* Перейти на [ваш микроблог](%s) и запостить вашу первую запись.\n"
-"* Добавить ваш [Jabber/GTalk - аккаунт](%%%%action.imsettings%%%%) так что "
-"вы сможете после этого отправлять записи через мессенджеры.\n"
-"* [Искать людей](%%%%action.peoplesearch%%%%), которых вы возможно знаете "
-"или с которыми разделяете одни и те же интересы.\n"
-"* Не нашли друзей или знакомых? [Пригласите их](%%%%action.invite%%%%) на "
-"%%%%site.name%%%%, подпишитесь на них и будьте всегда в курсе.\n"
-"* Обновить ваши [профильные настройки](%%%%action.profilesettings%%%%) чтобы "
-"больше рассказать другим о себе.\n"
-"* Прочитать [документацию](%%%%doc.help%%%%) чтобы поподробнее узнать об "
-"особенностях данного вэб сервиса и о том как его использовать.\n"
-"\n"
-"Спасибо за то, что присоединились к нам и надеемся, что вы получите "
-"удовольствие от использования данного сервиса!"
-
-#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
-msgid "Connect"
-msgstr "Соединить"
 
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
-msgid "Connect existing account"
-msgstr "Соединить с существующей записью"
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Неверный тег: \"%s\""
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
-msgid "Contact"
-msgstr "Контакты"
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Такое имя уже используется. Попробуйте какое-нибудь другое."
 
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
-#, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "Не удаётся создать OpenID-форму: %s "
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr "Не удается включить %s в список поддержки, он уже в Вашем списке."
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Вы уже являетесь членом этой группы"
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
-msgid "Could not follow user: User not found."
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
 msgstr ""
-"Не удаётся следовать пользователю, т.к. такого пользователя не существует."
 
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Не удаётся перенаправить на сервер: %s"
-
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
-msgid "Could not save avatar info"
-msgstr "Не удаётся сохранить информацию об аватаре"
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Не удаётся присоеденить пользователя %s к группе %s"
 
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
-msgid "Could not save new profile info"
-msgstr "Не удаётся сохранить новую информацию профиля"
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Вы не являетесь членом этой группы."
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
-msgid "Could not subscribe other to you."
-msgstr "Не удаётся подписать других на Вашу ленту."
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Не удаётся удалить пользователя %s из группы %s"
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
-msgid "Could not subscribe."
-msgstr "Подписка неудачна."
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "Группы %s"
 
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
-msgstr "Не удаётся одновить пользователя с подтверждённым электронным адресом."
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Действия группы"
 
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-msgid "Couldn't convert request tokens to access tokens."
-msgstr "Не удаётся преобразовать запросы в доступы."
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "Группы %s"
 
-#: ../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
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-msgid "Couldn't delete email confirmation."
-msgstr "Не удаётся удалить подверждение по электронному адресу."
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Группы, в которых состоит %s"
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
-msgid "Couldn't delete subscription."
-msgstr "Не удаётся удалить подписку."
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
+msgstr "Этот метод требует POST или DELETE."
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
-msgid "Couldn't find any statuses."
-msgstr "Нет статусов."
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
+msgstr "Вы не можете удалять статус других пользователей."
 
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-msgid "Couldn't get a request token."
-msgstr "Не удаётся получить запрос."
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+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
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
-msgid "Couldn't insert confirmation code."
-msgstr "Не удаётся вставить код подтверждения."
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
+msgstr "Не найдено статуса с таким ID."
 
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
-msgstr "Не удаётся вставить новую подписку."
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "Слишком длинная запись. Максимальная длина - 140 знаков."
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-msgid "Couldn't save profile."
-msgstr "Не удаётся сохранить профиль."
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
+msgstr "Не найдено"
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
-msgstr "Не удаётся обновить пользователя для автоподписки."
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
-msgid "Couldn't update user record."
-msgstr "Не удаётся обновить пользовательскую запись."
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+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
-#: actions/confirmaddress.php:114 actions/emailsettings.php:280
-#: actions/emailsettings.php:411 actions/imsettings.php:252
-#: actions/imsettings.php:395 actions/othersettings.php:162
-#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
-msgid "Couldn't update user."
-msgstr "Не удаётся обновить пользователя."
+#: actions/apitimelinefavorites.php:107
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr "%s / Любимое от %s"
 
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
-msgid "Create"
-msgstr "Создать"
+#: actions/apitimelinefavorites.php:119
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr "%s обновлённые любимые записи от %s / %s."
 
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
-msgid "Create a new user with this nickname."
-msgstr "Создать нового пользователя с таким именем."
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
+#, php-format
+msgid "%s timeline"
+msgstr "%s хронология"
 
-#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
-msgid "Create new account"
-msgstr "Создать новую учетную запись"
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "Обновлено от %1$s на %2$s!"
 
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
-msgid "Creating new account for OpenID that already has a user."
+#: actions/apitimelinementions.php:116
+#, php-format
+msgid "%1$s / Updates mentioning %2$s"
 msgstr ""
-"Создать новую учетную запись для OpenID, у которого уже есть пользователь."
 
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "Подтверждённый в настоящее время Jabber/Gtalk - адрес."
-
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
+#: actions/apitimelinementions.php:126
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
-"Подтверждённый в настоящее время SMS-доступный номер мобильного телефона."
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-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 classes/Notice.php:91
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
 #, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "Ошибка баз данных при вставке хеш-тегов для %s"
+msgid "%s public timeline"
+msgstr "%s общая хронология"
 
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
 #, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Ошибка баз данных при вставке ответа для %s"
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
-msgid "Delete notice"
-msgstr "Удалить запись"
-
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "Опиши себя и свои увлечения при помощи 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 actions/register.php:381
-#: actions/register.php:385 lib/accountsettingsaction.php:113
-msgid "Email"
-msgstr "Email"
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-msgid "Email Address"
-msgstr "Электронный адрес"
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
-msgstr "Настройка почты"
-
-#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-msgid "Email address already exists."
-msgstr "Такой электронный адрес уже задействован."
-
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
-msgid "Email address confirmation"
-msgstr "Подтверждение электронного адреса"
+msgid "%s updates from everyone!"
+msgstr "%s обновлен для всех!"
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
-msgstr "Электронный адрес вида \"UserName@example.org\""
+#: actions/apitimelinetag.php:101 actions/tag.php:66
+#, php-format
+msgid "Notices tagged with %s"
+msgstr "Записи, помеченные %s"
 
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-msgid "Email addresses"
-msgstr "Почтовый адрес"
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Обновлено от %1$s на %2$s!"
 
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
-msgid "Enter a nickname or email address."
-msgstr "Введите имя или электронный адрес."
+#: actions/apiusershow.php:96
+msgid "Not found."
+msgstr "Не найдено."
 
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
-msgstr "Введите код, который вы получили по телефону."
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "Нет такого документа."
 
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
-msgid "Error authorizing token"
-msgstr "Ошибка авторизации входа"
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+msgstr "Нет имени."
 
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
-msgid "Error connecting user to OpenID."
-msgstr "Ошибка при соединении пользователя с OpenID."
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "Нет размера."
 
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
-msgstr "Ошибка при соединении пользователя."
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "Неверный размер."
 
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
-msgstr "Ошибка при вставке аватара"
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "Аватар"
 
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
-msgstr "Ошибка при вставке нового профиля"
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "Тут вы можете загрузить свой аватар."
 
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
-msgstr "Ошибка вставки удалённого профиля"
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
+msgstr "Пользователь без соответствующего профиля"
 
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
-msgid "Error saving address confirmation."
-msgstr "Ошибка сохранения подтверждённого адреса."
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+msgid "Avatar settings"
+msgstr "Настройки аватара"
 
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
-msgid "Error saving remote profile"
-msgstr "Ошибка сохранения удалённого профиля"
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr "Оригинал"
 
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-msgid "Error saving the profile."
-msgstr "Ошибка сохранения текущего профиля."
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr "Просмотр"
 
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-msgid "Error saving the user."
-msgstr "Ошибка сохранения текущего пользователя."
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+msgid "Delete"
+msgstr "Удалить"
 
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
-msgid "Error saving user; invalid."
-msgstr "Ошибка сохранения пользователя; неверное имя."
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+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 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-msgid "Error setting user."
-msgstr "Ошибка в установках пользователя."
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
+msgstr "Обрезать"
 
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr "Ошибка обновления профиля"
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста."
 
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
-msgstr "Ошибка обновления удалённого профиля"
+#: actions/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Нетиповое подтверждение формы."
 
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr "Ошибка, связанная с кодом подтверждения."
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
+msgstr "Подберите нужный квадратный ракурс дла вашего аватара"
 
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
-msgid "Existing nickname"
-msgstr "Существующее имя"
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
+msgstr "Потеряна информация о файле."
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
-msgid "FAQ"
-msgstr "ЧаВо"
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+msgstr "Аватар обновлён."
 
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Неудача при обновлении аватара."
 
-#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
-#, 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 actions/replies.php:134
-#: actions/repliesrss.php:71
-#, php-format
-msgid "Feed for replies to %s"
-msgstr "Лента ответов %s"
-
-#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
-#, php-format
-msgid "Feed for tag %s"
-msgstr "Лента тегов %s"
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
-msgstr "Найти запись по содержимому"
+#: actions/avatarsettings.php:387
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Аватар обновлён."
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
-msgstr "Найти человека на этом сайте"
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+msgid "No nickname"
+msgstr "Нет названия группы"
 
-#: ../actions/login.php:122
-msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
-msgstr ""
-"По причинам сохранения безопасности введите имя и пароль ещё раз, прежде чем "
-"изменять Ваши установки."
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
+msgstr "Нет такой группы"
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
-#: actions/profilesettings.php:77 actions/register.php:178
-#: actions/profilesettings.php:103 actions/register.php:391
-#: actions/showgroup.php:235 actions/showstream.php:262
-#: actions/tagother.php:105 lib/groupeditform.php:142
-msgid "Full name"
-msgstr "Полное имя"
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+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
-#: actions/editgroup.php:195 actions/newgroup.php:146
-#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
-msgid "Full name is too long (max 255 chars)."
-msgstr "Полное имя слишком длинное (не больше 255 знаков)."
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s и друзья, страница %d"
 
-#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
-msgid "Help"
-msgstr "Помощь"
+#: actions/blockedfromgroup.php:108
+#, fuzzy
+msgid "A list of the users blocked from joining this group."
+msgstr "Список пользователей, являющихся членами этой группы."
 
-#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
-msgid "Home"
-msgstr "Моё"
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Неудача при разблокировке пользователя."
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
-msgid "Homepage"
-msgstr "Главная"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
+msgstr "Разблокировать"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
-msgid "Homepage is not a valid URL."
-msgstr "URL Главной страницы неверен."
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+msgid "Unblock this user"
+msgstr "Разблокировать пользователя."
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
-msgid "I want to post notices by email."
-msgstr "Я хочу отправлять записи по электронной почте."
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Не авторизован."
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
-msgstr "IM"
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
+msgstr "Профиль не определен."
 
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
-msgstr "IM-адрес"
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
+msgstr "Нет профиля с таким ID."
 
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
-msgstr "IM-установки"
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Заблокировать пользователя."
 
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/block.php:136
 msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
 msgstr ""
-"Если у вас уже есть аккаунт, то авторизуйтесь с вашим ником и паролем, чтобы "
-"соединить их с вашим 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/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
+msgid "No"
+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/block.php:149
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Разблокировать пользователя."
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-#: actions/emailsettings.php:127 actions/smssettings.php:140
-msgid "Incoming email"
-msgstr "Входящий электронный адрес"
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
+msgstr "Да"
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
-msgid "Incoming email address removed."
-msgstr "Входящий электронный адрес удалён."
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+msgid "Block this user"
+msgstr "Заблокировать пользователя."
 
-#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
-msgid "Incorrect old password"
-msgstr "Некорректный старый пароль"
+#: actions/block.php:165
+msgid "You have already blocked this user."
+msgstr "Вы уже заблокировали этого пользователя."
 
-#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
-msgid "Incorrect username or password."
-msgstr "Некорректное имя или пароль."
+#: actions/block.php:170
+msgid "Failed to save block information."
+msgstr "Не удаётся сохранить информацию о блокировании."
 
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
-msgstr ""
-"Инструкции по восстановлению пароля посланы на электронный адрес, который Вы "
-"указали при регистрации вашего аккаунта."
+#: actions/bookmarklet.php:50
+#, fuzzy
+msgid "Post to "
+msgstr "Фото"
 
-#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "Неверный URL-адрес аватара '%s'"
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+msgstr "Нет кода подтверждения."
 
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
-#, php-format
-msgid "Invalid email address: %s"
-msgstr "Неверный электронный адрес: %s"
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "Код подтверждения не найден."
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
-#, php-format
-msgid "Invalid homepage '%s'"
-msgstr "Неверная домашняя страничка для '%s'"
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "Это не Ваш код подтверждения!"
 
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/confirmaddress.php:90
 #, php-format
-msgid "Invalid license URL '%s'"
-msgstr "Неверный URL лицензии для '%s'"
-
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
-msgstr "Неверный контент записи"
-
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
-msgstr "Неверный URI записи"
-
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
-msgstr "Неверный URL записи"
+msgid "Unrecognized address type %s"
+msgstr "Нераспознанный тип адреса %s"
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "Неверный URL профиля для '%s'."
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr "Этот адрес уже подтверждён."
 
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
-msgstr "Неверный URL профиля (плохой формат)"
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "Не удаётся обновить пользователя."
 
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
-msgstr "Неврный URL профиля возвращённый сервером."
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr "Не удаётся удалить подверждение по электронному адресу."
 
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
-#: actions/avatarbynickname.php:69
-msgid "Invalid size."
-msgstr "Неверный размер."
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+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
-#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
-msgid "Invalid username or password."
-msgstr "Неверное имя или пароль."
+#: actions/confirmaddress.php:159
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "Адрес \"%s\" подтвержден для вашего аккаунта."
 
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-msgid "Invitation(s) sent"
-msgstr "Приглашение(я) отослано(ы)"
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Код подтверждения"
 
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-msgid "Invitation(s) sent to the following people:"
-msgstr "Приглашение(я) отослано(ы) следующим адресатам:"
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
+msgstr "Записи"
 
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
-msgid "Invite"
-msgstr "Пригласить"
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
+msgstr "Нет такой записи."
 
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-msgid "Invite new users"
-msgstr "Пригласить новых пользователей"
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "Не удаётся удалить эту запись."
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
-#, php-format
+#: actions/deletenotice.php:103
+#, fuzzy
 msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
 msgstr ""
-"Этот сервис работает при помощи [StatusNet](http://status.net/) - программного "
-"обеспечения для микроблогинга, версии %s, доступного под лицензией [GNU "
-"Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-"
-"3.0.html)."
+"Вы окончательно удаляете запись. После того, как это будет сделано, "
+"восстановление будет невозможно."
 
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
-msgstr "Этот Jabber ID уже используется другим пользователем."
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+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 ""
-"Jabber или GTalk - адрес, типа \"UserName@example.org\". Первым делом "
-"убедитесь, что добавили %s в список Ваших корреспондентов на Вашем IM-"
-"мессенджере или в GTalk."
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr "Вы уверены, что хотите удалить эту запись?"
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
-msgid "Language"
-msgstr "Язык"
+#: actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "Не удаётся удалить эту запись."
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
-msgid "Language is too long (max 50 chars)."
-msgstr "Слишком длинный язык (более 50 символов). "
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+msgid "Delete this notice"
+msgstr "Удалить эту запись"
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
-msgid "Location"
-msgstr "Месторасположение"
+#: actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
+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
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
-msgid "Location is too long (max 255 chars)."
-msgstr "Слишком длинное месторасположение (максимум 255 знаков)."
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr "Эта запись не входит в число ваших любимых записей!"
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
-#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
-#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
-#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
-#, php-format
-msgid "Login"
-msgstr "Вход"
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "Добавить в любимые"
 
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Вход при помощи [OpenID](%%doc.openid%%)."
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "Нет такого документа."
 
-#: ../actions/login.php:126
+#: actions/editgroup.php:56
 #, 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%%). "
+msgid "Edit %s group"
+msgstr "Изменить информацию о группе %s"
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
-msgid "Logout"
-msgstr "Выход"
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
+msgstr "Вы должны авторизоваться, чтобы создать новую группу."
 
-#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
-msgid "Longer name, preferably your \"real\" name"
-msgstr "Полное имя, предпочтительно Ваше настоящее имя"
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+msgid "You must be an admin to edit the group"
+msgstr "Вы должны быть администратором, чтобы изменять информацию о группе"
 
-#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
-msgid "Lost or forgotten password?"
-msgstr "Потеряли или забыли пароль?"
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
+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/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Слишком длинное описание (максимум 140 символов)"
+
+#: actions/editgroup.php:253
+msgid "Could not update group."
+msgstr "Не удаётся обновить информацию о группе"
+
+#: actions/editgroup.php:269
+msgid "Options saved."
+msgstr "Настройки сохранены"
+
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "Настройка почты"
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
 #: actions/emailsettings.php:71
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Управление процессом получения электронного адреса с %%site.name%%."
 
-#: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
-msgid "Member since"
-msgstr "Регистрация"
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "Адрес"
 
-#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
-#, php-format
-msgid "Microblog by %s"
-msgstr "Микроблог от %s"
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr "Подтверждённый в настоящее время электронный адрес."
 
-#: ../actions/smssettings.php:304
-#, php-format
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "Убрать"
+
+#: actions/emailsettings.php:113
 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."
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
 msgstr ""
-"Провайдер Вашего мобильного телефона. Если вы знаете провайдера, который "
-"принимает CVC при помощи электронных адресов и которого нет в списке ниже, "
-"то пошлите нам об этом электронное сообщение %s."
+"Ждём подтверждения этого адреса. Проверь свой почтовый ящик (и папку для "
+"спама!), там будут дальнейшие инструкции."
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-msgid "My text and files are available under "
-msgstr "Мои тексты и файлы находятся под лицензией"
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "Отменить"
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#: actions/emailsettings.php:142 actions/smssettings.php:152
-msgid "New"
-msgstr "Новое"
+#: actions/emailsettings.php:121
+msgid "Email Address"
+msgstr "Электронный адрес"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
-#, php-format
-msgid "New email address for posting to %s"
-msgstr "Новый электронный адрес для постинга %s"
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr "Электронный адрес вида \"UserName@example.org\""
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
-msgid "New incoming email address added."
-msgstr "Новый входящий электронный адрес добавлен."
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "Добавить"
 
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
-msgid "New nickname"
-msgstr "Новое имя"
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+msgstr "Входящий электронный адрес"
 
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
-msgstr "Новая запись"
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
+msgstr "Посылать электронные письма на этот адрес для постинга новых записей."
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-msgid "New password"
-msgstr "Новый пароль"
+#: actions/emailsettings.php:145 actions/smssettings.php:162
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr ""
+"Создать новый электронный адрес для постинга здесь; отменить один из старых."
 
-#: ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
-msgstr "Новый пароль успешно сохранён. Вы авторизовались."
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
+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
-#: actions/login.php:228 actions/profilesettings.php:98
-#: actions/register.php:367 actions/showgroup.php:224
-#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
-msgid "Nickname"
-msgstr "Имя"
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
+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
-#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
-msgid "Nickname already in use. Try another one."
-msgstr "Такое имя уже используется. Попробуйте какое-нибудь другое."
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
+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
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
-"Имя должно состоять только из прописных букв и цифр и не иметь пробелов."
-
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
-msgid "Nickname not allowed."
-msgstr "Такое имя недопустимо."
-
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
-msgstr "Имя пользователя, которому Вы хотите следовать"
-
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
-msgid "Nickname or email"
-msgstr "Имя или электронный адрес"
+"Посылать мне сообщение по электронной почте, если кто-нибудь добавит мою "
+"запись в число любимых."
 
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
-msgid "No"
-msgstr "Нет"
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+"Посылать мне сообщение по электронной почте, если кто-нибудь пошлёт мне "
+"приватное сообщение."
 
-#: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
-msgstr "Не Jabber ID."
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr ""
+"Посылать мне сообщение по электронной почте, если кто-нибудь пошлёт мне "
+"приватное сообщение."
 
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
-msgid "No authorization request!"
-msgstr "Не авторизованный запрос!"
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+"Разрешить друзьям \"подталкивать\" меня и посылать мне электронные сообщения."
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
-msgid "No carrier selected."
-msgstr "Провайдер не выбран."
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
+msgstr "Я хочу отправлять записи по электронной почте."
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
-msgstr "Код не введён"
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
+msgstr "Опубликовать MicroID для моего электронного адреса."
 
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
-#: actions/confirmaddress.php:75
-msgid "No confirmation code."
-msgstr "Нет кода подтверждения."
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Сохранить"
 
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
-#: actions/newnotice.php:126 classes/Command.php:223
-msgid "No content!"
-msgstr "Нет контента!"
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+msgstr "Предпочтения сохранены."
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr "Нет электронного адреса."
 
-#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
-msgid "No id."
-msgstr "Нет идентификатора."
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
-msgid "No incoming email address."
-msgstr "Нет входящего электронного адреса."
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
+msgstr "Не удаётся стандартизировать этот электронный адрес"
 
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr "Нет имени представленного удалённым сервером."
+#: actions/emailsettings.php:330
+msgid "Not a valid email address"
+msgstr "Неверный электронный адрес"
 
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
-msgid "No nickname."
-msgstr "Нет имени."
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
+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
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
-msgid "No pending confirmation to cancel."
-msgstr "Нет подтверждения отказа."
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another user."
+msgstr "Этот электронный адрес уже задействован другим пользователем."
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
-msgstr "Нет номера телефона."
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+msgstr "Не удаётся вставить код подтверждения."
 
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
-msgstr "Нет URL профиля, который вернул сервер."
+#: actions/emailsettings.php:358
+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/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
-msgid "No registered email address for that user."
-msgstr "Нет зарегистрированных электронных адресов для этого пользователя."
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
+msgstr "Нет подтверждения отказа."
 
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr "Запросы не найдены!"
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "Это неверный IM-адрес."
 
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
-msgid "No results"
-msgstr "Нет результатов."
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "Подтверждение отменено."
 
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
-msgstr "Нет размера."
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
+msgstr "Это не Ваш электронный адрес."
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
-msgid "No status found with that ID."
-msgstr "Нет статуса с таким ID."
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "Адрес удалён."
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
-msgid "No status with that ID found."
-msgstr "Не найдено статуса с таким ID."
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
+msgstr "Нет входящего электронного адреса."
 
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
-msgstr "Нет такого OpenID."
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
+msgstr "Не удаётся обновить пользовательскую запись."
 
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
-msgid "No such document."
-msgstr "Нет такого документа."
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
+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 actions/shownotice.php:87
-#: lib/deleteaction.php:51
-msgid "No such notice."
-msgstr "Нет такой записи."
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
+msgstr "Новый входящий электронный адрес добавлен."
 
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr "Нет такого кода восстановления."
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+msgid "Popular notices"
+msgstr "Популярные записи"
 
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-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 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
-msgid "No such user."
-msgstr "Нет такого пользователя."
+#: actions/favorited.php:67
+#, php-format
+msgid "Popular notices, page %d"
+msgstr "Популярные записи, страница %d"
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-msgid "No user with that email address or username."
-msgstr "Нет пользователя с таким электронным адресом или именем."
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
+msgstr "Самые популярные записи на %%site.name%% на текущий момент."
 
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
-msgstr "Ничего показывать!"
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
 
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr "Нет кода восстановления."
+#: actions/favorited.php:153
+msgid ""
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
+msgstr ""
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
-msgstr "Незарегистрированный пользователь."
+#: actions/favorited.php:156
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
+msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
-msgid "Not a supported data format."
-msgstr "Неподдерживаемый формат данных."
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
+msgstr "Любимые записи %s"
 
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
-msgstr "Неверный код Jabber ID"
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Обновлено от %1$s на %2$s!"
 
-#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-msgid "Not a valid OpenID."
-msgstr "Неверный код OpenID."
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Эта запись уже входит в число любимых!"
 
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
-msgid "Not a valid email address"
-msgstr "Неверный электронный адрес"
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Разлюбить"
 
-#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-msgid "Not a valid email address."
-msgstr "Неверный электронный адрес."
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr "Особые пользователи"
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-#: actions/editgroup.php:186 actions/newgroup.php:137
-#: actions/profilesettings.php:195 actions/register.php:161
-msgid "Not a valid nickname."
-msgstr "Неверное имя."
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr "Особые пользователи, страница %d"
 
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
-msgstr "Неверный URL профиля (некорректный сервис)."
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
+msgstr "Список наиболее активных, знаменитых и уважаемых пользователей на %s"
 
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr "Неверный URL профиля (неверно определённый XRDS)."
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "Новая запись"
 
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr "Неверный URL профиля (не YADIS-документ)."
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Новая запись"
 
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
-msgid "Not an image or corrupt file."
-msgstr "Не является изображением или разрушенный файл."
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
-msgid "Not authorized."
-msgstr "Не авторизовано."
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Неожиданный ответ!"
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
-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 actions/block.php:59 actions/disfavor.php:61
-#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
-#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
-#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
-#: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Не авторизован."
-
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
-msgid "Not subscribed!."
-msgstr "Не подписан!"
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
-msgstr "Поиск в записях"
-
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
-#, php-format
-msgid "Notice feed for %s"
-msgstr "Лента записей для %s"
-
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
-msgstr "Запись без профиля"
-
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
-msgid "Notices"
-msgstr "Записи"
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
-#, php-format
-msgid "Notices tagged with %s"
-msgstr "Записи, помеченные %s"
-
-#: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
-msgstr "Старый пароль"
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "Пользователь отслеживает несуществующее."
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
-msgid "OpenID"
-msgstr "OpenID"
-
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
-msgid "OpenID Account Setup"
-msgstr "Установки OpenID"
-
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-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
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-msgid "OpenID Login"
-msgstr "OpenID вход"
-
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-#: actions/openidlogin.php:102 actions/openidsettings.php:101
-msgid "OpenID URL"
-msgstr "URL для OpenID"
-
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
-msgid "OpenID authentication cancelled."
-msgstr "Вход при помощи OpenID отменён."
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr "Вход при помощи OpenID неудачен: %s"
-
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "Неверный OpenID: %s"
-
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr "OpenID удалён."
-
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
-msgstr "Установки OpenID"
-
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-msgid "Optionally add a personal message to the invitation."
-msgstr "Можно добавить к приглашению личное сообщение."
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+msgstr "Вы можете использовать локальную подписку!"
 
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
-msgid "Partial upload."
-msgstr "Частичная загрузка."
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
+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 actions/finishopenidlogin.php:118
-#: actions/login.php:231 actions/register.php:372
-#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-msgid "Password"
-msgstr "Пароль"
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "Не авторизовано."
 
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
-msgid "Password and confirmation do not match."
-msgstr "Пароль и его подтверждение не совпадают."
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "Не удаётся преобразовать запросы в доступы."
 
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
-msgid "Password must be 6 chars or more."
-msgstr "Пароль должен быть длиной не менее 6 символов."
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Неизвестная версия OMB-протокола."
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-msgid "Password recovery requested"
-msgstr "Запрошено восстановление пароля"
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "Ошибка обновления удалённого профиля"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-msgid "Password saved."
-msgstr "Пароль сохранён."
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+msgid "No such group."
+msgstr "Нет такой группы."
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-msgid "Passwords don't match."
-msgstr "Пароли не совпадают."
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "Нет такой записи."
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
-msgstr "Люди"
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Потерян файл."
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
-msgstr "Поиск людей"
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "Профиль не определен."
 
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
-msgstr "Поиск людей"
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
 
-#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
-msgid "Personal"
-msgstr "Личное"
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "Пользователь заблокировал Вас."
 
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-msgid "Personal message"
-msgstr "Личное сообщение"
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "Вы не являетесь членом этой группы."
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "Номер телефона, без пробелов, с кодом зоны"
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "Заблокировать пользователя."
 
-#: ../actions/userauthorization.php:78
+#: actions/groupblock.php:162
+#, php-format
 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\"."
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
 msgstr ""
-"Пожалуйста, отметьте эти подробности, чтобы быть уверенным, что вы хотите "
-"подписаться на эти записи. Если Вы этого не хотите делать, то нажмите "
-"\"Отказ\"."
 
-#: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Публиковать запись, когда мой Jabber/GTalk - статус изменяется."
+#: actions/groupblock.php:178
+#, fuzzy
+msgid "Do not block this user from this group"
+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 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
-msgid "Preferences"
-msgstr "Предпочтения"
+#: actions/groupblock.php:179
+#, fuzzy
+msgid "Block this user from this group"
+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
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
-msgid "Preferences saved."
-msgstr "Предпочтения сохранены."
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
+msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
-msgid "Preferred language"
-msgstr "Любимый язык"
+#: actions/groupbyid.php:74
+msgid "No ID"
+msgstr "Нет ID"
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
-msgid "Privacy"
-msgstr "Пользовательское соглашение"
+#: actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "Вы должны авторизоваться, чтобы создать новую группу."
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-msgid "Problem saving notice."
-msgstr "Проблемы с сохранением записи."
+#: actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "Группы"
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
-msgid "Profile"
-msgstr "Профиль"
+#: actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
 
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
-msgstr "URL профиля"
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Не удаётся обновить пользователя."
 
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
-msgstr "Настройки профиля"
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "Не удаётся сохранить Ваши установки по Твиттеру!"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-msgid "Profile unknown"
-msgstr "Неизвестный профиль"
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Настройки синхронизации сохранены."
 
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
-msgid "Public Stream Feed"
-msgstr "Лента публичного потока"
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
+msgstr "Логотип группы"
 
-#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
-msgid "Public timeline"
-msgstr "Общая лента"
+#: actions/grouplogo.php:150
+#, fuzzy, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr "Тут вы можете загрузить логотип для группы."
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Опубликовать MicroID для моего Jabber/GTalk - адреса."
+#: actions/grouplogo.php:362
+#, fuzzy
+msgid "Pick a square area of the image to be the logo."
+msgstr "Подберите нужный квадратный ракурс дла вашего аватара"
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
-msgid "Publish a MicroID for my email address."
-msgstr "Опубликовать MicroID для моего электронного адреса."
+#: actions/grouplogo.php:396
+msgid "Logo updated."
+msgstr "Логотип обновлён."
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr "Свежие теги"
+#: actions/grouplogo.php:398
+msgid "Failed updating logo."
+msgstr "Неудача при обновлении логотипа."
 
-#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
-msgid "Recover"
-msgstr "Восстановление"
+#: actions/groupmembers.php:93 lib/groupnav.php:92
+#, php-format
+msgid "%s group members"
+msgstr "Участники группы %s"
 
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
-msgid "Recover password"
-msgstr "Восстановление пароля"
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
+msgstr "Участники группы %s, страница %d"
 
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-msgid "Recovery code for unknown user."
-msgstr "Код восстановления неизвестного пользователя."
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+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
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-msgid "Register"
-msgstr "Регистрация"
+#: actions/groupmembers.php:175 lib/groupnav.php:107
+msgid "Admin"
+msgstr "Настройки"
 
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
-msgid "Registration not allowed."
-msgstr "Регистрация недопустима."
+#: actions/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
+msgstr "Блокировать"
 
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
-msgid "Registration successful"
-msgstr "Регистрация успешна!"
+#: actions/groupmembers.php:441
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "Вы должны быть администратором, чтобы изменять информацию о группе"
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
-msgid "Reject"
-msgstr "Отбросить"
+#: actions/groupmembers.php:473
+#, fuzzy
+msgid "Make Admin"
+msgstr "Настройки"
 
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
-msgid "Remember me"
-msgstr "Запомнить меня"
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
-msgid "Remote profile with no matching profile"
-msgstr "Удаление профиля как несоответствующего"
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Обновлено от %1$s на %2$s!"
 
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
-msgstr "Подписаться на пользователя"
+#: actions/groupsearch.php:52
+#, fuzzy, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"Поиск людей на %%site.name%% по имени, месторасположению или интересам. "
+"Разделяйте ключевые слова пробелами. Минимальная длина слова — 3 буквы."
 
-#: ../actions/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 actions/emailsettings.php:101
-#: actions/emailsettings.php:134 actions/imsettings.php:102
-#: actions/openidsettings.php:166 actions/smssettings.php:103
-#: actions/smssettings.php:146 actions/twittersettings.php:115
-msgid "Remove"
-msgstr "Убрать"
+#: actions/groupsearch.php:58
+msgid "Group search"
+msgstr "Поиск группы"
 
-#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
-msgstr "Убрать OpenID"
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "Нет результатов."
 
-#: ../actions/openidsettings.php:73
+#: actions/groupsearch.php:82
+#, php-format
 msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
 msgstr ""
-"Удаление последнего OpenID делает авторизацию невозможной! Если Вы всё же "
-"хотите удалить этот OpenID, то сначала добавьте ещё один."
-
-#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
-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
-#: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: actions/groupsearch.php:85
 #, php-format
-msgid "Replies to %s"
-msgstr "Ответы для %s"
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
 
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
-msgid "Reset"
-msgstr "Переустановить"
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Группы"
 
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
-msgid "Reset password"
-msgstr "Переустановить пароль"
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Группы, страница %d"
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-msgid "SMS"
-msgstr "СМС"
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
-msgid "SMS Phone number"
-msgstr "Номер телефона для СМС"
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Создать новую группу"
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
-msgstr "Установки СМС"
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
-msgid "SMS confirmation"
-msgstr "Подтверждение СМС"
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "Пользователь заблокировал Вас."
 
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
-msgid "Same as password above"
-msgstr "Тот же пароль, что и выше"
+#: actions/groupunblock.php:128 actions/unblock.php:108
+msgid "Error removing the block."
+msgstr "Ошибка при удалении данного блока."
 
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
-msgid "Same as password above. Required."
-msgstr "Тот же пароль что и сверху. Обязательно."
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "IM-установки"
 
-#: ../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 actions/emailsettings.php:182
-#: actions/facebooksettings.php:114 actions/imsettings.php:157
-#: actions/othersettings.php:117 actions/profilesettings.php:150
-#: actions/smssettings.php:169 actions/subscriptions.php:124
-#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
-msgid "Save"
-msgstr "Сохранить"
+#: actions/imsettings.php:70
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+"Вы можете отправлять и получать записи через Jabber/GTalk [онлайн-мессенджер]"
+"(%%doc.im%%). Настройте ваш аккаунт и предпочтения ниже."
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
-msgid "Search"
-msgstr "Поиск"
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Страница недоступна для того типа, который Вы задействовали."
 
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
-msgstr "Лента поискового потока"
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Подтверждённый в настоящее время Jabber/Gtalk - адрес."
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/imsettings.php:114
 #, php-format
 msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
+"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 ""
-"Поиск по содержанию записей на %%site.name%%. Между ключевыми словами "
-"ставьте пробелы. Минимальная длина слова — 3 буквы."
+"В ожидании подтверждения этого адреса. Проверьте ваш Jabber/GTalk на предмет "
+"сообщения с дальнейшими инструкциями. (Вы включили %s в ваш список "
+"контактов?)"
 
-#: ../actions/peoplesearch.php:28
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "IM-адрес"
+
+#: actions/imsettings.php:126
 #, 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."
+"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 ""
-"Поиск людей на %%site.name%% по имени, месторасположению или интересам. "
-"Разделяйте ключевые слова пробелами. Минимальная длина слова — 3 буквы."
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
-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 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
-msgid "Send"
-msgstr "ОК"
-
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
-msgstr "Посылать электронные письма на этот адрес для постинга новых записей."
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
-msgstr "Уведомлять меня о новых подписчиках по почте."
+"Jabber или GTalk - адрес, типа \"UserName@example.org\". Первым делом "
+"убедитесь, что добавили %s в список Ваших корреспондентов на Вашем IM-"
+"мессенджере или в GTalk."
 
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:143
 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 ""
-"Посылать мне записи через СМС; я понимаю, что это может привести к расходам "
-"по пересылке."
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr "Публиковать запись, когда мой Jabber/GTalk - статус изменяется."
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:153
 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 lib/facebookaction.php:215
-msgid "Settings"
-msgstr "Настройки"
-
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
-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
-#: actions/finishaddopenid.php:114
-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
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
-msgstr "Случилось что-то странное."
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
-msgstr "Простите, входящих писем нет."
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
-msgstr "Простите, это не Ваш входящий электронный адрес."
-
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
-msgid "Source"
-msgstr "Исходник"
-
-#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
-msgid "Statistics"
-msgstr "Статистика"
-
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-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
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
-msgid "Subscribe"
-msgstr "Подписаться"
-
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
-msgid "Subscribers"
-msgstr "Подписчики"
-
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
-msgid "Subscription authorized"
-msgstr "Подписка авторизована"
-
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
-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
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
-msgid "Subscriptions"
-msgstr "Подписки"
-
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
-msgid "System error uploading file."
-msgstr "Системная ошибка при загрузке файла."
-
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
-#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
-msgid "Tags"
-msgstr "Теги"
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "Текст"
-
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
-msgid "Text search"
-msgstr "Поиск текста"
-
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
-msgstr "Это не Ваш OpenID."
-
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
-msgstr "Этот адрес уже подтверждён."
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Опубликовать MicroID для моего Jabber/GTalk - адреса."
 
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
-msgstr "Это не Ваш код подтверждения!"
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "Не Jabber ID."
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr "Этот электронный адрес уже задействован другим пользователем."
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr "Не удаётся стандартизировать этот Jabber ID"
 
-#: ../actions/avatar.php:80 actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
-msgstr "Это слишком большой файл."
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "Неверный код Jabber ID"
 
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "Это уже Ваш Jabber ID."
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
-msgid "That is already your email address."
-msgstr "Это уже Ваш электронный адрес."
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr "Этот Jabber ID уже используется другим пользователем."
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
-msgid "That is already your phone number."
-msgstr "Это уже ваш номер телефона."
+#: actions/imsettings.php:327
+#, 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/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "Это не Ваш Jabber ID."
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
-msgid "That is not your email address."
-msgstr "Это не Ваш электронный адрес."
-
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
-msgstr "Это не Ваш номер телефона."
-
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-#: actions/emailsettings.php:367 actions/imsettings.php:349
-msgid "That is the wrong IM address."
-msgstr "Это неверный IM-адрес."
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
-msgstr "Это неверный номер подтверждения."
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-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
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-msgid "That's too long. Max notice size is 140 chars."
-msgstr "Слишком длинная запись. Максимальная длина - 140 знаков."
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "Слишком длинная запись. Максимальная длина - 255 знаков."
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr "Входящие для %s - страница %d"
 
-#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/inbox.php:62
 #, php-format
-msgid "The address \"%s\" has been confirmed for your account."
-msgstr "Адрес \"%s\" подтвержден для вашего аккаунта."
+msgid "Inbox for %s"
+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
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
-msgid "The address was removed."
-msgstr "Адрес удалён."
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
+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:"
+#: actions/invite.php:39
+msgid "Invites have been disabled."
 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."
+#: actions/invite.php:41
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
 msgstr ""
-"Подписка отвергнута, но нет обратного URL. Проверьте инструкции на сайте, "
-"чтобы полностью отказаться от подписки."
+"Вы должны авторизоваться, чтобы приглашать других пользователей следовать за "
+"%s"
 
-#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/invite.php:72
 #, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr "Это пользователи, которые читают записи %s."
+msgid "Invalid email address: %s"
+msgstr "Неверный электронный адрес: %s"
 
-#: ../actions/subscribers.php:33 actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr "Это пользователи, которые читают ваши записи."
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
+msgstr "Приглашение(я) отослано(ы)"
 
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
-#, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr "Это пользователи, записи которых читает %s."
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr "Пригласить новых пользователей"
 
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr "Это пользователи, записи которых вы читаете."
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr "Вы уже подписаны на пользователя:"
+
+#: actions/invite.php:131 actions/invite.php:139
+#, php-format
+msgid "%s (%s)"
+msgstr ""
 
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:136
 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
-#: actions/finishopenidlogin.php:67
-#, 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 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-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 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
-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
-#: actions/profilesettings.php:138
-msgid "Timezone"
-msgstr "Часовой пояс"
-
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
-msgid "Timezone not selected."
-msgstr "Часовой пояс не выбран."
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
+msgstr "Приглашение(я) отослано(ы) следующим адресатам:"
 
-#: ../actions/remotesubscribe.php:43
-#, php-format
+#: actions/invite.php:150
 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."
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 msgstr ""
-"Чтобы подписаться, необходимо [авторизоваться](%%action.login%%) или "
-"[зарегистрировать](%%action.register%%) новый аккаунт."
-
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
-msgid "Two user ids or screen_names must be supplied."
-msgstr "Надо представить два имени пользователя или кода."
-
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "Адрес твоей страницы, дневника или профиля на другом портале"
-
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-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 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-msgid "Unexpected form submission."
-msgstr "Нетиповое подтверждение формы."
-
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
-msgid "Unexpected password reset."
-msgstr "Нетиповая переустановка пароля."
-
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-msgid "Unknown action"
-msgstr "Неизвестное действие"
-
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-msgid "Unknown version of OMB protocol."
-msgstr "Неизвестная версия OMB-протокола."
+"Мы сообщим Вам, если приглашения будут приняты и вновь приглашенные "
+"зарегистрируются на сайте. Спасибо за помощь в росте нашего сообщества!"
 
-#: ../lib/util.php:269 lib/util.php:285
+#: actions/invite.php:162
 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:90
-#, php-format
-msgid "Unrecognized address type %s"
-msgstr "Нераспознанный тип адреса %s"
+"Use this form to invite your friends and colleagues to use this service."
+msgstr "В этой форме ты можешь пригласить друзей и коллег на этот сервис."
 
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
-msgstr "Отписаться"
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "Почтовый адрес"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-msgid "Unsupported OMB version"
-msgstr "Неподдерживаемая версия OMB"
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr "Адреса друзей, которых ты хочешь пригласить (по одному на строчку)"
 
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
-msgid "Unsupported image file format."
-msgstr "Неподдерживаемый формат файла изображения."
+#: actions/invite.php:192
+msgid "Personal message"
+msgstr "Личное сообщение"
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
-msgstr "Обновления по СМС"
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
+msgstr "Можно добавить к приглашению личное сообщение."
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
-msgstr "Обновлено по IM"
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
+msgstr "ОК"
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/invite.php:226
 #, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr "Обновлено от %1$s и его друзей на %2$s!"
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s пригласил вас присоединиться к нему на %2$s"
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/invite.php:228
 #, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr "Обновлено от %1$s на %2$s!"
-
-#: ../actions/avatar.php:68 actions/profilesettings.php:161
-#: actions/avatarsettings.php:162 actions/grouplogo.php:232
-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."
+"%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/settingsaction.php:91
-msgid "Upload a new profile image"
-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/invite.php:114 actions/invite.php:121 actions/invite.php:154
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
-msgstr "В этой форме ты можешь пригласить друзей и коллег на этот сервис."
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
+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/joingroup.php:90 lib/command.php:217
+msgid "You are already a member of that group"
+msgstr "Вы уже являетесь членом этой группы"
 
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
-msgid "User being listened to doesn't exist."
-msgstr "Пользователь отслеживает несуществующее."
+#: actions/joingroup.php:128 lib/command.php:234
+#, php-format
+msgid "Could not join user %s to group %s"
+msgstr "Не удаётся присоеденить пользователя %s к группе %s"
 
-#: ../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
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-msgid "User has no profile."
-msgstr "У пользователя нет профиля."
+#: actions/joingroup.php:135 lib/command.php:239
+#, php-format
+msgid "%s joined group %s"
+msgstr "%s вступил в группу %s"
 
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
-msgstr "Имя пользователя."
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
+msgstr "Вы должны авторизоваться, чтобы покинуть группу."
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr "Пользователь не найден."
+#: actions/leavegroup.php:90 lib/command.php:268
+msgid "You are not a member of that group."
+msgstr "Вы не являетесь членом этой группы."
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
-msgid "What timezone are you normally in?"
-msgstr "В каком часовом поясе Вы обычно находитесь?"
+#: actions/leavegroup.php:119 lib/command.php:278
+msgid "Could not find membership record."
+msgstr "Не удаётся найти учетную запись."
 
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: actions/leavegroup.php:127 lib/command.php:284
 #, 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
-#: actions/profilesettings.php:119
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Где вы находитесь, например «Город, область, страна»"
+msgid "Could not remove user %s to group %s"
+msgstr "Не удаётся удалить пользователя %s из группы %s"
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
-msgid "Wrong image type for '%s'"
-msgstr "Неверный тип изображения для '%s'"
+msgid "%s left group %s"
+msgstr "%s покинул группу %s"
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
-#, php-format
-msgid "Wrong size image at '%s'"
-msgstr "Неверный размер изображения для '%s'"
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "Уже авторизован."
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
-msgid "Yes"
-msgstr "Да"
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Неверный контент записи"
 
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-msgid "You already have this OpenID!"
-msgstr "У Вас уже есть такой OpenID!"
+#: actions/login.php:143
+msgid "Incorrect username or password."
+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/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
+msgstr "Ошибка в установках пользователя."
 
-#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
-msgstr "Вы уже авторизованы!"
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "Вход"
 
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-msgid "You are already subscribed to these users:"
-msgstr "Вы уже подписаны на пользователя:"
+#: actions/login.php:243
+msgid "Login to site"
+msgstr "Авторизоваться"
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
-msgid "You are not friends with the specified user."
-msgstr "Вы не являетесь другом для этого пользователя."
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Имя"
 
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr "Вы можете поменять Ваш пароль здесь. Выберите другой!"
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Пароль"
 
-#: ../actions/register.php:135 actions/register.php:145
-msgid "You can create a new account to start posting notices."
-msgstr ""
-"Вы можете создать новый аккаунт, чтобы начать писать записи в вашем "
-"микроблоге."
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "Запомнить меня"
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-"Вы можете отправлять СМС-сообщения по электронному адресу от %%site.name%%."
+#: actions/login.php:253 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
+msgstr "Автоматическии входить в дальнейшем. Не для общедоступных компьютеров!"
 
-#: ../actions/openidsettings.php:86
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr "Вы можете удалить OpenID из своего аккаунта, нажав на кнопку \"Убрать\". "
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "Потеряли или забыли пароль?"
 
-#: ../actions/imsettings.php:28 actions/imsettings.php:28
-#, php-format
+#: actions/login.php:282
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
 msgstr ""
-"Вы можете отправлять и получать записи через Jabber/GTalk "
-"[онлайн-мессенджер](%%doc.im%%). Настройте ваш аккаунт и предпочтения ниже."
+"По причинам сохранения безопасности введите имя и пароль ещё раз, прежде чем "
+"изменять Ваши установки."
 
-#: ../actions/profilesettings.php:27
+#: actions/login.php:286
+#, fuzzy, php-format
 msgid ""
-"You can update your personal profile info here so people know more about you."
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
 msgstr ""
-"Вы можете обновить ваш профиль ниже, так что люди узнают о вас немного "
-"больше."
-
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
-msgstr "Вы можете использовать локальную подписку!"
+"Вход с вашим ником и паролем. Нет аккаунта? [Зарегистрируйте](%%action."
+"register%%) новый аккаунт, или попробуйте авторизоваться при помощи [OpenID]"
+"(%%action.openidlogin%%). "
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
-msgid "You can't register if you don't agree to the license."
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
 msgstr ""
-"Вы не можете зарегистрироваться, если Вы не подтверждаете лицензионного "
-"соглашения."
 
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
-msgid "You did not send us that profile"
-msgstr "Вы не посылали нам этот профиль."
-
-#: ../lib/mail.php:147
+#: actions/makeadmin.php:95
 #, 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"
+msgid "%s is already an admin for group \"%s\"."
 msgstr ""
-"У Вас новый адрес постинга на %1$s.\n"
-"\n"
-"Посылайте электронные письма на %2$s для постинга новых записей.\n"
-"\n"
-"Инструкции по электронным публикациям записей на %3$s.\n"
-"\n"
-"Искренне Ваш,\n"
-"%4$s"
-
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
-msgid "You may not delete another user's status."
-msgstr "Вы не можете удалять статус других пользователей."
 
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/makeadmin.php:132
 #, 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 actions/invite.php:142
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+msgid "Can't get membership record for %s in group %s"
 msgstr ""
-"Мы сообщим Вам, если приглашения будут приняты и вновь приглашенные "
-"зарегистрируются на сайте. Спасибо за помощь в росте нашего сообщества!"
-
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr "Вы идентифицированны. Введите новый пароль ниже."
 
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
-msgid "Your OpenID URL"
-msgstr "Адрес (URL) Вашего OpenID"
-
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
-msgstr "Ваше имя на этом сервере или электронный адрес регистрации."
-
-#: ../actions/openidsettings.php:28
+#: actions/makeadmin.php:145
 #, php-format
-msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
-"account.  Manage your associated OpenIDs from here."
+msgid "Can't make %s an admin for group %s"
 msgstr ""
-"[OpenID](%%doc.openid%%) позволяет вам авторизоваться на многих сайтах при "
-"помощи только лишь одного аккаунта.  Управляйте вашим ассоциированным "
-"аккаунтом OpenIDs отсюда."
-
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
-msgid "a few seconds ago"
-msgstr "пару секунд назад"
-
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
-#, php-format
-msgid "about %d days ago"
-msgstr "около %d дня(ей) назад"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
-#, php-format
-msgid "about %d hours ago"
-msgstr "около %d часа(ов) назад"
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr "Нет текущего статуса"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
-#, php-format
-msgid "about %d minutes ago"
-msgstr "около %d минут(ы) назад"
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr "Новая группа"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
-#, php-format
-msgid "about %d months ago"
-msgstr "около %d месяца(ев) назад"
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
+msgstr "Используйте эту форму для создания новой группы."
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
-msgid "about a day ago"
-msgstr "около дня назад"
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr "Новое сообщение"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
-msgid "about a minute ago"
-msgstr "около минуты назад"
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
+msgstr "Вы не можете послать сообщение этому пользователю."
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
-msgid "about a month ago"
-msgstr "около месяца назад"
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+msgstr "Нет контента!"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
-msgid "about a year ago"
-msgstr "около года назад"
+#: actions/newmessage.php:158
+msgid "No recipient specified."
+msgstr "Нет адресата."
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
-msgid "about an hour ago"
-msgstr "около часа назад"
+#: actions/newmessage.php:164 lib/command.php:370
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly instead."
+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 actions/noticesearch.php:187
-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 actions/noticesearch.php:194
-msgid "reply"
-msgstr "ответить"
-
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-msgid "same as password above"
-msgstr "повторить пароль сверху"
+#: actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "Сообщение"
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
-msgid "unsupported file type"
-msgstr "неподдерживаемый тип файла"
+#: actions/newmessage.php:185 lib/command.php:375
+#, php-format
+msgid "Direct message to %s sent"
+msgstr "Прямое сообщение для %s послано"
 
-#: ../lib/util.php:1309 lib/util.php:1443
-msgid "« After"
-msgstr "Сюда"
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
+msgstr "Ошибка AJAX"
 
-#: 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
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста."
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "Новая запись"
 
-#: actions/disfavor.php:55 actions/disfavor.php:81
-msgid "This notice is not a favorite!"
-msgstr "Эта запись не входит в число ваших любимых записей!"
+#: actions/newnotice.php:199
+msgid "Notice posted"
+msgstr "Запись опубликована"
 
-#: actions/disfavor.php:63 actions/disfavor.php:87
-msgid "Could not delete favorite."
-msgstr "Не удаётся удалить любимую запись."
+#: actions/noticesearch.php:68
+#, php-format
+msgid ""
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
+msgstr ""
+"Поиск по содержанию записей на %%site.name%%. Между ключевыми словами "
+"ставьте пробелы. Минимальная длина слова — 3 буквы."
 
-#: actions/disfavor.php:72 lib/favorform.php:140
-msgid "Favor"
-msgstr "Пометить"
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "Поиск текста"
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
+#: actions/noticesearch.php:91
+#, php-format
+msgid "Search results for \"%s\" on %s"
 msgstr ""
-"Посылать мне сообщение по электронной почте, если кто-нибудь добавит мою "
-"запись в число любимых."
 
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-msgid "Send me email when someone sends me a private message."
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 msgstr ""
-"Посылать мне сообщение по электронной почте, если кто-нибудь пошлёт мне "
-"приватное сообщение."
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
-msgid "This notice is already a favorite!"
-msgstr "Эта запись уже входит в число любимых!"
-
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132 actions/favor.php:86
-#: actions/twitapifavorites.php:125 classes/Command.php:152
-msgid "Could not create favorite."
-msgstr "Не удаётся создать любимую запись."
+#: actions/noticesearch.php:124
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
+msgstr ""
 
-#: actions/favor.php:70
-msgid "Disfavor"
-msgstr "Нелюбимое"
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Обновлено от %1$s на %2$s!"
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/noticesearchrss.php:91
 #, php-format
-msgid "%s favorite notices"
-msgstr "Любимые записи %s"
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Все обновления, соответствующие поисковому запросу «%s»"
 
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
-#, php-format
-msgid "Feed of favorite notices of %s"
-msgstr "Лента любимых записей %s"
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+"Этот пользователь не разрешает \"подталкивать\" его, или ещё не подтверждён "
+"или ещё не представил свой электронный адрес."
 
-#: actions/inbox.php:28 actions/inbox.php:59
-#, php-format
-msgid "Inbox for %s - page %d"
-msgstr "Входящие для %s - страница %d"
+#: actions/nudge.php:94
+msgid "Nudge sent"
+msgstr "\"Подталкивание\" послано"
 
-#: actions/inbox.php:30 actions/inbox.php:62
-#, php-format
-msgid "Inbox for %s"
-msgstr "Входящие для %s"
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr "\"Подталкивание\" отправлено!"
 
-#: actions/inbox.php:53 actions/inbox.php:115
-msgid "This is your inbox, which lists your incoming private messages."
-msgstr ""
-"Это Ваши входящие сообщения, где перечислены входящие приватные сообщения."
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+msgstr "Запись без профиля"
 
-#: actions/invite.php:178 actions/invite.php:213
+#: actions/oembed.php:86 actions/shownotice.php:180
 #, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+msgid "%1$s's status on %2$s"
 msgstr ""
-"%1$s приглашает вас присоединиться к %2$s (%3$s).\n"
-"\n"
 
-#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-msgid "Automatically login in the future; "
-msgstr "Автоматически авторизоваться в дальнейшем."
-
-#: actions/login.php:122 actions/login.php:264
-msgid "For security reasons, please re-enter your "
-msgstr "По причинам безопасности повторите, пожалуйста, ваш пароль"
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Соединить"
 
-#: actions/login.php:126 actions/login.php:268
-msgid "Login with your username and password. "
-msgstr "Вход с вашим ником и паролем."
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
-msgid "That's too long. Max message size is 140 chars."
-msgstr "Слишком длинно. Максимальная длина сообщения - 140 знаков."
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
+msgstr "Неподдерживаемый формат данных."
 
-#: actions/newmessage.php:65 actions/newmessage.php:128
-msgid "No recipient specified."
-msgstr "Нет адресата."
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "Поиск людей"
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206 actions/newmessage.php:131
-#: actions/newmessage.php:168 classes/Command.php:237
-msgid "You can't send a message to this user."
-msgstr "Вы не можете послать сообщение этому пользователю."
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "Поиск в записях"
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "Не посылайте сообщения сами себе; просто потихоньку скажите это себе."
+#: actions/othersettings.php:60
+msgid "Other Settings"
+msgstr "Другие установки"
 
-#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
-msgid "No such user"
-msgstr "Нет такого пользователя"
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr "Управление другими опциями."
 
-#: actions/newmessage.php:117 actions/newmessage.php:67
-msgid "New message"
-msgstr "Новое сообщение"
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
 
-#: actions/noticesearch.php:95 actions/noticesearch.php:146
-msgid "Notice without matching profile"
-msgstr "Запись без соответствующего профиля"
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
+msgstr ""
 
-#: actions/openidsettings.php:28 actions/openidsettings.php:70
-#, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr "[OpenID](%%doc.openid%%) позволяет Вам авторизоваться на многих сайтах"
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
+msgstr "Автоматически использовать выбранный сервис"
 
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
-msgstr "Если вы хотите добавить OpenID к вашему аккаунту,"
+#: actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "Настройки профиля"
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
 msgstr ""
-"Удаление единственного из оставшихся OpenID сделает невозможной авторизацию!"
 
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-msgid "You can remove an OpenID from your account "
-msgstr "Вы можете удалить OpenID из вашего аккаунта"
+#: actions/othersettings.php:153
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Сервис сокращения URL слишком длинный (максимум 50 символов)."
 
-#: actions/outbox.php:28 actions/outbox.php:58
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %s - page %d"
 msgstr "Исходящие для %s - страница %d"
 
-#: actions/outbox.php:30 actions/outbox.php:61
+#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Исходящие для %s"
 
-#: actions/outbox.php:53 actions/outbox.php:116
+#: actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Это ящик Ваших исходящих писем, здесь приватные сообщения, которые отосланы "
 "Вами."
 
-#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
-#, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
-msgstr ""
-"поиск людей на %%site.name%% по их имени, месту жительства или интересам."
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "Изменить пароль"
 
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
-msgid "You can update your personal profile info here "
-msgstr "Вы можете обновить здесь Вашу личную профильную информацию"
+#: actions/passwordsettings.php:69
+msgid "Change your password."
+msgstr "Изменить ваш пароль"
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
-msgid "User without matching profile"
-msgstr "Пользователь без соответствующего профиля"
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+msgid "Password change"
+msgstr "Пароль сохранён."
 
-#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
-msgstr "Код подтверждения слишком старый."
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "Старый пароль"
 
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
-msgstr "Если Вы забыли или потеряли Ваш"
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "Новый пароль"
 
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a "
-msgstr "Вы идентифицированны. Введите "
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6 или больше знаков"
 
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-msgid "Your nickname on this server, "
-msgstr "Ваше имя на этом сервере,"
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "Подтвердить"
 
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-msgid "Instructions for recovering your password "
-msgstr "Инструкции для восстановления Вашего пароля"
+#: actions/passwordsettings.php:113
+msgid "same as password above"
+msgstr "повторить пароль сверху"
 
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
-msgid "New password successfully saved. "
-msgstr "Новый пароль успешно сохранён."
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "Изменить"
 
-#: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:154 actions/register.php:230
 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 actions/remotesubscribe.php:74
-#, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr "Чтобы подписаться, вы должны [авторизоваться](%%action.login%%),"
-
-#: actions/showfavorites.php:61 actions/showfavorites.php:145
-#, php-format
-msgid "Feed for favorites of %s"
-msgstr "Лента любимых записей от %s"
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "Пароли не совпадают."
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-msgid "Could not retrieve favorite notices."
-msgstr "Не удаётся восстановить любимые записи."
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "Некорректный старый пароль"
 
-#: actions/showmessage.php:33 actions/showmessage.php:81
-msgid "No such message."
-msgstr "Нет такого сообщения."
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "Ошибка сохранения пользователя; неверное имя."
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
-msgstr "Только отправитель и получатель могут читать это сообщение."
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "Не удаётся сохранить новый пароль."
 
-#: actions/showmessage.php:61 actions/showmessage.php:108
-#, php-format
-msgid "Message to %1$s on %2$s"
-msgstr "Сообщение для %1$s на %2$s"
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "Пароль сохранён."
 
-#: actions/showmessage.php:66 actions/showmessage.php:113
+#: actions/peoplesearch.php:52
 #, php-format
-msgid "Message from %1$s on %2$s"
-msgstr "Сообщение от %1$s на %2$s"
-
-#: actions/showstream.php:154
-msgid "Send a message"
-msgstr "Отправить сообщение"
+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:312 actions/smssettings.php:464
-#, php-format
-msgid "Mobile carrier for your phone. "
-msgstr "Ваш мобильный оператор."
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "Поиск людей"
 
-#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/peopletag.php:70
 #, php-format
-msgid "Direct messages to %s"
-msgstr "Прямые сообщения для %s"
+msgid "Not a valid people tag: %s"
+msgstr "Неверный тег человека: %s"
 
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/peopletag.php:144
 #, php-format
-msgid "All the direct messages sent to %s"
-msgstr "Все прямые сообщения посланные для %s"
+msgid "Users self-tagged with %s - page %d"
+msgstr "Пользовательские авто-теги от %s - страница %d"
 
-#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-msgid "Direct Messages You've Sent"
-msgstr "Прямые сообщения посланные Вами"
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "Неверный контент записи"
 
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/postnotice.php:90
 #, php-format
-msgid "All the direct messages sent from %s"
-msgstr "Все прямые сообщения от %s"
-
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-msgid "No message text!"
-msgstr "Отсутствует текст сообщения!"
-
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-msgid "Recipient user not found."
-msgstr "Получатель не найден."
-
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
-"Не удаётся посылать прямые сообщения пользователям, которые не являются "
-"Вашими друзьями."
 
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
-#, php-format
-msgid "%s / Favorites from %s"
-msgstr "%s / Любимое от %s"
-
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
-#, php-format
-msgid "%s updates favorited by %s / %s."
-msgstr "%s обновлённые любимые записи от %s / %s."
-
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
-#, php-format
-msgid "%s added your notice as a favorite"
-msgstr "%s добавил вашу запись в состав своих любимых"
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "Настройки профиля"
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
-#, php-format
+#: actions/profilesettings.php:71
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+"You can update your personal profile info here so people know more about you."
 msgstr ""
-"%1$s добавил вашу запись от %2$s в состав своих любимых.\n"
-"\n"
+"Вы можете обновить ваш профиль ниже, так что люди узнают о вас немного "
+"больше."
 
-#: actions/twittersettings.php:27
-msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
-msgstr ""
-"Добавьте ваш аккаунт на Твиттере для автоматической отправки ваших записей "
-"на Твиттер,"
+#: actions/profilesettings.php:99
+msgid "Profile information"
+msgstr "Информация профиля"
 
-#: actions/twittersettings.php:41 actions/twittersettings.php:60
-msgid "Twitter settings"
-msgstr "Установки Твиттера"
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64 латинских строчных буквы или цифры, без пробелов"
 
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-msgid "Twitter Account"
-msgstr "Твиттер аккаунт"
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full name"
+msgstr "Полное имя"
 
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-msgid "Current verified Twitter account."
-msgstr "Текущий проверенный аккаунт на Твиттере."
+#: actions/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "Главная"
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr "Имя на Твиттере"
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "Адрес твоей страницы, дневника или профиля на другом портале"
 
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-msgid "No spaces, please."
-msgstr "Без пробелов, пожалуйста."
+#: actions/profilesettings.php:122 actions/register.php:460
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Опиши себя и свои увлечения при помощи 140 символов"
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
-msgstr "Пароль на Твиттере"
+#: actions/profilesettings.php:125 actions/register.php:463
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Опиши себя и свои интересы при помощи 140 символов."
 
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-msgid "Automatically send my notices to Twitter."
-msgstr "Автоматически отправлять мои записи на Твиттер."
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "Био"
+
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "Месторасположение"
 
-#: actions/twittersettings.php:75 actions/twittersettings.php:146
-msgid "Send local \"@\" replies to Twitter."
-msgstr "Отправлять локальные \"@\"-реплики на Твиттер."
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "Где вы находитесь, например «Город, область, страна»"
 
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-msgid "Subscribe to my Twitter friends here."
-msgstr "Подписаться на моих Твиттер-друзей здесь."
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
+msgstr "Теги"
 
-#: actions/twittersettings.php:122
+#: actions/profilesettings.php:140
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
-"Имя пользователя должно состоят только из цифр, прописных или строчных букв "
-"и символа подчеркивания (_). Всего не более 15 символов."
-
-#: actions/twittersettings.php:128 actions/twittersettings.php:334
-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 "Не удаётся подтвердить данные по аккаунту \"%s\" из Твитера."
-
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-msgid "Unable to save your Twitter settings!"
-msgstr "Не удаётся сохранить Ваши установки по Твиттеру!"
-
-#: actions/twittersettings.php:174 actions/twittersettings.php:376
-msgid "Twitter settings saved."
-msgstr "Установки Твиттера сохранены."
-
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-msgid "That is not your Twitter account."
-msgstr "Это не ваш аккаунт на Твиттере."
-
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
-msgid "Couldn't remove Twitter user."
-msgstr "Не удаётся удалить Твиттер-пользователя."
-
-#: actions/twittersettings.php:212 actions/twittersettings.php:407
-msgid "Twitter account removed."
-msgstr "Твиттер аккаунт удалён."
-
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
-msgid "Couldn't save Twitter preferences."
-msgstr "Не удаётся сохранить предпочтения Твиттера."
+"Теги для самого себя (буквы, цифры, -, ., и _), разделенные запятой или "
+"пробелом"
 
-#: actions/twittersettings.php:245 actions/twittersettings.php:461
-msgid "Twitter preferences saved."
-msgstr "Предпочтения Твиттера сохранены."
+#: actions/profilesettings.php:144
+msgid "Language"
+msgstr "Язык"
 
-#: actions/userauthorization.php:84 actions/userauthorization.php:86
-msgid "Please check these details to make sure "
-msgstr "Для уверенности проверьте эти подробности"
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr "Любимый язык"
 
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
-msgid "The subscription has been authorized, but no "
-msgstr "Эта подписка авторизована, но не"
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr "Часовой пояс"
 
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-msgid "The subscription has been rejected, but no "
-msgstr "Эта подписка удалена, но не"
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
+msgstr "В каком часовом поясе Вы обычно находитесь?"
 
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-msgid "Command results"
-msgstr "Команда исполнена"
+#: actions/profilesettings.php:160
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr "Автоматически подписываться на всех, кто подписался на меня"
 
-#: classes/Channel.php:148 classes/Channel.php:204
-msgid "Command complete"
-msgstr "Команда завершена"
+#: actions/profilesettings.php:221 actions/register.php:223
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Слишком длинное био (максимум 140 символов)."
 
-#: classes/Channel.php:158 classes/Channel.php:215
-msgid "Command failed"
-msgstr "Команда неудачна"
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr "Часовой пояс не выбран."
 
-#: classes/Command.php:39 classes/Command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Простите, эта команда ещё не выполнена."
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr "Слишком длинный язык (более 50 символов). "
 
-#: classes/Command.php:96 classes/Command.php:113
+#: actions/profilesettings.php:246 actions/tagother.php:178
 #, php-format
-msgid "Subscriptions: %1$s\n"
-msgstr "Подписки: %1$s\n"
-
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
-msgid "User has no last notice"
-msgstr "У пользователя нет записей"
-
-#: classes/Command.php:146 classes/Command.php:166
-msgid "Notice marked as fave."
-msgstr "Запись помечена как любимая."
+msgid "Invalid tag: \"%s\""
+msgstr "Неверный тег: \"%s\""
 
-#: classes/Command.php:166 classes/Command.php:189
-#, php-format
-msgid "%1$s (%2$s)"
-msgstr "%1$s (%2$s)"
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
+msgstr "Не удаётся обновить пользователя для автоподписки."
 
-#: classes/Command.php:169 classes/Command.php:192
-#, php-format
-msgid "Fullname: %s"
-msgstr "Полное имя: %s"
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+msgstr "Не удаётся сохранить профиль."
 
-#: classes/Command.php:172 classes/Command.php:195
-#, php-format
-msgid "Location: %s"
-msgstr "Месторасположение: %s"
+#: actions/profilesettings.php:336
+msgid "Couldn't save tags."
+msgstr "Не удаётся сохранить теги."
 
-#: classes/Command.php:175 classes/Command.php:198
-#, php-format
-msgid "Homepage: %s"
-msgstr "Домашняя страница: %s"
+#: actions/profilesettings.php:344
+msgid "Settings saved."
+msgstr "Настройки сохранены."
 
-#: classes/Command.php:178 classes/Command.php:201
+#: actions/public.php:83
 #, php-format
-msgid "About: %s"
-msgstr "О пользователе: %s"
+msgid "Beyond the page limit (%s)"
+msgstr ""
 
-#: classes/Command.php:200 classes/Command.php:228
-#, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
-msgstr "Сообщение слишком длинное - не больше 140 символов, Вы посылаете %d"
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
+msgstr "Не удаётся вернуть публичный поток."
 
-#: classes/Command.php:214 classes/Command.php:245
+#: actions/public.php:129
 #, php-format
-msgid "Direct message to %s sent"
-msgstr "Прямое сообщение для %s послано"
+msgid "Public timeline, page %d"
+msgstr "Общая лента, страница %d"
 
-#: classes/Command.php:216 classes/Command.php:247
-msgid "Error sending direct message."
-msgstr "Ошибка при отправке прямого сообщения."
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr "Общая лента"
 
-#: classes/Command.php:263 classes/Command.php:300
-msgid "Specify the name of the user to subscribe to"
-msgstr "Определите имя пользователя при подписке на"
+#: actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Лента публичного потока"
 
-#: classes/Command.php:270 classes/Command.php:307
-#, php-format
-msgid "Subscribed to %s"
-msgstr "Подписано на %s"
+#: actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Лента публичного потока"
 
-#: classes/Command.php:288 classes/Command.php:328
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Определите имя пользователя для отписки от"
+#: actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Лента публичного потока"
 
-#: classes/Command.php:295 classes/Command.php:335
+#: actions/public.php:179
 #, php-format
-msgid "Unsubscribed from %s"
-msgstr "Отписано от %s"
-
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
-msgid "Command not yet implemented."
-msgstr "Команда ещё не выполнена."
-
-#: classes/Command.php:313 classes/Command.php:356
-msgid "Notification off."
-msgstr "Оповещение отсутствует."
-
-#: classes/Command.php:315 classes/Command.php:358
-msgid "Can't turn off notification."
-msgstr "Нет оповещения."
-
-#: classes/Command.php:333 classes/Command.php:379
-msgid "Notification on."
-msgstr "Есть оповещение."
-
-#: classes/Command.php:335 classes/Command.php:381
-msgid "Can't turn on notification."
-msgstr "Есть оповещение."
-
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
-msgstr "Команды:\n"
-
-#: classes/Message.php:53 classes/Message.php:56
-msgid "Could not insert message."
-msgstr "Не удаётся вставить сообщение."
-
-#: classes/Message.php:63 classes/Message.php:66
-msgid "Could not update message with new URI."
-msgstr "Не удаётся обновить сообщение с новым URI."
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
-msgstr "Пользователь без соответствующего профиля в системе."
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
 
-#: lib/mail.php:147 lib/mail.php:289
+#: actions/public.php:186
 #, php-format
 msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+"Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
-"У Вас новый адрес постинга на %1$s.\n"
-"\n"
 
-#: lib/mail.php:249 lib/mail.php:508
-#, php-format
-msgid "New private message from %s"
-msgstr "Новое приватное сообщение от %s"
-
-#: lib/mail.php:253 lib/mail.php:512
+#: actions/public.php:233
 #, php-format
 msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
-"%1$s (%2$s) послал Вам приватное сообщение:\n"
-"\n"
-
-#: lib/mailbox.php:43 lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "Только сам пользователь может читать собственный почтовый ящик."
-
-#: lib/openid.php:195 lib/openid.php:203
-msgid "This form should automatically submit itself. "
-msgstr "Это форма для автоматического подтверждения."
+"%%site.name%% - это сайт для [микроблогинга](http://ru.wikipedia.org/wiki/"
+"Микроблоггинг), созданный с использованием свободного программного "
+"обеспечения [StatusNet](http://status.net/). [Стань участником](%%action."
+"register%%), чтобы держать в курсе своих  событий  поклонников, друзей, "
+"родственников и коллег! ([Читать далее](%%doc.help%%))"
 
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-msgid "Favorites"
-msgstr "Любимое"
-
-#: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/public.php:238
 #, php-format
-msgid "%s's favorite notices"
-msgstr "Любимые записи %s"
-
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-msgid "User"
-msgstr "Пользователь"
-
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-msgid "Inbox"
-msgstr "Входящие"
-
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-msgid "Your incoming messages"
-msgstr "Ваши входящие сообщения"
-
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-msgid "Outbox"
-msgstr "Исходящее"
-
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-msgid "Your sent messages"
-msgstr "Ваши исходящие сообщения"
-
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-msgid "Twitter"
-msgstr "Твиттер"
-
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
-msgstr "Опции интеграции с Твиттером"
-
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-msgid "To"
-msgstr "Для"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
+msgstr ""
+"%%site.name%% - это сайт для [микроблогинга](http://ru.wikipedia.org/wiki/"
+"Микроблоггинг), созданный с использованием свободного программного "
+"обеспечения [StatusNet](http://status.net/)."
 
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-msgid "Could not parse message."
-msgstr "Сообщение не удаётся разобрать."
+#: actions/publictagcloud.php:57
+msgid "Public tag cloud"
+msgstr "Общее облако тэгов"
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "%s and friends, page %d"
-msgstr "%s и друзья, страница %d"
-
-#: actions/avatarsettings.php:76
-msgid "You can upload your personal avatar."
-msgstr "Тут вы можете загрузить свой аватар."
-
-#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
-msgid "Avatar settings"
-msgstr "Настройки аватара"
-
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-msgid "Original"
-msgstr "Оригинал"
-
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-msgid "Preview"
-msgstr "Просмотр"
-
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
-msgid "Crop"
-msgstr "Обрезать"
-
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-msgid "There was a problem with your session token. "
-msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста."
-
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-msgid "Pick a square area of the image to be your avatar"
-msgstr "Подберите нужный квадратный ракурс дла вашего аватара"
-
-#: actions/avatarsettings.php:327 actions/grouplogo.php:384
-msgid "Lost our file data."
-msgstr "Потеряна информация о файле."
-
-#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
-msgid "Lost our file."
-msgstr "Потерян файл."
-
-#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
-#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
-msgid "Unknown file type"
-msgstr "Неподдерживаемый тип файла"
-
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "Профиль не определен."
-
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "Нет профиля с таким ID."
-
-#: actions/block.php:111
-msgid "Block user"
-msgstr "Заблокировать пользователя."
-
-#: actions/block.php:129
-msgid "Are you sure you want to block this user? "
-msgstr "Вы уверены, что хотите заблокировать этого пользователя?"
-
-#: actions/block.php:162
-msgid "You have already blocked this user."
-msgstr "Вы уже заблокировали этого пользователя."
-
-#: actions/block.php:167
-msgid "Failed to save block information."
-msgstr "Не удаётся сохранить информацию о блокировании."
+msgid "These are most popular recent tags on %s "
+msgstr "Самые популярные тэги на %s на текущий момент"
 
-#: actions/confirmaddress.php:159
+#: actions/publictagcloud.php:69
 #, php-format
-msgid "The address \"%s\" has been "
-msgstr "Адрес %s был успешно подтверждён для вашего аккаунта."
-
-#: actions/deletenotice.php:73
-msgid "You are about to permanently delete a notice. "
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
-"Вы окончательно удаляете запись. После того, как это будет сделано, "
-"восстановление будет невозможно."
 
-#: actions/disfavor.php:94
-msgid "Add to favorites"
-msgstr "Добавить в любимые"
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
+msgstr ""
 
-#: actions/editgroup.php:54
+#: actions/publictagcloud.php:75
 #, php-format
-msgid "Edit %s group"
-msgstr "Изменить информацию о группе %s"
-
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-msgid "Inboxes must be enabled for groups to work"
-msgstr "Входящие должны быть включены для работы групп"
-
-#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-msgid "You must be logged in to create a group."
-msgstr "Вы должны авторизоваться, чтобы создать новую группу."
-
-#: actions/editgroup.php:87 actions/grouplogo.php:87
-#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
-msgid "No nickname"
-msgstr "Нет названия группы"
-
-#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
-#: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
-msgid "No such group"
-msgstr "Нет такой группы"
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
 
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
-msgid "You must be an admin to edit the group"
-msgstr "Вы должны быть администратором, чтобы изменять информацию о группе"
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
+msgstr "Облако тэгов"
 
-#: actions/editgroup.php:157
-msgid "Use this form to edit the group."
-msgstr "Заполните информацию о группе в следующие поля"
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "Вы уже авторизованы!"
 
-#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
-msgid "Nickname must have only lowercase letters "
-msgstr ""
-"Имя должно состоять только из прописных латинских букв и цифр и не иметь "
-"пробелов"
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "Нет такого кода восстановления."
 
-#: actions/editgroup.php:198 actions/newgroup.php:149
-msgid "description is too long (max 140 chars)."
-msgstr "Слишком длинное описание (максимум 140 символов)"
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "Нет кода восстановления."
 
-#: actions/editgroup.php:218
-msgid "Could not update group."
-msgstr "Не удаётся обновить информацию о группе"
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr "Код восстановления неизвестного пользователя."
 
-#: actions/editgroup.php:226
-msgid "Options saved."
-msgstr "Настройки сохранены"
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "Ошибка, связанная с кодом подтверждения."
 
-#: actions/emailsettings.php:107 actions/imsettings.php:108
-#, php-format
-msgid "Awaiting confirmation on this address. "
-msgstr "В ожидании подтверждения данного адреса."
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
+msgstr "Код подтверждения слишком старый. Попробуйте ещё раз."
 
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-msgid "Make a new email address for posting to; "
-msgstr "Новый электронный адрес для постинга %s"
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
+msgstr "Не удаётся одновить пользователя с подтверждённым электронным адресом."
 
-#: actions/emailsettings.php:157
-msgid "Send me email when someone "
+#: actions/recoverpassword.php:152
+msgid ""
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
 msgstr ""
-"Посылать мне сообщение по электронной почте, если кто-нибудь добавит мою "
-"запись в число любимых."
 
-#: actions/emailsettings.php:168
-msgid "Allow friends to nudge me and send me an email."
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
 msgstr ""
-"Разрешить друзьям \"подталкивать\" меня и посылать мне электронные сообщения."
-
-#: actions/emailsettings.php:321
-msgid "That email address already belongs "
-msgstr "Этот электронный адрес уже используется другим пользователем."
 
-#: actions/emailsettings.php:343
-msgid "A confirmation code was sent to the email address you added. "
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
 msgstr ""
-"Код подтверждения выслан на ваш электронный адрес, который Вы добавили. "
-"Проверьте входящие (а так же папку для спама)."
-
-#: actions/facebookhome.php:110
-msgid "Server error - couldn't get user!"
-msgstr "Ошибка сервера - невозможно достать пользователя!"
 
-#: actions/facebookhome.php:196
-#, php-format
-msgid "If you would like the %s app to automatically update "
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
 msgstr ""
-"Если вы хотите чтобы приложение %s автоматически обновляло ваш Facebook "
-"статус вашими последними записями, вы должны дать своё разрешение на это."
-
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "Разрешить %s обновлять мой Facebook статус"
-
-#: actions/facebookhome.php:218
-msgid "Skip"
-msgstr "Пропустить"
 
-#: actions/facebookhome.php:235
-msgid "No notice content!"
-msgstr "Нет записей!"
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
+msgstr "Ваше имя на этом сервере или электронный адрес регистрации."
 
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-msgid "Pagination"
-msgstr "Пагинация"
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
+msgstr "Восстановление"
 
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-msgid "After"
-msgstr "Сюда"
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "Переустановить пароль"
 
-#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
-msgid "Before"
-msgstr "Туда"
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr "Восстановление пароля"
 
-#: actions/facebookinvite.php:70
-#, php-format
-msgid "Thanks for inviting your friends to use %s"
-msgstr "Спасибо за приглашения друзьям использовать %s"
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
+msgstr "Запрошено восстановление пароля"
 
-#: actions/facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Приглашения отосланы следующим адресатам:"
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
+msgstr "Неизвестное действие"
 
-#: actions/facebookinvite.php:96
-#, php-format
-msgid "You have been invited to %s"
-msgstr "Вас пригласили на %s"
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 или более символов, и не забывайте его!"
 
-#: actions/facebookinvite.php:105
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Пригласите ваших друзей использовать %s"
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Тот же пароль, что и выше"
 
-#: actions/facebookinvite.php:113
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Друзья уже использующие %s"
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "Переустановить"
 
-#: actions/facebookinvite.php:130
-#, php-format
-msgid "Send invitations"
-msgstr "Отправить приглашения"
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "Введите имя или электронный адрес."
 
-#: actions/facebookremove.php:56
-msgid "Couldn't remove Facebook user."
-msgstr "Не удаётся удалить Facebook-пользователя."
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
+msgstr "Нет пользователя с таким электронным адресом или именем."
 
-#: actions/facebooksettings.php:65
-msgid "There was a problem saving your sync preferences!"
-msgstr "Произошла проблема сохранения настроек синхронизации!"
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr "Нет зарегистрированных электронных адресов для этого пользователя."
 
-#: actions/facebooksettings.php:67
-msgid "Sync preferences saved."
-msgstr "Настройки синхронизации сохранены."
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "Ошибка сохранения подтверждённого адреса."
 
-#: actions/facebooksettings.php:90
-msgid "Automatically update my Facebook status with my notices."
+#: actions/recoverpassword.php:325
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
 msgstr ""
-"Автоматически обновлять мой Facebook статус моими записями с %%site.name%%."
-
-#: actions/facebooksettings.php:97
-msgid "Send \"@\" replies to Facebook."
-msgstr "Отправлять \"@\" ответы на Facebook."
-
-#: actions/facebooksettings.php:106
-msgid "Prefix"
-msgstr "Префикс"
+"Инструкции по восстановлению пароля посланы на электронный адрес, который Вы "
+"указали при регистрации вашего аккаунта."
 
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
-msgstr "Присоеденять префикс к записям"
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
+msgstr "Нетиповая переустановка пароля."
 
-#: actions/facebooksettings.php:124
-#, php-format
-msgid "If you would like %s to automatically update "
-msgstr ""
-"Если вы хотите чтобы приложение %s автоматически обновляло ваш Facebook "
-"статус вашими последними записями, вы должны дать своё разрешение на это."
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "Пароль должен быть длиной не менее 6 символов."
 
-#: actions/facebooksettings.php:147
-msgid "Sync preferences"
-msgstr "Настройки синхронизации"
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
+msgstr "Пароль и его подтверждение не совпадают."
 
-#: actions/favor.php:94 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "Разлюбить"
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
+msgstr "Новый пароль успешно сохранён. Вы авторизовались."
 
-#: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
-msgid "Popular notices"
-msgstr "Популярные записи"
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
+msgstr "Простите, регистрация только по приглашению."
 
-#: actions/favorited.php:67
-#, php-format
-msgid "Popular notices, page %d"
-msgstr "Популярные записи, страница %d"
+#: actions/register.php:92
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "Ошибка, связанная с кодом подтверждения."
 
-#: actions/favorited.php:79
-msgid "The most popular notices on the site right now."
-msgstr "Самые популярные записи на %%site.name%% на текущий момент."
+#: actions/register.php:112
+msgid "Registration successful"
+msgstr "Регистрация успешна!"
 
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
-msgid "Featured users"
-msgstr "Особые пользователи"
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "Регистрация"
 
-#: actions/featured.php:71
-#, php-format
-msgid "Featured users, page %d"
-msgstr "Особые пользователи, страница %d"
+#: actions/register.php:135
+msgid "Registration not allowed."
+msgstr "Регистрация недопустима."
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some of the great users on %s"
+#: actions/register.php:198
+msgid "You can't register if you don't agree to the license."
 msgstr ""
-"Список наиболее активных, знаменитых и уважаемых пользователей на "
-"%%%%site.name%%%%"
+"Вы не можете зарегистрироваться, если Вы не подтверждаете лицензионного "
+"соглашения."
 
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
-msgstr "Этот пользователь заблокировал вас на его подписку."
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "Неверный электронный адрес."
 
-#: actions/groupbyid.php:79
-msgid "No ID"
-msgstr "Нет ID"
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "Такой электронный адрес уже задействован."
 
-#: actions/grouplogo.php:138 actions/grouplogo.php:191
-msgid "Group logo"
-msgstr "Логотип группы"
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "Неверное имя или пароль."
 
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
-msgstr "Тут вы можете загрузить логотип для группы."
+#: actions/register.php:342
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+"При помощи этой формы вы можете создать новый аккаунт, чтобы публиковать "
+"короткие сообщения и устанавливать связи с друзьями и коллегами (Есть "
+"[OpenID](http://openid.net/) аккаунт? Тогда используй [OpenID регистрацию](%%"
+"action.openidlogin%%)!)"
 
-#: actions/grouplogo.php:448
-msgid "Logo updated."
-msgstr "Логотип обновлён."
+#: actions/register.php:424
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+"1-64 латинских строчных букв или цифр, без пробелов. Обязательное поле."
 
-#: actions/grouplogo.php:450
-msgid "Failed updating logo."
-msgstr "Неудача при обновлении логотипа."
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr "6 или более символов. Обязательное поле."
 
-#: actions/groupmembers.php:93 lib/groupnav.php:91
-#, php-format
-msgid "%s group members"
-msgstr "Участники группы %s"
+#: actions/register.php:433
+msgid "Same as password above. Required."
+msgstr "Тот же пароль что и сверху. Обязательно."
 
-#: actions/groupmembers.php:96
-#, php-format
-msgid "%s group members, page %d"
-msgstr "Участники группы %s, страница %d"
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "Email"
 
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
-msgstr "Список пользователей, являющихся членами этой группы."
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
+msgstr "Нужна только для обновлений, осведомлений и восстановления пароля."
 
-#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
-msgid "Groups"
-msgstr "Группы"
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
+msgstr "Полное имя, предпочтительно Ваше настоящее имя"
 
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "Группы, страница %d"
+#: actions/register.php:493
+msgid "My text and files are available under "
+msgstr "Мои тексты и файлы находятся под лицензией"
 
-#: actions/groups.php:90
-#, php-format
-msgid "%%%%site.name%%%% groups let you find and talk with "
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
 msgstr ""
-"%%%%site.name%%%% группы помогут вам найти и общаться с людьми по интересам. "
-"Подробнее о группах [читайте тут](%%doc.groups%%). Попробуйте [поискать "
-"существующие группы](%%%%action.groupsearch%%%%) или [создайте новую "
-"группу](%%%%action.newgroup%%%%)."
 
-#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-msgid "Create a new group"
-msgstr "Создать новую группу"
+#: actions/register.php:496
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+", за исключением моей приватной информации: пароля, почты, мессенджера, "
+"телефона."
 
-#: actions/groupsearch.php:57
+#: actions/register.php:537
 #, php-format
 msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
+"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 ""
-"Поиск группы на %%site.name%% по названию, месторасположению или описанию."
-
-#: actions/groupsearch.php:63
-msgid "Group search"
-msgstr "Поиск группы"
+"Наши поздравления, %s! И добро пожаловать на %%%%site.name%%%%. Здесь вы "
+"можете…\n"
+"\n"
+"* Перейти на [ваш микроблог](%s) и опубликовать вашу первую запись.\n"
+"* Добавить ваш [адрес Jabber/GTalk](%%%%action.imsettings%%%%), для "
+"возможности отправлять записи через мгновенные сообщения.\n"
+"* [Найти людей](%%%%action.peoplesearch%%%%), которых вы, возможно, знаете, "
+"или с которыми разделяете одни и те же интересы.\n"
+"* Обновить ваши [настройки профиля](%%%%action.profilesettings%%%%), чтобы "
+"больше рассказать другим о себе.\n"
+"* Прочитать [документацию](%%%%doc.help%%%%), чтобы узнать о возможностях, о "
+"которые вы можете не знать.\n"
+"\n"
+"Спасибо за то, что присоединились к нам, надеемся, что вы получите "
+"удовольствие от использования данного сервиса!"
 
-#: actions/imsettings.php:70
-msgid "You can send and receive notices through "
+#: actions/register.php:561
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
 msgstr ""
-"Вы можете отправлять и получать записи через Jabber/GTalk "
-"[онлайн-мессенджер](%%doc.im%%). Настройте ваш IM аккаунт и предпочтения "
-"ниже."
+"(Вы должный получить письмо с описанием того, как подтвердить свой "
+"электронный адрес.)"
 
-#: actions/imsettings.php:120
+#: actions/remotesubscribe.php:98
 #, php-format
-msgid "Jabber or GTalk address, "
+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 ""
-"Jabber или GTalk - адрес, типа \\\"UserName@example.org\\\". Первым делом "
-"убедитесь, что добавили %s в список Ваших корреспондентов на Вашем "
-"IM-мессенджере или в GTalk."
-
-#: actions/imsettings.php:147
-msgid "Send me replies through Jabber/GTalk "
-msgstr "Посылать мне записи через Jabber/GTalk."
+"Чтобы подписаться, необходимо [авторизоваться](%%action.login%%) или "
+"[зарегистрировать](%%action.register%%) новый аккаунт."
 
-#: actions/imsettings.php:321
-#, php-format
-msgid "A confirmation code was sent "
-msgstr ""
-"Код подтверждения выслан на ваш IM-адрес, который вы добавили. Вы должны "
-"подтвердить %s для рассылки сообщений вам."
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr "Подписаться на пользователя"
 
-#: actions/joingroup.php:65
-msgid "You must be logged in to join a group."
-msgstr "Вы должны авторизоваться для вступления в группу."
+#: actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Подписаться на %s"
 
-#: actions/joingroup.php:95
-msgid "You are already a member of that group"
-msgstr "Вы уже являетесь членом этой группы"
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "Имя пользователя."
 
-#: actions/joingroup.php:128
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Не удаётся присоеденить пользователя %s к группе %s"
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr "Имя пользователя, которому Вы хотите следовать"
 
-#: actions/joingroup.php:135
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s вступил в группу %s"
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "URL профиля"
 
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
-msgstr "Входящие должны быть включены для работы групп."
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "Адрес URL твоего профиля на другом подходящем сервисе микроблогинга"
 
-#: actions/leavegroup.php:65
-msgid "You must be logged in to leave a group."
-msgstr "Вы должны авторизоваться, чтобы покинуть группу."
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
+msgstr "Подписаться"
 
-#: actions/leavegroup.php:88
-msgid "No such group."
-msgstr "Нет такой группы."
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr "Неверный URL профиля (плохой формат)"
 
-#: actions/leavegroup.php:95
-msgid "You are not a member of that group."
-msgstr "Вы не являетесь членом этой группы."
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "Неверный URL профиля (не YADIS-документ)."
 
-#: actions/leavegroup.php:100
-msgid "You may not leave a group while you are its administrator."
-msgstr "Вы не можете покинуть группу, пока являетесь её администратором."
+#: actions/remotesubscribe.php:176
+#, fuzzy
+msgid "That’s a local profile! Login to subscribe."
+msgstr "Это локальный профиль! Авторизуйтесь для подписки."
 
-#: actions/leavegroup.php:130
-msgid "Could not find membership record."
-msgstr "Не удаётся найти учетную запись."
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "Не удаётся получить запрос."
 
-#: actions/leavegroup.php:138
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
 #, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "Не удаётся удалить пользователя %s из группы %s"
+msgid "Replies to %s"
+msgstr "Ответы для %s"
 
-#: actions/leavegroup.php:145
+#: actions/replies.php:127
 #, php-format
-msgid "%s left group %s"
-msgstr "%s покинул группу %s"
-
-#: actions/login.php:225 lib/facebookaction.php:304
-msgid "Login to site"
-msgstr "Авторизоваться"
-
-#: actions/microsummary.php:69
-msgid "No current status"
-msgstr "Нет текущего статуса"
-
-#: actions/newgroup.php:53
-msgid "New group"
-msgstr "Новая группа"
-
-#: actions/newgroup.php:115
-msgid "Use this form to create a new group."
-msgstr "Используйте эту форму для создания новой группы."
-
-#: actions/newgroup.php:177
-msgid "Could not create group."
-msgstr "Не удаётся создать группу."
-
-#: actions/newgroup.php:191
-msgid "Could not set group membership."
-msgstr "Не удаётся назначить членство в группе."
-
-#: actions/newmessage.php:119 actions/newnotice.php:132
-msgid "That's too long. "
-msgstr "Это слишком длинно."
+msgid "Replies to %s, page %d"
+msgstr "Ответы для %s, страница %d"
 
-#: actions/newmessage.php:134
-msgid "Don't send a message to yourself; "
-msgstr "Вы не можете послать сообщение самому себе."
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Лента записей для %s"
 
-#: actions/newnotice.php:166
-msgid "Notice posted"
-msgstr "Запись опубликована"
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Лента записей для %s"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
-msgid "Ajax Error"
-msgstr "Ошибка AJAX"
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Лента записей для %s"
 
-#: actions/nudge.php:85
+#: actions/replies.php:198
+#, php-format
 msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
 msgstr ""
-"Этот пользователь не разрешает \"подталкивать\" его, или ещё не подтверждён "
-"или ещё не представил свой электронный адрес."
-
-#: actions/nudge.php:94
-msgid "Nudge sent"
-msgstr "\"Подталкивание\" послано"
-
-#: actions/nudge.php:97
-msgid "Nudge sent!"
-msgstr "\"Подталкивание\" отправлено!"
-
-#: actions/openidlogin.php:97
-msgid "OpenID login"
-msgstr "OpenID вход"
-
-#: actions/openidsettings.php:128
-msgid "Removing your only OpenID "
-msgstr "Убрать OpenID"
-
-#: actions/othersettings.php:60
-msgid "Other Settings"
-msgstr "Другие установки"
-
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Управление другими опциями."
-
-#: actions/othersettings.php:93
-msgid "URL Auto-shortening"
-msgstr "Автоматическое укорочение длинных URL"
-
-#: actions/othersettings.php:112
-msgid "Service"
-msgstr "Сервис"
-
-#: actions/othersettings.php:113
-msgid "Automatic shortening service to use."
-msgstr "Автоматически использовать выбранный сервис"
-
-#: actions/othersettings.php:144
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "Сервис сокращения URL слишком длинный (максимум 50 символов)."
-
-#: actions/passwordsettings.php:69
-msgid "Change your password."
-msgstr "Изменить ваш пароль"
-
-#: actions/passwordsettings.php:89
-msgid "Password change"
-msgstr "Пароль сохранён."
-
-#: actions/peopletag.php:35
-#, php-format
-msgid "Not a valid people tag: %s"
-msgstr "Неверный тег человека: %s"
 
-#: actions/peopletag.php:47
+#: actions/replies.php:203
 #, php-format
-msgid "Users self-tagged with %s - page %d"
-msgstr "Пользовательские авто-теги от %s - страница %d"
-
-#: actions/peopletag.php:91
-#, php-format
-msgid "These are users who have tagged themselves \"%s\" "
-msgstr "Есть пользователи, которые пометили себя как \"%s\""
-
-#: actions/profilesettings.php:91
-msgid "Profile information"
-msgstr "Информация профиля"
-
-#: actions/profilesettings.php:124
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
 msgstr ""
-"Теги для самого себя (буквы, цифры, -, ., и _), разделенные запятой или "
-"пробелом"
 
-#: actions/profilesettings.php:144
-msgid "Automatically subscribe to whoever "
-msgstr "Автоматически подписываться на всех, кто подписался на меня"
-
-#: actions/profilesettings.php:229 actions/tagother.php:176
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Неверный тег: \"%s\""
-
-#: actions/profilesettings.php:311
-msgid "Couldn't save tags."
-msgstr "Не удаётся сохранить теги."
-
-#: actions/public.php:107
-#, php-format
-msgid "Public timeline, page %d"
-msgstr "Общая лента, страница %d"
-
-#: actions/public.php:173
-msgid "Could not retrieve public stream."
-msgstr "Не удаётся вернуть публичный поток."
-
-#: actions/public.php:220
+#: actions/replies.php:205
 #, php-format
 msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
-"Это сайт %%site.name%%, для [микроблогинга](http://en.wikipedia.org/wiki/"
-"Micro-blogging)"
 
-#: actions/publictagcloud.php:57
-msgid "Public tag cloud"
-msgstr "Общее облако тэгов"
-
-#: actions/publictagcloud.php:63
-#, php-format
-msgid "These are most popular recent tags on %s "
-msgstr "Самые популярные тэги на %s на текущий момент"
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Сообщение для %1$s на %2$s"
 
-#: actions/publictagcloud.php:119
-msgid "Tag cloud"
-msgstr "Облако тэгов"
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "Любимые записи %s, страница %d"
 
-#: actions/register.php:139 actions/register.php:349
-msgid "Sorry, only invited people can register."
-msgstr "Простите, регистрация только по приглашению."
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
+msgstr "Не удаётся восстановить любимые записи."
 
-#: actions/register.php:149
-msgid "You can't register if you don't "
-msgstr ""
-"Вы не можете зарегистрироваться, если вы не согласны лицензионным "
-"соглашением."
+#: actions/showfavorites.php:170
+#, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Лента друзей %s (RSS 1.0)"
 
-#: actions/register.php:286
-msgid "With this form you can create "
-msgstr ""
-"При помощи этой формы вы можете создать новый %%site.name%% аккаунт. (Есть "
-"[OpenID](http://openid.net/) аккаунт? Тогда используй [OpenID "
-"регистрацию](%%action.openidlogin%%)!)"
+#: actions/showfavorites.php:177
+#, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Лента друзей %s (RSS 2.0)"
 
-#: actions/register.php:368
-msgid "1-64 lowercase letters or numbers, "
-msgstr ""
-"Разрешено от 1 до 64 латинских строчных букв или цифр, без пробелов и знаков "
-"пунктуации."
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Лента друзей %s"
 
-#: actions/register.php:382 actions/register.php:386
-msgid "Used only for updates, announcements, "
+#: actions/showfavorites.php:205
+msgid ""
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""
-"Используется только для обновлений, осведомлений и восстановления пароля."
-
-#: actions/register.php:398
-msgid "URL of your homepage, blog, "
-msgstr "Адрес твоей страницы, дневника или профиля на другом портале."
 
-#: actions/register.php:404
-msgid "Describe yourself and your "
-msgstr "Опиши себя и свои интересы при помощи 140 символов."
-
-#: actions/register.php:410
-msgid "Where you are, like \"City, "
-msgstr "Где вы находитесь, например «Город, область, страна»."
-
-#: actions/register.php:432
-msgid " except this private data: password, "
+#: actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
 msgstr ""
-", за исключением моей приватной информации: пароля, почты, мессенджера, "
-"телефона."
 
-#: actions/register.php:471
+#: actions/showfavorites.php:211
 #, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
 msgstr ""
-"Наши поздравления, %s! И добро пожаловать на %%%%site.name%%%%. Здесь вы "
-"можете ...\n"
-"\n"
-"* Перейти на [ваш микроблог](%s) и запостить вашу первую запись.\n"
-"* Добавить ваш [Jabber/GTalk - аккаунт](%%%%action.imsettings%%%%) так что "
-"вы сможете после этого отправлять записи через мессенджеры.\n"
-"* [Искать людей](%%%%action.peoplesearch%%%%), которых вы возможно знаете "
-"или с которыми разделяете одни и те же интересы.\n"
-"* Обновить ваши [профильные настройки](%%%%action.profilesettings%%%%) чтобы "
-"больше рассказать другим о себе.\n"
-"* Прочитать [документацию](%%%%doc.help%%%%) чтобы поподробнее узнать об "
-"особенностях данного вэб сервиса и о том как его использовать.\n"
-"Спасибо за то, что присоединились к нам и надеемся, что вы получите "
-"удовольствие от использования данного сервиса!"
 
-#: actions/register.php:495
-msgid "(You should receive a message by email "
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
 msgstr ""
-"(Вам сразу же послано сообщение по электронной почте, с инструкциями по "
-"тому, как подтвердить свой электронный адрес.)"
 
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
-msgstr "Это локальный профиль! Авторизуйтесь для подписки."
-
-#: actions/replies.php:118
-#, php-format
-msgid "Replies to %s, page %d"
-msgstr "Ответы для %s, страница %d"
-
-#: actions/showfavorites.php:79
-#, php-format
-msgid "%s favorite notices, page %d"
-msgstr "Любимые записи %s, страница %d"
-
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:82 lib/groupnav.php:86
 #, php-format
 msgid "%s group"
 msgstr "Группа %s"
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr "Группа %s, страница %d"
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:218
 msgid "Group profile"
 msgstr "Профиль группы"
 
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
 msgid "URL"
 msgstr "URL"
 
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
 msgid "Note"
 msgstr "Запись"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:293
 msgid "Group actions"
 msgstr "Действия группы"
 
-#: actions/showgroup.php:323
-#, php-format
-msgid "Notice feed for %s group"
+#: actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Лента записей от группы %s"
+
+#: actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Лента записей от группы %s"
+
+#: actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
 msgstr "Лента записей от группы %s"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "Исходящие для %s"
+
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
 msgid "Members"
 msgstr "Участники"
 
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
 #: lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(пока ничего нет)"
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:392
 msgid "All members"
 msgstr "Все участники"
 
-#: actions/showgroup.php:378
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "Статистика"
+
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Создать"
+
+#: actions/showgroup.php:448
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+"**%s** - это группа на сайте %%%%site.name%%%%, предоставляющем сервис "
+"[микроблогинга](http://ru.wikipedia.org/wiki/Микроблоггинг), созданный с "
+"использованием свободного программного обеспечения [StatusNet](http://status."
+"net/). Участники обмениваются короткими сообщениями о своих новостях. "
+"[Зарегистрируйся](%%%%action.register%%%%), чтобы стать участником группы и "
+"получить множество других возможностей! ([Читать далее](%%%%doc.help%%%%))"
+
+#: actions/showgroup.php:454
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
 msgstr ""
-"Это сайт %%site.name%%, для [микроблогинга](http://en.wikipedia.org/wiki/"
-"Micro-blogging)"
+"**%s** - это группа на сайте %%%%site.name%%%%, предоставляющем сервис "
+"[микроблогинга](http://ru.wikipedia.org/wiki/Микроблоггинг) , созданный с "
+"использованием свободного программного обеспечения [StatusNet](http://status."
+"net/). Участники обмениваются короткими сообщениями о своих новостях. "
+
+#: actions/showgroup.php:482
+#, fuzzy
+msgid "Admins"
+msgstr "Настройки"
+
+#: actions/showmessage.php:81
+msgid "No such message."
+msgstr "Нет такого сообщения."
 
 #: actions/showmessage.php:98
-msgid "Only the sender and recipient "
+msgid "Only the sender and recipient may read this message."
 msgstr "Только отправитель и получатель могут читать это сообщение."
 
+#: actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr "Сообщение для %1$s на %2$s"
+
+#: actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr "Сообщение от %1$s на %2$s"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Запись опубликована"
+
 #: actions/showstream.php:73
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "Записи, помеченные %s"
+
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr "Входящие для %s - страница %d"
 
-#: actions/showstream.php:143
-msgid "'s profile"
-msgstr "Профиль"
+#: actions/showstream.php:122
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Лента записей от группы %s"
 
-#: actions/showstream.php:236 actions/tagother.php:77
-msgid "User profile"
-msgstr "Профиль пользователя"
+#: actions/showstream.php:129
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Лента записей для %s"
 
-#: actions/showstream.php:240 actions/tagother.php:81
-msgid "Photo"
-msgstr "Фото"
+#: actions/showstream.php:136
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Лента записей для %s"
 
-#: actions/showstream.php:317
-msgid "User actions"
-msgstr "Действия пользователя"
+#: actions/showstream.php:143
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Лента записей для %s"
 
-#: actions/showstream.php:342
-msgid "Send a direct message to this user"
-msgstr "Послать приватное сообщение этому пользователю."
+#: actions/showstream.php:148
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Исходящие для %s"
 
-#: actions/showstream.php:343
-msgid "Message"
-msgstr "Сообщение"
+#: actions/showstream.php:191
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
 
-#: actions/showstream.php:451
-msgid "All subscribers"
-msgstr "Все подписчики"
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
 
-#: actions/showstream.php:533
-msgid "All groups"
-msgstr "Все группы"
+#: actions/showstream.php:198
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:234
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+"**%s** является зарегистрированным участником %%%%site.name%%%% - сайта для "
+"[микроблогинга](http://ru.wikipedia.org/wiki/Микроблоггинг), созданного с "
+"использованием свободного программного обеспечения [StatusNet](http://status."
+"net/). [Зарегистрируйся](%%%%action.register%%%%), чтобы всегда получать "
+"сообщения  участника **%s** и иметь доступ ко множеству других возможностей! "
+"([Читать далее](%%%%doc.help%%%%))"
 
-#: actions/showstream.php:542
+#: actions/showstream.php:239
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
 msgstr ""
-"**%s** имеет аккаунт на %%%%site.name%%%%, сервисе для "
-"[микроблогинга](http://en.wikipedia.org/wiki/Micro-blogging). "
-"[Присоеденяйся](%%%%action.register%%%%) и получи возможность быть всегда в "
-"курсе всего самого интересного в жизни **%s**. ([Читать "
-"больше](%%%%doc.help%%%%))"
+"**%s** является зарегистрированным участником %%%%site.name%%%% - сайта для "
+"[микроблогинга](http://ru.wikipedia.org/wiki/Микроблоггинг), созданного с "
+"использованием свободного программного обеспечения [StatusNet](http://status."
+"net/)."
+
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "Установки СМС"
 
-#: actions/smssettings.php:128
-msgid "Phone number, no punctuation or spaces, "
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+"Вы можете отправлять СМС-сообщения по электронному адресу от %%site.name%%."
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Страница недоступна для того типа, который Вы задействовали."
+
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+"Подтверждённый в настоящее время SMS-доступный номер мобильного телефона."
+
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
+msgstr "В ожидании подтверждения данного номера телефона."
+
+#: actions/smssettings.php:130
+msgid "Confirmation code"
+msgstr "Код подтверждения"
+
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
+msgstr "Введите код, который вы получили по телефону."
+
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
+msgstr "Номер телефона для СМС"
+
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Номер телефона, без пробелов, с кодом зоны"
 
-#: actions/smssettings.php:162
-msgid "Send me notices through SMS; "
+#: actions/smssettings.php:174
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
 msgstr ""
 "Посылать мне записи через СМС; я понимаю, что это может привести к расходам "
 "по пересылке."
 
-#: actions/smssettings.php:335
-msgid "A confirmation code was sent to the phone number you added. "
-msgstr "В ожидании подтверждения данного номера телефона."
+#: actions/smssettings.php:306
+msgid "No phone number."
+msgstr "Нет номера телефона."
+
+#: actions/smssettings.php:311
+msgid "No carrier selected."
+msgstr "Провайдер не выбран."
+
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
+msgstr "Это уже ваш номер телефона."
+
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
+msgstr "Этот телефонный номер уже задействован другим пользователем."
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"Код подтверждения выслан на мобильный номер, который вы добавили.  "
+"Посмотрите Ваши входящие сообщения (и папку для спама тоже!) для нахождения "
+"этого кода и инструкций по его использованию."
+
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
+msgstr "Это неверный номер подтверждения."
+
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
+msgstr "Это не Ваш номер телефона."
+
+#: actions/smssettings.php:465
 msgid "Mobile carrier"
 msgstr "Выбор провайдера"
 
+#: actions/smssettings.php:469
+msgid "Select a carrier"
+msgstr "Выбор провайдера"
+
+#: actions/smssettings.php:476
+#, 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 ""
+"Провайдер Вашего мобильного телефона. Если вы знаете провайдера, который "
+"принимает CVC при помощи электронных адресов и которого нет в списке ниже, "
+"то пошлите нам об этом электронное сообщение %s."
+
+#: actions/smssettings.php:498
+msgid "No code entered"
+msgstr "Код не введён"
+
 #: actions/subedit.php:70
 msgid "You are not subscribed to that profile."
 msgstr "Вы не подписаны на этот профиль."
@@ -4300,14 +3067,32 @@ msgid "%s subscribers, page %d"
 msgstr "%s подписчики, страница %d"
 
 #: actions/subscribers.php:63
-msgid "These are the people who listen to "
-msgstr "Это пользователи, которые читают записи %s."
+msgid "These are the people who listen to your notices."
+msgstr "Это пользователи, которые читают ваши записи."
 
 #: actions/subscribers.php:67
 #, php-format
-msgid "These are the people who "
+msgid "These are the people who listen to %s's notices."
 msgstr "Это пользователи, которые читают записи %s."
 
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
+msgstr ""
+
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr ""
+
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
 #: actions/subscriptions.php:52
 #, php-format
 msgid "%s subscriptions"
@@ -4319,27 +3104,36 @@ msgid "%s subscriptions, page %d"
 msgstr "Подписки %s, страница %d"
 
 #: actions/subscriptions.php:65
-msgid "These are the people whose notices "
-msgstr "Это пользователи, записи которых читает %s."
+msgid "These are the people whose notices you listen to."
+msgstr "Это пользователи, записи которых вы читаете."
 
 #: actions/subscriptions.php:69
 #, php-format
-msgid "These are the people whose "
-msgstr "Это пользователи, которые читают записи %s."
+msgid "These are the people whose notices %s listens to."
+msgstr "Это пользователи, записи которых читает %s."
+
+#: actions/subscriptions.php:121
+#, php-format
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
+msgstr ""
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s теперь просматривает твои записи на %2$s."
+
+#: actions/subscriptions.php:194
 msgid "Jabber"
 msgstr "Jabber"
 
-#: actions/tag.php:43
-#, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Записи, помеченные %s, страница %d"
-
-#: actions/tag.php:66
-#, php-format
-msgid "Messages tagged \"%s\", most recent first"
-msgstr "Записи, помеченные \"%s\", в хронологическом порядке"
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
+msgstr "СМС"
 
 #: actions/tagother.php:33
 msgid "Not logged in"
@@ -4354,11 +3148,19 @@ msgstr "Нет ID аргумента."
 msgid "Tag %s"
 msgstr "Тэги %s"
 
+#: actions/tagother.php:77 lib/userprofile.php:75
+msgid "User profile"
+msgstr "Профиль пользователя"
+
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
+msgstr "Фото"
+
 #: actions/tagother.php:141
 msgid "Tag user"
 msgstr "Тэги для пользователя"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4366,243 +3168,889 @@ msgstr ""
 "Теги для этого пользователя (буквы, цифры, -, ., и _), разделённые запятой "
 "или пробелом"
 
-#: actions/tagother.php:164
-msgid "There was a problem with your session token."
-msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста."
-
-#: actions/tagother.php:191
+#: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Вы можете помечать тегами только пользователей, на которых подписаны или "
 "которые подписаны на Вас."
 
-#: actions/tagother.php:198
+#: actions/tagother.php:200
 msgid "Could not save tags."
 msgstr "Не удаётся сохранить теги."
 
-#: actions/tagother.php:233
+#: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Используйте эту форму для добавления тегов Вашим подписчикам или подписантам."
 
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Записи, помеченные %s, страница %d"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Лента записей для %s"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Лента записей для %s"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Лента записей для %s"
+
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Нет такого тега."
 
-#: actions/tagrss.php:66
-#, php-format
-msgid "Microblog tagged with %s"
-msgstr "Микроблог помеченный для %s"
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
+msgstr "Метод API реконструируется."
 
-#: actions/twitapiblocks.php:47
-msgid "Block user failed."
-msgstr "Неудача при блокировке пользователя."
+#: actions/unsubscribe.php:77
+msgid "No profile id in request."
+msgstr "Нет ID профиля в запросе."
 
-#: actions/twitapiblocks.php:69
-msgid "Unblock user failed."
-msgstr "Неудача при разблокировке пользователя."
+#: actions/unsubscribe.php:84
+msgid "No profile with that id."
+msgstr "Нет профиля с таким ID."
 
-#: actions/twitapiusers.php:48
-msgid "Not found."
-msgstr "Не найдено."
+#: actions/unsubscribe.php:98
+msgid "Unsubscribed"
+msgstr "Отписано"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "Авторизовать подписку"
 
-#: actions/twittersettings.php:71
-msgid "Add your Twitter account to automatically send "
+#: actions/userauthorization.php:110
+#, fuzzy
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
 msgstr ""
-"Добавьте ваш аккаунт на Твиттере для автоматической отправки ваших записей "
-"на Твиттер, и подпишитесь на друзей с Твиттера, которые уже здесь."
+"Пожалуйста, отметьте эти подробности, чтобы быть уверенным, что вы хотите "
+"подписаться на эти записи. Если Вы этого не хотите делать, то нажмите \"Отказ"
+"\"."
+
+#: actions/userauthorization.php:188
+#, fuzzy
+msgid "License"
+msgstr "лицензия."
+
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "Принять"
+
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Подписаться на %s"
+
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "Отбросить"
+
+#: actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "Подписки %s"
+
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
+msgstr "Не авторизованный запрос!"
 
-#: actions/twittersettings.php:119
-msgid "Twitter user name"
-msgstr "Имя Твиттер-пользователя"
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+msgstr "Подписка авторизована"
 
-#: actions/twittersettings.php:126
-msgid "Twitter password"
-msgstr "Твиттер-пароль"
+#: actions/userauthorization.php:249
+#, fuzzy
+msgid ""
+"The subscription has been authorized, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to authorize the "
+"subscription. Your subscription token is:"
+msgstr ""
+"Подписка авторизована, но нет обратного URL. Посмотрите инструкции на сайте "
+"о том, как авторизовать подписку. Ваш подписочный купон: "
 
-#: actions/twittersettings.php:228
-msgid "Twitter Friends"
-msgstr "Твиттер-друзья"
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
+msgstr "Подписка отменена"
 
-#: actions/twittersettings.php:327
-msgid "Username must have only numbers, "
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
 msgstr ""
-"Имя пользователя должно состоят только из цифр, прописных или строчных букв "
-"и символа подчеркивания (_). Всего не более 15 символов."
+"Подписка отвергнута, но нет обратного URL. Проверьте инструкции на сайте, "
+"чтобы полностью отказаться от подписки."
 
-#: actions/twittersettings.php:341
+#: actions/userauthorization.php:296
 #, php-format
-msgid "Unable to retrieve account information "
-msgstr "Не удаётся подтвердить данные по аккаунту от \"%s\" из Твитера."
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
 
-#: actions/unblock.php:108
-msgid "Error removing the block."
-msgstr "Ошибка при удалении данного блока."
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
 
-#: actions/unsubscribe.php:50
-msgid "No profile id in request."
-msgstr "Нет ID профиля в запросе."
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
 
-#: actions/unsubscribe.php:57
-msgid "No profile with that id."
-msgstr "Нет профиля с таким ID."
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
 
-#: actions/unsubscribe.php:71
-msgid "Unsubscribed"
-msgstr "Отписано"
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
 
-#: actions/usergroups.php:63
+#: actions/userauthorization.php:343
 #, php-format
-msgid "%s groups"
-msgstr "Группы %s"
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Не удаётся прочитать URL аватары «%s»"
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Неверный тип изображения для '%s'"
+
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr "Нет идентификатора."
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "Настройки профиля"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "Группы %s, страница %d"
 
-#: classes/Notice.php:104
+#: actions/usergroups.php:130
+#, fuzzy
+msgid "Search for more groups"
+msgstr "Искать людей или текст"
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "Вы не являетесь членом этой группы."
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Message.php:55
+msgid "Could not insert message."
+msgstr "Не удаётся вставить сообщение."
+
+#: classes/Message.php:65
+msgid "Could not update message with new URI."
+msgstr "Не удаётся обновить сообщение с новым URI."
+
+#: classes/Notice.php:164
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "Ошибка баз данных при вставке хеш-тегов для %s"
+
+#: classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Проблемы с сохранением записи."
+
+#: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
 msgstr "Проблема при сохранении записи. Неизвестный пользователь."
 
-#: classes/Notice.php:109
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Слишком много записей за столь короткий срок; передохните немного и "
 "попробуйте вновь через пару минут."
 
-#: classes/Notice.php:116
+#: classes/Notice.php:194
+#, fuzzy
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+"Слишком много записей за столь короткий срок; передохните немного и "
+"попробуйте вновь через пару минут."
+
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr "Вам запрещено поститься на этом сайте (бан)"
 
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
+msgstr "Проблемы с сохранением записи."
+
+#: classes/Notice.php:1120
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "Ошибка баз данных при вставке ответа для %s"
+
+#: classes/User.php:347
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Сообщение для %1$s на %2$s"
+
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Профиль"
+
 #: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
+msgstr "Изменить ваши настройки профиля"
+
+#: lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "Загрузить аватар"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr "Изменить ваш пароль"
+
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
+msgstr "Изменить электронный адрес"
+
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:124
+#, fuzzy
+msgid "Design your profile"
+msgstr "Профиль пользователя"
+
+#: lib/accountsettingsaction.php:128
 msgid "Other"
 msgstr "Другое"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:128
 msgid "Other options"
 msgstr "Другие опции"
 
-#: lib/action.php:130
+#: lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr "%s (%s)"
 
-#: lib/action.php:145
+#: lib/action.php:159
 msgid "Untitled page"
 msgstr "Страница без названия"
 
-#: lib/action.php:316
+#: lib/action.php:424
 msgid "Primary site navigation"
 msgstr "Главная навигация"
 
-#: lib/action.php:322
+#: lib/action.php:430
+msgid "Home"
+msgstr "Моё"
+
+#: lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr "Личный профиль и лента друзей"
 
-#: lib/action.php:325
-msgid "Search for people or text"
-msgstr "Искать людей или текст"
-
-#: lib/action.php:328
+#: lib/action.php:432
 msgid "Account"
 msgstr "Настройки"
 
-#: lib/action.php:328
+#: lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr "Изменить ваш email, аватар, пароль, профиль и др."
 
-#: lib/action.php:330
-msgid "Connect to IM, SMS, Twitter"
-msgstr "Соединиться с IM, SMS, Twitter"
+#: lib/action.php:435
+msgid "Connect"
+msgstr "Соединить"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Не удаётся перенаправить на сервер: %s"
+
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
+msgstr "Пригласить"
+
+#: lib/action.php:440 lib/subgroupnav.php:106
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr "Пригласи друзей и коллег стать такими же как ты участниками %s"
 
-#: lib/action.php:332
+#: lib/action.php:445
+msgid "Logout"
+msgstr "Выход"
+
+#: lib/action.php:445
 msgid "Logout from the site"
 msgstr "Выйти"
 
-#: lib/action.php:335
-msgid "Login to the site"
-msgstr "Войти"
-
-#: lib/action.php:338
+#: lib/action.php:450
 msgid "Create an account"
 msgstr "Создать новый аккаунт"
 
-#: lib/action.php:341
-msgid "Login with OpenID"
-msgstr "Войти с OpenID"
+#: lib/action.php:453
+msgid "Login to the site"
+msgstr "Войти"
+
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
+msgstr "Помощь"
 
-#: lib/action.php:344
+#: lib/action.php:456
 msgid "Help me!"
 msgstr "Помощь"
 
-#: lib/action.php:362
+#: lib/action.php:459
+msgid "Search"
+msgstr "Поиск"
+
+#: lib/action.php:459
+msgid "Search for people or text"
+msgstr "Искать людей или текст"
+
+#: lib/action.php:480
 msgid "Site notice"
 msgstr "Новая запись"
 
-#: lib/action.php:417
+#: lib/action.php:546
 msgid "Local views"
 msgstr "Локальные виды"
 
-#: lib/action.php:472
+#: lib/action.php:612
 msgid "Page notice"
 msgstr "Новая запись"
 
-#: lib/action.php:562
+#: lib/action.php:714
 msgid "Secondary site navigation"
 msgstr "Навигация по подпискам"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:721
+msgid "About"
+msgstr "О проекте"
+
+#: lib/action.php:723
+msgid "FAQ"
+msgstr "ЧаВо"
+
+#: lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/action.php:730
+msgid "Privacy"
+msgstr "Пользовательское соглашение"
+
+#: lib/action.php:732
+msgid "Source"
+msgstr "Исходник"
+
+#: lib/action.php:734
+msgid "Contact"
+msgstr "Контакты"
+
+#: lib/action.php:736
+#, fuzzy
+msgid "Badge"
+msgstr "\"Подтолкнуть\""
+
+#: lib/action.php:764
 msgid "StatusNet software license"
 msgstr "StatusNet лицензия"
 
-#: lib/action.php:630
+#: lib/action.php:767
+#, 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/action.php:769
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** — сервис микроблогинга. "
+
+#: lib/action.php:771
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+"Этот сервис работает при помощи [StatusNet](http://status.net/) - "
+"программного обеспечения для микроблогинга, версии %s, доступного под "
+"лицензией [GNU Affero General Public License](http://www.fsf.org/licensing/"
+"licenses/agpl-3.0.html)."
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "StatusNet лицензия"
+
+#: lib/action.php:794
 msgid "All "
 msgstr "Все"
 
-#: lib/action.php:635
+#: lib/action.php:799
 msgid "license."
 msgstr "лицензия."
 
-#: lib/blockform.php:123 lib/blockform.php:153
-msgid "Block this user"
-msgstr "Заблокировать пользователя."
+#: lib/action.php:1052
+msgid "Pagination"
+msgstr "Пагинация"
 
-#: lib/blockform.php:153
-msgid "Block"
-msgstr "Блокировать"
+#: lib/action.php:1061
+msgid "After"
+msgstr "Сюда"
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
-msgid "Disfavor this notice"
-msgstr "Мне не нравиться эта запись"
+#: lib/action.php:1069
+msgid "Before"
+msgstr "Туда"
+
+#: lib/action.php:1117
+msgid "There was a problem with your session token."
+msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста."
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "Профиль"
 
-#: lib/facebookaction.php:268
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
+msgstr "Команда исполнена"
+
+#: lib/channel.php:210
+msgid "Command complete"
+msgstr "Команда завершена"
+
+#: lib/channel.php:221
+msgid "Command failed"
+msgstr "Команда неудачна"
+
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr "Простите, эта команда ещё не выполнена."
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Не удаётся одновить пользователя с подтверждённым электронным адресом."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "\"Подталкивание\" послано"
+
+#: lib/command.php:126
 #, php-format
-msgid "To use the %s Facebook Application you need to login "
-msgstr "Вы должны авторизоваться чтобы использовать %s приложение"
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
 
-#: lib/facebookaction.php:271
-msgid " a new account."
-msgstr "Создать новую учетную запись"
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
 
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-msgid "Published"
-msgstr "Общее"
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
+msgstr "У пользователя нет записей"
+
+#: lib/command.php:190
+msgid "Notice marked as fave."
+msgstr "Запись помечена как любимая."
+
+#: lib/command.php:315
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#: lib/command.php:318
+#, php-format
+msgid "Fullname: %s"
+msgstr "Полное имя: %s"
+
+#: lib/command.php:321
+#, php-format
+msgid "Location: %s"
+msgstr "Месторасположение: %s"
+
+#: lib/command.php:324
+#, php-format
+msgid "Homepage: %s"
+msgstr "Домашняя страница: %s"
+
+#: lib/command.php:327
+#, php-format
+msgid "About: %s"
+msgstr "О пользователе: %s"
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr "Сообщение слишком длинное - не больше 140 символов, Вы посылаете %d"
+
+#: lib/command.php:377
+msgid "Error sending direct message."
+msgstr "Ошибка при отправке прямого сообщения."
+
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "Сообщение слишком длинное - не больше 140 символов, Вы посылаете %d"
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Ответить на эту запись"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Проблемы с сохранением записи."
+
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
+msgstr "Определите имя пользователя при подписке на"
+
+#: lib/command.php:502
+#, php-format
+msgid "Subscribed to %s"
+msgstr "Подписано на %s"
+
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
+msgstr "Определите имя пользователя для отписки от"
+
+#: lib/command.php:530
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr "Отписано от %s"
+
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
+msgstr "Команда ещё не выполнена."
+
+#: lib/command.php:551
+msgid "Notification off."
+msgstr "Оповещение отсутствует."
+
+#: lib/command.php:553
+msgid "Can't turn off notification."
+msgstr "Нет оповещения."
+
+#: lib/command.php:574
+msgid "Notification on."
+msgstr "Есть оповещение."
+
+#: lib/command.php:576
+msgid "Can't turn on notification."
+msgstr "Есть оповещение."
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Не удаётся создать OpenID-форму: %s "
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Вы не подписаны на этот профиль."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Вы не подписаны на этот профиль."
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Не удаётся подписать других на вашу ленту."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Люди подписанные на %s"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Вы не являетесь членом этой группы."
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "Вы не являетесь членом этой группы."
+
+#: lib/command.php:670
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+
+#: lib/common.php:192
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Нет кода подтверждения."
+
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:195
+#, fuzzy
+msgid "Go to the installer."
+msgstr "Войти"
+
+#: lib/connectsettingsaction.php:110
+msgid "IM"
+msgstr "IM"
+
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Обновлено по IM"
+
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
+msgstr "Обновления по СМС"
+
+#: lib/dberroraction.php:60
+msgid "Database error"
+msgstr "Ошибка базы данных"
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Загрузить"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Изменить Ваш пароль"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Соединить"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Поиск"
+
+#: lib/designsettings.php:217
+msgid "Text"
+msgstr "Текст"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Список"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
+msgstr "Мне не нравиться эта запись"
 
 #: lib/favorform.php:114 lib/favorform.php:140
 msgid "Favor this notice"
 msgstr "Мне нравиться эта запись"
 
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr "Пометить"
+
 #: lib/feedlist.php:64
 msgid "Export data"
 msgstr "Экспорт потока записей"
 
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr ""
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr ""
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr ""
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Фильтровать тэги"
@@ -4611,57 +4059,84 @@ msgstr "Фильтровать тэги"
 msgid "All"
 msgstr "Все"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Выбор провайдера"
+
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Тэги"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "Выберите тэг из выпадающего списка"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "Перейти"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "Адрес страницы, дневника или профиля группы на другом портале"
 
-#: lib/groupeditform.php:151
-msgid "Description"
-msgstr "Описание"
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Опиши группу при помощи 140 символов"
 
-#: lib/groupeditform.php:153
-msgid "Describe the group or topic in 140 chars"
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
 msgstr "Опиши группу при помощи 140 символов"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:172
+msgid "Description"
+msgstr "Описание"
+
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr "Где находится группа, например «Город, область, страна»"
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
 msgid "Group"
 msgstr "Группа"
 
-#: lib/groupnav.php:100
-msgid "Admin"
-msgstr "Настройки"
-
 #: lib/groupnav.php:101
+#, fuzzy
+msgid "Blocked"
+msgstr "Блокировать"
+
+#: lib/groupnav.php:102
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Заблокировать пользователя."
+
+#: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
 msgstr "Редактировать информацию о группе %s"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:113
 msgid "Logo"
 msgstr "Логотип"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:114
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "Добавить или изменить логотип группы %s"
 
+#: lib/groupnav.php:120
+#, fuzzy, php-format
+msgid "Add or edit %s design"
+msgstr "Добавить или изменить логотип группы %s"
+
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Группы с наибольшим количеством участников"
@@ -4676,9 +4151,43 @@ msgid "Tags in %s group's notices"
 msgstr "Тэги записей группы %s"
 
 #: lib/htmloutputter.php:104
-msgid "This page is not available in a "
+msgid "This page is not available in a media type you accept"
 msgstr "Страница недоступна для того типа, который Вы задействовали."
 
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Тут вы можете загрузить логотип для группы."
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr "Частичная загрузка."
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr "Системная ошибка при загрузке файла."
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr "Не является изображением или разрушенный файл."
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr "Неподдерживаемый формат файла изображения."
+
+#: lib/imagefile.php:118
+msgid "Lost our file."
+msgstr "Потерян файл."
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr "Неподдерживаемый тип файла"
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr ""
+
 #: lib/joinform.php:114
 msgid "Join"
 msgstr "Авторизация"
@@ -4687,43 +4196,80 @@ msgstr "Авторизация"
 msgid "Leave"
 msgstr "Выйти"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr "Войти с вашим ником и паролем."
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr "Создать новый аккаунт"
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
-msgstr "Войти или зарегистрироваться с OpenID"
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "Только сам пользователь может читать собственный почтовый ящик."
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+msgid "from"
+msgstr "от "
 
-#: lib/mail.php:175
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "Подтверждение электронного адреса"
+
+#: lib/mail.php:174
 #, php-format
 msgid ""
 "Hey, %s.\n"
 "\n"
-msgstr ""
-"Привет, %s.\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%s\n"
+"\n"
+"If not, just ignore this message.\n"
 "\n"
+"Thanks for your time, \n"
+"%s\n"
+msgstr ""
 
-#: lib/mail.php:236
+#: lib/mail.php:235
 #, php-format
-msgid "%1$s is now listening to "
-msgstr "%1$s теперь просматривает твои записи на %2$s."
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr "%1$s сейчас слушает ваши заметки на %2$s."
+
+#: lib/mail.php:240
+#, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
 
-#: lib/mail.php:254
+#: lib/mail.php:253
 #, php-format
 msgid "Location: %s\n"
 msgstr "Месторасположение: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:255
 #, php-format
 msgid "Homepage: %s\n"
 msgstr "Домашняя страница: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
@@ -4732,59 +4278,227 @@ msgstr ""
 "Био: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:285
+#, php-format
+msgid "New email address for posting to %s"
+msgstr "Новый электронный адрес для постинга %s"
+
+#: lib/mail.php:288
+#, 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"
+"Искренне Ваш,\n"
+"%4$s"
+
+#: lib/mail.php:412
+#, php-format
+msgid "%s status"
+msgstr "%s статус"
+
+#: lib/mail.php:438
+msgid "SMS confirmation"
+msgstr "Подтверждение СМС"
+
+#: lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "Вас \"подтолкнул\" пользователь %s"
 
-#: lib/mail.php:465
+#: lib/mail.php:466
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
+msgstr ""
+
+#: lib/mail.php:509
+#, php-format
+msgid "New private message from %s"
+msgstr "Новое приватное сообщение от %s"
+
+#: lib/mail.php:513
 #, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
+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 ""
+
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s добавил вашу запись в состав своих любимых"
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, php-format
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+msgstr ""
+
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
 msgstr ""
-"%1$s (%2$s) интересуется чем Вы занимались последнее время и предлагает Вам "
-"запостить парочку новостей."
 
-#: lib/mail.php:555
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "Не удаётся вернуть публичный поток."
+
+#: lib/mediafile.php:270
 #, php-format
-msgid "%1$s just added your notice from %2$s"
-msgstr "%1$s добавил вашу запись от %2$s в состав своих любимых."
+msgid " Try using another %s format."
+msgstr ""
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
-msgid "From"
-msgstr " из"
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
 
-#: lib/messageform.php:110
+#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Послать прямую запись"
 
-#: lib/noticeform.php:125
-msgid "Send a notice"
-msgstr "Послать запись"
+#: lib/messageform.php:146
+msgid "To"
+msgstr "Для"
 
-#: lib/noticeform.php:152
+#: lib/messageform.php:162 lib/noticeform.php:173
 msgid "Available characters"
 msgstr "6 или больше знаков"
 
-#: lib/noticelist.php:426
-msgid "in reply to"
-msgstr "в ответ на"
+#: lib/noticeform.php:145
+msgid "Send a notice"
+msgstr "Послать запись"
+
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
+msgstr "Что нового, %s?"
+
+#: lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "Нет контента!"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr "Ответить на эту запись"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "Ответить"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
-msgid "Delete this notice"
-msgstr "Удалить эту запись"
-
-#: lib/noticelist.php:474
-msgid "Delete"
-msgstr "Удалить"
-
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "\"Подтолкнуть\" этого пользователя"
@@ -4797,39 +4511,139 @@ msgstr "\"Подтолкнуть\""
 msgid "Send a nudge to this user"
 msgstr "\"Подтолкнуть\" этого пользователя"
 
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "Ошибка при вставке нового профиля"
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "Ошибка при вставке аватара"
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "Ошибка вставки удалённого профиля"
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Удалить запись"
+
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
+msgstr "Не удаётся вставить новую подписку."
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "Личное"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "Ответы"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr "Любимое"
+
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr "Пользователь"
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr "Входящие"
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr "Ваши входящие сообщения"
+
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr "Исходящее"
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr "Ваши исходящие сообщения"
+
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Тэги записей пользователя %s"
 
-#: lib/profilelist.php:182
-msgid "(none)"
-msgstr "(пока ничего нет)"
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "Подписки"
+
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "Все подписки."
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "Подписчики"
+
+#: lib/profileaction.php:157
+msgid "All subscribers"
+msgstr "Все подписчики"
+
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "Пользователь"
+
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "Регистрация"
+
+#: lib/profileaction.php:235
+msgid "All groups"
+msgstr "Все группы"
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Общее"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Группы"
 
-#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Облаго тэгов"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Особые"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Популярное"
 
+#: lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Поиск"
+
+#: lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Поиск"
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "Люди"
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr "Найти человека на этом сайте"
+
 #: lib/searchgroupnav.php:82
 msgid "Notice"
 msgstr "Запись"
 
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr "Найти запись по содержимому"
+
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Найти группы на этом сайте"
@@ -4838,33 +4652,63 @@ msgstr "Найти группы на этом сайте"
 msgid "Untitled section"
 msgstr "Секция без названия"
 
-#: lib/subgroupnav.php:81
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Люди на которых подписан %s"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:91
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Люди подписанные на %s"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Группы, в которых состоит %s"
 
-#: lib/subgroupnav.php:104
-#, php-format
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "В этой форме ты можешь пригласить друзей и коллег на этот сервис."
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(пока ничего нет)"
 
-#: lib/subs.php:53
+#: lib/subs.php:48
+msgid "Already subscribed!"
+msgstr ""
+
+#: lib/subs.php:52
 msgid "User has blocked you."
 msgstr "Пользователь заблокировал Вас."
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Подписаться на %s"
+#: lib/subs.php:56
+msgid "Could not subscribe."
+msgstr "Подписка неудачна."
+
+#: lib/subs.php:75
+msgid "Could not subscribe other to you."
+msgstr "Не удаётся подписать других на вашу ленту."
+
+#: lib/subs.php:124
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Не подписан!"
+
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
+msgstr "Не удаётся удалить подписку."
 
 #: lib/tagcloudsection.php:56
 msgid "None"
@@ -4874,50 +4718,106 @@ msgstr "Нет тэгов"
 msgid "Top posters"
 msgstr "Самые активные"
 
-#: lib/unblockform.php:120 lib/unblockform.php:150
-msgid "Unblock this user"
-msgstr "Разблокировать пользователя."
-
-#: lib/unblockform.php:150
-msgid "Unblock"
-msgstr "Разблокировать"
-
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Отписаться от этого пользователя"
 
-#~ msgid "Code not yet ready."
-#~ msgstr "Код ещё не готов."
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "Отписаться"
 
-#~ msgid "Export and delete your user information."
-#~ msgstr "Экспорт и удаление Вашей пользовательской информации."
+#: lib/userprofile.php:116
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "Аватар"
 
-#~ msgid "Delete my account"
-#~ msgstr "Удалить мой счёт"
+#: lib/userprofile.php:236
+msgid "User actions"
+msgstr "Действия пользователя"
 
-#~ msgid "Delete my account confirmation"
-#~ msgstr "Подтверждение удаления моего счёта"
+#: lib/userprofile.php:248
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Настройки профиля"
 
-#~ msgid "Check if you are sure you want to delete your account."
-#~ msgstr "Пометьте, если уверены, что хотите удалить ваш счёт."
+#: lib/userprofile.php:249
+msgid "Edit"
+msgstr ""
 
-#~ msgid "Showing recently popular notices"
-#~ msgstr "Показ последних популярных заметок"
+#: lib/userprofile.php:272
+msgid "Send a direct message to this user"
+msgstr "Послать приватное сообщение этому пользователю."
+
+#: lib/userprofile.php:273
+msgid "Message"
+msgstr "Сообщение"
+
+#: lib/util.php:821
+msgid "a few seconds ago"
+msgstr "пару секунд назад"
+
+#: lib/util.php:823
+msgid "about a minute ago"
+msgstr "около минуты назад"
+
+#: lib/util.php:825
+#, php-format
+msgid "about %d minutes ago"
+msgstr "около %d минут(ы) назад"
+
+#: lib/util.php:827
+msgid "about an hour ago"
+msgstr "около часа назад"
 
-#~ msgid "Tag a person"
-#~ msgstr "Тег пользователя"
+#: lib/util.php:829
+#, php-format
+msgid "about %d hours ago"
+msgstr "около %d часа(ов) назад"
 
-#~ msgid "List"
-#~ msgstr "Список"
+#: lib/util.php:831
+msgid "about a day ago"
+msgstr "около дня назад"
 
-#~ msgid "Icons"
-#~ msgstr "Иконки"
+#: lib/util.php:833
+#, php-format
+msgid "about %d days ago"
+msgstr "около %d дня(ей) назад"
 
-#~ msgid ""
-#~ "Hey, %s.\n"
-#~ "\n"
-#~ "Someone just entered this email address on %s.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Привет, %s.\n"
-#~ "Кто-то добавил этот электронный адрес для %s."
+#: lib/util.php:835
+msgid "about a month ago"
+msgstr "около месяца назад"
+
+#: lib/util.php:837
+#, php-format
+msgid "about %d months ago"
+msgstr "около %d месяца(ев) назад"
+
+#: lib/util.php:839
+msgid "about a year ago"
+msgstr "около года назад"
+
+#: lib/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "URL Главной страницы неверен."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr "Сообщение не удаётся разобрать."
+
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr "Незарегистрированный пользователь."
+
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr "Простите, это не Ваш входящий электронный адрес."
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr "Простите, входящих писем нет."
diff --git a/locale/statusnet.po b/locale/statusnet.po
index c7ac6ac9b..0d0ea85f6 100644
--- a/locale/statusnet.po
+++ b/locale/statusnet.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-14 10:32-0700\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,4474 +16,2805 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
-#, php-format
-msgid " Search Stream for \"%s\""
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-#: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
-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
-#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
-#: actions/invite.php:218 actions/invite.php:220
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+msgid "No such page"
+msgstr ""
+
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
 msgstr ""
 
-#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/all.php:84
 #, 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 "%s and friends, page %d"
 msgstr ""
 
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
-#: lib/mail.php:236 lib/mail.php:235
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
-msgid "%1$s is now listening to your notices on %2$s."
+msgid "%s and friends"
 msgstr ""
 
-#: ../lib/mail.php:126
+#: actions/all.php:99
 #, 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"
+msgid "Feed for friends of %s (RSS 1.0)"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
-#: actions/twitapistatuses.php:328
+#: actions/all.php:107
 #, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgid "Feed for friends of %s (RSS 2.0)"
 msgstr ""
 
-#: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161 actions/shownotice.php:174
+#: actions/all.php:115
 #, php-format
-msgid "%1$s's status on %2$s"
+msgid "Feed for friends of %s (Atom)"
 msgstr ""
 
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
-#: actions/invite.php:125 actions/invite.php:133
+#: actions/all.php:127
 #, php-format
-msgid "%s (%s)"
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
 
-#: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90 actions/publicrss.php:89
+#: actions/all.php:132
 #, php-format
-msgid "%s Public Stream"
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
 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
-#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
-#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
-#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
-#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
-#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
-#: lib/personalgroupnav.php:100
+#: actions/all.php:134
 #, php-format
-msgid "%s and friends"
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
-#: actions/twitapistatuses.php:37
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
 #, php-format
-msgid "%s public timeline"
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
 msgstr ""
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
-#, php-format
-msgid "%s status"
+#: actions/all.php:165
+msgid "You and friends"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
-#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
 #, php-format
-msgid "%s timeline"
+msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
-#: actions/twitapistatuses.php:41
-#, php-format
-msgid "%s updates from everyone!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+msgid "API method not found."
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
 msgstr ""
 
-#: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545
+#: actions/apiaccountupdatedeliverydevice.php:105
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
 msgstr ""
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
-#: lib/action.php:752
-#, php-format
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+#: actions/apiaccountupdatedeliverydevice.php:132
+msgid "Could not update user."
 msgstr ""
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
-#: lib/action.php:754
-#, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr ""
-
-#: ../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
-#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-
-#: ../actions/register.php:152 actions/register.php:166
-#: actions/register.php:368 actions/register.php:414
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
-#: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr ""
-
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
-msgid "6 or more characters, and don't forget it!"
-msgstr ""
-
-#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373 actions/register.php:419
-msgid "6 or more characters. Required."
-msgstr ""
-
-#: ../actions/imsettings.php:197 actions/imsettings.php:205
-#: actions/imsettings.php:321
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
 #, 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
-#: actions/emailsettings.php:350
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
 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 actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
-#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
-#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
-#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
-#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
-#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
-#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
-#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
-#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
-#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
-#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
-#: actions/twitapiusers.php:34
-msgid "API method not found!"
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
 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 actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
-#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
-#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
-#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
-#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
-#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
-msgid "API method under construction."
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+msgid "Could not update your design."
 msgstr ""
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
-#: lib/action.php:706
-msgid "About"
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
 msgstr ""
 
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143 actions/userauthorization.php:178
-msgid "Accept"
+#: actions/apiaccountupdateprofile.php:147
+msgid "Could not save profile."
 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 actions/emailsettings.php:120
-#: actions/imsettings.php:127 actions/openidsettings.php:111
-#: actions/smssettings.php:133 actions/twittersettings.php:163
-#: actions/twittersettings.php:166 actions/twittersettings.php:182
-msgid "Add"
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
 msgstr ""
 
-#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
 msgstr ""
 
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-msgid "Add or remove OpenIDs"
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
 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
-#: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
 msgstr ""
 
-#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-#: actions/invite.php:181 actions/invite.php:183
-msgid "Addresses of friends to invite (one per line)"
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
 msgstr ""
 
-#: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422 lib/profileaction.php:126
-msgid "All subscriptions"
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92 actions/publicrss.php:91
+#: actions/apidirectmessage.php:89
 #, php-format
-msgid "All updates for %s"
+msgid "Direct messages from %s"
 msgstr ""
 
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
+#: actions/apidirectmessage.php:93
 #, 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
-#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
-msgid "Already logged in."
-msgstr ""
-
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
-msgid "Already subscribed!."
-msgstr ""
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113 actions/deletenotice.php:114
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81 actions/userauthorization.php:76
-msgid "Authorize subscription"
-msgstr ""
-
-#: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
-#: actions/register.php:416 actions/register.php:463
-msgid "Automatically login in the future; not for shared computers!"
-msgstr ""
-
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-#: actions/profilesettings.php:144 actions/profilesettings.php:145
-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 actions/avatarsettings.php:65
-#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
-#: actions/avatarsettings.php:67 actions/showgroup.php:211
-#: actions/showgroup.php:216
-msgid "Avatar"
-msgstr ""
-
-#: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
-msgid "Avatar updated."
+msgid "All the direct messages sent from %s"
 msgstr ""
 
-#: ../actions/imsettings.php:55 actions/imsettings.php:56
-#: actions/imsettings.php:108
+#: actions/apidirectmessage.php:101
 #, 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?)"
+msgid "Direct messages to %s"
 msgstr ""
 
-#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
-#: actions/emailsettings.php:107
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
-msgid "Awaiting confirmation on this phone number."
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
 msgstr ""
 
-#: ../lib/util.php:1318 lib/util.php:1452
-msgid "Before »"
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
 msgstr ""
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
-#: actions/profilesettings.php:82 actions/register.php:184
-#: actions/profilesettings.php:112 actions/register.php:402
-#: actions/register.php:448
-msgid "Bio"
+#: actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
 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
-#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107 actions/updateprofile.php:109
-#: actions/profilesettings.php:206 actions/register.php:211
-msgid "Bio is too long (max 140 chars)."
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
 msgstr ""
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
-msgid "Can't delete this notice."
+#: actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
 msgstr ""
 
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123 actions/updateprofile.php:125
-#, php-format
-msgid "Can't read avatar URL '%s'"
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
 msgstr ""
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404 actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
-msgid "Can't save new password."
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
 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
-#: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
+#: actions/apifriendshipscreate.php:118
+#, php-format
+msgid "Could not follow user: %s is already on your list."
 msgstr ""
 
-#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-#: lib/openid.php:133
-msgid "Cannot instantiate OpenID consumer object."
+#: actions/apifriendshipsdestroy.php:109
+msgid "Could not unfollow user: User not found."
 msgstr ""
 
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
 msgstr ""
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311 actions/emailsettings.php:318
-msgid "Cannot normalize that email address"
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
-#: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
+#: actions/apifriendshipsshow.php:135
+msgid "Could not determine source user."
 msgstr ""
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
+#: actions/apifriendshipsshow.php:143
+msgid "Could not find target user."
 msgstr ""
 
-#: ../actions/password.php:32 actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
+msgid "Could not create group."
 msgstr ""
 
-#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
-msgid "Change your password"
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
+msgid "Could not create aliases."
 msgstr ""
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-msgid "Change your profile settings"
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+msgid "Could not set group membership."
 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
-#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
-#: actions/register.php:376 actions/smssettings.php:122
-#: actions/recoverpassword.php:236 actions/register.php:422
-msgid "Confirm"
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
 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
-#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374 actions/emailsettings.php:386
-msgid "Confirmation cancelled."
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
 msgstr ""
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
-msgid "Confirmation code"
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
 msgstr ""
 
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-msgid "Confirmation code not found."
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
 msgstr ""
 
-#: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521
+#: actions/apigroupcreate.php:261
 #, 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
-#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
-#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
-#: lib/action.php:425
-msgid "Connect"
+msgid "Description is too long (max %d chars)."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
-msgid "Connect existing account"
-msgstr ""
-
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
-#: lib/action.php:719
-msgid "Contact"
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
 msgstr ""
 
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
-#: lib/openid.php:190
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
 #, php-format
-msgid "Could not create OpenID form: %s"
+msgid "Too many aliases! Maximum %d."
 msgstr ""
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
-#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
 #, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
-msgid "Could not follow user: User not found."
+msgid "Invalid alias: \"%s\""
 msgstr ""
 
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
-#: lib/openid.php:172
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
 #, php-format
-msgid "Could not redirect to server: %s"
-msgstr ""
-
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166 actions/updateprofile.php:176
-msgid "Could not save avatar info"
-msgstr ""
-
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159 actions/updateprofile.php:163
-msgid "Could not save new profile info"
-msgstr ""
-
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
-msgid "Could not subscribe."
-msgstr ""
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
+msgid "Alias \"%s\" already in use. Try another one."
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-msgid "Couldn't convert request tokens to access tokens."
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
 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
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-#: actions/emailsettings.php:382
-msgid "Couldn't delete email confirmation."
+#: actions/apigroupjoin.php:110
+msgid "You are already a member of that group."
 msgstr ""
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
-msgid "Couldn't delete subscription."
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
-msgid "Couldn't find any statuses."
+#: actions/apigroupjoin.php:138
+#, php-format
+msgid "Could not join user %s to group %s."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-msgid "Couldn't get a request token."
+#: actions/apigroupleave.php:114
+msgid "You are not a member of this group."
 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
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325 actions/emailsettings.php:344
-msgid "Couldn't insert confirmation code."
+#: actions/apigroupleave.php:124
+#, php-format
+msgid "Could not remove user %s to group %s."
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
 msgstr ""
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-#: actions/twitapiaccount.php:82
-msgid "Couldn't save profile."
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
 msgstr ""
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
+#: actions/apigrouplist.php:95
+#, php-format
+msgid "%s's groups"
 msgstr ""
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
-#: actions/emailsettings.php:447 actions/emailsettings.php:469
-#: actions/smssettings.php:515 actions/smssettings.php:539
-#: actions/smssettings.php:516 actions/smssettings.php:540
-msgid "Couldn't update user record."
+#: actions/apigrouplist.php:103
+#, php-format
+msgid "Groups %s is a member of on %s."
 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
-#: actions/confirmaddress.php:114 actions/emailsettings.php:280
-#: actions/emailsettings.php:411 actions/imsettings.php:252
-#: actions/imsettings.php:395 actions/othersettings.php:162
-#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408 actions/emailsettings.php:287
-#: actions/emailsettings.php:418 actions/othersettings.php:167
-#: actions/profilesettings.php:260
-msgid "Couldn't update user."
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
-msgid "Create"
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
-msgid "Create a new user with this nickname."
+#: actions/apistatusesshow.php:138
+msgid "Status deleted."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
-msgid "Create new account"
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
-msgid "Creating new account for OpenID that already has a user."
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, php-format
+msgid "That's too long. Max notice size is %d chars."
 msgstr ""
 
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
 msgstr ""
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-msgid "Current confirmed email address."
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+msgid "Unsupported format."
 msgstr ""
 
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
+#: actions/apitimelinefavorites.php:107
+#, php-format
+msgid "%s / Favorites from %s"
 msgstr ""
 
-#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
-#: classes/Notice.php:114 classes/Notice.php:124
+#: actions/apitimelinefavorites.php:119
 #, php-format
-msgid "DB error inserting hashtag: %s"
+msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
-#: classes/Notice.php:757 classes/Notice.php:1042
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
-msgid "DB error inserting reply: %s"
+msgid "%s timeline"
 msgstr ""
 
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79 actions/deletenotice.php:111
-msgid "Delete notice"
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
+#, php-format
+msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114 actions/register.php:404
-#: actions/register.php:450
-msgid "Describe yourself and your interests in 140 chars"
+#: actions/apitimelinementions.php:116
+#, php-format
+msgid "%1$s / Updates mentioning %2$s"
 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 actions/register.php:381
-#: actions/register.php:385 lib/accountsettingsaction.php:113
-#: actions/register.php:427 actions/register.php:431
-msgid "Email"
+#: actions/apitimelinementions.php:126
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-msgid "Email Address"
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#, php-format
+msgid "%s public timeline"
 msgstr ""
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#, php-format
+msgid "%s updates from everyone!"
 msgstr ""
 
-#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-#: actions/register.php:200
-msgid "Email address already exists."
+#: actions/apitimelinetag.php:101 actions/tag.php:66
+#, php-format
+msgid "Notices tagged with %s"
 msgstr ""
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
-msgid "Email address confirmation"
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, php-format
+msgid "Updates tagged with %1$s on %2$s!"
 msgstr ""
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
+#: actions/apiusershow.php:96
+msgid "Not found."
 msgstr ""
 
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-#: actions/invite.php:179 actions/invite.php:181
-msgid "Email addresses"
+#: actions/attachment.php:73
+msgid "No such attachment."
 msgstr ""
 
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
-msgid "Enter a nickname or email address."
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
 msgstr ""
 
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
+#: actions/avatarbynickname.php:64
+msgid "No size."
 msgstr ""
 
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161 actions/userauthorization.php:200
-msgid "Error authorizing token"
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
-#: actions/finishopenidlogin.php:325
-msgid "Error connecting user to OpenID."
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
 msgstr ""
 
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+msgid "Avatar settings"
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
 msgstr ""
 
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
-msgid "Error saving address confirmation."
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
 msgstr ""
 
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164 actions/userauthorization.php:203
-msgid "Error saving remote profile"
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+msgid "Delete"
 msgstr ""
 
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-#: lib/openid.php:238
-msgid "Error saving the profile."
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
 msgstr ""
 
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-#: lib/openid.php:249
-msgid "Error saving the user."
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
 msgstr ""
 
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
-msgid "Error saving user; invalid."
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
 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 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-#: actions/login.php:120 actions/recoverpassword.php:372
-#: actions/register.php:235
-msgid "Error setting user."
+#: actions/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
 msgstr ""
 
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
 msgstr ""
 
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
-msgid "Existing nickname"
+#: actions/avatarsettings.php:363
+msgid "Failed updating avatar."
 msgstr ""
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
-#: lib/action.php:708
-msgid "FAQ"
+#: actions/avatarsettings.php:387
+msgid "Avatar deleted."
 msgstr ""
 
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
-msgid "Failed updating avatar."
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+msgid "No nickname"
 msgstr ""
 
-#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
-#: actions/allrss.php:110 actions/allrss.php:118
-#, php-format
-msgid "Feed for friends of %s"
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
 msgstr ""
 
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
+#: actions/blockedfromgroup.php:90
 #, php-format
-msgid "Feed for replies to %s"
+msgid "%s blocked profiles"
 msgstr ""
 
-#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
-#: actions/tag.php:68
+#: actions/blockedfromgroup.php:93
 #, php-format
-msgid "Feed for tag %s"
-msgstr ""
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/login.php:122 actions/login.php:247
-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
-#: actions/profilesettings.php:103 actions/register.php:391
-#: actions/showgroup.php:235 actions/showstream.php:262
-#: actions/tagother.php:105 lib/groupeditform.php:142
-#: actions/showgroup.php:237 actions/showstream.php:255
-#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
-#: actions/showstream.php:220 lib/groupeditform.php:157
-msgid "Full name"
+msgid "%s blocked profiles, page %d"
 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
-#: actions/editgroup.php:195 actions/newgroup.php:146
-#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97 actions/updateprofile.php:99
-#: actions/editgroup.php:197 actions/newgroup.php:147
-#: actions/profilesettings.php:203 actions/register.php:208
-msgid "Full name is too long (max 255 chars)."
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
 msgstr ""
 
-#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
-#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
-msgid "Help"
+#: actions/blockedfromgroup.php:281
+msgid "Unblock user from group"
 msgstr ""
 
-#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
-#: lib/action.php:417
-msgid "Home"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
 msgstr ""
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146 actions/register.php:442
-#: lib/groupeditform.php:161
-msgid "Homepage"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+msgid "Unblock this user"
 msgstr ""
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
-#: actions/editgroup.php:194 actions/newgroup.php:144
-#: actions/profilesettings.php:200 actions/register.php:205
-msgid "Homepage is not a valid URL."
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
+#: lib/settingsaction.php:72
+msgid "Not logged in."
 msgstr ""
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173 actions/emailsettings.php:178
-msgid "I want to post notices by email."
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
 msgstr ""
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
 msgstr ""
 
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+msgid "Block user"
 msgstr ""
 
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
+#: actions/block.php:136
+msgid ""
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
+#: actions/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
+msgid "No"
 msgstr ""
 
-#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
-msgid ""
-"If you want to add an OpenID to your account, enter it in the box below and "
-"click \"Add\"."
+#: actions/block.php:149
+msgid "Do not block this user"
 msgstr ""
 
-#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored  in your account."
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
 msgstr ""
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-#: actions/emailsettings.php:127 actions/smssettings.php:140
-msgid "Incoming email"
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+msgid "Block this user"
 msgstr ""
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443 actions/emailsettings.php:450
-#: actions/smssettings.php:518 actions/smssettings.php:519
-msgid "Incoming email address removed."
+#: actions/block.php:165
+msgid "You have already blocked this user."
 msgstr ""
 
-#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
-msgid "Incorrect old password"
+#: actions/block.php:170
+msgid "Failed to save block information."
 msgstr ""
 
-#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
-#: actions/facebookhome.php:129
-msgid "Incorrect username or password."
+#: actions/bookmarklet.php:50
+msgid "Post to "
 msgstr ""
 
-#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
-#: actions/recoverpassword.php:322
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
 msgstr ""
 
-#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118 actions/updateprofile.php:120
-#, php-format
-msgid "Invalid avatar URL '%s'"
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
 msgstr ""
 
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
-#: actions/invite.php:72
-#, php-format
-msgid "Invalid email address: %s"
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
 msgstr ""
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102 actions/updateprofile.php:104
+#: actions/confirmaddress.php:90
 #, php-format
-msgid "Invalid homepage '%s'"
+msgid "Unrecognized address type %s"
 msgstr ""
 
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86 actions/updateprofile.php:88
-#, php-format
-msgid "Invalid license URL '%s'"
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
 msgstr ""
 
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
 msgstr ""
 
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
 msgstr ""
 
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
 msgstr ""
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91 actions/updateprofile.php:93
+#: actions/confirmaddress.php:159
 #, php-format
-msgid "Invalid profile URL '%s'."
+msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
+#: actions/conversation.php:99
+msgid "Conversation"
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
 msgstr ""
 
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
-#: actions/avatarbynickname.php:69
-msgid "Invalid size."
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
 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
-#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211 actions/finishopenidlogin.php:284
-#: actions/finishopenidlogin.php:307 actions/register.php:230
-#: actions/register.php:251
-msgid "Invalid username or password."
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
 msgstr ""
 
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-#: actions/invite.php:104
-msgid "Invitation(s) sent"
+#: actions/deletenotice.php:103
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
 msgstr ""
 
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-#: actions/invite.php:138
-msgid "Invitation(s) sent to the following people:"
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
 msgstr ""
 
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
-#: lib/facebookaction.php:221 lib/subgroupnav.php:105
-msgid "Invite"
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
 msgstr ""
 
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-#: actions/invite.php:106
-msgid "Invite new users"
+#: actions/deletenotice.php:145
+msgid "Do not delete this notice"
 msgstr ""
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
-#: lib/action.php:756
-#, php-format
-msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+msgid "Delete this notice"
 msgstr ""
 
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
+#: actions/deletenotice.php:157
+msgid "There was a problem with your session token.  Try again, please."
 msgstr ""
 
-#: ../actions/imsettings.php:62 actions/imsettings.php:63
-#: actions/imsettings.php:120
-#, php-format
-msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
 msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128 actions/profilesettings.php:129
-msgid "Language"
+#: actions/disfavor.php:94
+msgid "Add to favorites"
 msgstr ""
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217 actions/profilesettings.php:218
-msgid "Language is too long (max 50 chars)."
+#: actions/doc.php:69
+msgid "No such document."
 msgstr ""
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125 actions/showgroup.php:246
-#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
-#: actions/register.php:454 actions/showgroup.php:251
-#: actions/showstream.php:229 actions/userauthorization.php:128
-#: lib/groupeditform.php:171 lib/profilelist.php:185
-msgid "Location"
+#: actions/editgroup.php:56
+#, php-format
+msgid "Edit %s group"
 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
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112 actions/updateprofile.php:114
-#: actions/editgroup.php:203 actions/newgroup.php:153
-#: actions/profilesettings.php:209 actions/register.php:214
-msgid "Location is too long (max 255 chars)."
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
 msgstr ""
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
-#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
-#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
-#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
-#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
-#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
-#: lib/facebookaction.php:295 lib/facebookaction.php:321
-#, php-format
-msgid "Login"
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+msgid "You must be an admin to edit the group"
 msgstr ""
 
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62 actions/openidlogin.php:70
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
 msgstr ""
 
-#: ../actions/login.php:126 actions/login.php:251
+#: actions/editgroup.php:201 actions/newgroup.php:145
 #, 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%"
-"%). "
+msgid "description is too long (max %d chars)."
 msgstr ""
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
-#: lib/action.php:435
-msgid "Logout"
-msgstr ""
-
-#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393 actions/register.php:439
-msgid "Longer name, preferably your \"real\" name"
+#: actions/editgroup.php:253
+msgid "Could not update group."
 msgstr ""
 
-#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
-#: lib/facebookaction.php:327
-msgid "Lost or forgotten password?"
+#: actions/editgroup.php:269
+msgid "Options saved."
 msgstr ""
 
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-#: actions/emailsettings.php:81 actions/smssettings.php:89
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-msgid "Make a new email address for posting to; cancels the old one."
+#: actions/emailsettings.php:60
+msgid "Email Settings"
 msgstr ""
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
 #: actions/emailsettings.php:71
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
-#: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480 lib/profileaction.php:182
-msgid "Member since"
-msgstr ""
-
-#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
-#: actions/userrss.php:93
-#, php-format
-msgid "Microblog by %s"
-msgstr ""
-
-#: ../actions/smssettings.php:304 actions/smssettings.php:464
-#, 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."
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-#: actions/register.php:430 actions/finishopenidlogin.php:106
-#: actions/register.php:477
-msgid "My text and files are available under "
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
 msgstr ""
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#: actions/emailsettings.php:142 actions/smssettings.php:152
-msgid "New"
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
 msgstr ""
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
-#, php-format
-msgid "New email address for posting to %s"
+#: actions/emailsettings.php:113
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
 msgstr ""
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465 actions/emailsettings.php:472
-#: actions/smssettings.php:542 actions/smssettings.php:543
-msgid "New incoming email address added."
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
-msgid "New nickname"
+#: actions/emailsettings.php:121
+msgid "Email Address"
 msgstr ""
 
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-#: actions/recoverpassword.php:232
-msgid "New password"
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
 msgstr ""
 
-#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
-#: actions/recoverpassword.php:379
-msgid "New password successfully saved. You are now logged in."
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
 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
-#: actions/login.php:228 actions/profilesettings.php:98
-#: actions/register.php:367 actions/showgroup.php:224
-#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
-#: actions/showgroup.php:226 actions/showstream.php:244
-#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
-#: actions/showgroup.php:231 actions/showstream.php:209
-#: lib/facebookaction.php:314 lib/groupeditform.php:152
-msgid "Nickname"
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
 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
-#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159 actions/editgroup.php:185
-#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
-#: actions/profilesettings.php:215 actions/register.php:196
-msgid "Nickname already in use. Try another one."
+#: actions/emailsettings.php:145 actions/smssettings.php:162
+msgid "Make a new email address for posting to; cancels the old 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
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81 actions/editgroup.php:179
-#: actions/newgroup.php:130 actions/register.php:156
-#: actions/updateprofile.php:83 actions/editgroup.php:181
-#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
-#: actions/profilesettings.php:193 actions/register.php:193
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
-msgid "Nickname not allowed."
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
-msgid "Nickname or email"
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
-#: actions/deletenotice.php:116 actions/block.php:149
-#: actions/deletenotice.php:115 actions/groupblock.php:176
-msgid "No"
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
+#: actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153 actions/userauthorization.php:192
-msgid "No authorization request!"
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
-msgid "No carrier selected."
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
 msgstr ""
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
 msgstr ""
 
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
-#: actions/confirmaddress.php:75
-msgid "No confirmation code."
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
 msgstr ""
 
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
-#: actions/newnotice.php:126 classes/Command.php:223
-#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
-#: actions/newnotice.php:162 lib/command.php:216
-msgid "No content!"
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
 msgstr ""
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr ""
 
-#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
-msgid "No id."
-msgstr ""
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430 actions/emailsettings.php:437
-#: actions/smssettings.php:505 actions/smssettings.php:506
-msgid "No incoming email address."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr ""
-
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
-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
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358 actions/emailsettings.php:370
-msgid "No pending confirmation to cancel."
-msgstr ""
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
-msgstr ""
-
-#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
-msgid "No registered email address for that user."
-msgstr ""
-
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr ""
-
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85 actions/noticesearch.php:117
-msgid "No results"
-msgstr ""
-
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
-#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
-#: actions/twitapistatuses.php:426
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
-#: actions/twitapistatuses.php:399
-msgid "No status with that ID found."
-msgstr ""
-
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
-msgstr ""
-
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
-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 actions/shownotice.php:87
-#: lib/deleteaction.php:51
-msgid "No such notice."
-msgstr ""
-
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr ""
-
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-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 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
-#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
-#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
-#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
-#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
-#: lib/command.php:178 lib/command.php:227 lib/command.php:264
-#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
-msgid "No such user."
-msgstr ""
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
-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
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr ""
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
-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 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
-#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
-#: lib/twitterapi.php:741
-msgid "Not a supported data format."
-msgstr ""
-
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
-msgstr ""
-
-#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-#: lib/openid.php:143
-msgid "Not a valid OpenID."
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
 msgstr ""
 
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr ""
 
-#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-#: actions/register.php:189
-msgid "Not a valid email address."
-msgstr ""
-
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-#: actions/editgroup.php:186 actions/newgroup.php:137
-#: actions/profilesettings.php:195 actions/register.php:161
-#: actions/editgroup.php:188 actions/newgroup.php:138
-#: actions/profilesettings.php:196 actions/register.php:198
-msgid "Not a valid nickname."
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another user."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
+#: actions/emailsettings.php:358
+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/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
-msgid "Not an image or corrupt file."
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
-msgid "Not authorized."
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
-msgid "Not expecting this response!"
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
-#: actions/twitapistatuses.php:284
-msgid "Not found"
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
 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 actions/block.php:59 actions/disfavor.php:61
-#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
-#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
-#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
-#: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
-#: actions/groupblock.php:61 actions/groupunblock.php:61
-#: actions/makeadmin.php:61 actions/newnotice.php:88
-msgid "Not logged in."
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
 msgstr ""
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
-msgid "Not subscribed!."
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
 msgstr ""
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
 msgstr ""
 
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
-#, php-format
-msgid "Notice feed for %s"
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
 msgstr ""
 
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
 msgstr ""
 
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
-#: actions/conversation.php:149 lib/facebookaction.php:572
-#: lib/profileaction.php:206
-msgid "Notices"
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+msgid "Popular notices"
 msgstr ""
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
-#: actions/twitapitags.php:69
+#: actions/favorited.php:67
 #, php-format
-msgid "Notices tagged with %s"
-msgstr ""
-
-#: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
-msgstr ""
-
-#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81 lib/action.php:418
-msgid "OpenID"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
-msgid "OpenID Account Setup"
-msgstr ""
-
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-#: lib/openid.php:269
-msgid "OpenID Auto-Submit"
+msgid "Popular notices, page %d"
 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
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-#: actions/openidlogin.php:89
-msgid "OpenID Login"
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
 msgstr ""
 
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-#: actions/openidlogin.php:102 actions/openidsettings.php:101
-#: actions/openidlogin.php:111
-msgid "OpenID URL"
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
-#: actions/finishopenidlogin.php:129
-msgid "OpenID authentication cancelled."
+#: actions/favorited.php:153
+msgid ""
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
 msgstr ""
 
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
-#: actions/finishopenidlogin.php:133
+#: actions/favorited.php:156
 #, php-format
-msgid "OpenID authentication failed: %s"
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
 msgstr ""
 
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
-#: lib/openid.php:145
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
 #, php-format
-msgid "OpenID failure: %s"
-msgstr ""
-
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr ""
-
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
-msgstr ""
-
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-#: actions/invite.php:186 actions/invite.php:188
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
-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 actions/finishopenidlogin.php:118
-#: actions/login.php:231 actions/register.php:372
-#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-#: actions/login.php:214 lib/facebookaction.php:315
-#: actions/finishopenidlogin.php:117 actions/register.php:418
-#: lib/facebookaction.php:317
-msgid "Password"
-msgstr ""
-
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
-msgid "Password and confirmation do not match."
-msgstr ""
-
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
-msgid "Password must be 6 chars or more."
-msgstr ""
-
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
-msgid "Password recovery requested"
+msgid "%s's favorite notices"
 msgstr ""
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
-msgid "Password saved."
+#: actions/favoritesrss.php:115
+#, php-format
+msgid "Updates favored by %1$s on %2$s!"
 msgstr ""
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-#: actions/passwordsettings.php:150 actions/register.php:220
-msgid "Passwords don't match."
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
 msgstr ""
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
 msgstr ""
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
 msgstr ""
 
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
 msgstr ""
 
-#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
-#: lib/personalgroupnav.php:99
-msgid "Personal"
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-#: actions/invite.php:184 actions/invite.php:186
-msgid "Personal message"
+#: actions/file.php:34
+msgid "No notice id"
 msgstr ""
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-#: actions/smssettings.php:128
-msgid "Phone number, no punctuation or spaces, with area code"
+#: actions/file.php:38
+msgid "No notice"
 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\"."
+#: actions/file.php:42
+msgid "No attachments"
 msgstr ""
 
-#: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
-msgid "Post a notice when my Jabber/GTalk status changes."
+#: actions/file.php:51
+msgid "No uploaded attachments"
 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 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134 actions/twittersettings.php:137
-msgid "Preferences"
+#: actions/finishremotesubscribe.php:69
+msgid "Not expecting this response!"
 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
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
-#: actions/emailsettings.php:293 actions/othersettings.php:173
-msgid "Preferences saved."
+#: actions/finishremotesubscribe.php:80
+msgid "User being listened to does not exist."
 msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129 actions/profilesettings.php:130
-msgid "Preferred language"
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
 msgstr ""
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
-#: lib/action.php:715
-msgid "Privacy"
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
-#: classes/Notice.php:216 classes/Notice.php:232
-msgid "Problem saving notice."
+#: actions/finishremotesubscribe.php:106
+msgid "You are not authorized."
 msgstr ""
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
-msgid "Profile"
+#: actions/finishremotesubscribe.php:109
+msgid "Could not convert request token to access token."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
+#: actions/finishremotesubscribe.php:114
+msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
 
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
 msgstr ""
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-#: actions/updateprofile.php:58
-msgid "Profile unknown"
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+msgid "No such group."
 msgstr ""
 
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
-msgid "Public Stream Feed"
+#: actions/getfile.php:75
+msgid "No such file."
 msgstr ""
 
-#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
-#: actions/public.php:120
-msgid "Public timeline"
+#: actions/getfile.php:79
+msgid "Cannot read file."
 msgstr ""
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
 msgstr ""
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178 actions/emailsettings.php:183
-msgid "Publish a MicroID for my email address."
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
 msgstr ""
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
+#: actions/groupblock.php:95
+msgid "User is already blocked from group."
 msgstr ""
 
-#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
-msgid "Recover"
+#: actions/groupblock.php:100
+msgid "User is not a member of group."
 msgstr ""
 
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
-msgid "Recover password"
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+msgid "Block user from group"
 msgstr ""
 
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-msgid "Recovery code for unknown user."
+#: actions/groupblock.php:162
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
 msgstr ""
 
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
-#: actions/register.php:152 actions/register.php:207 lib/util.php:328
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
-#: actions/register.php:108 actions/register.php:486 lib/action.php:440
-#: lib/facebookaction.php:281
-msgid "Register"
+#: actions/groupblock.php:178
+msgid "Do not block this user from this group"
 msgstr ""
 
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
-#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
-#: actions/register.php:129
-msgid "Registration not allowed."
+#: actions/groupblock.php:179
+msgid "Block this user from this group"
 msgstr ""
 
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67 actions/register.php:106
-msgid "Registration successful"
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
 msgstr ""
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144 actions/userauthorization.php:179
-msgid "Reject"
+#: actions/groupbyid.php:74
+msgid "No ID"
 msgstr ""
 
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
-#: actions/register.php:461
-msgid "Remember me"
+#: actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
 msgstr ""
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74 actions/updateprofile.php:76
-msgid "Remote profile with no matching profile"
+#: actions/groupdesignsettings.php:141
+msgid "Group design"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
+#: actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
 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 actions/emailsettings.php:101
-#: actions/emailsettings.php:134 actions/imsettings.php:102
-#: actions/openidsettings.php:166 actions/smssettings.php:103
-#: actions/smssettings.php:146 actions/twittersettings.php:115
-#: actions/twittersettings.php:118
-msgid "Remove"
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+msgid "Couldn't update your design."
 msgstr ""
 
-#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+msgid "Unable to save your design settings!"
 msgstr ""
 
-#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
-msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+msgid "Design preferences saved."
 msgstr ""
 
-#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
-#: lib/personalgroupnav.php:104
-msgid "Replies"
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
 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
-#: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104 actions/replies.php:118
-#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/grouplogo.php:150
 #, php-format
-msgid "Replies to %s"
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
 msgstr ""
 
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
-msgid "Reset"
+#: actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
-msgid "Reset password"
+#: actions/grouplogo.php:396
+msgid "Logo updated."
 msgstr ""
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-#: actions/subscriptions.php:125 actions/subscriptions.php:184
-msgid "SMS"
+#: actions/grouplogo.php:398
+msgid "Failed updating logo."
 msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
-msgid "SMS Phone number"
+#: actions/groupmembers.php:93 lib/groupnav.php:92
+#, php-format
+msgid "%s group members"
 msgstr ""
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
-msgid "SMS confirmation"
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
 msgstr ""
 
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
-msgid "Same as password above"
+#: actions/groupmembers.php:175 lib/groupnav.php:107
+msgid "Admin"
 msgstr ""
 
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377 actions/register.php:423
-msgid "Same as password above. Required."
+#: actions/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
 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 actions/emailsettings.php:182
-#: actions/facebooksettings.php:114 actions/imsettings.php:157
-#: actions/othersettings.php:117 actions/profilesettings.php:150
-#: actions/smssettings.php:169 actions/subscriptions.php:124
-#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171 actions/emailsettings.php:187
-#: actions/subscriptions.php:126 actions/tagother.php:154
-#: actions/twittersettings.php:164 actions/othersettings.php:119
-#: actions/profilesettings.php:152 actions/subscriptions.php:185
-#: actions/twittersettings.php:180 lib/designsettings.php:256
-#: lib/groupeditform.php:196
-msgid "Save"
+#: actions/groupmembers.php:441
+msgid "Make user an admin of the group"
 msgstr ""
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
-msgid "Search"
+#: actions/groupmembers.php:473
+msgid "Make Admin"
 msgstr ""
 
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
 msgstr ""
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57 actions/noticesearch.php:68
+#: actions/grouprss.php:133
 #, php-format
-msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
+msgid "Updates from members of %1$s on %2$s!"
 msgstr ""
 
-#: ../actions/peoplesearch.php:28 actions/peoplesearch.php:52
+#: actions/groupsearch.php:52
 #, php-format
 msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+"Search for groups on %%site.name%% by their name, location, or description. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
-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 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
-#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
-#: lib/noticeform.php:179
-msgid "Send"
-msgstr ""
-
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
-msgstr ""
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
+#: actions/groupsearch.php:58
+msgid "Group search"
 msgstr ""
 
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
-msgid "Send me notices through Jabber/GTalk."
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+msgid "No results."
 msgstr ""
 
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
-#: actions/smssettings.php:162
+#: actions/groupsearch.php:82
+#, php-format
 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
-#: actions/imsettings.php:147
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr ""
-
-#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
-#: lib/facebookaction.php:228 lib/facebookaction.php:230
-msgid "Settings"
-msgstr ""
-
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319 actions/profilesettings.php:318
-msgid "Settings saved."
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
 msgstr ""
 
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
 msgstr ""
 
-#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:114
-msgid "Someone else already has this OpenID."
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
 msgstr ""
 
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
-msgid "Sorry, no incoming email allowed."
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
 msgstr ""
 
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
-msgid "Sorry, that is not your incoming email address."
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
 msgstr ""
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
-#: lib/action.php:717
-msgid "Source"
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
 msgstr ""
 
-#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476 actions/showgroup.php:375
-#: actions/showgroup.php:421 lib/profileaction.php:173
-msgid "Statistics"
+#: actions/groupunblock.php:95
+msgid "User is not blocked from group."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
-#: actions/finishopenidlogin.php:318
-msgid "Stored OpenID not found."
+#: actions/groupunblock.php:128 actions/unblock.php:108
+msgid "Error removing the block."
 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
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139 actions/showstream.php:345
-msgid "Subscribe"
+#: actions/imsettings.php:59
+msgid "IM Settings"
 msgstr ""
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
-#: lib/subgroupnav.php:90
-msgid "Subscribers"
+#: actions/imsettings.php:70
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 msgstr ""
 
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338 actions/userauthorization.php:344
-#: actions/userauthorization.php:378
-msgid "Subscription authorized"
+#: actions/imsettings.php:89
+msgid "IM is not available."
 msgstr ""
 
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349 actions/userauthorization.php:355
-#: actions/userauthorization.php:389
-msgid "Subscription rejected"
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
 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
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
-#: lib/subgroupnav.php:82
-msgid "Subscriptions"
+#: actions/imsettings.php:114
+#, 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/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
-msgid "System error uploading file."
+#: actions/imsettings.php:124
+msgid "IM Address"
 msgstr ""
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
-#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
-#: actions/tagother.php:209 lib/profilelist.php:160
-#: actions/profilesettings.php:123 actions/showstream.php:255
-#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
-msgid "Tags"
+#: actions/imsettings.php:126
+#, 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 ""
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-#: lib/designsettings.php:217
-msgid "Text"
+#: actions/imsettings.php:143
+msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67 actions/noticesearch.php:78
-msgid "Text search"
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
+#: actions/imsettings.php:153
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
 msgstr ""
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-#: actions/emailsettings.php:328
-msgid "That email address already belongs to another user."
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
 msgstr ""
 
-#: ../actions/avatar.php:80 actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
 msgstr ""
 
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr ""
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318 actions/emailsettings.php:325
-msgid "That is already your email address."
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
 msgstr ""
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
-msgid "That is already your phone number."
+#: actions/imsettings.php:327
+#, 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/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr ""
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397 actions/emailsettings.php:404
-msgid "That is not your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-#: actions/emailsettings.php:367 actions/imsettings.php:349
-#: actions/emailsettings.php:374
-msgid "That is the wrong IM address."
-msgstr ""
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
 msgstr ""
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-msgid "That phone number already belongs to another user."
+#: actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
 msgstr ""
 
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49 actions/twitapistatuses.php:330
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-#: actions/newnotice.php:136 actions/twitapistatuses.php:294
-#: lib/facebookaction.php:485 actions/newnotice.php:166
-#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
-#: scripts/maildaemon.php:70
-msgid "That's too long. Max notice size is 140 chars."
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
-#: actions/twitapiaccount.php:66
-msgid "That's too long. Max notice size is 255 chars."
+#: actions/invite.php:39
+msgid "Invites have been disabled."
 msgstr ""
 
-#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
-#: actions/confirmaddress.php:159
+#: actions/invite.php:41
 #, 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
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413 actions/emailsettings.php:423
-msgid "The address was removed."
+msgid "You must be logged in to invite other users to use %s"
 msgstr ""
 
-#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
-#: actions/userauthorization.php:380
-msgid ""
-"The subscription has been authorized, but no callback URL was passed. Check "
-"with the site's instructions for details on how to authorize the "
-"subscription. Your subscription token is:"
+#: actions/invite.php:72
+#, php-format
+msgid "Invalid email address: %s"
 msgstr ""
 
-#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
-#: actions/userauthorization.php:391
-msgid ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the site's instructions for details on how to fully reject the "
-"subscription."
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
 msgstr ""
 
-#: ../actions/subscribers.php:35 actions/subscribers.php:35
-#: actions/subscribers.php:67
-#, php-format
-msgid "These are the people who listen to %s's notices."
+#: actions/invite.php:112
+msgid "Invite new users"
 msgstr ""
 
-#: ../actions/subscribers.php:33 actions/subscribers.php:33
-#: actions/subscribers.php:63
-msgid "These are the people who listen to your notices."
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
 msgstr ""
 
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
-#: actions/subscriptions.php:69
+#: actions/invite.php:131 actions/invite.php:139
 #, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr ""
-
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-#: actions/subscriptions.php:65
-msgid "These are the people whose notices you listen to."
+msgid "%s (%s)"
 msgstr ""
 
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
-#: actions/invite.php:130
+#: actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
 
-#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. Please start again."
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
 msgstr ""
 
-#: ../lib/openid.php:195 lib/openid.php:206
+#: actions/invite.php:150
 msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
-#, php-format
+#: actions/invite.php:162
 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 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
-#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
-#: actions/twitapistatuses.php:416
-msgid "This method requires a POST or DELETE."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
-#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
-#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
-#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
-msgid "This method requires a POST."
-msgstr ""
-
-#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
-msgid "This page is not available in a media type you accept"
-msgstr ""
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138 actions/profilesettings.php:139
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211 actions/profilesettings.php:212
-msgid "Timezone not selected."
+"Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
-#, 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."
+#: actions/invite.php:187
+msgid "Email addresses"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-msgid "Two user ids or screen_names must be supplied."
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
 msgstr ""
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109 actions/register.php:398
-#: actions/register.php:444
-msgid "URL of your homepage, blog, or profile on another site"
+#: actions/invite.php:192
+msgid "Personal message"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-msgid "URL of your profile on another compatible microblogging service"
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
 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 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-#: actions/avatarsettings.php:263 actions/emailsettings.php:247
-#: actions/grouplogo.php:324 actions/twittersettings.php:306
-#: actions/twittersettings.php:322 lib/designsettings.php:301
-msgid "Unexpected form submission."
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
 msgstr ""
 
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
-msgid "Unexpected password reset."
+#: actions/invite.php:226
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
 
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-#: actions/recoverpassword.php:210
-msgid "Unknown action"
+#: actions/invite.php:228
+#, 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/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-msgid "Unknown version of OMB protocol."
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
 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 "
+#: actions/joingroup.php:90 lib/command.php:217
+msgid "You are already a member of that group"
 msgstr ""
 
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
+#: actions/joingroup.php:128 lib/command.php:234
 #, php-format
-msgid "Unrecognized address type %s"
-msgstr ""
-
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
+msgid "Could not join user %s to group %s"
 msgstr ""
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-#: actions/updateprofile.php:51
-msgid "Unsupported OMB version"
+#: actions/joingroup.php:135 lib/command.php:239
+#, php-format
+msgid "%s joined group %s"
 msgstr ""
 
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
-msgid "Unsupported image file format."
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
+#: actions/leavegroup.php:90 lib/command.php:268
+msgid "You are not a member of that group."
 msgstr ""
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
+#: actions/leavegroup.php:119 lib/command.php:278
+msgid "Could not find membership record."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
-#: actions/twitapistatuses.php:94
+#: actions/leavegroup.php:127 lib/command.php:284
 #, php-format
-msgid "Updates from %1$s and friends on %2$s!"
+msgid "Could not remove user %s to group %s"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
-#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
-msgid "Updates from %1$s on %2$s!"
+msgid "%s left group %s"
 msgstr ""
 
-#: ../actions/avatar.php:68 actions/profilesettings.php:161
-#: actions/avatarsettings.php:162 actions/grouplogo.php:232
-#: actions/avatarsettings.php:165 actions/grouplogo.php:238
-msgid "Upload"
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
 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."
+#: actions/login.php:110 actions/login.php:120
+msgid "Invalid or expired token."
 msgstr ""
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
+#: actions/login.php:143
+msgid "Incorrect username or password."
 msgstr ""
 
-#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
-#: actions/invite.php:156
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
+#: actions/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
 msgstr ""
 
-#: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176 actions/register.php:382
-#: actions/register.php:386 actions/register.php:428 actions/register.php:432
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
-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
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
-#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
-#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
+#: actions/login.php:243
+msgid "Login to site"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
 msgstr ""
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
 msgstr ""
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139 actions/profilesettings.php:140
-msgid "What timezone are you normally in?"
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
 msgstr ""
 
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
-#, php-format
-msgid "What's up, %s?"
+#: actions/login.php:253 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-#: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119 actions/register.php:410
-#: actions/register.php:456
-msgid "Where you are, like \"City, State (or Region), Country\""
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
 msgstr ""
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132 actions/updateprofile.php:134
-#, php-format
-msgid "Wrong image type for '%s'"
+#: actions/login.php:282
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
 msgstr ""
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127 actions/updateprofile.php:129
+#: actions/login.php:286
 #, 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
-#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141 actions/deletenotice.php:115
-#: actions/block.php:150 actions/deletenotice.php:116
-#: actions/groupblock.php:177
-msgid "Yes"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-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
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
 msgstr ""
 
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-#: actions/invite.php:122
-msgid "You are already subscribed to these users:"
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
 msgstr ""
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
-msgid "You are not friends with the specified user."
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
 msgstr ""
 
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
 msgstr ""
 
-#: ../actions/register.php:135 actions/register.php:145
-msgid "You can create a new account to start posting notices."
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
 msgstr ""
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
+#: actions/microsummary.php:69
+msgid "No current status"
 msgstr ""
 
-#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
+#: actions/newgroup.php:53
+msgid "New group"
 msgstr ""
 
-#: ../actions/imsettings.php:28 actions/imsettings.php:28
-#: actions/imsettings.php:70
-#, php-format
-msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
 msgstr ""
 
-#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
-msgid ""
-"You can update your personal profile info here so people know more about you."
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43 actions/register.php:149
-#: actions/register.php:186
-msgid "You can't register if you don't agree to the license."
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
 msgstr ""
 
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67 actions/updateprofile.php:69
-msgid "You did not send us that profile"
+#: actions/newmessage.php:158
+msgid "No recipient specified."
 msgstr ""
 
-#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
-#, php-format
+#: actions/newmessage.php:164 lib/command.php:370
 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"
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
-#: actions/twitapistatuses.php:443
-msgid "You may not delete another user's status."
+#: actions/newmessage.php:181
+msgid "Message sent"
 msgstr ""
 
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
-#: actions/invite.php:41
+#: actions/newmessage.php:185 lib/command.php:375
 #, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr ""
-
-#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
-#: actions/invite.php:144
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+msgid "Direct message to %s sent"
 msgstr ""
 
-#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a  new password below. "
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
 msgstr ""
 
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104 actions/openidlogin.php:113
-msgid "Your OpenID URL"
+#: actions/newnotice.php:69
+msgid "New notice"
 msgstr ""
 
-#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:193
-msgid "Your nickname on this server, or your registered email address."
+#: actions/newnotice.php:199
+msgid "Notice posted"
 msgstr ""
 
-#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
-"account.  Manage your associated OpenIDs from here."
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
 msgstr ""
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
-#: lib/util.php:770
-msgid "a few seconds ago"
+#: actions/noticesearch.php:78
+msgid "Text search"
 msgstr ""
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
-#: lib/util.php:782
+#: actions/noticesearch.php:91
 #, php-format
-msgid "about %d days ago"
+msgid "Search results for \"%s\" on %s"
 msgstr ""
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
-#: lib/util.php:778
+#: actions/noticesearch.php:121
 #, php-format
-msgid "about %d hours ago"
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 msgstr ""
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
-#: lib/util.php:774
+#: actions/noticesearch.php:124
 #, php-format
-msgid "about %d minutes ago"
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
-#: lib/util.php:786
+#: actions/noticesearchrss.php:89
 #, php-format
-msgid "about %d months ago"
-msgstr ""
-
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
-#: lib/util.php:780
-msgid "about a day ago"
-msgstr ""
-
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
-#: lib/util.php:772
-msgid "about a minute ago"
-msgstr ""
-
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
-#: lib/util.php:784
-msgid "about a month ago"
-msgstr ""
-
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
-#: lib/util.php:788
-msgid "about a year ago"
+msgid "Updates with \"%s\""
 msgstr ""
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
-#: lib/util.php:776
-msgid "about an hour ago"
-msgstr ""
-
-#: ../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 actions/noticesearch.php:187
-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 actions/noticesearch.php:194
-msgid "reply"
-msgstr ""
-
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-msgid "same as password above"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
-#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
-#: actions/twitapistatuses.php:575
-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
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-#: actions/avatarsettings.php:251 actions/emailsettings.php:229
-#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
-#: actions/newmessage.php:133 actions/newnotice.php:96
-#: actions/openidsettings.php:188 actions/othersettings.php:136
-#: actions/passwordsettings.php:131 actions/profilesettings.php:172
-#: actions/register.php:113 actions/remotesubscribe.php:53
-#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
-#: actions/twittersettings.php:294 actions/userauthorization.php:39
-#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
-#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
-#: actions/othersettings.php:138 actions/recoverpassword.php:334
-#: actions/register.php:153 actions/twittersettings.php:310
-#: lib/designsettings.php:291
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: actions/disfavor.php:55 actions/disfavor.php:81
-msgid "This notice is not a favorite!"
-msgstr ""
-
-#: actions/disfavor.php:63 actions/disfavor.php:87
-#: actions/twitapifavorites.php:188
-msgid "Could not delete favorite."
-msgstr ""
-
-#: actions/disfavor.php:72 lib/favorform.php:140
-msgid "Favor"
-msgstr ""
-
-#: actions/emailsettings.php:92 actions/emailsettings.php:157
-msgid "Send me email when someone adds my notice as a favorite."
-msgstr ""
-
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-msgid "Send me email when someone sends me a private message."
-msgstr ""
-
-#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr ""
-
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132 actions/favor.php:86
-#: actions/twitapifavorites.php:125 classes/Command.php:152
-#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
-#: actions/twitapifavorites.php:133 lib/command.php:145
-msgid "Could not create favorite."
-msgstr ""
-
-#: actions/favor.php:70
-msgid "Disfavor"
-msgstr ""
-
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
-#: actions/favoritesrss.php:110
+#: actions/noticesearchrss.php:91
 #, php-format
-msgid "%s favorite notices"
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr ""
 
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
-#: actions/favoritesrss.php:114
-#, php-format
-msgid "Feed of favorite notices of %s"
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
 
-#: actions/inbox.php:28 actions/inbox.php:59
-#, php-format
-msgid "Inbox for %s - page %d"
+#: actions/nudge.php:94
+msgid "Nudge sent"
 msgstr ""
 
-#: actions/inbox.php:30 actions/inbox.php:62
-#, php-format
-msgid "Inbox for %s"
+#: actions/nudge.php:97
+msgid "Nudge sent!"
 msgstr ""
 
-#: actions/inbox.php:53 actions/inbox.php:115
-msgid "This is your inbox, which lists your incoming private messages."
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
 msgstr ""
 
-#: actions/invite.php:178 actions/invite.php:213
+#: actions/oembed.php:86 actions/shownotice.php:180
 #, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-msgstr ""
-
-#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-msgid "Automatically login in the future; "
+msgid "%1$s's status on %2$s"
 msgstr ""
 
-#: actions/login.php:122 actions/login.php:264
-msgid "For security reasons, please re-enter your "
+#: actions/oembed.php:157
+msgid "content type "
 msgstr ""
 
-#: actions/login.php:126 actions/login.php:268
-msgid "Login with your username and password. "
+#: actions/oembed.php:160
+msgid "Only "
 msgstr ""
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
-#: actions/twitapidirect_messages.php:150
-#: actions/twitapidirect_messages.php:145
-msgid "That's too long. Max message size is 140 chars."
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
 msgstr ""
 
-#: actions/newmessage.php:65 actions/newmessage.php:128
-#: actions/newmessage.php:155
-msgid "No recipient specified."
+#: actions/opensearch.php:64
+msgid "People Search"
 msgstr ""
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206 actions/newmessage.php:131
-#: actions/newmessage.php:168 classes/Command.php:237
-#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
-#: lib/command.php:230
-msgid "You can't send a message to this user."
+#: actions/opensearch.php:67
+msgid "Notice Search"
 msgstr ""
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240 actions/newmessage.php:161
-#: actions/twitapidirect_messages.php:167 lib/command.php:240
-#: actions/twitapidirect_messages.php:163 lib/command.php:233
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
+#: actions/othersettings.php:60
+msgid "Other Settings"
 msgstr ""
 
-#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163 actions/newmessage.php:114
-msgid "No such user"
+#: actions/othersettings.php:71
+msgid "Manage various other options."
 msgstr ""
 
-#: actions/newmessage.php:117 actions/newmessage.php:67
-#: actions/newmessage.php:71
-msgid "New message"
+#: actions/othersettings.php:108
+msgid " (free service)"
 msgstr ""
 
-#: actions/noticesearch.php:95 actions/noticesearch.php:146
-msgid "Notice without matching profile"
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
 msgstr ""
 
-#: actions/openidsettings.php:28 actions/openidsettings.php:70
-#, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
+#: actions/othersettings.php:122
+msgid "View profile designs"
 msgstr ""
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
 msgstr ""
 
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-msgid "You can remove an OpenID from your account "
+#: actions/othersettings.php:153
+msgid "URL shortening service is too long (max 50 chars)."
 msgstr ""
 
-#: actions/outbox.php:28 actions/outbox.php:58
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %s - page %d"
 msgstr ""
 
-#: actions/outbox.php:30 actions/outbox.php:61
+#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr ""
 
-#: actions/outbox.php:53 actions/outbox.php:116
+#: actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
-#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
-#, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+#: actions/passwordsettings.php:58
+msgid "Change password"
 msgstr ""
 
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
-msgid "You can update your personal profile info here "
+#: actions/passwordsettings.php:69
+msgid "Change your password."
 msgstr ""
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
-#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
-#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
-#: actions/userrss.php:103
-msgid "User without matching profile"
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+msgid "Password change"
 msgstr ""
 
-#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
+#: actions/passwordsettings.php:104
+msgid "Old password"
 msgstr ""
 
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
 msgstr ""
 
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a "
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
 msgstr ""
 
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-msgid "Your nickname on this server, "
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
 msgstr ""
 
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-msgid "Instructions for recovering your password "
+#: actions/passwordsettings.php:113
+msgid "same as password above"
 msgstr ""
 
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
-msgid "New password successfully saved. "
+#: actions/passwordsettings.php:117
+msgid "Change"
 msgstr ""
 
-#: actions/register.php:95 actions/register.php:180
-#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:154 actions/register.php:230
 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 actions/remotesubscribe.php:74
-#, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr ""
-
-#: actions/showfavorites.php:61 actions/showfavorites.php:145
-#: actions/showfavorites.php:147
-#, php-format
-msgid "Feed for favorites of %s"
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
 msgstr ""
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-#: actions/showfavorites.php:179 actions/showfavorites.php:209
-msgid "Could not retrieve favorite notices."
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
 msgstr ""
 
-#: actions/showmessage.php:33 actions/showmessage.php:81
-msgid "No such message."
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
 msgstr ""
 
-#: actions/showmessage.php:42 actions/showmessage.php:98
-msgid "Only the sender and recipient may read this message."
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
 msgstr ""
 
-#: actions/showmessage.php:61 actions/showmessage.php:108
-#, php-format
-msgid "Message to %1$s on %2$s"
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
 msgstr ""
 
-#: actions/showmessage.php:66 actions/showmessage.php:113
+#: actions/peoplesearch.php:52
 #, php-format
-msgid "Message from %1$s on %2$s"
+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/showstream.php:154
-msgid "Send a message"
+#: actions/peoplesearch.php:58
+msgid "People search"
 msgstr ""
 
-#: actions/smssettings.php:312 actions/smssettings.php:464
+#: actions/peopletag.php:70
 #, php-format
-msgid "Mobile carrier for your phone. "
+msgid "Not a valid people tag: %s"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
-#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/peopletag.php:144
 #, php-format
-msgid "Direct messages to %s"
+msgid "Users self-tagged with %s - page %d"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
-#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
-#, php-format
-msgid "All the direct messages sent to %s"
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
-msgid "Direct Messages You've Sent"
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
-#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
-#, php-format
-msgid "All the direct messages sent from %s"
+#: actions/profilesettings.php:60
+msgid "Profile settings"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-#: actions/twitapidirect_messages.php:146
-#: actions/twitapidirect_messages.php:140
-msgid "No message text!"
+#: actions/profilesettings.php:71
+msgid ""
+"You can update your personal profile info here so people know more about you."
 msgstr ""
 
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-#: actions/twitapidirect_messages.php:159
-#: actions/twitapidirect_messages.php:154
-msgid "Recipient user not found."
+#: actions/profilesettings.php:99
+msgid "Profile information"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-#: actions/twitapidirect_messages.php:162
-#: actions/twitapidirect_messages.php:158
-msgid "Can't send direct messages to users who aren't your friend."
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
-#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
-#, php-format
-msgid "%s / Favorites from %s"
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full name"
 msgstr ""
 
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
-#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
-#, php-format
-msgid "%s updates favorited by %s / %s."
+#: actions/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
 msgstr ""
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
-#: actions/twitapifavorites.php:170 lib/mail.php:554
-#: actions/twitapifavorites.php:221
-#, php-format
-msgid "%s added your notice as a favorite"
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
+#: actions/profilesettings.php:122 actions/register.php:460
 #, php-format
-msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+msgid "Describe yourself and your interests in %d chars"
 msgstr ""
 
-#: actions/twittersettings.php:27
-msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+#: actions/profilesettings.php:125 actions/register.php:463
+msgid "Describe yourself and your interests"
 msgstr ""
 
-#: actions/twittersettings.php:41 actions/twittersettings.php:60
-#: actions/twittersettings.php:61
-msgid "Twitter settings"
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
 msgstr ""
 
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-#: actions/twittersettings.php:106
-msgid "Twitter Account"
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
 msgstr ""
 
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-#: actions/twittersettings.php:114
-msgid "Current verified Twitter account."
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
 msgstr ""
 
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-#: actions/twittersettings.php:126
-msgid "No spaces, please."
+#: actions/profilesettings.php:140
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
+#: actions/profilesettings.php:144
+msgid "Language"
 msgstr ""
 
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-#: actions/twittersettings.php:142
-msgid "Automatically send my notices to Twitter."
+#: actions/profilesettings.php:145
+msgid "Preferred language"
 msgstr ""
 
-#: actions/twittersettings.php:75 actions/twittersettings.php:146
-#: actions/twittersettings.php:149
-msgid "Send local \"@\" replies to Twitter."
+#: actions/profilesettings.php:154
+msgid "Timezone"
 msgstr ""
 
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-#: actions/twittersettings.php:156
-msgid "Subscribe to my Twitter friends here."
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
 msgstr ""
 
-#: actions/twittersettings.php:122 actions/twittersettings.php:331
-#: actions/twittersettings.php:348
+#: actions/profilesettings.php:160
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
-msgstr ""
-
-#: actions/twittersettings.php:128 actions/twittersettings.php:334
-#: actions/twittersettings.php:338 actions/twittersettings.php:355
-msgid "Could not verify your Twitter credentials!"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/profilesettings.php:221 actions/register.php:223
 #, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr ""
-
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-#: actions/twittersettings.php:352 actions/twittersettings.php:372
-#: actions/twittersettings.php:369 actions/twittersettings.php:389
-msgid "Unable to save your Twitter settings!"
-msgstr ""
-
-#: actions/twittersettings.php:174 actions/twittersettings.php:376
-#: actions/twittersettings.php:380 actions/twittersettings.php:399
-msgid "Twitter settings saved."
-msgstr ""
-
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-#: actions/twittersettings.php:399 actions/twittersettings.php:418
-msgid "That is not your Twitter account."
-msgstr ""
-
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403 actions/twittersettings.php:407
-#: actions/twittersettings.php:426
-msgid "Couldn't remove Twitter user."
+msgid "Bio is too long (max %d chars)."
 msgstr ""
 
-#: actions/twittersettings.php:212 actions/twittersettings.php:407
-#: actions/twittersettings.php:411 actions/twittersettings.php:430
-msgid "Twitter account removed."
-msgstr ""
-
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453 actions/twittersettings.php:432
-#: actions/twittersettings.php:443 actions/twittersettings.php:457
-#: actions/twittersettings.php:452 actions/twittersettings.php:463
-#: actions/twittersettings.php:477
-msgid "Couldn't save Twitter preferences."
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
 msgstr ""
 
-#: actions/twittersettings.php:245 actions/twittersettings.php:461
-#: actions/twittersettings.php:465 actions/twittersettings.php:485
-msgid "Twitter preferences saved."
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
 msgstr ""
 
-#: actions/userauthorization.php:84 actions/userauthorization.php:86
-msgid "Please check these details to make sure "
+#: actions/profilesettings.php:246 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
 msgstr ""
 
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
-msgid "The subscription has been authorized, but no "
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
 msgstr ""
 
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-msgid "The subscription has been rejected, but no "
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
 msgstr ""
 
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-#: lib/channel.php:138 lib/channel.php:158
-msgid "Command results"
+#: actions/profilesettings.php:336
+msgid "Couldn't save tags."
 msgstr ""
 
-#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
-msgid "Command complete"
+#: actions/profilesettings.php:344
+msgid "Settings saved."
 msgstr ""
 
-#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
-msgid "Command failed"
+#: actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
 msgstr ""
 
-#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
 msgstr ""
 
-#: classes/Command.php:96 classes/Command.php:113
+#: actions/public.php:129
 #, php-format
-msgid "Subscriptions: %1$s\n"
+msgid "Public timeline, page %d"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
-#: lib/command.php:138 lib/command.php:269
-msgid "User has no last notice"
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
 msgstr ""
 
-#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
-#: lib/command.php:159
-msgid "Notice marked as fave."
+#: actions/public.php:151
+msgid "Public Stream Feed (RSS 1.0)"
 msgstr ""
 
-#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
-#: lib/command.php:182
-#, php-format
-msgid "%1$s (%2$s)"
+#: actions/public.php:155
+msgid "Public Stream Feed (RSS 2.0)"
 msgstr ""
 
-#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
-#: lib/command.php:185
-#, php-format
-msgid "Fullname: %s"
+#: actions/public.php:159
+msgid "Public Stream Feed (Atom)"
 msgstr ""
 
-#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
-#: lib/command.php:188
+#: actions/public.php:179
 #, php-format
-msgid "Location: %s"
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
 msgstr ""
 
-#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
-#: lib/command.php:191
-#, php-format
-msgid "Homepage: %s"
+#: actions/public.php:182
+msgid "Be the first to post!"
 msgstr ""
 
-#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
-#: lib/command.php:194
+#: actions/public.php:186
 #, php-format
-msgid "About: %s"
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
-#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
-#: lib/command.php:221
+#: actions/public.php:233
 #, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 
-#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
-#: actions/newmessage.php:182 lib/command.php:238
+#: actions/public.php:238
 #, php-format
-msgid "Direct message to %s sent"
-msgstr ""
-
-#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
-#: lib/command.php:240
-msgid "Error sending direct message."
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
 msgstr ""
 
-#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
-#: lib/command.php:293
-msgid "Specify the name of the user to subscribe to"
+#: actions/publictagcloud.php:57
+msgid "Public tag cloud"
 msgstr ""
 
-#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
-#: lib/command.php:300
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "Subscribed to %s"
-msgstr ""
-
-#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
-#: lib/command.php:321
-msgid "Specify the name of the user to unsubscribe from"
+msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
-#: lib/command.php:328
+#: actions/publictagcloud.php:69
 #, php-format
-msgid "Unsubscribed from %s"
-msgstr ""
-
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
-#: lib/command.php:346 lib/command.php:369
-msgid "Command not yet implemented."
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
 
-#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
-#: lib/command.php:349
-msgid "Notification off."
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
 msgstr ""
 
-#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
-#: lib/command.php:351
-msgid "Can't turn off notification."
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
 msgstr ""
 
-#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
-#: lib/command.php:372
-msgid "Notification on."
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
 msgstr ""
 
-#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
-#: lib/command.php:374
-msgid "Can't turn on notification."
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
 msgstr ""
 
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
 msgstr ""
 
-#: classes/Message.php:53 classes/Message.php:56
-msgid "Could not insert message."
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
 msgstr ""
 
-#: classes/Message.php:63 classes/Message.php:66
-msgid "Could not update message with new URI."
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
 msgstr ""
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
 msgstr ""
 
-#: lib/mail.php:147 lib/mail.php:289
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
 msgstr ""
 
-#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
-#, php-format
-msgid "New private message from %s"
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
 msgstr ""
 
-#: lib/mail.php:253 lib/mail.php:512
-#, php-format
+#: actions/recoverpassword.php:152
 msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
-msgstr ""
-
-#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
-msgid "Only the user can read their own mailboxes."
-msgstr ""
-
-#: lib/openid.php:195 lib/openid.php:203
-msgid "This form should automatically submit itself. "
-msgstr ""
-
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-#: lib/personalgroupnav.php:114
-msgid "Favorites"
-msgstr ""
-
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-#: actions/favoritesrss.php:110 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:115
-#, php-format
-msgid "%s's favorite notices"
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
 msgstr ""
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-#: lib/personalgroupnav.php:115
-msgid "User"
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-#: lib/personalgroupnav.php:124
-msgid "Inbox"
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
 msgstr ""
 
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-#: lib/personalgroupnav.php:125
-msgid "Your incoming messages"
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
 msgstr ""
 
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-#: lib/personalgroupnav.php:129
-msgid "Outbox"
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-#: lib/personalgroupnav.php:130
-msgid "Your sent messages"
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
 msgstr ""
 
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-msgid "Twitter"
+#: actions/recoverpassword.php:208
+msgid "Reset password"
 msgstr ""
 
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
+#: actions/recoverpassword.php:209
+msgid "Recover password"
 msgstr ""
 
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
-#: lib/noticelist.php:433
-msgid "To"
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
 msgstr ""
 
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-#: scripts/maildaemon.php:47
-msgid "Could not parse message."
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
 msgstr ""
 
-#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
-#: actions/facebookhome.php:161 actions/all.php:48
-#: actions/facebookhome.php:156
-#, php-format
-msgid "%s and friends, page %d"
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
 msgstr ""
 
-#: actions/avatarsettings.php:76
-msgid "You can upload your personal avatar."
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
 msgstr ""
 
-#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250 actions/avatarsettings.php:119
-#: actions/avatarsettings.php:194 actions/grouplogo.php:256
-msgid "Avatar settings"
+#: actions/recoverpassword.php:243
+msgid "Reset"
 msgstr ""
 
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
-#: actions/grouplogo.php:204 actions/grouplogo.php:264
-msgid "Original"
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
 msgstr ""
 
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
-#: actions/grouplogo.php:215 actions/grouplogo.php:276
-msgid "Preview"
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
 msgstr ""
 
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
-#: actions/avatarsettings.php:228 actions/grouplogo.php:291
-msgid "Crop"
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
 msgstr ""
 
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-msgid "There was a problem with your session token. "
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
 msgstr ""
 
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-#: actions/avatarsettings.php:308
-msgid "Pick a square area of the image to be your avatar"
+#: actions/recoverpassword.php:325
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
 msgstr ""
 
-#: actions/avatarsettings.php:327 actions/grouplogo.php:384
-#: actions/avatarsettings.php:323 actions/grouplogo.php:382
-msgid "Lost our file data."
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
 msgstr ""
 
-#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
-msgid "Lost our file."
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
 msgstr ""
 
-#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
-#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
-#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
-msgid "Unknown file type"
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
 msgstr ""
 
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71
-msgid "No profile specified."
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75 actions/groupblock.php:76
-#: actions/groupunblock.php:76 actions/makeadmin.php:76
-msgid "No profile with that ID."
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/block.php:111 actions/block.php:134
-msgid "Block user"
+#: actions/register.php:92
+msgid "Sorry, invalid invitation code."
 msgstr ""
 
-#: actions/block.php:129
-msgid "Are you sure you want to block this user? "
+#: actions/register.php:112
+msgid "Registration successful"
 msgstr ""
 
-#: actions/block.php:162 actions/block.php:165
-msgid "You have already blocked this user."
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
 msgstr ""
 
-#: actions/block.php:167 actions/block.php:170
-msgid "Failed to save block information."
+#: actions/register.php:135
+msgid "Registration not allowed."
 msgstr ""
 
-#: actions/confirmaddress.php:159
-#, php-format
-msgid "The address \"%s\" has been "
+#: actions/register.php:198
+msgid "You can't register if you don't agree to the license."
 msgstr ""
 
-#: actions/deletenotice.php:73
-msgid "You are about to permanently delete a notice. "
+#: actions/register.php:201
+msgid "Not a valid email address."
 msgstr ""
 
-#: actions/disfavor.php:94
-msgid "Add to favorites"
+#: actions/register.php:212
+msgid "Email address already exists."
 msgstr ""
 
-#: actions/editgroup.php:54 actions/editgroup.php:56
-#, php-format
-msgid "Edit %s group"
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
 msgstr ""
 
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
-#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
-msgid "Inboxes must be enabled for groups to work"
+#: actions/register.php:342
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
 msgstr ""
 
-#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-#: actions/grouplogo.php:75 actions/editgroup.php:73
-msgid "You must be logged in to create a group."
+#: actions/register.php:424
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 
-#: actions/editgroup.php:87 actions/grouplogo.php:87
-#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
-#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
-#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
-msgid "No nickname"
+#: actions/register.php:429
+msgid "6 or more characters. Required."
 msgstr ""
 
-#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
-#: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128 actions/grouplogo.php:104
-#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
-#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
-#: actions/showgroup.php:133
-msgid "No such group"
+#: actions/register.php:433
+msgid "Same as password above. Required."
 msgstr ""
 
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107 actions/grouplogo.php:111
-#: actions/editgroup.php:108 actions/editgroup.php:167
-#: actions/groupdesignsettings.php:109
-msgid "You must be an admin to edit the group"
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
 msgstr ""
 
-#: actions/editgroup.php:157 actions/editgroup.php:159
-msgid "Use this form to edit the group."
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
-#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
-msgid "Nickname must have only lowercase letters "
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
-#: actions/editgroup.php:198 actions/newgroup.php:149
-#: actions/editgroup.php:200 actions/newgroup.php:150
-msgid "description is too long (max 140 chars)."
+#: actions/register.php:493
+msgid "My text and files are available under "
 msgstr ""
 
-#: actions/editgroup.php:218 actions/editgroup.php:253
-msgid "Could not update group."
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
-#: actions/editgroup.php:226 actions/editgroup.php:269
-msgid "Options saved."
+#: actions/register.php:496
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
 msgstr ""
 
-#: actions/emailsettings.php:107 actions/imsettings.php:108
+#: actions/register.php:537
 #, php-format
-msgid "Awaiting confirmation on this address. "
+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/emailsettings.php:139 actions/smssettings.php:150
-msgid "Make a new email address for posting to; "
+#: actions/register.php:561
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
 msgstr ""
 
-#: actions/emailsettings.php:157
-msgid "Send me email when someone "
+#: actions/remotesubscribe.php:98
+#, php-format
+msgid ""
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 
-#: actions/emailsettings.php:168 actions/emailsettings.php:173
-msgid "Allow friends to nudge me and send me an email."
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
 msgstr ""
 
-#: actions/emailsettings.php:321
-msgid "That email address already belongs "
+#: actions/remotesubscribe.php:124
+msgid "Subscribe to a remote user"
 msgstr ""
 
-#: actions/emailsettings.php:343
-msgid "A confirmation code was sent to the email address you added. "
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
 msgstr ""
 
-#: actions/facebookhome.php:110 actions/facebookhome.php:109
-msgid "Server error - couldn't get user!"
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
 msgstr ""
 
-#: actions/facebookhome.php:196
-#, php-format
-msgid "If you would like the %s app to automatically update "
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
 msgstr ""
 
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
-#, php-format
-msgid "Allow %s to update my Facebook status"
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
-#: actions/facebookhome.php:218 actions/facebookhome.php:223
-#: actions/facebookhome.php:217
-msgid "Skip"
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
 msgstr ""
 
-#: actions/facebookhome.php:235 lib/facebookaction.php:479
-#: lib/facebookaction.php:471
-msgid "No notice content!"
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
 msgstr ""
 
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
-#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
-msgid "Pagination"
+#: actions/remotesubscribe.php:168
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
 msgstr ""
 
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
-#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
-msgid "After"
+#: actions/remotesubscribe.php:176
+msgid "That’s a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
-#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
-#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
-msgid "Before"
+#: actions/remotesubscribe.php:183
+msgid "Couldn’t get a request token."
 msgstr ""
 
-#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
 #, php-format
-msgid "Thanks for inviting your friends to use %s"
-msgstr ""
-
-#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
-msgid "Invitations have been sent to the following users:"
+msgid "Replies to %s"
 msgstr ""
 
-#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
-#: actions/facebookinvite.php:94
+#: actions/replies.php:127
 #, php-format
-msgid "You have been invited to %s"
+msgid "Replies to %s, page %d"
 msgstr ""
 
-#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
-#: actions/facebookinvite.php:103
+#: actions/replies.php:144
 #, php-format
-msgid "Invite your friends to use %s"
+msgid "Replies feed for %s (RSS 1.0)"
 msgstr ""
 
-#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
-#: actions/facebookinvite.php:124
+#: actions/replies.php:151
 #, php-format
-msgid "Friends already using %s:"
+msgid "Replies feed for %s (RSS 2.0)"
 msgstr ""
 
-#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
-#: actions/facebookinvite.php:142
+#: actions/replies.php:158
 #, php-format
-msgid "Send invitations"
-msgstr ""
-
-#: actions/facebookremove.php:56
-msgid "Couldn't remove Facebook user."
-msgstr ""
-
-#: actions/facebooksettings.php:65
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
-
-#: actions/facebooksettings.php:67
-msgid "Sync preferences saved."
-msgstr ""
-
-#: actions/facebooksettings.php:90
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
-
-#: actions/facebooksettings.php:97
-msgid "Send \"@\" replies to Facebook."
+msgid "Replies feed for %s (Atom)"
 msgstr ""
 
-#: actions/facebooksettings.php:106
-msgid "Prefix"
-msgstr ""
-
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
-msgstr ""
-
-#: actions/facebooksettings.php:124
+#: actions/replies.php:198
 #, php-format
-msgid "If you would like %s to automatically update "
-msgstr ""
-
-#: actions/facebooksettings.php:147
-msgid "Sync preferences"
-msgstr ""
-
-#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
-msgid "Disfavor favorite"
-msgstr ""
-
-#: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
-#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
-msgid "Popular notices"
-msgstr ""
-
-#: actions/favorited.php:67
-#, php-format
-msgid "Popular notices, page %d"
-msgstr ""
-
-#: actions/favorited.php:79
-msgid "The most popular notices on the site right now."
-msgstr ""
-
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
-#: lib/featureduserssection.php:87
-msgid "Featured users"
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
 msgstr ""
 
-#: actions/featured.php:71
+#: actions/replies.php:203
 #, php-format
-msgid "Featured users, page %d"
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
 msgstr ""
 
-#: actions/featured.php:99
+#: actions/replies.php:205
 #, php-format
-msgid "A selection of some of the great users on %s"
-msgstr ""
-
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
-msgstr ""
-
-#: actions/groupbyid.php:79
-msgid "No ID"
-msgstr ""
-
-#: actions/grouplogo.php:138 actions/grouplogo.php:191
-#: actions/grouplogo.php:144 actions/grouplogo.php:197
-msgid "Group logo"
-msgstr ""
-
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
-msgstr ""
-
-#: actions/grouplogo.php:448 actions/grouplogo.php:401
-msgid "Logo updated."
-msgstr ""
-
-#: actions/grouplogo.php:450 actions/grouplogo.php:403
-msgid "Failed updating logo."
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: actions/groupmembers.php:93 lib/groupnav.php:91
+#: actions/repliesrss.php:72
 #, php-format
-msgid "%s group members"
+msgid "Replies to %1$s on %2$s!"
 msgstr ""
 
-#: actions/groupmembers.php:96
+#: actions/showfavorites.php:79
 #, php-format
-msgid "%s group members, page %d"
-msgstr ""
-
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
+msgid "%s's favorite notices, page %d"
 msgstr ""
 
-#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
-#: lib/subgroupnav.php:98
-msgid "Groups"
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
 msgstr ""
 
-#: actions/groups.php:64
+#: actions/showfavorites.php:170
 #, php-format
-msgid "Groups, page %d"
+msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr ""
 
-#: actions/groups.php:90
+#: actions/showfavorites.php:177
 #, php-format
-msgid "%%%%site.name%%%% groups let you find and talk with "
+msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr ""
 
-#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
-msgid "Create a new group"
-msgstr ""
-
-#: actions/groupsearch.php:57
+#: actions/showfavorites.php:184
 #, php-format
-msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-msgstr ""
-
-#: actions/groupsearch.php:63 actions/groupsearch.php:58
-msgid "Group search"
+msgid "Feed for favorites of %s (Atom)"
 msgstr ""
 
-#: actions/imsettings.php:70
-msgid "You can send and receive notices through "
+#: actions/showfavorites.php:205
+msgid ""
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""
 
-#: actions/imsettings.php:120
+#: actions/showfavorites.php:207
 #, php-format
-msgid "Jabber or GTalk address, "
-msgstr ""
-
-#: actions/imsettings.php:147
-msgid "Send me replies through Jabber/GTalk "
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
 msgstr ""
 
-#: actions/imsettings.php:321
+#: actions/showfavorites.php:211
 #, php-format
-msgid "A confirmation code was sent "
-msgstr ""
-
-#: actions/joingroup.php:65
-msgid "You must be logged in to join a group."
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
 msgstr ""
 
-#: actions/joingroup.php:95
-msgid "You are already a member of that group"
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
 msgstr ""
 
-#: actions/joingroup.php:128 actions/joingroup.php:133
+#: actions/showgroup.php:82 lib/groupnav.php:86
 #, php-format
-msgid "Could not join user %s to group %s"
+msgid "%s group"
 msgstr ""
 
-#: actions/joingroup.php:135 actions/joingroup.php:140
+#: actions/showgroup.php:84
 #, php-format
-msgid "%s joined group %s"
-msgstr ""
-
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
+msgid "%s group, page %d"
 msgstr ""
 
-#: actions/leavegroup.php:65
-msgid "You must be logged in to leave a group."
+#: actions/showgroup.php:218
+msgid "Group profile"
 msgstr ""
 
-#: actions/leavegroup.php:88 actions/groupblock.php:86
-#: actions/groupunblock.php:86 actions/makeadmin.php:86
-msgid "No such group."
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
+msgid "URL"
 msgstr ""
 
-#: actions/leavegroup.php:95
-msgid "You are not a member of that group."
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
+msgid "Note"
 msgstr ""
 
-#: actions/leavegroup.php:100
-msgid "You may not leave a group while you are its administrator."
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
 msgstr ""
 
-#: actions/leavegroup.php:130 actions/leavegroup.php:124
-msgid "Could not find membership record."
+#: actions/showgroup.php:293
+msgid "Group actions"
 msgstr ""
 
-#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/showgroup.php:328
 #, php-format
-msgid "Could not remove user %s to group %s"
+msgid "Notice feed for %s group (RSS 1.0)"
 msgstr ""
 
-#: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/showgroup.php:334
 #, php-format
-msgid "%s left group %s"
-msgstr ""
-
-#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
-msgid "Login to site"
-msgstr ""
-
-#: actions/microsummary.php:69
-msgid "No current status"
-msgstr ""
-
-#: actions/newgroup.php:53
-msgid "New group"
+msgid "Notice feed for %s group (RSS 2.0)"
 msgstr ""
 
-#: actions/newgroup.php:115
-msgid "Use this form to create a new group."
+#: actions/showgroup.php:340
+#, php-format
+msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
-#: actions/newgroup.php:177 actions/newgroup.php:209
-msgid "Could not create group."
+#: actions/showgroup.php:345
+#, php-format
+msgid "FOAF for %s group"
 msgstr ""
 
-#: actions/newgroup.php:191 actions/newgroup.php:229
-msgid "Could not set group membership."
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
+msgid "Members"
 msgstr ""
 
-#: actions/newmessage.php:119 actions/newnotice.php:132
-msgid "That's too long. "
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/tagcloudsection.php:71
+msgid "(None)"
 msgstr ""
 
-#: actions/newmessage.php:134
-msgid "Don't send a message to yourself; "
+#: actions/showgroup.php:392
+msgid "All members"
 msgstr ""
 
-#: actions/newnotice.php:166 actions/newnotice.php:174
-#: actions/newnotice.php:272
-msgid "Notice posted"
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
 msgstr ""
 
-#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
-#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
-msgid "Ajax Error"
+#: actions/showgroup.php:432
+msgid "Created"
 msgstr ""
 
-#: actions/nudge.php:85
+#: actions/showgroup.php:448
+#, php-format
 msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
-msgstr ""
-
-#: actions/nudge.php:94
-msgid "Nudge sent"
-msgstr ""
-
-#: actions/nudge.php:97
-msgid "Nudge sent!"
-msgstr ""
-
-#: actions/openidlogin.php:97 actions/openidlogin.php:106
-msgid "OpenID login"
-msgstr ""
-
-#: actions/openidsettings.php:128
-msgid "Removing your only OpenID "
-msgstr ""
-
-#: actions/othersettings.php:60
-msgid "Other Settings"
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/othersettings.php:71
-msgid "Manage various other options."
+#: actions/showgroup.php:454
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
 msgstr ""
 
-#: actions/othersettings.php:93
-msgid "URL Auto-shortening"
+#: actions/showgroup.php:482
+msgid "Admins"
 msgstr ""
 
-#: actions/othersettings.php:112
-msgid "Service"
+#: actions/showmessage.php:81
+msgid "No such message."
 msgstr ""
 
-#: actions/othersettings.php:113 actions/othersettings.php:111
-msgid "Automatic shortening service to use."
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: actions/othersettings.php:144 actions/othersettings.php:146
-msgid "URL shortening service is too long (max 50 chars)."
+#: actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: actions/passwordsettings.php:69
-msgid "Change your password."
+#: actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
-msgid "Password change"
+#: actions/shownotice.php:90
+msgid "Notice deleted."
 msgstr ""
 
-#: actions/peopletag.php:35 actions/peopletag.php:70
+#: actions/showstream.php:73
 #, php-format
-msgid "Not a valid people tag: %s"
+msgid " tagged %s"
 msgstr ""
 
-#: actions/peopletag.php:47 actions/peopletag.php:144
+#: actions/showstream.php:79
 #, php-format
-msgid "Users self-tagged with %s - page %d"
+msgid "%s, page %d"
 msgstr ""
 
-#: actions/peopletag.php:91
+#: actions/showstream.php:122
 #, php-format
-msgid "These are users who have tagged themselves \"%s\" "
-msgstr ""
-
-#: actions/profilesettings.php:91
-msgid "Profile information"
-msgstr ""
-
-#: actions/profilesettings.php:124 actions/profilesettings.php:125
-msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
-msgstr ""
-
-#: actions/profilesettings.php:144
-msgid "Automatically subscribe to whoever "
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
 msgstr ""
 
-#: actions/profilesettings.php:229 actions/tagother.php:176
-#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/showstream.php:129
 #, php-format
-msgid "Invalid tag: \"%s\""
-msgstr ""
-
-#: actions/profilesettings.php:311 actions/profilesettings.php:310
-msgid "Couldn't save tags."
+msgid "Notice feed for %s (RSS 1.0)"
 msgstr ""
 
-#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/showstream.php:136
 #, php-format
-msgid "Public timeline, page %d"
-msgstr ""
-
-#: actions/public.php:173 actions/public.php:184 actions/public.php:210
-msgid "Could not retrieve public stream."
+msgid "Notice feed for %s (RSS 2.0)"
 msgstr ""
 
-#: actions/public.php:220
+#: actions/showstream.php:143
 #, php-format
-msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
-msgstr ""
-
-#: actions/publictagcloud.php:57
-msgid "Public tag cloud"
+msgid "Notice feed for %s (Atom)"
 msgstr ""
 
-#: actions/publictagcloud.php:63
+#: actions/showstream.php:148
 #, php-format
-msgid "These are most popular recent tags on %s "
-msgstr ""
-
-#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
-msgid "Tag cloud"
-msgstr ""
-
-#: actions/register.php:139 actions/register.php:349 actions/register.php:79
-#: actions/register.php:177 actions/register.php:394
-msgid "Sorry, only invited people can register."
-msgstr ""
-
-#: actions/register.php:149
-msgid "You can't register if you don't "
-msgstr ""
-
-#: actions/register.php:286
-msgid "With this form you can create "
-msgstr ""
-
-#: actions/register.php:368
-msgid "1-64 lowercase letters or numbers, "
-msgstr ""
-
-#: actions/register.php:382 actions/register.php:386
-msgid "Used only for updates, announcements, "
-msgstr ""
-
-#: actions/register.php:398
-msgid "URL of your homepage, blog, "
-msgstr ""
-
-#: actions/register.php:404
-msgid "Describe yourself and your "
-msgstr ""
-
-#: actions/register.php:410
-msgid "Where you are, like \"City, "
-msgstr ""
-
-#: actions/register.php:432
-msgid " except this private data: password, "
+msgid "FOAF for %s"
 msgstr ""
 
-#: actions/register.php:471
+#: actions/showstream.php:191
 #, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
-msgstr ""
-
-#: actions/register.php:495
-msgid "(You should receive a message by email "
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
 msgstr ""
 
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
 msgstr ""
 
-#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/showstream.php:198
 #, php-format
-msgid "Replies to %s, page %d"
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: actions/showfavorites.php:79
+#: actions/showstream.php:234
 #, php-format
-msgid "%s favorite notices, page %d"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
+#: actions/showstream.php:239
 #, php-format
-msgid "%s group"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
 msgstr ""
 
-#: actions/showgroup.php:79 actions/showgroup.php:84
-#, php-format
-msgid "%s group, page %d"
+#: actions/smssettings.php:58
+msgid "SMS Settings"
 msgstr ""
 
-#: actions/showgroup.php:206 actions/showgroup.php:208
-#: actions/showgroup.php:213
-msgid "Group profile"
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
-#: actions/showgroup.php:253 actions/showstream.php:271
-#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
-#: actions/showstream.php:236 actions/userauthorization.php:137
-#: lib/profilelist.php:197
-msgid "URL"
+#: actions/smssettings.php:91
+msgid "SMS is not available."
 msgstr ""
 
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
-#: actions/showgroup.php:264 actions/showstream.php:282
-#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
-#: actions/showstream.php:247 actions/userauthorization.php:149
-#: lib/profilelist.php:212
-msgid "Note"
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
-#: actions/showgroup.php:270 actions/showgroup.php:272
-#: actions/showgroup.php:288
-msgid "Group actions"
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
-#: actions/showgroup.php:323 actions/showgroup.php:304
-#, php-format
-msgid "Notice feed for %s group"
+#: actions/smssettings.php:130
+msgid "Confirmation code"
 msgstr ""
 
-#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
-#: actions/showgroup.php:384 actions/showgroup.php:373
-#: actions/showgroup.php:430
-msgid "Members"
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
 msgstr ""
 
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71 actions/showgroup.php:344
-#: actions/showgroup.php:378 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226
-msgid "(None)"
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
 msgstr ""
 
-#: actions/showgroup.php:370 actions/showgroup.php:350
-#: actions/showgroup.php:384
-msgid "All members"
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
-#: actions/showgroup.php:378
-#, php-format
+#: actions/smssettings.php:174
 msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
-msgstr ""
-
-#: actions/showmessage.php:98
-msgid "Only the sender and recipient "
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
 msgstr ""
 
-#: actions/showstream.php:73 actions/showstream.php:78
-#, php-format
-msgid "%s, page %d"
+#: actions/smssettings.php:306
+msgid "No phone number."
 msgstr ""
 
-#: actions/showstream.php:143
-msgid "'s profile"
+#: actions/smssettings.php:311
+msgid "No carrier selected."
 msgstr ""
 
-#: actions/showstream.php:236 actions/tagother.php:77
-#: actions/showstream.php:220 actions/showstream.php:185
-msgid "User profile"
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
 msgstr ""
 
-#: actions/showstream.php:240 actions/tagother.php:81
-#: actions/showstream.php:224 actions/showstream.php:189
-msgid "Photo"
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
 msgstr ""
 
-#: actions/showstream.php:317 actions/showstream.php:309
-#: actions/showstream.php:274
-msgid "User actions"
+#: actions/smssettings.php:347
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
 msgstr ""
 
-#: actions/showstream.php:342 actions/showstream.php:307
-msgid "Send a direct message to this user"
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
 msgstr ""
 
-#: actions/showstream.php:343 actions/showstream.php:308
-msgid "Message"
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
 msgstr ""
 
-#: actions/showstream.php:451 lib/profileaction.php:157
-msgid "All subscribers"
+#: actions/smssettings.php:465
+msgid "Mobile carrier"
 msgstr ""
 
-#: actions/showstream.php:533 lib/profileaction.php:235
-msgid "All groups"
+#: actions/smssettings.php:469
+msgid "Select a carrier"
 msgstr ""
 
-#: actions/showstream.php:542
+#: actions/smssettings.php:476
 #, php-format
 msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
-msgstr ""
-
-#: actions/smssettings.php:128
-msgid "Phone number, no punctuation or spaces, "
-msgstr ""
-
-#: actions/smssettings.php:162
-msgid "Send me notices through SMS; "
-msgstr ""
-
-#: actions/smssettings.php:335
-msgid "A confirmation code was sent to the phone number you added. "
+"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/smssettings.php:453
-msgid "Mobile carrier"
+#: actions/smssettings.php:498
+msgid "No code entered"
 msgstr ""
 
 #: actions/subedit.php:70
@@ -4513,12 +2844,30 @@ msgid "%s subscribers, page %d"
 msgstr ""
 
 #: actions/subscribers.php:63
-msgid "These are the people who listen to "
+msgid "These are the people who listen to your notices."
 msgstr ""
 
 #: actions/subscribers.php:67
 #, php-format
-msgid "These are the people who "
+msgid "These are the people who listen to %s's notices."
+msgstr ""
+
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
+msgstr ""
+
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr ""
+
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
 msgstr ""
 
 #: actions/subscriptions.php:52
@@ -4532,27 +2881,35 @@ msgid "%s subscriptions, page %d"
 msgstr ""
 
 #: actions/subscriptions.php:65
-msgid "These are the people whose notices "
+msgid "These are the people whose notices you listen to."
 msgstr ""
 
 #: actions/subscriptions.php:69
 #, php-format
-msgid "These are the people whose "
+msgid "These are the people whose notices %s listens to."
 msgstr ""
 
-#: actions/subscriptions.php:122 actions/subscriptions.php:124
-#: actions/subscriptions.php:183
-msgid "Jabber"
+#: actions/subscriptions.php:121
+#, php-format
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
 msgstr ""
 
-#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
 #, php-format
-msgid "Notices tagged with %s, page %d"
+msgid "%s is not listening to anyone."
 msgstr ""
 
-#: actions/tag.php:66 actions/tag.php:73
-#, php-format
-msgid "Messages tagged \"%s\", most recent first"
+#: actions/subscriptions.php:194
+msgid "Jabber"
+msgstr ""
+
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
 msgstr ""
 
 #: actions/tagother.php:33
@@ -4568,840 +2925,700 @@ msgstr ""
 msgid "Tag %s"
 msgstr ""
 
+#: actions/tagother.php:77 lib/userprofile.php:75
+msgid "User profile"
+msgstr ""
+
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
+msgstr ""
+
 #: actions/tagother.php:141
 msgid "Tag user"
 msgstr ""
 
-#: actions/tagother.php:149 actions/tagother.php:151
+#: actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 msgstr ""
 
-#: actions/tagother.php:164
-msgid "There was a problem with your session token."
-msgstr ""
-
-#: actions/tagother.php:191 actions/tagother.php:193
+#: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:198 actions/tagother.php:200
+#: actions/tagother.php:200
 msgid "Could not save tags."
 msgstr ""
 
-#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
+#: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/tagrss.php:35
-msgid "No such tag."
-msgstr ""
-
-#: actions/tagrss.php:66 actions/tagrss.php:64
+#: actions/tag.php:68
 #, php-format
-msgid "Microblog tagged with %s"
-msgstr ""
-
-#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
-msgid "Block user failed."
-msgstr ""
-
-#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
-msgid "Unblock user failed."
-msgstr ""
-
-#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
-#: actions/twitapiusers.php:50
-msgid "Not found."
-msgstr ""
-
-#: actions/twittersettings.php:71
-msgid "Add your Twitter account to automatically send "
-msgstr ""
-
-#: actions/twittersettings.php:119 actions/twittersettings.php:122
-msgid "Twitter user name"
+msgid "Notices tagged with %s, page %d"
 msgstr ""
 
-#: actions/twittersettings.php:126 actions/twittersettings.php:129
-msgid "Twitter password"
+#: actions/tag.php:86
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr ""
 
-#: actions/twittersettings.php:228 actions/twittersettings.php:232
-#: actions/twittersettings.php:248
-msgid "Twitter Friends"
+#: actions/tag.php:92
+#, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr ""
 
-#: actions/twittersettings.php:327
-msgid "Username must have only numbers, "
+#: actions/tag.php:98
+#, php-format
+msgid "Notice feed for tag %s (Atom)"
 msgstr ""
 
-#: actions/twittersettings.php:341
-#, php-format
-msgid "Unable to retrieve account information "
+#: actions/tagrss.php:35
+msgid "No such tag."
 msgstr ""
 
-#: actions/unblock.php:108 actions/groupunblock.php:128
-msgid "Error removing the block."
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
 msgstr ""
 
-#: actions/unsubscribe.php:50
+#: actions/unsubscribe.php:77
 msgid "No profile id in request."
 msgstr ""
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:84
 msgid "No profile with that id."
 msgstr ""
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr ""
 
-#: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
 #, php-format
-msgid "%s groups"
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
-#: actions/usergroups.php:65 actions/usergroups.php:64
-#, php-format
-msgid "%s groups, page %d"
-msgstr ""
-
-#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
-msgid "Problem saving notice. Unknown user."
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
 msgstr ""
 
-#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: actions/userauthorization.php:110
 msgid ""
-"Too many notices too fast; take a breather and post again in a few minutes."
-msgstr ""
-
-#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
-msgid "You are banned from posting notices on this site."
-msgstr ""
-
-#: lib/accountsettingsaction.php:108
-msgid "Upload an avatar"
-msgstr ""
-
-#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
-msgid "Other"
-msgstr ""
-
-#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
-msgid "Other options"
-msgstr ""
-
-#: lib/action.php:130 lib/action.php:132 lib/action.php:142
-#, php-format
-msgid "%s - %s"
-msgstr ""
-
-#: lib/action.php:145 lib/action.php:147 lib/action.php:157
-msgid "Untitled page"
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
 msgstr ""
 
-#: lib/action.php:316 lib/action.php:387 lib/action.php:411
-msgid "Primary site navigation"
+#: actions/userauthorization.php:188
+msgid "License"
 msgstr ""
 
-#: lib/action.php:322 lib/action.php:393 lib/action.php:417
-msgid "Personal profile and friends timeline"
+#: actions/userauthorization.php:209
+msgid "Accept"
 msgstr ""
 
-#: lib/action.php:325 lib/action.php:396 lib/action.php:448
-msgid "Search for people or text"
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
 msgstr ""
 
-#: lib/action.php:328 lib/action.php:399 lib/action.php:419
-msgid "Account"
+#: actions/userauthorization.php:211
+msgid "Reject"
 msgstr ""
 
-#: lib/action.php:328 lib/action.php:399 lib/action.php:419
-msgid "Change your email, avatar, password, profile"
+#: actions/userauthorization.php:212
+msgid "Reject this subscription"
 msgstr ""
 
-#: lib/action.php:330 lib/action.php:403 lib/action.php:422
-msgid "Connect to IM, SMS, Twitter"
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
 msgstr ""
 
-#: lib/action.php:332 lib/action.php:409 lib/action.php:435
-msgid "Logout from the site"
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
 msgstr ""
 
-#: lib/action.php:335 lib/action.php:412 lib/action.php:443
-msgid "Login to the site"
+#: actions/userauthorization.php:249
+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 ""
 
-#: lib/action.php:338 lib/action.php:415 lib/action.php:440
-msgid "Create an account"
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
 msgstr ""
 
-#: lib/action.php:341 lib/action.php:418
-msgid "Login with OpenID"
+#: actions/userauthorization.php:261
+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 ""
 
-#: lib/action.php:344 lib/action.php:421 lib/action.php:446
-msgid "Help me!"
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
 msgstr ""
 
-#: lib/action.php:362 lib/action.php:441 lib/action.php:468
-msgid "Site notice"
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
 msgstr ""
 
-#: lib/action.php:417 lib/action.php:504 lib/action.php:531
-msgid "Local views"
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr ""
 
-#: lib/action.php:472 lib/action.php:559 lib/action.php:597
-msgid "Page notice"
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr ""
 
-#: lib/action.php:562 lib/action.php:654 lib/action.php:699
-msgid "Secondary site navigation"
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr ""
 
-#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
-#: lib/action.php:749 lib/action.php:770
-msgid "StatusNet software license"
+#: actions/userauthorization.php:343
+#, php-format
+msgid "Can’t read avatar URL ‘%s’."
 msgstr ""
 
-#: lib/action.php:630 lib/action.php:727 lib/action.php:779
-msgid "All "
+#: actions/userauthorization.php:348
+#, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr ""
 
-#: lib/action.php:635 lib/action.php:732 lib/action.php:784
-msgid "license."
+#: actions/userbyid.php:70
+msgid "No id."
 msgstr ""
 
-#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
-msgid "Block this user"
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+msgid "Profile design"
 msgstr ""
 
-#: lib/blockform.php:153 actions/groupmembers.php:343
-msgid "Block"
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
 msgstr ""
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
-msgid "Disfavor this notice"
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
 msgstr ""
 
-#: lib/facebookaction.php:268
+#: actions/usergroups.php:64
 #, php-format
-msgid "To use the %s Facebook Application you need to login "
+msgid "%s groups, page %d"
 msgstr ""
 
-#: lib/facebookaction.php:271 lib/facebookaction.php:273
-#: lib/facebookaction.php:275
-msgid " a new account."
+#: actions/usergroups.php:130
+msgid "Search for more groups"
 msgstr ""
 
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
-#: lib/mailbox.php:217 lib/noticelist.php:361
-msgid "Published"
+#: actions/usergroups.php:153
+#, php-format
+msgid "%s is not a member of any group."
 msgstr ""
 
-#: lib/favorform.php:114 lib/favorform.php:140
-msgid "Favor this notice"
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
 
-#: lib/feedlist.php:64
-msgid "Export data"
+#: classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
 msgstr ""
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
+#: classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
 msgstr ""
 
-#: lib/galleryaction.php:131
-msgid "All"
+#: classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
-#: lib/galleryaction.php:137 lib/galleryaction.php:138
-msgid "Tag"
+#: classes/Message.php:55
+msgid "Could not insert message."
 msgstr ""
 
-#: lib/galleryaction.php:138 lib/galleryaction.php:139
-msgid "Choose a tag to narrow list"
+#: classes/Message.php:65
+msgid "Could not update message with new URI."
 msgstr ""
 
-#: lib/galleryaction.php:139 lib/galleryaction.php:141
-msgid "Go"
+#: classes/Notice.php:164
+#, php-format
+msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: lib/groupeditform.php:148 lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#: classes/Notice.php:179
+msgid "Problem saving notice. Too long."
 msgstr ""
 
-#: lib/groupeditform.php:151 lib/groupeditform.php:166
-msgid "Description"
+#: classes/Notice.php:183
+msgid "Problem saving notice. Unknown user."
 msgstr ""
 
-#: lib/groupeditform.php:153 lib/groupeditform.php:168
-msgid "Describe the group or topic in 140 chars"
+#: classes/Notice.php:188
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: classes/Notice.php:194
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
 msgstr ""
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
-msgid "Group"
+#: classes/Notice.php:202
+msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
-msgid "Admin"
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
 msgstr ""
 
-#: lib/groupnav.php:101 lib/groupnav.php:107
+#: classes/Notice.php:1120
 #, php-format
-msgid "Edit %s group properties"
-msgstr ""
-
-#: lib/groupnav.php:106 lib/groupnav.php:112
-msgid "Logo"
+msgid "DB error inserting reply: %s"
 msgstr ""
 
-#: lib/groupnav.php:107 lib/groupnav.php:113
+#: classes/User.php:347
 #, php-format
-msgid "Add or edit %s logo"
+msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 
-#: lib/groupsbymemberssection.php:71
-msgid "Groups with most members"
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
 msgstr ""
 
-#: lib/groupsbypostssection.php:71
-msgid "Groups with most posts"
+#: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
 msgstr ""
 
-#: lib/grouptagcloudsection.php:56
-#, php-format
-msgid "Tags in %s group's notices"
+#: lib/accountsettingsaction.php:112
+msgid "Upload an avatar"
 msgstr ""
 
-#: lib/htmloutputter.php:104
-msgid "This page is not available in a "
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
 msgstr ""
 
-#: lib/joinform.php:114
-msgid "Join"
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
 msgstr ""
 
-#: lib/leaveform.php:114
-msgid "Leave"
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
 msgstr ""
 
-#: lib/logingroupnav.php:76
-msgid "Login with a username and password"
+#: lib/accountsettingsaction.php:124
+msgid "Design your profile"
 msgstr ""
 
-#: lib/logingroupnav.php:79
-msgid "Sign up for a new account"
+#: lib/accountsettingsaction.php:128
+msgid "Other"
 msgstr ""
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
+#: lib/accountsettingsaction.php:128
+msgid "Other options"
 msgstr ""
 
-#: lib/mail.php:175
+#: lib/action.php:144
 #, php-format
-msgid ""
-"Hey, %s.\n"
-"\n"
+msgid "%s - %s"
 msgstr ""
 
-#: lib/mail.php:236
-#, php-format
-msgid "%1$s is now listening to "
+#: lib/action.php:159
+msgid "Untitled page"
 msgstr ""
 
-#: lib/mail.php:254 lib/mail.php:253
-#, php-format
-msgid "Location: %s\n"
+#: lib/action.php:424
+msgid "Primary site navigation"
 msgstr ""
 
-#: lib/mail.php:256 lib/mail.php:255
-#, php-format
-msgid "Homepage: %s\n"
+#: lib/action.php:430
+msgid "Home"
 msgstr ""
 
-#: lib/mail.php:258 lib/mail.php:257
-#, php-format
-msgid ""
-"Bio: %s\n"
-"\n"
+#: lib/action.php:430
+msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: lib/mail.php:461 lib/mail.php:462
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/action.php:432
+msgid "Account"
 msgstr ""
 
-#: lib/mail.php:465
-#, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
+#: lib/action.php:432
+msgid "Change your email, avatar, password, profile"
 msgstr ""
 
-#: lib/mail.php:555
-#, php-format
-msgid "%1$s just added your notice from %2$s"
+#: lib/action.php:435
+msgid "Connect"
 msgstr ""
 
-#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
-#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
-msgid "From"
+#: lib/action.php:435
+msgid "Connect to services"
 msgstr ""
 
-#: lib/messageform.php:110 lib/messageform.php:109
-msgid "Send a direct notice"
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
 msgstr ""
 
-#: lib/noticeform.php:125 lib/noticeform.php:128
-msgid "Send a notice"
+#: lib/action.php:440 lib/subgroupnav.php:106
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: lib/noticeform.php:152 lib/noticeform.php:149
-msgid "Available characters"
+#: lib/action.php:445
+msgid "Logout"
 msgstr ""
 
-#: lib/noticelist.php:426 lib/noticelist.php:429
-msgid "in reply to"
+#: lib/action.php:445
+msgid "Logout from the site"
 msgstr ""
 
-#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
-#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
-msgid "Reply to this notice"
+#: lib/action.php:450
+msgid "Create an account"
 msgstr ""
 
-#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
-msgid "Reply"
+#: lib/action.php:453
+msgid "Login to the site"
 msgstr ""
 
-#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
-#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
-#: lib/noticelist.php:486
-msgid "Delete this notice"
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
 msgstr ""
 
-#: lib/noticelist.php:474 actions/avatarsettings.php:148
-#: lib/noticelist.php:479 lib/noticelist.php:486
-msgid "Delete"
+#: lib/action.php:456
+msgid "Help me!"
 msgstr ""
 
-#: lib/nudgeform.php:116
-msgid "Nudge this user"
+#: lib/action.php:459
+msgid "Search"
 msgstr ""
 
-#: lib/nudgeform.php:128
-msgid "Nudge"
+#: lib/action.php:459
+msgid "Search for people or text"
 msgstr ""
 
-#: lib/nudgeform.php:128
-msgid "Send a nudge to this user"
+#: lib/action.php:480
+msgid "Site notice"
 msgstr ""
 
-#: lib/personaltagcloudsection.php:56
-#, php-format
-msgid "Tags in %s's notices"
+#: lib/action.php:546
+msgid "Local views"
 msgstr ""
 
-#: lib/profilelist.php:182 lib/profilelist.php:180
-#: lib/subscriptionlist.php:126
-msgid "(none)"
+#: lib/action.php:612
+msgid "Page notice"
 msgstr ""
 
-#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
-msgid "Public"
+#: lib/action.php:714
+msgid "Secondary site navigation"
 msgstr ""
 
-#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
-msgid "User groups"
+#: lib/action.php:721
+msgid "About"
 msgstr ""
 
-#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
-msgid "Recent tags"
+#: lib/action.php:723
+msgid "FAQ"
 msgstr ""
 
-#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
-msgid "Featured"
+#: lib/action.php:727
+msgid "TOS"
 msgstr ""
 
-#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
-msgid "Popular"
+#: lib/action.php:730
+msgid "Privacy"
 msgstr ""
 
-#: lib/searchgroupnav.php:82
-msgid "Notice"
+#: lib/action.php:732
+msgid "Source"
 msgstr ""
 
-#: lib/searchgroupnav.php:85
-msgid "Find groups on this site"
+#: lib/action.php:734
+msgid "Contact"
 msgstr ""
 
-#: lib/section.php:89
-msgid "Untitled section"
+#: lib/action.php:736
+msgid "Badge"
 msgstr ""
 
-#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
-#, php-format
-msgid "People %s subscribes to"
+#: lib/action.php:764
+msgid "StatusNet software license"
 msgstr ""
 
-#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
+#: lib/action.php:767
 #, php-format
-msgid "People subscribed to %s"
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
 
-#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
+#: lib/action.php:769
 #, php-format
-msgid "Groups %s is a member of"
+msgid "**%%site.name%%** is a microblogging service. "
 msgstr ""
 
-#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:771
 #, php-format
-msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
-
-#: lib/subs.php:53 lib/subs.php:52
-msgid "User has blocked you."
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-#: actions/userauthorization.php:178
-msgid "Subscribe to this user"
+#: lib/action.php:785
+msgid "Site content license"
 msgstr ""
 
-#: lib/tagcloudsection.php:56
-msgid "None"
+#: lib/action.php:794
+msgid "All "
 msgstr ""
 
-#: lib/topposterssection.php:74
-msgid "Top posters"
+#: lib/action.php:799
+msgid "license."
 msgstr ""
 
-#: lib/unblockform.php:120 lib/unblockform.php:150
-#: actions/blockedfromgroup.php:313
-msgid "Unblock this user"
+#: lib/action.php:1052
+msgid "Pagination"
 msgstr ""
 
-#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
-msgid "Unblock"
+#: lib/action.php:1061
+msgid "After"
 msgstr ""
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
-msgid "Unsubscribe from this user"
+#: lib/action.php:1069
+msgid "Before"
 msgstr ""
 
-#: actions/all.php:77 actions/all.php:59
-#, php-format
-msgid "Feed for friends of %s (RSS 1.0)"
+#: lib/action.php:1117
+msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/all.php:82 actions/all.php:64
-#, php-format
-msgid "Feed for friends of %s (RSS 2.0)"
+#: lib/attachmentlist.php:87
+msgid "Attachments"
 msgstr ""
 
-#: actions/all.php:87 actions/all.php:69
-#, php-format
-msgid "Feed for friends of %s (Atom)"
+#: lib/attachmentlist.php:265
+msgid "Author"
 msgstr ""
 
-#: actions/all.php:112 actions/all.php:125
-msgid "You and friends"
+#: lib/attachmentlist.php:278
+msgid "Provider"
 msgstr ""
 
-#: actions/avatarsettings.php:78
-#, php-format
-msgid "You can upload your personal avatar. The maximum file size is %s."
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
 msgstr ""
 
-#: actions/avatarsettings.php:373
-msgid "Avatar deleted."
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
 msgstr ""
 
-#: actions/block.php:129 actions/block.php:136
-msgid ""
-"Are you sure you want to block this user? Afterwards, they will be "
-"unsubscribed from you, unable to subscribe to you in the future, and you "
-"will not be notified of any @-replies from them."
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
 msgstr ""
 
-#: actions/deletenotice.php:73
-msgid ""
-"You are about to permanently delete a notice. Once this is done, it cannot "
-"be undone."
+#: lib/channel.php:210
+msgid "Command complete"
 msgstr ""
 
-#: actions/deletenotice.php:127
-msgid "There was a problem with your session token.  Try again, please."
+#: lib/channel.php:221
+msgid "Command failed"
 msgstr ""
 
-#: actions/emailsettings.php:168
-msgid "Send me email when someone sends me an \"@-reply\"."
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: actions/facebookhome.php:193 actions/facebookhome.php:187
+#: lib/command.php:88
 #, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
+msgid "Could not find a user with nickname %s"
 msgstr ""
 
-#: actions/facebookhome.php:217 actions/facebookhome.php:211
-#, php-format
-msgid "Okay, do it!"
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: actions/facebooksettings.php:124
+#: lib/command.php:99
 #, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
+msgid "Nudge sent to %s"
 msgstr ""
 
-#: actions/grouplogo.php:155
+#: lib/command.php:126
 #, php-format
 msgid ""
-"You can upload a logo image for your group. The maximum file size is %s."
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
 msgstr ""
 
-#: actions/grouplogo.php:367
-msgid "Pick a square area of the image to be the logo."
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
 msgstr ""
 
-#: actions/grouprss.php:136 actions/grouprss.php:137
-#, php-format
-msgid "Microblog by %s group"
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
 msgstr ""
 
-#: actions/groupsearch.php:57 actions/groupsearch.php:52
-#, php-format
-msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-"Separate the terms by spaces; they must be 3 characters or more."
+#: lib/command.php:190
+msgid "Notice marked as fave."
 msgstr ""
 
-#: actions/groups.php:90
+#: lib/command.php:315
 #, php-format
-msgid ""
-"%%%%site.name%%%% groups let you find and talk with people of similar "
-"interests. After you join a group you can send messages to all other members "
-"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
-msgstr ""
-
-#: actions/newmessage.php:102
-msgid "Only logged-in users can send direct messages."
+msgid "%1$s (%2$s)"
 msgstr ""
 
-#: actions/noticesearch.php:91
+#: lib/command.php:318
 #, php-format
-msgid "Search results for \"%s\" on %s"
+msgid "Fullname: %s"
 msgstr ""
 
-#: actions/openidlogin.php:66
+#: lib/command.php:321
 #, php-format
-msgid ""
-"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
-"before changing your settings."
-msgstr ""
-
-#: actions/public.php:125 actions/public.php:133
-msgid "Public Stream Feed (RSS 1.0)"
-msgstr ""
-
-#: actions/public.php:130 actions/public.php:138
-msgid "Public Stream Feed (RSS 2.0)"
-msgstr ""
-
-#: actions/public.php:135 actions/public.php:143
-msgid "Public Stream Feed (Atom)"
+msgid "Location: %s"
 msgstr ""
 
-#: actions/public.php:210 actions/public.php:241
+#: lib/command.php:324
 #, php-format
-msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service based on the Free Software [StatusNet](http://status.net/) "
-"tool. [Join now](%%action.register%%) to share notices about yourself with "
-"friends, family, and colleagues! ([Read more](%%doc.help%%))"
+msgid "Homepage: %s"
 msgstr ""
 
-#: actions/register.php:286 actions/register.php:329
+#: lib/command.php:327
 #, php-format
-msgid ""
-"With this form you can create  a new account. You can then post notices and "
-"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
-"Try our [OpenID registration](%%action.openidlogin%%)!)"
-msgstr ""
-
-#: actions/register.php:432 actions/register.php:479
-msgid "Creative Commons Attribution 3.0"
-msgstr ""
-
-#: actions/register.php:433 actions/register.php:480
-msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
-msgstr ""
-
-#: actions/showgroup.php:378 actions/showgroup.php:424
-msgid "Created"
+msgid "About: %s"
 msgstr ""
 
-#: actions/showgroup.php:393 actions/showgroup.php:440
+#: lib/command.php:358 scripts/xmppdaemon.php:321
 #, php-format
-msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. [Join now](%%%%action.register%%%%) to become part "
-"of this group and many more! ([Read more](%%%%doc.help%%%%))"
+msgid "Message too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: actions/showstream.php:147
-msgid "Your profile"
+#: lib/command.php:377
+msgid "Error sending direct message."
 msgstr ""
 
-#: actions/showstream.php:149
+#: lib/command.php:431
 #, php-format
-msgid "%s's profile"
+msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: actions/showstream.php:163 actions/showstream.php:128
+#: lib/command.php:439
 #, php-format
-msgid "Notice feed for %s (RSS 1.0)"
+msgid "Reply to %s sent"
 msgstr ""
 
-#: actions/showstream.php:170 actions/showstream.php:135
-#, php-format
-msgid "Notice feed for %s (RSS 2.0)"
+#: lib/command.php:441
+msgid "Error saving notice."
 msgstr ""
 
-#: actions/showstream.php:177 actions/showstream.php:142
-#, php-format
-msgid "Notice feed for %s (Atom)"
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: actions/showstream.php:182 actions/showstream.php:147
+#: lib/command.php:502
 #, php-format
-msgid "FOAF for %s"
+msgid "Subscribed to %s"
 msgstr ""
 
-#: actions/showstream.php:237 actions/showstream.php:202
-msgid "Edit Avatar"
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: actions/showstream.php:316 actions/showstream.php:281
-msgid "Edit profile settings"
+#: lib/command.php:530
+#, php-format
+msgid "Unsubscribed from %s"
 msgstr ""
 
-#: actions/showstream.php:317 actions/showstream.php:282
-msgid "Edit"
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
 msgstr ""
 
-#: actions/showstream.php:542 actions/showstream.php:388
-#, php-format
-msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
-"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
+#: lib/command.php:551
+msgid "Notification off."
 msgstr ""
 
-#: actions/smssettings.php:335
-msgid ""
-"A confirmation code was sent to the phone number you added. Check your phone "
-"for the code and instructions on how to use it."
+#: lib/command.php:553
+msgid "Can't turn off notification."
 msgstr ""
 
-#: actions/twitapifavorites.php:171 lib/mail.php:556
-#: actions/twitapifavorites.php:222
-#, php-format
-msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\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"
+#: lib/command.php:574
+msgid "Notification on."
 msgstr ""
 
-#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
-#: actions/twitapistatuses.php:314
-msgid "No such user!"
+#: lib/command.php:576
+msgid "Can't turn on notification."
 msgstr ""
 
-#: actions/twittersettings.php:72
-msgid ""
-"Add your Twitter account to automatically send  your notices to Twitter, and "
-"subscribe to Twitter friends already here."
+#: lib/command.php:597
+#, php-format
+msgid "Could not create login token for %s"
 msgstr ""
 
-#: actions/twittersettings.php:345 actions/twittersettings.php:362
+#: lib/command.php:602
 #, php-format
-msgid "Unable to retrieve account information For \"%s\" from Twitter."
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: actions/userauthorization.php:86 actions/userauthorization.php:81
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user's notices. If you didn't just ask to subscribe to someone's notices, "
-"click \"Reject\"."
+#: lib/command.php:618
+msgid "You are not subscribed to anyone."
 msgstr ""
 
-#: actions/usergroups.php:131 actions/usergroups.php:130
-msgid "Search for more groups"
+#: lib/command.php:620
+msgid "You are subscribed to these people: "
 msgstr ""
 
-#: classes/Notice.php:138 classes/Notice.php:154
-msgid ""
-"Too many duplicate messages too quickly; take a breather and post again in a "
-"few minutes."
+#: lib/command.php:637
+msgid "No one is subscribed to you."
 msgstr ""
 
-#: lib/action.php:406 lib/action.php:425
-msgid "Connect to SMS, Twitter"
+#: lib/command.php:639
+msgid "These people are subscribed to you: "
 msgstr ""
 
-#: lib/action.php:671 lib/action.php:721
-msgid "Badge"
+#: lib/command.php:656
+msgid "You are not a member of any groups."
 msgstr ""
 
-#: lib/command.php:113 lib/command.php:106
-#, php-format
-msgid ""
-"Subscriptions: %1$s\n"
-"Subscribers: %2$s\n"
-"Notices: %3$s"
+#: lib/command.php:658
+msgid "You are a member of these groups: "
 msgstr ""
 
-#: lib/command.php:392 lib/command.php:385
+#: lib/command.php:670
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
 "whois <nickname> - get profile info on user\n"
 "fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
 "stats - get your stats\n"
 "stop - same as 'off'\n"
 "quit - same as 'off'\n"
@@ -5410,7 +3627,7 @@ msgid ""
 "last <nickname> - same as 'get'\n"
 "on <nickname> - not yet implemented.\n"
 "off <nickname> - not yet implemented.\n"
-"nudge <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
 "invite <phone number> - not yet implemented.\n"
 "track <word> - not yet implemented.\n"
 "untrack <word> - not yet implemented.\n"
@@ -5420,1054 +3637,892 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/dberroraction.php:60
-msgid "Database error"
+#: lib/common.php:192
+msgid "No configuration file found. "
 msgstr ""
 
-#: lib/facebookaction.php:271 lib/facebookaction.php:273
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet? "
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/feed.php:85
-msgid "RSS 1.0"
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/feed.php:87
-msgid "RSS 2.0"
+#: lib/common.php:195
+msgid "Go to the installer."
 msgstr ""
 
-#: lib/feed.php:89
-msgid "Atom"
+#: lib/connectsettingsaction.php:110
+msgid "IM"
 msgstr ""
 
-#: lib/feed.php:91
-msgid "FOAF"
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
 msgstr ""
 
-#: lib/imagefile.php:75
-#, php-format
-msgid "That file is too big. The maximum file size is %d."
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
 msgstr ""
 
-#: lib/mail.php:175 lib/mail.php:174
-#, php-format
-msgid ""
-"Hey, %s.\n"
-"\n"
-"Someone just entered this email address on %s.\n"
-"\n"
-"If it was you, and you want to confirm your entry, use the URL below:\n"
-"\n"
-"\t%s\n"
-"\n"
-"If not, just ignore this message.\n"
-"\n"
-"Thanks for your time, \n"
-"%s\n"
+#: lib/dberroraction.php:60
+msgid "Database error"
 msgstr ""
 
-#: lib/mail.php:241 lib/mail.php:240
-#, php-format
-msgid ""
-"%1$s is now listening to your notices on %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"%4$s%5$s%6$s\n"
-"Faithfully yours,\n"
-"%7$s.\n"
-"\n"
-"----\n"
-"Change your email address or notification options at %8$s\n"
+#: lib/designsettings.php:101
+msgid "Change background image"
 msgstr ""
 
-#: lib/mail.php:466
-#, php-format
-msgid ""
-"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
-"to post some news.\n"
-"\n"
-"So let's hear from you :)\n"
-"\n"
-"%3$s\n"
-"\n"
-"Don't reply to this email; it won't get to them.\n"
-"\n"
-"With kind regards,\n"
-"%4$s\n"
+#: lib/designsettings.php:105
+msgid "Upload file"
 msgstr ""
 
-#: lib/mail.php:513
-#, php-format
+#: lib/designsettings.php:109
 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 ""
-
-#: lib/mail.php:598 lib/mail.php:600
-#, php-format
-msgid "%s sent a notice to your attention"
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 
-#: lib/mail.php:600 lib/mail.php:602
-#, php-format
-msgid ""
-"%1$s just sent a notice to your attention (an '@-reply') on %2$s.\n"
-"\n"
-"The notice is here:\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"It reads:\n"
-"\n"
-"\t%4$s\n"
-"\n"
-"You can reply back here:\n"
-"\n"
-"\t%5$s\n"
-"\n"
-"The list of all @-replies for you here:\n"
-"\n"
-"%6$s\n"
-"\n"
-"Faithfully yours,\n"
-"%2$s\n"
-"\n"
-"P.S. You can turn off these email notifications here: %7$s\n"
+#: lib/designsettings.php:139
+msgid "On"
 msgstr ""
 
-#: lib/searchaction.php:122 lib/searchaction.php:120
-msgid "Search site"
+#: lib/designsettings.php:155
+msgid "Off"
 msgstr ""
 
-#: lib/section.php:106
-msgid "More..."
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
 msgstr ""
 
-#: actions/all.php:80
-#, php-format
-msgid ""
-"This is the timeline for %s and friends but no one has posted anything yet."
+#: lib/designsettings.php:161
+msgid "Tile background image"
 msgstr ""
 
-#: actions/all.php:85
-#, php-format
-msgid ""
-"Try subscribing to more people, [join a group](%%action.groups%%) or post "
-"something yourself."
+#: lib/designsettings.php:170
+msgid "Change colours"
 msgstr ""
 
-#: actions/all.php:87
-#, php-format
-msgid ""
-"You can try to [nudge %s](../%s) from his profile or [post something to his "
-"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+#: lib/designsettings.php:178
+msgid "Background"
 msgstr ""
 
-#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
-#, php-format
-msgid ""
-"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
-"post a notice to his or her attention."
+#: lib/designsettings.php:191
+msgid "Content"
 msgstr ""
 
-#: actions/attachment.php:73
-msgid "No such attachment."
+#: lib/designsettings.php:204
+msgid "Sidebar"
 msgstr ""
 
-#: actions/block.php:149
-msgid "Do not block this user from this group"
+#: lib/designsettings.php:217
+msgid "Text"
 msgstr ""
 
-#: actions/block.php:150
-msgid "Block this user from this group"
+#: lib/designsettings.php:230
+msgid "Links"
 msgstr ""
 
-#: actions/blockedfromgroup.php:90
-#, php-format
-msgid "%s blocked profiles"
+#: lib/designsettings.php:247
+msgid "Use defaults"
 msgstr ""
 
-#: actions/blockedfromgroup.php:93
-#, php-format
-msgid "%s blocked profiles, page %d"
+#: lib/designsettings.php:248
+msgid "Restore default designs"
 msgstr ""
 
-#: actions/blockedfromgroup.php:108
-msgid "A list of the users blocked from joining this group."
+#: lib/designsettings.php:254
+msgid "Reset back to default"
 msgstr ""
 
-#: actions/blockedfromgroup.php:281
-msgid "Unblock user from group"
+#: lib/designsettings.php:257
+msgid "Save design"
 msgstr ""
 
-#: actions/conversation.php:99
-msgid "Conversation"
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
 msgstr ""
 
-#: actions/deletenotice.php:115
-msgid "Do not delete this notice"
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
 msgstr ""
 
-#: actions/editgroup.php:214 actions/newgroup.php:164
-#, php-format
-msgid "Too many aliases! Maximum %d."
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
 msgstr ""
 
-#: actions/editgroup.php:223 actions/newgroup.php:173
-#, php-format
-msgid "Invalid alias: \"%s\""
+#: lib/favorform.php:114 lib/favorform.php:140
+msgid "Favor this notice"
 msgstr ""
 
-#: actions/editgroup.php:227 actions/newgroup.php:177
-#, php-format
-msgid "Alias \"%s\" already in use. Try another one."
+#: lib/favorform.php:140
+msgid "Favor"
 msgstr ""
 
-#: actions/editgroup.php:233 actions/newgroup.php:183
-msgid "Alias can't be the same as nickname."
+#: lib/feedlist.php:64
+msgid "Export data"
 msgstr ""
 
-#: actions/editgroup.php:259 actions/newgroup.php:215
-msgid "Could not create aliases."
+#: lib/feed.php:85
+msgid "RSS 1.0"
 msgstr ""
 
-#: actions/favorited.php:150
-msgid "Favorite notices appear on this page but no one has favorited one yet."
+#: lib/feed.php:87
+msgid "RSS 2.0"
 msgstr ""
 
-#: actions/favorited.php:153
-msgid ""
-"Be the first to add a notice to your favorites by clicking the fave button "
-"next to any notice you like."
+#: lib/feed.php:89
+msgid "Atom"
 msgstr ""
 
-#: actions/favorited.php:156
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to add a "
-"notice to your favorites!"
+#: lib/feed.php:91
+msgid "FOAF"
 msgstr ""
 
-#: actions/file.php:34
-msgid "No notice id"
+#: lib/galleryaction.php:121
+msgid "Filter tags"
 msgstr ""
 
-#: actions/file.php:38
-msgid "No notice"
+#: lib/galleryaction.php:131
+msgid "All"
 msgstr ""
 
-#: actions/file.php:42
-msgid "No attachments"
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
 msgstr ""
 
-#: actions/file.php:51
-msgid "No uploaded attachments"
+#: lib/galleryaction.php:140
+msgid "Tag"
 msgstr ""
 
-#: actions/finishopenidlogin.php:211
-msgid "Not a valid invitation code."
+#: lib/galleryaction.php:141
+msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: actions/groupblock.php:81 actions/groupunblock.php:81
-#: actions/makeadmin.php:81
-msgid "No group specified."
+#: lib/galleryaction.php:143
+msgid "Go"
 msgstr ""
 
-#: actions/groupblock.php:91
-msgid "Only an admin can block group members."
+#: lib/groupeditform.php:163
+msgid "URL of the homepage or blog of the group or topic"
 msgstr ""
 
-#: actions/groupblock.php:95
-msgid "User is already blocked from group."
+#: lib/groupeditform.php:168
+msgid "Describe the group or topic"
 msgstr ""
 
-#: actions/groupblock.php:100
-msgid "User is not a member of group."
+#: lib/groupeditform.php:170
+#, php-format
+msgid "Describe the group or topic in %d characters"
 msgstr ""
 
-#: actions/groupblock.php:136 actions/groupmembers.php:311
-msgid "Block user from group"
+#: lib/groupeditform.php:172
+msgid "Description"
 msgstr ""
 
-#: actions/groupblock.php:155
-#, php-format
+#: lib/groupeditform.php:179
 msgid ""
-"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
-"be removed from the group, unable to post, and unable to subscribe to the "
-"group in the future."
-msgstr ""
-
-#: actions/groupblock.php:193
-msgid "Database error blocking user from group."
+"Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr ""
 
-#: actions/groupdesignsettings.php:73
-msgid "You must be logged in to edit a group."
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: actions/groupdesignsettings.php:146
-msgid "Group design"
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+msgid "Group"
 msgstr ""
 
-#: actions/groupdesignsettings.php:157
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
+#: lib/groupnav.php:101
+msgid "Blocked"
 msgstr ""
 
-#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
-#: lib/designsettings.php:440 lib/designsettings.php:470
-msgid "Couldn't update your design."
+#: lib/groupnav.php:102
+#, php-format
+msgid "%s blocked users"
 msgstr ""
 
-#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
-msgid "Unable to save your design settings!"
+#: lib/groupnav.php:108
+#, php-format
+msgid "Edit %s group properties"
 msgstr ""
 
-#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
-msgid "Design preferences saved."
+#: lib/groupnav.php:113
+msgid "Logo"
 msgstr ""
 
-#: actions/groupmembers.php:438
-msgid "Make user an admin of the group"
+#: lib/groupnav.php:114
+#, php-format
+msgid "Add or edit %s logo"
 msgstr ""
 
-#: actions/groupmembers.php:470
-msgid "Make Admin"
+#: lib/groupnav.php:120
+#, php-format
+msgid "Add or edit %s design"
 msgstr ""
 
-#: actions/groupmembers.php:470
-msgid "Make this user an admin"
+#: lib/groupsbymemberssection.php:71
+msgid "Groups with most members"
 msgstr ""
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
-msgid "No results."
+#: lib/groupsbypostssection.php:71
+msgid "Groups with most posts"
 msgstr ""
 
-#: actions/groupsearch.php:82
+#: lib/grouptagcloudsection.php:56
 #, php-format
-msgid ""
-"If you can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+msgid "Tags in %s group's notices"
 msgstr ""
 
-#: actions/groupsearch.php:85
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and [create the group](%%"
-"action.newgroup%%) yourself!"
+#: lib/htmloutputter.php:104
+msgid "This page is not available in a media type you accept"
 msgstr ""
 
-#: actions/groupunblock.php:91
-msgid "Only an admin can unblock group members."
+#: lib/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %s."
 msgstr ""
 
-#: actions/groupunblock.php:95
-msgid "User is not blocked from group."
+#: lib/imagefile.php:80
+msgid "Partial upload."
 msgstr ""
 
-#: actions/invite.php:39
-msgid "Invites have been disabled."
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
 msgstr ""
 
-#: actions/joingroup.php:100
-msgid "You have been blocked from that group by the admin."
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
 msgstr ""
 
-#: actions/makeadmin.php:91
-msgid "Only an admin can make another user an admin."
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
 msgstr ""
 
-#: actions/makeadmin.php:95
-#, php-format
-msgid "%s is already an admin for group \"%s\"."
+#: lib/imagefile.php:118
+msgid "Lost our file."
 msgstr ""
 
-#: actions/makeadmin.php:132
-#, php-format
-msgid "Can't get membership record for %s in group %s"
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
 msgstr ""
 
-#: actions/makeadmin.php:145
+#: lib/jabber.php:192
 #, php-format
-msgid "Can't make %s an admin for group %s"
+msgid "[%s]"
 msgstr ""
 
-#: actions/newmessage.php:178
-msgid "Message sent"
+#: lib/joinform.php:114
+msgid "Join"
 msgstr ""
 
-#: actions/newnotice.php:93 lib/designsettings.php:281
-#, php-format
-msgid ""
-"The server was unable to handle that much POST data (%s bytes) due to its "
-"current configuration."
+#: lib/leaveform.php:114
+msgid "Leave"
 msgstr ""
 
-#: actions/newnotice.php:128 scripts/maildaemon.php:185
-#, php-format
-msgid " Try using another %s format."
+#: lib/logingroupnav.php:80
+msgid "Login with a username and password"
 msgstr ""
 
-#: actions/newnotice.php:133 scripts/maildaemon.php:190
-#, php-format
-msgid "%s is not a supported filetype on this server."
+#: lib/logingroupnav.php:86
+msgid "Sign up for a new account"
 msgstr ""
 
-#: actions/newnotice.php:205
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
 msgstr ""
 
-#: actions/newnotice.php:208
+#: lib/mailbox.php:139
 msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form."
-msgstr ""
-
-#: actions/newnotice.php:211
-msgid "The uploaded file was only partially uploaded."
-msgstr ""
-
-#: actions/newnotice.php:214
-msgid "Missing a temporary folder."
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: actions/newnotice.php:217
-msgid "Failed to write file to disk."
+#: lib/mailbox.php:227 lib/noticelist.php:424
+msgid "from"
 msgstr ""
 
-#: actions/newnotice.php:220
-msgid "File upload stopped by extension."
+#: lib/mail.php:172
+msgid "Email address confirmation"
 msgstr ""
 
-#: actions/newnotice.php:230 scripts/maildaemon.php:85
-msgid "Couldn't save file."
+#: lib/mail.php:174
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%s\n"
+"\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
 msgstr ""
 
-#: actions/newnotice.php:246 scripts/maildaemon.php:101
-msgid "Max notice size is 140 chars, including attachment URL."
+#: lib/mail.php:235
+#, php-format
+msgid "%1$s is now listening to your notices on %2$s."
 msgstr ""
 
-#: actions/newnotice.php:297
-msgid "Somehow lost the login in saveFile"
+#: lib/mail.php:240
+#, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
 msgstr ""
 
-#: actions/newnotice.php:309 scripts/maildaemon.php:127
-msgid "File could not be moved to destination directory."
+#: lib/mail.php:253
+#, php-format
+msgid "Location: %s\n"
 msgstr ""
 
-#: actions/newnotice.php:336 actions/newnotice.php:360
-#: scripts/maildaemon.php:148 scripts/maildaemon.php:167
-msgid "There was a database error while saving your file. Please try again."
+#: lib/mail.php:255
+#, php-format
+msgid "Homepage: %s\n"
 msgstr ""
 
-#: actions/noticesearch.php:121
+#: lib/mail.php:257
 #, php-format
 msgid ""
-"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
-"status_textarea=%s)!"
+"Bio: %s\n"
+"\n"
 msgstr ""
 
-#: actions/noticesearch.php:124
+#: lib/mail.php:285
 #, php-format
-msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to  "
-"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
+msgid "New email address for posting to %s"
 msgstr ""
 
-#: actions/openidsettings.php:70
+#: lib/mail.php:288
 #, php-format
 msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
-"account. Manage your associated OpenIDs from here."
-msgstr ""
-
-#: actions/othersettings.php:110
-msgid "Shorten URLs with"
+"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/othersettings.php:115
-msgid "View profile designs"
+#: lib/mail.php:412
+#, php-format
+msgid "%s status"
 msgstr ""
 
-#: actions/othersettings.php:116
-msgid "Show or hide profile designs."
+#: lib/mail.php:438
+msgid "SMS confirmation"
 msgstr ""
 
-#: actions/public.php:82
+#: lib/mail.php:462
 #, php-format
-msgid "Beyond the page limit (%s)"
+msgid "You've been nudged by %s"
 msgstr ""
 
-#: actions/public.php:179
+#: lib/mail.php:466
 #, php-format
 msgid ""
-"This is the public timeline for %%site.name%% but no one has posted anything "
-"yet."
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
 msgstr ""
 
-#: actions/public.php:182
-msgid "Be the first to post!"
+#: lib/mail.php:509
+#, php-format
+msgid "New private message from %s"
 msgstr ""
 
-#: actions/public.php:186
+#: lib/mail.php:513
 #, php-format
 msgid ""
-"Why not [register an account](%%action.register%%) and be the first to post!"
+"%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 ""
 
-#: actions/public.php:245
+#: lib/mail.php:554
 #, php-format
-msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service based on the Free Software [StatusNet](http://status.net/) "
-"tool."
+msgid "%s (@%s) added your notice as a favorite"
 msgstr ""
 
-#: actions/publictagcloud.php:69
+#: lib/mail.php:556
 #, php-format
-msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
 msgstr ""
 
-#: actions/publictagcloud.php:72
-msgid "Be the first to post one!"
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
 msgstr ""
 
-#: actions/publictagcloud.php:75
+#: lib/mail.php:613
 #, php-format
 msgid ""
-"Why not [register an account](%%action.register%%) and be the first to post "
-"one!"
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
 msgstr ""
 
-#: actions/recoverpassword.php:152
-msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
-"email address you have stored in your account."
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#: actions/recoverpassword.php:158
-msgid "You've been identified. Enter a new password below. "
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
-#: actions/recoverpassword.php:188
-msgid "Password recover"
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
 msgstr ""
 
-#: actions/register.php:86
-msgid "Sorry, invalid invitation code."
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
-#: actions/remotesubscribe.php:100
-msgid "Subscribe to a remote user"
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
 msgstr ""
 
-#: actions/replies.php:179
-#, php-format
-msgid ""
-"This is the timeline showing replies to %s but %s hasn't received a notice "
-"to his attention yet."
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
 msgstr ""
 
-#: actions/replies.php:184
-#, php-format
-msgid ""
-"You can engage other users in a conversation, subscribe to more people or "
-"[join groups](%%action.groups%%)."
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
 msgstr ""
 
-#: actions/replies.php:186
-#, php-format
-msgid ""
-"You can try to [nudge %s](../%s) or [post something to his or her attention]"
-"(%%%%action.newnotice%%%%?status_textarea=%s)."
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
 msgstr ""
 
-#: actions/showfavorites.php:79
-#, php-format
-msgid "%s's favorite notices, page %d"
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
 msgstr ""
 
-#: actions/showfavorites.php:170
-msgid ""
-"You haven't chosen any favorite notices yet. Click the fave button on "
-"notices you like to bookmark them for later or shed a spotlight on them."
+#: lib/mediafile.php:201 lib/mediafile.php:237
+msgid "Could not determine file's mime-type!"
 msgstr ""
 
-#: actions/showfavorites.php:172
+#: lib/mediafile.php:270
 #, php-format
-msgid ""
-"%s hasn't added any notices to his favorites yet. Post something interesting "
-"they would add to their favorites :)"
+msgid " Try using another %s format."
 msgstr ""
 
-#: actions/showfavorites.php:176
+#: lib/mediafile.php:275
 #, php-format
-msgid ""
-"%s hasn't added any notices to his favorites yet. Why not [register an "
-"account](%%%%action.register%%%%) and then post something interesting they "
-"would add to thier favorites :)"
+msgid "%s is not a supported filetype on this server."
 msgstr ""
 
-#: actions/showfavorites.php:226
-msgid "This is a way to share what you like."
+#: lib/messageform.php:120
+msgid "Send a direct notice"
 msgstr ""
 
-#: actions/showgroup.php:279 lib/groupeditform.php:178
-msgid "Aliases"
+#: lib/messageform.php:146
+msgid "To"
 msgstr ""
 
-#: actions/showgroup.php:323
-#, php-format
-msgid "Notice feed for %s group (RSS 1.0)"
+#: lib/messageform.php:162 lib/noticeform.php:173
+msgid "Available characters"
 msgstr ""
 
-#: actions/showgroup.php:330 actions/tag.php:84
-#, php-format
-msgid "Notice feed for %s group (RSS 2.0)"
+#: lib/noticeform.php:145
+msgid "Send a notice"
 msgstr ""
 
-#: actions/showgroup.php:337
+#: lib/noticeform.php:158
 #, php-format
-msgid "Notice feed for %s group (Atom)"
+msgid "What's up, %s?"
 msgstr ""
 
-#: actions/showgroup.php:446
-#, php-format
-msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+#: lib/noticeform.php:180
+msgid "Attach"
 msgstr ""
 
-#: actions/showgroup.php:474
-msgid "Admins"
+#: lib/noticeform.php:184
+msgid "Attach a file"
 msgstr ""
 
-#: actions/shownotice.php:101
-msgid "Not a local notice"
+#: lib/noticelist.php:478
+msgid "in context"
 msgstr ""
 
-#: actions/showstream.php:72
-#, php-format
-msgid " tagged %s"
+#: lib/noticelist.php:498
+msgid "Reply to this notice"
 msgstr ""
 
-#: actions/showstream.php:121
-#, php-format
-msgid "Notice feed for %s tagged %s (RSS 1.0)"
+#: lib/noticelist.php:499
+msgid "Reply"
 msgstr ""
 
-#: actions/showstream.php:350
-#, php-format
-msgid "This is the timeline for %s but %s hasn't posted anything yet."
+#: lib/nudgeform.php:116
+msgid "Nudge this user"
 msgstr ""
 
-#: actions/showstream.php:355
-msgid ""
-"Seen anything interesting recently? You haven't posted any notices yet, now "
-"would be a good time to start :)"
+#: lib/nudgeform.php:128
+msgid "Nudge"
 msgstr ""
 
-#: actions/showstream.php:357
-#, php-format
-msgid ""
-"You can try to nudge %s or [post something to his or her attention](%%%%"
-"action.newnotice%%%%?status_textarea=%s)."
+#: lib/nudgeform.php:128
+msgid "Send a nudge to this user"
 msgstr ""
 
-#: actions/showstream.php:393
-#, php-format
-msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
 msgstr ""
 
-#: actions/subscribers.php:108
-msgid ""
-"You have no subscribers. Try subscribing to people you know and they might "
-"return the favor"
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
 msgstr ""
 
-#: actions/subscribers.php:110
-#, php-format
-msgid "%s has no subscribers. Want to be the first?"
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
 msgstr ""
 
-#: actions/subscribers.php:114
-#, php-format
-msgid ""
-"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
-"%) and be the first?"
+#: lib/oauthstore.php:345
+msgid "Duplicate notice"
 msgstr ""
 
-#: actions/subscriptions.php:115
-#, php-format
-msgid ""
-"You're not listening to anyone's notices right now, try subscribing to "
-"people you know. Try [people search](%%action.peoplesearch%%), look for "
-"members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
 msgstr ""
 
-#: actions/subscriptions.php:117 actions/subscriptions.php:121
-#, php-format
-msgid "%s is not listening to anyone."
+#: lib/personalgroupnav.php:99
+msgid "Personal"
 msgstr ""
 
-#: actions/tag.php:77
-#, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
+#: lib/personalgroupnav.php:104
+msgid "Replies"
 msgstr ""
 
-#: actions/tag.php:91
-#, php-format
-msgid "Notice feed for tag %s (Atom)"
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
 msgstr ""
 
-#: actions/twitapifavorites.php:125
-msgid "This status is already a favorite!"
+#: lib/personalgroupnav.php:115
+msgid "User"
 msgstr ""
 
-#: actions/twitapifavorites.php:179
-msgid "That status is not a favorite!"
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
 msgstr ""
 
-#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
-msgid "Could not determine source user."
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
 msgstr ""
 
-#: actions/twitapifriendships.php:215
-msgid "Target user not specified."
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
 msgstr ""
 
-#: actions/twitapifriendships.php:221
-msgid "Could not find target user."
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
 msgstr ""
 
-#: actions/twitapistatuses.php:322
+#: lib/personaltagcloudsection.php:56
 #, php-format
-msgid "%1$s / Updates mentioning %2$s"
+msgid "Tags in %s's notices"
 msgstr ""
 
-#: actions/twitapitags.php:74
-#, php-format
-msgid "Updates tagged with %1$s on %2$s!"
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
 msgstr ""
 
-#: actions/twittersettings.php:165
-msgid "Import my Friends Timeline."
+#: lib/profileaction.php:126
+msgid "All subscriptions"
 msgstr ""
 
-#: actions/userauthorization.php:158
-msgid "License"
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
 msgstr ""
 
-#: actions/userauthorization.php:179
-msgid "Reject this subscription"
+#: lib/profileaction.php:157
+msgid "All subscribers"
 msgstr ""
 
-#: actions/userdesignsettings.php:76 lib/designsettings.php:65
-msgid "Profile design"
+#: lib/profileaction.php:177
+msgid "User ID"
 msgstr ""
 
-#: actions/userdesignsettings.php:87 lib/designsettings.php:76
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
+#: lib/profileaction.php:182
+msgid "Member since"
 msgstr ""
 
-#: actions/userdesignsettings.php:282
-msgid "Enjoy your hotdog!"
+#: lib/profileaction.php:235
+msgid "All groups"
 msgstr ""
 
-#: actions/usergroups.php:153
-#, php-format
-msgid "%s is not a member of any group."
+#: lib/publicgroupnav.php:78
+msgid "Public"
 msgstr ""
 
-#: actions/usergroups.php:158
-#, php-format
-msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+#: lib/publicgroupnav.php:82
+msgid "User groups"
 msgstr ""
 
-#: classes/File.php:127
-#, php-format
-msgid ""
-"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
-"to upload a smaller version."
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
+msgid "Recent tags"
 msgstr ""
 
-#: classes/File.php:137
-#, php-format
-msgid "A file this large would exceed your user quota of %d bytes."
+#: lib/publicgroupnav.php:88
+msgid "Featured"
 msgstr ""
 
-#: classes/File.php:145
-#, php-format
-msgid "A file this large would exceed your monthly quota of %d bytes."
+#: lib/publicgroupnav.php:92
+msgid "Popular"
 msgstr ""
 
-#: classes/Notice.php:139
-msgid "Problem saving notice. Too long."
+#: lib/searchaction.php:120
+msgid "Search site"
 msgstr ""
 
-#: classes/User.php:319
-#, php-format
-msgid "Welcome to %1$s, @%2$s!"
+#: lib/searchaction.php:162
+msgid "Search help"
 msgstr ""
 
-#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
-msgid "Design"
+#: lib/searchgroupnav.php:80
+msgid "People"
 msgstr ""
 
-#: lib/accountsettingsaction.php:120
-msgid "Design your profile"
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
 msgstr ""
 
-#: lib/action.php:712
-msgid "TOS"
+#: lib/searchgroupnav.php:82
+msgid "Notice"
 msgstr ""
 
-#: lib/attachmentlist.php:87
-msgid "Attachments"
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
 msgstr ""
 
-#: lib/attachmentlist.php:265
-msgid "Author"
+#: lib/searchgroupnav.php:85
+msgid "Find groups on this site"
 msgstr ""
 
-#: lib/attachmentlist.php:278
-msgid "Provider"
+#: lib/section.php:89
+msgid "Untitled section"
 msgstr ""
 
-#: lib/attachmentnoticesection.php:67
-msgid "Notices where this attachment appears"
+#: lib/section.php:106
+msgid "More..."
 msgstr ""
 
-#: lib/attachmenttagcloudsection.php:48
-msgid "Tags for this attachment"
+#: lib/subgroupnav.php:83
+#, php-format
+msgid "People %s subscribes to"
 msgstr ""
 
-#: lib/designsettings.php:101
-msgid "Change background image"
+#: lib/subgroupnav.php:91
+#, php-format
+msgid "People subscribed to %s"
 msgstr ""
 
-#: lib/designsettings.php:105
-msgid "Upload file"
+#: lib/subgroupnav.php:99
+#, php-format
+msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/designsettings.php:109
-msgid ""
-"You can upload your personal background image. The maximum file size is 2Mb."
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
 msgstr ""
 
-#: lib/designsettings.php:139
-msgid "On"
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
 msgstr ""
 
-#: lib/designsettings.php:155
-msgid "Off"
+#: lib/subscriptionlist.php:126
+msgid "(none)"
 msgstr ""
 
-#: lib/designsettings.php:156
-msgid "Turn background image on or off."
+#: lib/subs.php:48
+msgid "Already subscribed!"
 msgstr ""
 
-#: lib/designsettings.php:161
-msgid "Tile background image"
+#: lib/subs.php:52
+msgid "User has blocked you."
 msgstr ""
 
-#: lib/designsettings.php:170
-msgid "Change colours"
+#: lib/subs.php:56
+msgid "Could not subscribe."
 msgstr ""
 
-#: lib/designsettings.php:178
-msgid "Background"
+#: lib/subs.php:75
+msgid "Could not subscribe other to you."
 msgstr ""
 
-#: lib/designsettings.php:191
-msgid "Content"
+#: lib/subs.php:124
+msgid "Not subscribed!"
 msgstr ""
 
-#: lib/designsettings.php:204
-msgid "Sidebar"
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
 msgstr ""
 
-#: lib/designsettings.php:230
-msgid "Links"
+#: lib/tagcloudsection.php:56
+msgid "None"
 msgstr ""
 
-#: lib/designsettings.php:247
-msgid "Use defaults"
+#: lib/topposterssection.php:74
+msgid "Top posters"
 msgstr ""
 
-#: lib/designsettings.php:248
-msgid "Restore default designs"
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+msgid "Unsubscribe from this user"
 msgstr ""
 
-#: lib/designsettings.php:254
-msgid "Reset back to default"
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
 msgstr ""
 
-#: lib/designsettings.php:257
-msgid "Save design"
+#: lib/userprofile.php:116
+msgid "Edit Avatar"
 msgstr ""
 
-#: lib/designsettings.php:378
-msgid "Bad default color settings: "
+#: lib/userprofile.php:236
+msgid "User actions"
 msgstr ""
 
-#: lib/designsettings.php:474
-msgid "Design defaults restored."
+#: lib/userprofile.php:248
+msgid "Edit profile settings"
 msgstr ""
 
-#: lib/groupeditform.php:181
-#, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+#: lib/userprofile.php:249
+msgid "Edit"
 msgstr ""
 
-#: lib/groupnav.php:100
-msgid "Blocked"
+#: lib/userprofile.php:272
+msgid "Send a direct message to this user"
 msgstr ""
 
-#: lib/groupnav.php:101
-#, php-format
-msgid "%s blocked users"
+#: lib/userprofile.php:273
+msgid "Message"
 msgstr ""
 
-#: lib/groupnav.php:119
-#, php-format
-msgid "Add or edit %s design"
+#: lib/util.php:821
+msgid "a few seconds ago"
 msgstr ""
 
-#: lib/mail.php:556
-#, php-format
-msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
-"The URL of your notice is:\n"
-"\n"
-"%3$s\n"
-"\n"
-"The text of your notice is:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see the list of %1$s's favorites here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"Faithfully yours,\n"
-"%6$s\n"
+#: lib/util.php:823
+msgid "about a minute ago"
 msgstr ""
 
-#: lib/mail.php:646
+#: lib/util.php:825
 #, php-format
-msgid "Your Twitter bridge has been disabled."
+msgid "about %d minutes ago"
 msgstr ""
 
-#: lib/mail.php:648
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
-"disabled. Your Twitter credentials have either changed (did you recently "
-"change your Twitter password?) or you have otherwise revoked our access to "
-"your Twitter account.\n"
-"\n"
-"You can re-enable your Twitter bridge by visiting your Twitter settings "
-"page:\n"
-"\n"
-"\t%2$s\n"
-"\n"
-"Regards,\n"
-"%3$s\n"
+#: lib/util.php:827
+msgid "about an hour ago"
 msgstr ""
 
-#: lib/mail.php:682
+#: lib/util.php:829
 #, php-format
-msgid "Your %s Facebook application access has been disabled."
+msgid "about %d hours ago"
 msgstr ""
 
-#: lib/mail.php:685
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %s, and have disabled the Facebook application for your "
-"account. This may be because you have removed the Facebook application's "
-"authorization, or have deleted your Facebook account.  You can re-enable the "
-"Facebook application and automatic status updating by re-installing the %1$s "
-"Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%1$s"
+#: lib/util.php:831
+msgid "about a day ago"
 msgstr ""
 
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
+#: lib/util.php:833
+#, php-format
+msgid "about %d days ago"
 msgstr ""
 
-#: lib/noticeform.php:154
-msgid "Attach"
+#: lib/util.php:835
+msgid "about a month ago"
 msgstr ""
 
-#: lib/noticeform.php:158
-msgid "Attach a file"
+#: lib/util.php:837
+#, php-format
+msgid "about %d months ago"
 msgstr ""
 
-#: lib/noticelist.php:436
-msgid "in context"
+#: lib/util.php:839
+msgid "about a year ago"
 msgstr ""
 
-#: lib/profileaction.php:177
-msgid "User ID"
+#: lib/webcolor.php:82
+#, php-format
+msgid "%s is not a valid color!"
 msgstr ""
 
-#: lib/searchaction.php:156
-msgid "Search help"
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr ""
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
-msgid "People Tagcloud as self-tagged"
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
 msgstr ""
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
-msgid "People Tagcloud as tagged"
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
 msgstr ""
 
-#: lib/webcolor.php:82
-#, php-format
-msgid "%s is not a valid color!"
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
 msgstr ""
 
-#: lib/webcolor.php:123
-#, php-format
-msgid "%s is not a valid color! Use 3 or 6 hex chars."
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
 msgstr ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.mo b/locale/sv/LC_MESSAGES/statusnet.mo
index 2cb0397ec..ed78309b1 100644
--- a/locale/sv/LC_MESSAGES/statusnet.mo
+++ b/locale/sv/LC_MESSAGES/statusnet.mo
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index d0a5001da..437c4b244 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -1,4645 +1,4021 @@
-# 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.
+# Translation of StatusNet to Swedish
 #
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-03-17 10:54+0000\n"
-"Last-Translator: Per-Olov Jernberg <possan@possan.se>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:44:15+0000\n"
+"Language-Team: Swedish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: sv\n"
+"X-Message-Group: out-statusnet\n"
 
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
-#, php-format
-msgid " Search Stream for \"%s\""
-msgstr "Sök i strömmen efter \"%s\""
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "Inget sådant meddelande."
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-#: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
-msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr ""
-"förutom det här, som är privat: lösenord, epostadress, IM-adress, "
-"telefonnummer."
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
+msgstr "Ingen sådan användare"
 
-#: ../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/all.php:84
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s med vänner"
 
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr "%1$s / Uppdateringar med svar till %2$s"
+msgid "%s and friends"
+msgstr "%s med vänner"
 
-#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s har bjudit in dig till %2$s"
+#: actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Flöden för $s vänner"
 
-#: ../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/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Flöden för $s vänner"
 
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s lyssnar nu på dina meddelanden i %2$s."
+#: actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Flöden för $s vänner"
 
-#: ../lib/mail.php:126
+#: actions/all.php:127
 #, 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"
+"This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
-"%1$s lyssnar nu på dina meddelanden i %1$s.\n"
-"\n"
-"\tHälsningar,\n"
-"%4$s.\n"
 
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/all.php:132
 #, 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/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr "%1$s's status den %2$s"
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
 
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/all.php:134
 #, php-format
-msgid "%s (%s)"
-msgstr "%s(%s)"
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
 
-#: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
 #, php-format
-msgid "%s Public Stream"
-msgstr "%s Publik Ström"
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+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
-#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
-#, php-format
-msgid "%s and friends"
+#: actions/all.php:165
+#, fuzzy
+msgid "You and friends"
 msgstr "%s med vänner"
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
-#, php-format
-msgid "%s public timeline"
-msgstr "%s publika tidslinje"
-
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
 #, php-format
-msgid "%s status"
-msgstr "%s status"
+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:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
-#, php-format
-msgid "%s timeline"
-msgstr "%s tidslinje"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
+msgstr "API-metoden hittades inte!"
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
-#, php-format
-msgid "%s updates from everyone!"
-msgstr "%s uppdateringar ifrån allihop!"
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
+msgstr "Denna metod kräver skicka."
 
-#: ../actions/register.php:213
+#: actions/apiaccountupdatedeliverydevice.php:105
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
 msgstr ""
-"(Du kommer få ett meddelande med email inom kort med instruktioner hur du "
-"bekräftar din emailadress)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
-#, php-format
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
-msgstr ""
-"**%%site.name%%** är en mikroblogg service för dig ifrån [%%site.broughtby%%]"
-"(%%site.broughtbyurl%%)"
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Kunde inte uppdatera användare."
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
 #, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** är en mikroblogg service."
-
-#: ../lib/util.php:274 lib/util.php:290
-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/finishopenidlogin.php:79 actions/profilesettings.php:76
-#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag"
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
 msgstr ""
-"1-64 små bokstäver eller nummer, inga punkter eller mellanslag. Måste fyllas "
-"i."
 
-#: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr "Minst 6 tecken"
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "Kunde inte spara dina Twitter inställningar!"
 
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
-msgid "6 or more characters, and don't forget it!"
-msgstr "Minst 6 tecken och glöm inte bort det!"
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Kunde inte uppdatera användare."
 
-#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
-msgid "6 or more characters. Required."
-msgstr "6 eller fler tecken. Måste fyllas i."
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Användaren har ingen profil."
 
-#: ../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 ""
-"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/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Kunde inte spara profil."
 
-#: ../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."
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
 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."
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
 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 actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
-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 actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
-msgid "API method under construction."
-msgstr "API-metoden är under uppbyggnad."
-
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
-msgid "About"
-msgstr "Om"
-
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
-msgid "Accept"
-msgstr "Acceptera"
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "Ingen meddelande text!"
 
-#: ../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 actions/emailsettings.php:120
-#: actions/imsettings.php:127 actions/openidsettings.php:111
-#: actions/smssettings.php:133 actions/twittersettings.php:163
-msgid "Add"
-msgstr "Lägg till"
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Det är för långt. Max är 140 tecken. "
 
-#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
-msgstr "Lägg till OpenID"
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-msgid "Add or remove OpenIDs"
-msgstr "Lägg till eller ta bort 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
-#: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
-msgstr "Adress"
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "Mottagaren kunde inte hittas."
 
-#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-msgid "Addresses of friends to invite (one per line)"
-msgstr "Adresser till vänner att bjuda in (en rad per adress)"
+#: actions/apidirectmessagenew.php:150
+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/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
-msgid "All subscriptions"
-msgstr "Alla prenumerationer"
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "Direktmeddelande till %s"
 
-#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/apidirectmessage.php:93
 #, php-format
-msgid "All updates for %s"
-msgstr "%s alla uppdateringar"
+msgid "All the direct messages sent from %s"
+msgstr "Alla direktmeddelanden skickade ifrån %s"
 
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/apidirectmessage.php:101
 #, php-format
-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:31
-#: actions/openidlogin.php:29 actions/register.php:30
-#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
-msgid "Already logged in."
-msgstr "Redan inloggad."
-
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
-msgid "Already subscribed!."
-msgstr "Det finns redan en prenumeration!"
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
-msgid "Are you sure you want to delete this notice?"
-msgstr "Är du säker på att du vill tabort detta inlägg?"
-
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
-msgid "Authorize subscription"
-msgstr "Tillåt prenumeration."
-
-#: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
-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 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/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34 actions/avatarsettings.php:65
-#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
-msgid "Avatar"
-msgstr "Användarbild"
-
-#: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
-msgid "Avatar updated."
-msgstr "Användarbilden uppdaterad."
+msgid "Direct messages to %s"
+msgstr "Direktmeddelande till %s"
 
-#: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/apidirectmessage.php:105
 #, 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 ""
-"Väntar bekräftelse på denna adress. Kontrollera ditt Jabber/GTalk konto för "
-"vidare instruktioner. (La du till %s i din vännerlista?)"
+msgid "All the direct messages sent to %s"
+msgstr "Alla direktmeddelanden skickade till %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 ""
-"Väntar bekräftelse på denna adress. Kontrollera din inbox (och spamlådan!) "
-"efter meddelande om vidare instruktioner."
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "API-metoden hittades inte!"
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
-msgid "Awaiting confirmation on this phone number."
-msgstr "Väntar bekräftelse på detta telefonnummer. "
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
+msgstr "Ingen status hittad med det ID"
 
-#: ../lib/util.php:1318 lib/util.php:1452
+#: actions/apifavoritecreate.php:119
 #, fuzzy
-msgid "Before »"
-msgstr "Tidigare »"
+msgid "This status is already a favorite!"
+msgstr "Detta inlägg är redan en favorit!"
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
-#: actions/profilesettings.php:82 actions/register.php:184
-#: actions/profilesettings.php:112 actions/register.php:402
-msgid "Bio"
-msgstr "Biografi"
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+msgstr "Kunde inte skapa favorit."
 
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
-#: actions/register.php:89 actions/updateprofile.php:104
-#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
-msgid "Bio is too long (max 140 chars)."
-msgstr "Biografin är för lång (max 140 tecken)"
+#: actions/apifavoritedestroy.php:122
+#, fuzzy
+msgid "That status is not a favorite!"
+msgstr "Det inlägget är ingen favorit!"
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
-msgid "Can't delete this notice."
-msgstr "Kan inte ta bort detta inlägg."
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr "Kunde inte tabort favoriten."
+
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
+msgstr "Kunde inte följa användaren: Användaren kunde inte hittas."
 
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/apifriendshipscreate.php:118
 #, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr "Kan inte läsa användarbild URL '%s'"
+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/password.php:85 ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404 actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-msgid "Can't save new password."
-msgstr "Kan inte spara det nya lösenordet."
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "Kunde inte följa användaren: Användaren kunde inte hittas."
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62 actions/emailsettings.php:58
-#: actions/imsettings.php:59 actions/smssettings.php:62
-#: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
-msgstr "Avbryt"
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
 
-#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Kan inte initiera OpenID objekt."
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
+msgstr "Två användarid eller namn måste läggas till."
 
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
-msgstr "Kan inte normalisera det Jabber ID"
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Kunde inte ta emot favoritinläggen."
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
-msgid "Cannot normalize that email address"
-msgstr "Kan inte normalisera den emailadressen"
+#: actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Kunde inte få fram status."
 
-#: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
-msgstr "Ändra"
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
+#, fuzzy
+msgid "Could not create group."
+msgstr "Kunde inte skapa favorit."
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
-msgstr "Ändra email hantering"
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Kunde inte skapa favorit."
 
-#: ../actions/password.php:32 actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr "Byt lösenord"
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Kunde inte skapa prenumeration."
 
-#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
-msgid "Change your password"
-msgstr "Ändra ditt lösenord"
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+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."
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-msgid "Change your profile settings"
-msgstr "Ändra dina profilinställningar"
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr "Användarnamnet används redan, försök med ett annat."
 
-#: ../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
-#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
-#: actions/register.php:376 actions/smssettings.php:122
-msgid "Confirm"
-msgstr "Bekräfta"
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "Det är inget giltigt användarnamn."
 
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "Bekräfta adress"
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "Hemsidan har ingen giltig URL"
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245 actions/emailsettings.php:256
-#: actions/imsettings.php:230 actions/smssettings.php:253
-#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
-msgid "Confirmation cancelled."
-msgstr "Verifikation avbruten"
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "Ditt namn är för långt (max 255 tecken)."
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
-msgid "Confirmation code"
-msgstr "Bekräftelsekod"
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "Biografin är för lång (max 140 tecken)"
 
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-msgid "Confirmation code not found."
-msgstr "Bekräftelsekoden kunde inte hittas."
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "Platse är för lång (max 255 tecken)."
 
-#: ../actions/register.php:202
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
 #, 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."
+msgid "Too many aliases! Maximum %d."
 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."
 
-#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
-msgid "Connect"
-msgstr "Anslut"
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Ogiltig hemsideadress '%s'"
 
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
-msgid "Connect existing account"
-msgstr "Anslut till existerande konto"
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Användarnamnet används redan, försök med ett annat."
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
-msgid "Contact"
-msgstr "Kontakta"
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
 
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
-#, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "Kan inte skapa OpenID formulär: %s"
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Du prenumererar redan på dessa användare:"
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr "Kunde inte följa användaren: %s finns redan i din lista."
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
-msgid "Could not follow user: User not found."
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
 msgstr "Kunde inte följa användaren: Användaren kunde inte hittas."
 
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Kunde inte skicka vidare till servern: %s"
-
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
-msgid "Could not save avatar info"
-msgstr "Kunde inte spara informationen om användarbild"
-
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
-msgid "Could not save new profile info"
-msgstr "Kunde inte spara informationen om den nya profilen"
-
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
-msgid "Could not subscribe other to you."
-msgstr "Kunde inte prenumerera på annat åt dig."
-
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
-msgid "Could not subscribe."
-msgstr "Kunde inte prenumerera."
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
-msgstr "Kunde inte uppdatera användaren med bekräftad emailadress."
-
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-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/confirmaddress.php:84 actions/emailsettings.php:252
-#: actions/imsettings.php:226 actions/smssettings.php:249
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-msgid "Couldn't delete email confirmation."
-msgstr "Kunde inte radera epost bekräftelsen."
-
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
-msgid "Couldn't delete subscription."
-msgstr "Kunde inte radera prenumerationen. "
-
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
-msgid "Couldn't find any statuses."
-msgstr "Kunde inte få fram status."
-
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-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/emailsettings.php:223
-#: actions/imsettings.php:195 actions/smssettings.php:214
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
-msgid "Couldn't insert confirmation code."
-msgstr "Kunde inte lägga till bekräftelsekoden."
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Du skickade inte oss den profilen"
 
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
-msgstr "Kunde inte lägga till ny prenumeration."
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Kunde inte följa användaren: Användaren kunde inte hittas."
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-msgid "Couldn't save profile."
-msgstr "Kunde inte spara profil."
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr ""
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
-msgstr "Kunde inte uppdatera användaren för automatisk prenumeration."
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Sök personer på denna sida"
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
-msgid "Couldn't update user record."
-msgstr "Kunde inte uppdatera användarens inställningar."
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "%s / Favoriter från %s"
 
-#: ../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
-#: actions/confirmaddress.php:114 actions/emailsettings.php:280
-#: actions/emailsettings.php:411 actions/imsettings.php:252
-#: actions/imsettings.php:395 actions/othersettings.php:162
-#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
-msgid "Couldn't update user."
-msgstr "Kunde inte uppdatera användare."
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Du skickade inte oss den profilen"
 
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
-msgid "Create"
-msgstr "Skapa"
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
+msgstr "Denna metod kräver antingen skicka eller tabort."
 
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
-msgid "Create a new user with this nickname."
-msgstr "Skapa en ny användare med det här smeknamnet"
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
+msgstr "Du kan inte tabort nån annan användares status."
 
-#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
-msgid "Create new account"
-msgstr "Skapa ett nytt konto"
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "Användarbilden uppdaterad."
 
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
-msgid "Creating new account for OpenID that already has a user."
-msgstr "Skapar ett nytt konto för OpenID som redan har en användare"
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
+msgstr "Ingen status med det ID hittades."
 
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "Aktuell bekräftad Jabber/Gtalk-adress."
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "För långt. Maximalt 140 tecken"
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "Nuvarande bekäftat SMS telefonnummer"
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
+msgstr "Hittades inte"
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-msgid "Current confirmed email address."
-msgstr "Nuvarande bekräftade emailadress."
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
 
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
-msgstr "Just nu"
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Bildfilens format stödjs inte."
 
-#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: actions/apitimelinefavorites.php:107
 #, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "DB error vid infog av hashtag: %s"
+msgid "%s / Favorites from %s"
+msgstr "%s / Favoriter från %s"
 
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: actions/apitimelinefavorites.php:119
 #, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Databasfel för svar: %s"
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
-msgid "Delete notice"
-msgstr "Tabort inlägg"
+msgid "%s updates favorited by %s / %s."
+msgstr "%s uppdaterade favoriter av %s / %s."
 
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "Berätta om dig själv och dina intressen inom 140 tecken"
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
+#, php-format
+msgid "%s timeline"
+msgstr "%s tidslinje"
 
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87 actions/register.php:172
-#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
-#: actions/register.php:385 lib/accountsettingsaction.php:113
-msgid "Email"
-msgstr "Epost"
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "Uppdateringar från %1$s på %2$s!"
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-msgid "Email Address"
-msgstr "Emailadress"
+#: actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Uppdateringar med svar till %2$s"
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
-msgstr "Email inställningar"
+#: actions/apitimelinementions.php:126
+#, 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/register.php:73 actions/register.php:80 actions/register.php:163
-msgid "Email address already exists."
-msgstr "Epostadressen finns redan."
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#, php-format
+msgid "%s public timeline"
+msgstr "%s publika tidslinje"
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
-msgid "Email address confirmation"
-msgstr "Bekräfta epostadress"
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#, php-format
+msgid "%s updates from everyone!"
+msgstr "%s uppdateringar ifrån allihop!"
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
-msgstr "Emailadress såsom \"användare@exempel.se\""
+#: actions/apitimelinetag.php:101 actions/tag.php:66
+#, php-format
+msgid "Notices tagged with %s"
+msgstr "Inlägg taggade med %s"
 
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-msgid "Email addresses"
-msgstr "Emailadresser"
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Uppdateringar från %1$s på %2$s!"
 
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
-msgid "Enter a nickname or email address."
-msgstr "Skriv in ett smeknamn eller en epostadress."
+#: actions/apiusershow.php:96
+#, fuzzy
+msgid "Not found."
+msgstr "Hittades inte"
 
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
-msgstr "Fyll i koden du mottog i din telefon."
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "Inget sådant dokument."
 
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
-msgid "Error authorizing token"
-msgstr "Felaktig bekräftelse av token"
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+msgstr "Inget användarnamn"
 
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
-msgid "Error connecting user to OpenID."
-msgstr "Lyckades inte ansluta användaren till OpenID."
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "Ingen storlek"
 
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
-msgstr "Lyckades inte ansluta användaren."
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "Felaktig storlek"
 
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
-msgstr "Fel uppstog när användarbild skulle läggas till"
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "Användarbild"
 
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
-msgstr "Fel uppstog när nya profilen skulle läggas till"
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "Du kan uppdatera din personliga profil här"
 
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
-msgstr "Fel uppstog när fjärrprofilen skulle läggas till"
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
+msgstr "Användare utan matchande profil"
 
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
-msgid "Error saving address confirmation."
-msgstr "Fel uppstog när adressen skulle bekräftas."
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+#, fuzzy
+msgid "Avatar settings"
+msgstr "Twitter inställningar"
 
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
-msgid "Error saving remote profile"
-msgstr "Fel uppstog när fjärrprofil skulle sparas"
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr ""
 
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-msgid "Error saving the profile."
-msgstr "Fel uppstog när profilen skulle sparas."
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr ""
 
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-msgid "Error saving the user."
-msgstr "Fel uppstog när användaren skulle sparas."
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#, fuzzy
+msgid "Delete"
+msgstr "Ta bort"
 
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
-msgid "Error saving user; invalid."
-msgstr "Fel uppstog när användare skulle sparas."
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+msgstr "Ladda upp"
 
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
-#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
-#: actions/register.php:108 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-msgid "Error setting user."
-msgstr "Fel uppstog i användarens inställning"
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
+msgstr ""
 
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr "Fel uppstog vid uppdatering av profilen"
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+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/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
-msgstr "Fel uppstog under uppdatering av fjärranvändare"
+#: actions/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Oväntat utskick av formuläret."
 
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr "Fel uppstog med bekräftelsekoden."
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
-msgid "Existing nickname"
-msgstr "Nuvarande smeknamn"
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
+msgstr ""
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
-msgid "FAQ"
-msgstr "Frågor & svar"
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+msgstr "Användarbilden uppdaterad."
 
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Uppdatering av profilbild misslyckades."
 
-#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
-#, php-format
-msgid "Feed for friends of %s"
-msgstr "Flöden för $s vänner"
+#: actions/avatarsettings.php:387
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Användarbilden uppdaterad."
 
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
-#, php-format
-msgid "Feed for replies to %s"
-msgstr "Flöde för svar till %s"
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+#, fuzzy
+msgid "No nickname"
+msgstr "Inget användarnamn"
 
-#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
-#, php-format
-msgid "Feed for tag %s"
-msgstr "Feed för taggar %s"
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+#, fuzzy
+msgid "No such group"
+msgstr "Ingen sådan användare"
 
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
-msgstr "Sök innehåll i inlägg"
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "Användaren har ingen profil."
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
-msgstr "Sök personer på denna sida"
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s med vänner"
 
-#: ../actions/login.php:122
-msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
 msgstr ""
-"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:77 actions/register.php:178
-#: actions/profilesettings.php:103 actions/register.php:391
-#: actions/showgroup.php:235 actions/showstream.php:262
-#: actions/tagother.php:105 lib/groupeditform.php:142
-msgid "Full name"
-msgstr "Ditt fulla namn."
-
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
-#: actions/register.php:86 actions/updateprofile.php:94
-#: actions/editgroup.php:195 actions/newgroup.php:146
-#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
-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:338 lib/action.php:344 lib/action.php:566
-msgid "Help"
-msgstr "Hjälp"
 
-#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
-msgid "Home"
-msgstr "Hem"
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Ingen sådan användare"
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
-msgid "Homepage"
-msgstr "Hemsida"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
+msgstr ""
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
-msgid "Homepage is not a valid URL."
-msgstr "Hemsidan har ingen giltig URL"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+#, fuzzy
+msgid "Unblock this user"
+msgstr "Ingen sådan användare"
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
-msgid "I want to post notices by email."
-msgstr "Jag vill posta inlägg via min email."
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Inte inloggad."
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
-msgstr "IM"
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+#, fuzzy
+msgid "No profile specified."
+msgstr "Ingen mottagare tillagd."
 
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
-msgstr "IM adress"
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+#, fuzzy
+msgid "No profile with that ID."
+msgstr "Ingen status hittad med det ID"
 
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
-msgstr "IM inställningar"
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#, fuzzy
+msgid "Block user"
+msgstr "Ingen sådan användare"
 
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/block.php:136
 msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
 msgstr ""
-"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\""
+#: actions/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
+msgid "No"
+msgstr "Nej"
 
-#: ../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/block.php:149
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Ingen sådan användare"
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-#: actions/emailsettings.php:127 actions/smssettings.php:140
-msgid "Incoming email"
-msgstr "Inkommande email"
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
+msgstr "Ja"
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
-msgid "Incoming email address removed."
-msgstr "Inkommande emailadress borttagen."
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "Ingen sådan användare"
 
-#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
-msgid "Incorrect old password"
-msgstr "Felaktigt, gammalt lösenord"
+#: actions/block.php:165
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "Du prenumererar redan på dessa användare:"
 
-#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
-msgid "Incorrect username or password."
-msgstr "Felaktigt användarnamn eller lösenord."
+#: actions/block.php:170
+msgid "Failed to save block information."
+msgstr ""
 
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
+#: actions/bookmarklet.php:50
+msgid "Post to "
 msgstr ""
-"Instruktioner om hur du återställer ditt lösenord har sänts till din e-"
-"postadress "
 
-#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "Ogiltig användarbild URL '%s'"
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+msgstr "Ingen bekräftelsekod."
 
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
-#, php-format
-msgid "Invalid email address: %s"
-msgstr "Ogiltig emailadress: %s"
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "Bekräftelsekoden kunde inte hittas."
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
-#, php-format
-msgid "Invalid homepage '%s'"
-msgstr "Ogiltig hemsideadress '%s'"
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "Den bekräftelsekoden är inte för dig!"
 
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/confirmaddress.php:90
 #, php-format
-msgid "Invalid license URL '%s'"
-msgstr "Ogiltig licens URL '%s'"
-
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
-msgstr "Ogiltig innehåll i inlägget "
-
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
-msgstr "Ogiltig inlägg uri"
-
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
-msgstr "Ogiltig inlägg url"
+msgid "Unrecognized address type %s"
+msgstr "Adresstypen känns inte igen %s"
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "Ogiltig profil URL '%s' "
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr "Den adressen har redan blivit bekräftad en gång."
 
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
-msgstr "Nåt är fel med profil URL (Format fel)"
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "Kunde inte uppdatera användare."
 
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
-msgstr "Felaktig profil URL skickades åter av servern."
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr "Kunde inte radera epost bekräftelsen."
 
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
-#: actions/avatarbynickname.php:69
-msgid "Invalid size."
-msgstr "Felaktig storlek"
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "Bekräfta adress"
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111 actions/finishopenidlogin.php:241
-#: actions/register.php:103 actions/register.php:121
-#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
-msgid "Invalid username or password."
-msgstr "Felaktigt användarnamn eller lösenord."
+#: actions/confirmaddress.php:159
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "Adressen \"%s\" har blivit bekräftad för ditt konto."
 
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-msgid "Invitation(s) sent"
-msgstr "Inbjudan(ar) skickad"
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Bekräftelsekod"
 
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-msgid "Invitation(s) sent to the following people:"
-msgstr "Inbjudan(ar) är skickade till följande personer:"
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
+msgstr "Inlägg"
 
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
-msgid "Invite"
-msgstr "Bjud in"
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
+msgstr "Inget sådant inlägg."
 
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-msgid "Invite new users"
-msgstr "Bjud in nya användare"
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "Kan inte ta bort detta inlägg."
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
-#, php-format
+#: actions/deletenotice.php:103
+#, fuzzy
 msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
 msgstr ""
-"Det drivs med [StatusNet](http://status.net/) mikroblogging software, version %"
-"s, tillgängligt under [GNU Affero General Public License](http://www.fsf.org/"
-"licensing/licenses/agpl-3.0.html)."
+"Du håller på att tabort inlägget permanent. När det väl är gjort kan du inte "
+"ångra dig."
 
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
-msgstr "Jabber ID används redan utav en annan användare."
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr "Tabort inlägg"
 
-#: ../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 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/deletenotice.php:144
+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:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
-msgid "Language"
-msgstr "Språk"
+#: actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "Kan inte ta bort detta inlägg."
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
-msgid "Language is too long (max 50 chars)."
-msgstr "Språket är för långt(max 50 tecken)."
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+#, fuzzy
+msgid "Delete this notice"
+msgstr "Ta bort inlägg"
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
-msgid "Location"
-msgstr "Plats"
+#: actions/deletenotice.php:157
+#, fuzzy
+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/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
-#: actions/register.php:92 actions/updateprofile.php:109
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
-msgid "Location is too long (max 255 chars)."
-msgstr "Platse är för lång (max 255 tecken)."
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr "Det inlägget är ingen favorit!"
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
-#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
-#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
-#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
-#, php-format
-msgid "Login"
-msgstr "Logga in"
+#: actions/disfavor.php:94
+#, fuzzy
+msgid "Add to favorites"
+msgstr "Feed för %s favoriter"
 
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Logga in med ett [OpenID](%%doc.openid%%) konto."
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "Inget sådant dokument."
 
-#: ../actions/login.php:126
+#: actions/editgroup.php:56
 #, 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%"
-"%). "
+msgid "Edit %s group"
 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%%)."
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
-msgid "Logout"
-msgstr "Logga ut"
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+#, fuzzy
+msgid "You must be logged in to create a group."
+msgstr "du måste vara inloggad för att kunna bjuda in andra användare till %s"
 
-#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
-msgid "Longer name, preferably your \"real\" name"
-msgstr "Långt namn, förslagsvis ditt \"riktiga\" namn"
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+#, fuzzy
+msgid "You must be an admin to edit the group"
+msgstr "du måste vara inloggad för att kunna bjuda in andra användare till %s"
 
-#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
-msgid "Lost or forgotten password?"
-msgstr "Glömt bort lösenord?"
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
+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 "Skapa en ny emailadress för att posta till, avaktiverar den gamla"
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Biografin är för lång (max 140 tecken)"
+
+#: actions/editgroup.php:253
+#, fuzzy
+msgid "Could not update group."
+msgstr "Kunde inte uppdatera användare."
+
+#: actions/editgroup.php:269
+#, fuzzy
+msgid "Options saved."
+msgstr "Inställningar sparade."
+
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "Email inställningar"
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
 #: actions/emailsettings.php:71
 #, 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/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
-msgid "Member since"
-msgstr "Medlem sedan"
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "Adress"
 
-#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
-#, php-format
-msgid "Microblog by %s"
-msgstr "Mikroblogg av %s"
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr "Nuvarande bekräftade emailadress."
 
-#: ../actions/smssettings.php:304
-#, php-format
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "Ta bort"
+
+#: actions/emailsettings.php:113
 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."
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
 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/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-msgid "My text and files are available under "
-msgstr "Min text och filer finns tillgängliga under"
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#: actions/emailsettings.php:142 actions/smssettings.php:152
-msgid "New"
-msgstr "Ny"
-
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
-#, php-format
-msgid "New email address for posting to %s"
-msgstr "Ny emailadress för att skicka till %s"
+"Väntar bekräftelse på denna adress. Kontrollera din inbox (och spamlådan!) "
+"efter meddelande om vidare instruktioner."
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
-msgid "New incoming email address added."
-msgstr "Ny inkommande emailadress inlagd."
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "Avbryt"
 
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
-msgid "New nickname"
-msgstr "Nytt användarnamn"
+#: actions/emailsettings.php:121
+msgid "Email Address"
+msgstr "Emailadress"
 
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
-msgstr "Nytt inlägg"
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr "Emailadress såsom \"användare@example.org\""
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-msgid "New password"
-msgstr "Nytt lösenord"
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "Lägg till"
 
-#: ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
-msgstr "Nya lösenordet har blivit sparat. Du är nu även inloggad."
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+msgstr "Inkommande email"
 
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151 actions/login.php:101
-#: actions/profilesettings.php:74 actions/register.php:165
-#: actions/login.php:228 actions/profilesettings.php:98
-#: actions/register.php:367 actions/showgroup.php:224
-#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
-msgid "Nickname"
-msgstr "Smeknamn"
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+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/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69 actions/finishopenidlogin.php:181
-#: actions/profilesettings.php:225 actions/register.php:76
-#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
-msgid "Nickname already in use. Try another one."
-msgstr "Användarnamnet används redan, försök med ett annat."
+#: actions/emailsettings.php:145 actions/smssettings.php:162
+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/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:67 ../actions/updateprofile.php:77
-#: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
-#: actions/register.php:74 actions/updateprofile.php:78
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Smeknamnet får endast innehålla små bokstäver eller siffror, inga mellanslag."
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
+msgstr "Ny"
 
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
-msgid "Nickname not allowed."
-msgstr "Inget giltigt smeknamn."
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
+msgstr "Inställningar"
 
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
-msgstr "Smeknamnet på användaren du vill följa"
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
+msgstr "Skicka meddelande till mig via email vid nya prenumerationer."
 
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
-msgid "Nickname or email"
-msgstr "Smeknamn eller epost"
+#: actions/emailsettings.php:163
+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/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
-msgid "No"
-msgstr "Nej"
+#: actions/emailsettings.php:169
+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/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
-msgstr "Inget Jabber ID."
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "Skicka mig ett email när någon sänder ett privat meddelande."
 
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
-msgid "No authorization request!"
-msgstr "Ingen rättighet förfrågan!"
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
-msgid "No carrier selected."
-msgstr "Ingen operatör vald."
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
+msgstr "Jag vill posta inlägg via min email."
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
-msgstr "Ingen kod är ifylld"
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
+msgstr "Publicera ett MicroID för min emailadress."
 
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
-#: actions/confirmaddress.php:75
-msgid "No confirmation code."
-msgstr "Ingen bekräftelsekod."
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Spara"
 
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
-#: actions/newnotice.php:126 classes/Command.php:223
-msgid "No content!"
-msgstr "Inget innehåll!"
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+msgstr "Inställningar sparade."
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr "Ingen emailadress."
 
-#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
-msgid "No id."
-msgstr "Inget id."
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
+msgstr "Kan inte normalisera den emailadressen"
 
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
-msgid "No incoming email address."
-msgstr "Ingen inkommande emailadress."
+#: actions/emailsettings.php:330
+msgid "Not a valid email address"
+msgstr "Ingen giltig emailadress"
 
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr "Inget smeknamn lämnades ut av fjärrservern."
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
+msgstr "Det är redan din emailadress."
 
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
-msgid "No nickname."
-msgstr "Inget användarnamn"
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another user."
+msgstr "Den emailadressen tillhör redan en annan användare."
 
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229 actions/emailsettings.php:240
-#: actions/imsettings.php:214 actions/smssettings.php:237
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
-msgid "No pending confirmation to cancel."
-msgstr "Ingen väntande bekräftelse att avbryta."
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+msgstr "Kunde inte lägga till bekräftelsekoden."
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
-msgstr "Inget telefonnummer."
+#: actions/emailsettings.php:358
+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/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
-msgstr "Ingen profil URL lämnades ut av servern."
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
+msgstr "Ingen väntande bekräftelse att avbryta."
 
-#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
-msgid "No registered email address for that user."
-msgstr "Ingen registrerad epost adress för den användaren."
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "Det är fel IM adress."
 
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr "Ingen begäran funnen!"
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "Verifikation avbruten"
 
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
-msgid "No results"
-msgstr "Inget resultat"
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
+msgstr "Det är inte din emailadress."
 
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
-msgstr "Ingen storlek"
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "Adressen är borttagen."
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
-msgid "No status found with that ID."
-msgstr "Ingen status hittad med det ID"
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
+msgstr "Ingen inkommande emailadress."
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
-msgid "No status with that ID found."
-msgstr "Ingen status med det ID hittades."
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
+msgstr "Kunde inte uppdatera användarens inställningar."
 
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
-msgstr "Det existerar inget sådant OpenID"
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
+msgstr "Inkommande emailadress borttagen."
 
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
-msgid "No such document."
-msgstr "Inget sådant dokument."
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
+msgstr "Ny inkommande emailadress inlagd."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30 actions/shownotice.php:32
-#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
-msgid "No such notice."
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+#, fuzzy
+msgid "Popular notices"
 msgstr "Inget sådant inlägg."
 
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr "Ingen sådan återställningskod. "
-
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-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/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 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
-msgid "No such user."
-msgstr "Ingen sådan användare"
+#: actions/favorited.php:67
+#, fuzzy, php-format
+msgid "Popular notices, page %d"
+msgstr "Inget sådant inlägg."
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-msgid "No user with that email address or username."
-msgstr "Ingen användare med den emailadressen eller användarnamn."
+#: actions/favorited.php:79
+#, fuzzy
+msgid "The most popular notices on the site right now."
+msgstr "Visar dom populäraste taggarna ifrån den senaste veckan."
 
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
-msgstr "Finns inget att visa!"
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
 
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr "Det är ingen kod för återställning."
+#: actions/favorited.php:153
+msgid ""
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
+msgstr ""
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
-msgstr "Inte registrerad användare."
+#: actions/favorited.php:156
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
+msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
-msgid "Not a supported data format."
-msgstr "Ingen support för det formatet."
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
 
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
-msgstr "Det är inget giltigt Jabber ID"
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Uppdateringar från %1$s på %2$s!"
 
-#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-msgid "Not a valid OpenID."
-msgstr "Det är inget giltigt OpenID."
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Detta inlägg är redan en favorit!"
 
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
-msgid "Not a valid email address"
-msgstr "Ingen giltig emailadress"
+#: actions/favor.php:92 lib/disfavorform.php:140
+#, fuzzy
+msgid "Disfavor favorite"
+msgstr "Avfavorisera"
 
-#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-msgid "Not a valid email address."
-msgstr "Det är ingen giltig epost adress."
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr ""
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-#: actions/editgroup.php:186 actions/newgroup.php:137
-#: actions/profilesettings.php:195 actions/register.php:161
-msgid "Not a valid nickname."
-msgstr "Det är inget giltigt användarnamn."
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr ""
 
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
-msgstr "Det är ingen giltig profil URL (felaktig service)."
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
+msgstr ""
 
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr "Det är ingen giltig profil URL (ingen XRDS angiven)."
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "Nytt inlägg"
 
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr "Det är ingen giltig profil URL (ingen YADIS angiven)."
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Nytt inlägg"
 
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
-msgid "Not an image or corrupt file."
-msgstr "Det verkar inte vara en bildfil, annars korrupt."
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
-msgid "Not authorized."
-msgstr "Inte tillstånd ännu."
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Väntade mig inte detta svar!"
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
-msgid "Not found"
-msgstr "Hittades inte"
-
-#: ../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 actions/block.php:59 actions/disfavor.php:61
-#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
-#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
-#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
-#: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Inte inloggad."
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "Användaren som avlyssnas existerar inte."
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
-msgid "Not subscribed!."
-msgstr "Ingen prenumerant!"
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+msgstr "Du kan använda lokala prenumerationer!"
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
-msgstr "Inlägg sökning"
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
+msgstr ""
 
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
-#, php-format
-msgid "Notice feed for %s"
-msgstr "Inlägg flöde för %s"
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "Inte tillstånd ännu."
 
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
-msgstr "Inlägget har ingen profil"
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "Kunde inte konvertera förfrågan tokens till Access tokens."
 
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
-msgid "Notices"
-msgstr "Inlägg"
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Okänd version av OMB protokollet."
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
-#, php-format
-msgid "Notices tagged with %s"
-msgstr "Inlägg taggade med %s"
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "Fel uppstog under uppdatering av fjärranvändare"
 
-#: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
-msgstr "Gammalt lösenord"
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+#, fuzzy
+msgid "No such group."
+msgstr "Inget sådant meddelande."
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
-msgid "OpenID"
-msgstr "OpenID"
-
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
-msgid "OpenID Account Setup"
-msgstr "OpenID konto setup"
-
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-msgid "OpenID Auto-Submit"
-msgstr "OpenID skicka automatiskt"
-
-#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
-#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-msgid "OpenID Login"
-msgstr "OpenID inloggning"
-
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-#: actions/openidlogin.php:102 actions/openidsettings.php:101
-msgid "OpenID URL"
-msgstr "OpenID URL"
-
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
-msgid "OpenID authentication cancelled."
-msgstr "OpenID bekäftelse ångrad."
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr "OpenID bekräftelse misslyckad: %s"
-
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "OpenID misslyckades: %s"
-
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr "OpenID borttagen."
-
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
-msgstr "OpenID inställningar"
-
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-msgid "Optionally add a personal message to the invitation."
-msgstr "Om du vill, skriv ett personligt meddelande med inbjudan."
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "Inget sådant inlägg."
 
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
-msgid "Partial upload."
-msgstr "Bitvis uppladdad."
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Inget sådant inlägg."
 
-#: ../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 actions/finishopenidlogin.php:118
-#: actions/login.php:231 actions/register.php:372
-#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-msgid "Password"
-msgstr "Lösenord"
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "Ingen mottagare tillagd."
 
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
-msgid "Password and confirmation do not match."
-msgstr "Lösenord och bekräftelse matchar inte."
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
 
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
-msgid "Password must be 6 chars or more."
-msgstr "Lösenordet måste vara 6 tecken eller fler."
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "Användaren har ingen profil."
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-msgid "Password recovery requested"
-msgstr "Förfrågan om återställning av lösenord"
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "Du skickade inte oss den profilen"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-msgid "Password saved."
-msgstr "Lösenord är sparat."
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "Ingen sådan användare"
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-msgid "Passwords don't match."
-msgstr "Lösenorden matchar inte."
+#: actions/groupblock.php:162
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
-msgstr "Personer"
+#: actions/groupblock.php:178
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "Kunde inte följa användaren: Användaren kunde inte hittas."
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
-msgstr "Personer sökning"
+#: actions/groupblock.php:179
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "Ingen sådan användare"
 
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
-msgstr "Sökning personer"
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
+msgstr ""
 
-#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
-msgid "Personal"
-msgstr "Personlig"
+#: actions/groupbyid.php:74
+msgid "No ID"
+msgstr ""
 
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-msgid "Personal message"
-msgstr "Personligt meddelande"
+#: actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "du måste vara inloggad för att kunna bjuda in andra användare till %s"
 
-#: ../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/groupdesignsettings.php:141
+msgid "Group design"
+msgstr ""
 
-#: ../actions/userauthorization.php:78
+#: actions/groupdesignsettings.php:152
 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\"."
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
 msgstr ""
-"Kontrollera dessa detajer noga så att du verkligen vet att du vill "
-"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
-#: actions/imsettings.php:142
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Posta ett inlägg när min Jabber/GTalk status ändras."
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Kunde inte uppdatera användare."
 
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94 actions/emailsettings.php:86
-#: actions/imsettings.php:68 actions/smssettings.php:94
-#: actions/twittersettings.php:70 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
-msgid "Preferences"
-msgstr "Inställningar"
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "Kunde inte spara dina Twitter inställningar!"
 
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163 actions/emailsettings.php:180
-#: actions/imsettings.php:152 actions/smssettings.php:171
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
-msgid "Preferences saved."
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+#, fuzzy
+msgid "Design preferences saved."
 msgstr "Inställningar sparade."
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
-msgid "Preferred language"
-msgstr "Språkval"
-
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
-msgid "Privacy"
-msgstr "Sekretesspolicy"
-
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-msgid "Problem saving notice."
-msgstr "Det var ett problem när inlägget sparades."
-
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
-msgid "Profile"
-msgstr "Profil"
-
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
-msgstr "Profil URL"
-
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
-msgstr "Profil inställningar"
-
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-msgid "Profile unknown"
-msgstr "Okänd profil"
-
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
-msgid "Public Stream Feed"
-msgstr "Publik ström"
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
+msgstr ""
 
-#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
-msgid "Public timeline"
-msgstr "Publik tidslinje"
+#: actions/grouplogo.php:150
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Publicera ett MicroID för min Jabber/GTalk adress."
+#: actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
+msgstr ""
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
-msgid "Publish a MicroID for my email address."
-msgstr "Publicera ett MicroID för min emailadress."
+#: actions/grouplogo.php:396
+#, fuzzy
+msgid "Logo updated."
+msgstr "Användarbilden uppdaterad."
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr "Tidigare taggar"
+#: actions/grouplogo.php:398
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "Uppdatering av profilbild misslyckades."
 
-#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
-msgid "Recover"
-msgstr "Återställ"
+#: actions/groupmembers.php:93 lib/groupnav.php:92
+#, php-format
+msgid "%s group members"
+msgstr ""
 
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
-msgid "Recover password"
-msgstr "Återställ lösenord"
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
+msgstr ""
 
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-msgid "Recovery code for unknown user."
-msgstr "Kod för återställning av okänd användare."
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+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
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-msgid "Register"
-msgstr "Registrera"
+#: actions/groupmembers.php:175 lib/groupnav.php:107
+msgid "Admin"
+msgstr ""
 
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
-msgid "Registration not allowed."
-msgstr "Registrering är inte möjlig."
+#: actions/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
+msgstr ""
 
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
-msgid "Registration successful"
-msgstr "Registreringen är genomförd"
+#: actions/groupmembers.php:441
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "du måste vara inloggad för att kunna bjuda in andra användare till %s"
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
-msgid "Reject"
-msgstr "Avvisa"
+#: actions/groupmembers.php:473
+msgid "Make Admin"
+msgstr ""
 
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
-msgid "Remember me"
-msgstr "Kom ihåg mig"
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
-msgid "Remote profile with no matching profile"
-msgstr "Fjärrprofil utan motsvarande profil"
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Uppdateringar från %1$s på %2$s!"
 
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
-msgstr "Fjärrprenumerera"
+#: actions/groupsearch.php:52
+#, fuzzy, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"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/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 actions/emailsettings.php:101
-#: actions/emailsettings.php:134 actions/imsettings.php:102
-#: actions/openidsettings.php:166 actions/smssettings.php:103
-#: actions/smssettings.php:146 actions/twittersettings.php:115
-msgid "Remove"
-msgstr "Ta bort"
+#: actions/groupsearch.php:58
+#, fuzzy
+msgid "Group search"
+msgstr "Sökning personer"
 
-#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
-msgstr "Ta bort OpenID"
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "Inget resultat"
 
-#: ../actions/openidsettings.php:73
+#: actions/groupsearch.php:82
+#, php-format
 msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
 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."
-
-#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
-msgid "Replies"
-msgstr "Svar"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
-#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
-#: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: actions/groupsearch.php:85
 #, php-format
-msgid "Replies to %s"
-msgstr "Svarat på %s"
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
 
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
-msgid "Reset"
-msgstr "Återställ"
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
+msgstr ""
 
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
-msgid "Reset password"
-msgstr "Återställ lösenord"
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr ""
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-msgid "SMS"
-msgstr "SMS"
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
-msgid "SMS Phone number"
-msgstr "SMS Telefonnummer"
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+#, fuzzy
+msgid "Create a new group"
+msgstr "Skapa ett nytt konto"
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
-msgstr "SMS Inställningar"
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
-msgid "SMS confirmation"
-msgstr "SMS Bekräftelse"
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "Användaren har ingen profil."
 
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
-msgid "Same as password above"
-msgstr "Samma som lösenordet ovan"
+#: actions/groupunblock.php:128 actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Fel uppstog när användaren skulle sparas."
 
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
-msgid "Same as password above. Required."
-msgstr "Samma som lösenordet ovan. Måste fyllas i."
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "IM inställningar"
 
-#: ../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 actions/emailsettings.php:182
-#: actions/facebooksettings.php:114 actions/imsettings.php:157
-#: actions/othersettings.php:117 actions/profilesettings.php:150
-#: actions/smssettings.php:169 actions/subscriptions.php:124
-#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
-msgid "Save"
-msgstr "Spara"
+#: actions/imsettings.php:70
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+"Du kan skicka och ta emot inlägg genom Jabber/GTalk [instant messages](%%doc."
+"im%%). Konfigurera din adress och inställningar nedan. "
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
-msgid "Search"
-msgstr "Sök"
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Denna sida är inte tillgänglig i den mediatyp du accepterat"
 
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
-msgstr "Sök strömflöde"
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Aktuell bekräftad Jabber/Gtalk-adress."
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/imsettings.php:114
 #, php-format
 msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
+"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
+"message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
-"Sök efter innehåll i inlägg på %%site.name%%. Skilj söktermerna åt med "
-"mellanslag; dom måste vara minst tre tecken långa."
+"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/peoplesearch.php:28
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "IM adress"
+
+#: actions/imsettings.php:126
 #, 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."
+"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 ""
-"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 actions/smssettings.php:304
-#: actions/smssettings.php:457
-msgid "Select a carrier"
-msgstr "Välj en operatör"
-
-#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
-#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
-msgid "Send"
-msgstr "Skicka"
-
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
-msgstr "Skicka email till denna adress för att posta ett nya inlägg."
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
-msgstr "Skicka meddelande till mig via email vid nya prenumerationer."
+"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/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Skicka inlägg till mig via 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 ""
-"Skicka inlägg till mig via SMS; Jag är införstådd att min operatör kan "
-"debitera mig."
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr "Posta ett inlägg när min Jabber/GTalk status ändras."
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:153
 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å."
 
-#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
-msgid "Settings"
-msgstr "Inställningar"
-
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
-msgid "Settings saved."
-msgstr "Inställningar sparade."
-
-#: ../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."
-
-#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:114
-msgid "Someone else already has this OpenID."
-msgstr "Någon annan använder redan denna OpenID."
-
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
-msgstr "Någonting konstigt inträffade."
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
-msgstr "Ledsen, men inga inkommande email är tillåtna."
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
-msgstr "Ledsen, men det är inte din inkommande emailadress."
-
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
-msgid "Source"
-msgstr "Källa"
-
-#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
-msgid "Statistics"
-msgstr "Statistik"
-
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-msgid "Stored OpenID not found."
-msgstr "Sparade OpenID kunde inte hittas."
-
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
-#: actions/showstream.php:197 actions/showstream.php:206
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
-msgid "Subscribe"
-msgstr "Prenumerera"
-
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
-msgid "Subscribers"
-msgstr "Prenumerant"
-
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
-msgid "Subscription authorized"
-msgstr "Prenumeration accepterad"
-
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
-msgid "Subscription rejected"
-msgstr "Prenumeration avvisad"
-
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27 actions/showstream.php:240
-#: actions/showstream.php:322 actions/subscriptions.php:27
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
-msgid "Subscriptions"
-msgstr "Prenumerationer"
-
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
-msgid "System error uploading file."
-msgstr "Systemfel när filen laddades upp."
-
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
-#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
-msgid "Tags"
-msgstr "Taggar"
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "Text"
-
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
-msgid "Text search"
-msgstr "Text sökning"
-
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
-msgstr "Det OpenID du angav tillhör inte dig."
-
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
-msgstr "Den adressen har redan blivit bekräftad en gång."
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Publicera ett MicroID för min Jabber/GTalk adress."
 
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
-msgstr "Den bekräftelsekoden är inte för dig!"
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "Inget Jabber ID."
 
-#: ../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/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr "Kan inte normalisera det Jabber ID"
 
-#: ../actions/avatar.php:80 actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
-msgstr "Filen är för stor."
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "Det är inget giltigt Jabber ID"
 
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "Det är redan din Jabber ID."
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
-msgid "That is already your email address."
-msgstr "Det är redan din emailadress."
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr "Jabber ID används redan utav en annan användare."
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
-msgid "That is already your phone number."
-msgstr "Det är redan ditt telefonnummer."
+#: actions/imsettings.php:327
+#, php-format
+msgid ""
+"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/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "Det är inte ditt Jabber ID."
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
-msgid "That is not your email address."
-msgstr "Det är inte din emailadress."
-
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
-msgstr "Det är inte ditt telefonnummer."
-
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-#: actions/emailsettings.php:367 actions/imsettings.php:349
-msgid "That is the wrong IM address."
-msgstr "Det är fel IM adress."
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
-msgstr "Det är fel nummer i bekräftelsen"
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-msgid "That phone number already belongs to another user."
-msgstr "Det numret tillhör en annan användare."
-
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49 actions/twitapistatuses.php:330
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-msgid "That's too long. Max notice size is 140 chars."
-msgstr "För långt. Maximalt 140 tecken"
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "Det är för långt. Max antal tecken är 255."
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr "Inbox för %s - sida %d"
 
-#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/inbox.php:62
 #, php-format
-msgid "The address \"%s\" has been confirmed for your account."
-msgstr "Adressen \"%s\" har blivit bekräftad för ditt konto."
+msgid "Inbox for %s"
+msgstr "Inbox för %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
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
-msgid "The address was removed."
-msgstr "Adressen är borttagen."
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr "Detta är din inbox som innehåller dina privata meddelanden."
 
-#: ../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:"
+#: actions/invite.php:39
+msgid "Invites have been disabled."
 msgstr ""
-"Prenumerationen har blivit bekräftad, men ingen URL har gått igenom. Kolla "
-"med sidans instruktioner hur du bekräftar en prenumeration. Din "
-"prenumerering token är:"
 
-#: ../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 ""
-"Prenumerationen har blivit avvisad, men inga URL har gått igenom. Kolla med "
-"sidans instruktioner hur du avvisar en prenumeration."
+#: actions/invite.php:41
+#, 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/subscribers.php:35 actions/subscribers.php:35
+#: actions/invite.php:72
 #, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr "Dessa personer är dom som lyssnar på %s inlägg."
+msgid "Invalid email address: %s"
+msgstr "Ogiltig emailadress: %s"
 
-#: ../actions/subscribers.php:33 actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr "Dessa personer är dom som lyssnar på dina inlägg."
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
+msgstr "Inbjudan(ar) skickad"
 
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
-#, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr "Detta är personer och inlägg som %s lyssnar på."
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr "Bjud in nya användare"
 
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr "Detta är personer och inlägg som du lyssnar på."
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr "Du prenumererar redan på dessa användare:"
 
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:131 actions/invite.php:139
+#, php-format
+msgid "%s (%s)"
+msgstr "%s(%s)"
+
+#: actions/invite.php:136
 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/recoverpassword.php:88
-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."
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
+msgstr "Inbjudan(ar) är skickade till följande personer:"
 
-#: ../lib/openid.php:195
+#: actions/invite.php:150
 msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 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."
+"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/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
-#, php-format
+#: actions/invite.php:162
 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 ""
-"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
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-msgid "This method requires a POST or DELETE."
-msgstr "Denna metod kräver antingen skicka eller tabort."
+"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/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
-msgid "This method requires a POST."
-msgstr "Denna metod kräver skicka."
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "Emailadresser"
 
-#: ../lib/util.php:164 lib/util.php:246
-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/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr "Adresser till vänner att bjuda in (en rad per adress)"
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
-msgid "Timezone"
-msgstr "Tidszon"
+#: actions/invite.php:192
+msgid "Personal message"
+msgstr "Personligt meddelande"
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
-msgid "Timezone not selected."
-msgstr "Du har inte valt tidszon"
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
+msgstr "Om du vill, skriv ett personligt meddelande med inbjudan."
 
-#: ../actions/remotesubscribe.php:43
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
+msgstr "Skicka"
+
+#: actions/invite.php:226
+#, 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:228
 #, 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."
+"%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 ""
-"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."
+"%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/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
-msgid "Two user ids or screen_names must be supplied."
-msgstr "Två användarid eller namn måste läggas till."
+#: actions/joingroup.php:60
+#, fuzzy
+msgid "You must be logged in to join a group."
+msgstr "du måste vara inloggad för att kunna bjuda in andra användare till %s"
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL till din hemsida, blog eller profil på en annan sida."
+#: actions/joingroup.php:90 lib/command.php:217
+#, fuzzy
+msgid "You are already a member of that group"
+msgstr "Du prenumererar redan på dessa användare:"
 
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-msgid "URL of your profile on another compatible microblogging service"
-msgstr "URL till din profil på en annan kompatibel mikroblogg"
+#: actions/joingroup.php:128 lib/command.php:234
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s"
+msgstr "Kunde inte följa användaren: Användaren kunde inte hittas."
 
-#: ../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 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-msgid "Unexpected form submission."
-msgstr "Oväntat utskick av formuläret."
+#: actions/joingroup.php:135 lib/command.php:239
+#, fuzzy, php-format
+msgid "%s joined group %s"
+msgstr "%s / Favoriter från %s"
 
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
-msgid "Unexpected password reset."
-msgstr "Oväntad rensning av lösenord."
+#: actions/leavegroup.php:60
+#, fuzzy
+msgid "You must be logged in to leave a group."
+msgstr "du måste vara inloggad för att kunna bjuda in andra användare till %s"
 
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-msgid "Unknown action"
-msgstr "Okänd funktion"
+#: actions/leavegroup.php:90 lib/command.php:268
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "Du skickade inte oss den profilen"
 
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-msgid "Unknown version of OMB protocol."
-msgstr "Okänd version av OMB protokollet."
+#: actions/leavegroup.php:119 lib/command.php:278
+#, fuzzy
+msgid "Could not find membership record."
+msgstr "Kunde inte uppdatera användarens inställningar."
 
-#: ../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 ""
-"Om inget annat anges, innehåll på denna sida skyddas utav copyright ifrån "
-"användarna och tillgängliga under"
+#: actions/leavegroup.php:127 lib/command.php:284
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "Kunde inte följa användaren: Användaren kunde inte hittas."
 
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
-msgid "Unrecognized address type %s"
-msgstr "Adresstypen känns inte igen %s"
+msgid "%s left group %s"
+msgstr ""
 
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
-msgstr "Lämnar pren."
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "Redan inloggad."
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-msgid "Unsupported OMB version"
-msgstr "OMB versionen stöds inte"
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Ogiltig innehåll i inlägget "
 
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
-msgid "Unsupported image file format."
-msgstr "Bildfilens format stödjs inte."
+#: actions/login.php:143
+msgid "Incorrect username or password."
+msgstr "Felaktigt användarnamn eller lösenord."
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
-msgstr "Uppdateringar via SMS"
+#: actions/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
+msgstr "Fel uppstog i användarens inställning"
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
-msgstr "Uppdateringar via instant messenger (IM)"
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "Logga in"
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr "Uppdateringar från %1$s och vänner på %2$s!"
+#: actions/login.php:243
+msgid "Login to site"
+msgstr ""
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr "Uppdateringar från %1$s på %2$s!"
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Smeknamn"
 
-#: ../actions/avatar.php:68 actions/profilesettings.php:161
-#: actions/avatarsettings.php:162 actions/grouplogo.php:232
-msgid "Upload"
-msgstr "Ladda upp"
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Lösenord"
 
-#: ../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 ""
-"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."
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "Kom ihåg mig"
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr "Ladda upp en ny profilbild"
+#: actions/login.php:253 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
+msgstr "Logga in automatiskt i framtiden; Ej för publika datorer!"
 
-#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "Glömt bort lösenord?"
+
+#: actions/login.php:282
 msgid ""
-"Use this form to invite your friends and colleagues to use this service."
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
 msgstr ""
-"Använd detta formulär för att bjuda in dina vänner och kollegor till denna "
-"sida."
+"Av säkerhetsskäl, var vänlig skriv in ditt användarnamn och lösenord innan "
+"du ändrar dina inställningar."
 
-#: ../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"
+#: actions/login.php:286
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
 msgstr ""
-"Används endast för uppdateringar, annonsering och återställning av lösenord"
+"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%%)."
 
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
-msgid "User being listened to doesn't exist."
-msgstr "Användaren som avlyssnas existerar inte."
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+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
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-msgid "User has no profile."
-msgstr "Användaren har ingen profil."
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
 
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
-msgstr "Användarens smeknamn"
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr "Användare hittades inte."
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
-msgid "What timezone are you normally in?"
-msgstr "Vilken tidszon befinner du dig normalt?"
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr ""
 
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
-#, php-format
-msgid "What's up, %s?"
-msgstr "Vad är på gång, %s?"
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr ""
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-#: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Var du håller till, såsom \"Stad, Län, Land\""
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
+msgstr ""
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
-#, php-format
-msgid "Wrong image type for '%s'"
-msgstr "Fel filtyp för bild '%s'"
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr "Nytt meddelande"
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
-#, php-format
-msgid "Wrong size image at '%s'"
-msgstr "Fel bildstorlek för '%s'"
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
+msgstr "Du kan inte skicka meddelande till den användaren."
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
-msgid "Yes"
-msgstr "Ja"
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+msgstr "Inget innehåll!"
 
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-msgid "You already have this OpenID!"
-msgstr "Du handhar redan denna OpenID!"
+#: actions/newmessage.php:158
+msgid "No recipient specified."
+msgstr "Ingen mottagare tillagd."
 
-#: ../actions/deletenotice.php:37 actions/deletenotice.php:37
+#: actions/newmessage.php:164 lib/command.php:370
 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."
+"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/recoverpassword.php:31 actions/recoverpassword.php:31
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
-msgstr "Du är redan inloggad!"
+#: actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "Nytt meddelande"
 
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-msgid "You are already subscribed to these users:"
-msgstr "Du prenumererar redan på dessa användare:"
+#: actions/newmessage.php:185 lib/command.php:375
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
-msgid "You are not friends with the specified user."
-msgstr "Du är inte vän med den användaren."
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
+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/newnotice.php:69
+msgid "New notice"
+msgstr "Nytt inlägg"
 
-#: ../actions/register.php:135 actions/register.php:145
-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/newnotice.php:199
+#, fuzzy
+msgid "Notice posted"
+msgstr "Inlägg"
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
+#: actions/noticesearch.php:68
 #, 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%%."
+msgid ""
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
+msgstr ""
+"Sök efter innehåll i inlägg på %%site.name%%. Skilj söktermerna åt med "
+"mellanslag; dom måste vara minst tre tecken långa."
 
-#: ../actions/openidsettings.php:86
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "Text sökning"
+
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "Sök i strömmen efter \"%s\""
+
+#: actions/noticesearch.php:121
+#, php-format
 msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 msgstr ""
-"Du kan ta bort en OpenID ifrån ditt konto genom att klicka på knappen "
-"\"Remove\""
 
-#: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
-"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
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Uppdateringar från %1$s på %2$s!"
+
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Alla uppdateringar som matchar söksträngen \"%s\""
+
+#: actions/nudge.php:85
 msgid ""
-"You can update your personal profile info here so people know more about you."
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
-"Du kan uppdatera din personliga profil här så personer får veta mer om dig."
 
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
-msgstr "Du kan använda lokala prenumerationer!"
+#: actions/nudge.php:94
+msgid "Nudge sent"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
-msgid "You can't register if you don't agree to the license."
-msgstr "Du kan inte registrera dig om du inte godkänner licensvillkor."
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr ""
 
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
-msgid "You did not send us that profile"
-msgstr "Du skickade inte oss den profilen"
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+msgstr "Inlägget har ingen profil"
 
-#: ../lib/mail.php:147
+#: actions/oembed.php:86 actions/shownotice.php:180
 #, 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"
+msgid "%1$s's status on %2$s"
+msgstr "%1$s's status den %2$s"
+
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Anslut"
+
+#: actions/oembed.php:160
+msgid "Only "
 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
-#: actions/twitapistatuses.php:463
-msgid "You may not delete another user's status."
-msgstr "Du kan inte tabort nån annan användares status."
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
+msgstr "Ingen support för det formatet."
 
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr "du måste vara inloggad för att kunna bjuda in andra användare till %s"
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "Personer sökning"
 
-#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "Inlägg sökning"
+
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "Twitter inställningar"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
 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/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr "Du är identifierad. Skriv ett nytt lösenord nedan."
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
 
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
-msgid "Your OpenID URL"
-msgstr "Din OpenID URL"
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
+msgstr ""
 
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
-msgstr "Ditt användarnamn på denna server eller registrerad epost adress."
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
+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."
+#: actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "Profil inställningar"
+
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
 msgstr ""
-"[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:992 lib/util.php:945
-msgid "a few seconds ago"
-msgstr "ett par sekunder sedan"
+#: actions/othersettings.php:153
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Språket är för långt(max 50 tecken)."
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: actions/outbox.php:58
 #, php-format
-msgid "about %d days ago"
-msgstr "för %d dagar sedan"
+msgid "Outbox for %s - page %d"
+msgstr "Outbox för %s - sida %d"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: actions/outbox.php:61
 #, php-format
-msgid "about %d hours ago"
-msgstr "för %d timmar sedan"
+msgid "Outbox for %s"
+msgstr "Outbox för %s"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
-#, php-format
-msgid "about %d minutes ago"
-msgstr "för %d minuter sedan"
+#: actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr "Detta är din outbox som innehåller meddelanden som du skickat."
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
-#, php-format
-msgid "about %d months ago"
-msgstr "för %d månader sedan"
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "Byt lösenord"
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
-msgid "about a day ago"
-msgstr "för en dag sedan"
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "Ändra ditt lösenord"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
-msgid "about a minute ago"
-msgstr "för nån minut sedan"
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#, fuzzy
+msgid "Password change"
+msgstr "Lösenord är sparat."
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
-msgid "about a month ago"
-msgstr "för en månad sedan"
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "Gammalt lösenord"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
-msgid "about a year ago"
-msgstr "för ett år sedan"
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "Nytt lösenord"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
-msgid "about an hour ago"
-msgstr "för en timma sedan"
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "Minst 6 tecken"
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
-msgstr "Tabort"
-
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117 actions/noticesearch.php:136
-#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
-msgid "in reply to..."
-msgstr "svar till..."
-
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124 actions/noticesearch.php:143
-#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
-msgid "reply"
-msgstr "svar"
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "Bekräfta"
 
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
+#: actions/passwordsettings.php:113
 msgid "same as password above"
 msgstr "samma som lösenordet ovan"
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
-msgid "unsupported file type"
-msgstr "okänd fil typ"
-
-#: ../lib/util.php:1309 lib/util.php:1443
-#, fuzzy
-msgid "« After"
-msgstr "« Nyare"
-
-#: 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
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-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/passwordsettings.php:117
+msgid "Change"
+msgstr "Ändra"
 
-#: actions/disfavor.php:55 actions/disfavor.php:81
-msgid "This notice is not a favorite!"
-msgstr "Det inlägget är ingen favorit!"
+#: actions/passwordsettings.php:154 actions/register.php:230
+msgid "Password must be 6 or more characters."
+msgstr "Lösenordet måste vara minst 6 tecken."
 
-#: actions/disfavor.php:63 actions/disfavor.php:87
-msgid "Could not delete favorite."
-msgstr "Kunde inte tabort favoriten."
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "Lösenorden matchar inte."
 
-#: actions/disfavor.php:72 lib/favorform.php:140
-msgid "Favor"
-msgstr "Favorisera"
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "Felaktigt, gammalt lösenord"
 
-#: 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/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "Fel uppstog när användare skulle sparas."
 
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-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/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "Kan inte spara det nya lösenordet."
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
-msgid "This notice is already a favorite!"
-msgstr "Detta inlägg är redan en favorit!"
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "Lösenord är sparat."
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132 actions/favor.php:86
-#: actions/twitapifavorites.php:125 classes/Command.php:152
-msgid "Could not create favorite."
-msgstr "Kunde inte skapa favorit."
+#: actions/peoplesearch.php:52
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"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/favor.php:70
-msgid "Disfavor"
-msgstr "Avfavorisera"
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "Sökning personer"
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
-#, php-format
-msgid "%s favorite notices"
-msgstr "%s favoriter"
+#: actions/peopletag.php:70
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Ingen giltig emailadress"
 
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/peopletag.php:144
 #, php-format
-msgid "Feed of favorite notices of %s"
-msgstr "Feed över %s favoriter"
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
 
-#: actions/inbox.php:28 actions/inbox.php:59
-#, php-format
-msgid "Inbox for %s - page %d"
-msgstr "Inbox för %s - sida %d"
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "Ogiltig innehåll i inlägget "
 
-#: actions/inbox.php:30 actions/inbox.php:62
+#: actions/postnotice.php:90
 #, php-format
-msgid "Inbox for %s"
-msgstr "Inbox för %s"
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
 
-#: actions/inbox.php:53 actions/inbox.php:115
-msgid "This is your inbox, which lists your incoming private messages."
-msgstr "Detta är din inbox som innehåller dina privata meddelanden."
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "Profil inställningar"
 
-#: actions/invite.php:178 actions/invite.php:213
-#, php-format
+#: actions/profilesettings.php:71
 msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+"You can update your personal profile info here so people know more about you."
 msgstr ""
-"%1$s har bjudit in dig till %2$s(%3$s).\n"
-"\n"
-
-#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-msgid "Automatically login in the future; "
-msgstr "Logga in automatiskt;"
+"Du kan uppdatera din personliga profil här så personer får veta mer om dig."
 
-#: actions/login.php:122 actions/login.php:264
-msgid "For security reasons, please re-enter your "
-msgstr "För säkerhets skull, skriv in dina"
+#: actions/profilesettings.php:99
+#, fuzzy
+msgid "Profile information"
+msgstr "Okänd profil"
 
-#: actions/login.php:126 actions/login.php:268
-msgid "Login with your username and password. "
-msgstr "Logga in med ditt användarnamn och lösenord."
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag"
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
-msgid "That's too long. Max message size is 140 chars."
-msgstr "Det är för långt. Max är 140 tecken. "
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full name"
+msgstr "Ditt fulla namn."
 
-#: actions/newmessage.php:65 actions/newmessage.php:128
-msgid "No recipient specified."
-msgstr "Ingen mottagare tillagd."
+#: actions/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "Hemsida"
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206 actions/newmessage.php:131
-#: actions/newmessage.php:168 classes/Command.php:237
-msgid "You can't send a message to this user."
-msgstr "Du kan inte skicka meddelande till den användaren."
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "URL till din hemsida, blog eller profil på en annan sida."
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "Skicka inte meddelande till dig själv, viska lite tyst istället."
+#: actions/profilesettings.php:122 actions/register.php:460
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Berätta om dig själv och dina intressen inom 140 tecken"
 
-#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
-msgid "No such user"
-msgstr "Ingen sådan användare"
+#: actions/profilesettings.php:125 actions/register.php:463
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Berätta om dig själv och dina intressen inom 140 tecken"
 
-#: actions/newmessage.php:117 actions/newmessage.php:67
-msgid "New message"
-msgstr "Nytt meddelande"
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "Biografi"
 
-#: actions/noticesearch.php:95 actions/noticesearch.php:146
-msgid "Notice without matching profile"
-msgstr "Inlägg utan matchande profil"
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "Plats"
 
-#: actions/openidsettings.php:28 actions/openidsettings.php:70
-#, 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/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "Var du håller till, såsom \"Stad, Län, Land\""
 
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
-msgstr "Om du vill lägga till en OpenID till ditt konto,"
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
+msgstr "Taggar"
 
-#: 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/profilesettings.php:140
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
 
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-msgid "You can remove an OpenID from your account "
-msgstr "Du kan tabort ett OpenID ifrån ditt konto"
+#: actions/profilesettings.php:144
+msgid "Language"
+msgstr "Språk"
 
-#: actions/outbox.php:28 actions/outbox.php:58
-#, php-format
-msgid "Outbox for %s - page %d"
-msgstr "Outbox för %s - sida %d"
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr "Språkval"
 
-#: actions/outbox.php:30 actions/outbox.php:61
-#, php-format
-msgid "Outbox for %s"
-msgstr "Outbox för %s"
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr "Tidszon"
 
-#: actions/outbox.php:53 actions/outbox.php:116
-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/profilesettings.php:155
+msgid "What timezone are you normally in?"
+msgstr "Vilken tidszon befinner du dig normalt?"
 
-#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
-#, php-format
+#: actions/profilesettings.php:160
 msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
-"Sök efter personer på %%site.name%% efter deras namn, plats eller intressen."
-
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
-msgid "You can update your personal profile info here "
-msgstr "Du kan uppdatera din personliga profil här"
+"Automatisk prenummeration på den som prenumererar på mig. (Bäst för icke "
+"mänsklig användare) "
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
-msgid "User without matching profile"
-msgstr "Användare utan matchande profil"
+#: actions/profilesettings.php:221 actions/register.php:223
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Biografin är för lång (max 140 tecken)"
 
-#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
-msgstr "Denna bekräftelsekod är för gammal."
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr "Du har inte valt tidszon"
 
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
-msgstr "Om du har glömt eller tappat bort din"
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr "Språket är för långt(max 50 tecken)."
 
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a "
-msgstr "Du är identifierad. Skriv in"
+#: actions/profilesettings.php:246 actions/tagother.php:178
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Ogiltig hemsideadress '%s'"
 
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-msgid "Your nickname on this server, "
-msgstr "Ditt smeknamn på denna server,"
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
+msgstr "Kunde inte uppdatera användaren för automatisk prenumeration."
 
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-msgid "Instructions for recovering your password "
-msgstr "Instruktioner för att återfå ditt lösenord"
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+msgstr "Kunde inte spara profil."
 
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
-msgid "New password successfully saved. "
-msgstr "Nya lösenordet är sparat."
+#: actions/profilesettings.php:336
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Kunde inte spara profil."
 
-#: actions/register.php:95 actions/register.php:180
-msgid "Password must be 6 or more characters."
-msgstr "Lösenordet måste vara minst 6 tecken."
+#: actions/profilesettings.php:344
+msgid "Settings saved."
+msgstr "Inställningar sparade."
 
-#: actions/register.php:216
+#: actions/public.php:83
 #, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
+msgid "Beyond the page limit (%s)"
 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 actions/remotesubscribe.php:74
-#, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr "För att prenumerera så kan du [login](%%action.login%%),"
+#: actions/public.php:92
+#, fuzzy
+msgid "Could not retrieve public stream."
+msgstr "Kunde inte ta emot favoritinläggen."
 
-#: actions/showfavorites.php:61 actions/showfavorites.php:145
-#, php-format
-msgid "Feed for favorites of %s"
-msgstr "Feed för %s favoriter"
+#: actions/public.php:129
+#, fuzzy, php-format
+msgid "Public timeline, page %d"
+msgstr "Publik tidslinje"
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-msgid "Could not retrieve favorite notices."
-msgstr "Kunde inte ta emot favoritinläggen."
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr "Publik tidslinje"
 
-#: actions/showmessage.php:33 actions/showmessage.php:81
-msgid "No such message."
-msgstr "Inget sådant meddelande."
+#: actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Publik ström"
 
-#: 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/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Publik ström"
 
-#: actions/showmessage.php:61 actions/showmessage.php:108
-#, php-format
-msgid "Message to %1$s on %2$s"
-msgstr "Meddelande till %1$s på %2$s"
+#: actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Publik ström"
 
-#: actions/showmessage.php:66 actions/showmessage.php:113
+#: actions/public.php:179
 #, php-format
-msgid "Message from %1$s on %2$s"
-msgstr "Meddelande från %1$s på %2$s"
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
 
-#: actions/showstream.php:154
-msgid "Send a message"
-msgstr "Skicka ett meddelande"
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
 
-#: actions/smssettings.php:312 actions/smssettings.php:464
+#: actions/public.php:186
 #, php-format
-msgid "Mobile carrier for your phone. "
-msgstr "Mobiloperatören för din telefon."
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
 
-#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/public.php:233
 #, php-format
-msgid "Direct messages to %s"
-msgstr "Direktmeddelande till %s"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
+msgstr ""
 
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/public.php:238
 #, php-format
-msgid "All the direct messages sent to %s"
-msgstr "Alla direktmeddelanden skickade till %s"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
+msgstr ""
 
-#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-msgid "Direct Messages You've Sent"
-msgstr "Direktmeddelanden du skickat"
+#: actions/publictagcloud.php:57
+#, fuzzy
+msgid "Public tag cloud"
+msgstr "Publik ström"
 
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "All the direct messages sent from %s"
-msgstr "Alla direktmeddelanden skickade ifrån %s"
-
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-msgid "No message text!"
-msgstr "Ingen meddelande text!"
-
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-msgid "Recipient user not found."
-msgstr "Mottagaren kunde inte hittas."
-
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "These are most popular recent tags on %s "
 msgstr ""
-"Kan inte skicka direktmeddelanden till användare som inte är dina vänner."
-
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
-#, php-format
-msgid "%s / Favorites from %s"
-msgstr "%s / Favoriter från %s"
 
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/publictagcloud.php:69
 #, php-format
-msgid "%s updates favorited by %s / %s."
-msgstr "%s uppdaterade favoriter av %s / %s."
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
+msgstr ""
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
-#, php-format
-msgid "%s added your notice as a favorite"
-msgstr "%s la till ditt inlägg som favorit"
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
+msgstr ""
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
+#: actions/publictagcloud.php:75
 #, php-format
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
 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, "
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
 msgstr ""
-"Lägg till ditt Twitter konto för att automatiskt skicka dina inlägg till "
-"Twitter,"
-
-#: actions/twittersettings.php:41 actions/twittersettings.php:60
-msgid "Twitter settings"
-msgstr "Twitter inställningar"
-
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-msgid "Twitter Account"
-msgstr "Twitter konto"
 
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-msgid "Current verified Twitter account."
-msgstr "Verifierat Twitter konto."
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "Du är redan inloggad!"
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr "Twitter användarnamn"
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "Ingen sådan återställningskod. "
 
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-msgid "No spaces, please."
-msgstr "Inga mellanslag tack."
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "Det är ingen kod för återställning."
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
-msgstr "Twitter lösenord"
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr "Kod för återställning av okänd användare."
 
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-msgid "Automatically send my notices to Twitter."
-msgstr "Skicka automatiskt mina inlägg till Twitter."
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "Fel uppstog med bekräftelsekoden."
 
-#: actions/twittersettings.php:75 actions/twittersettings.php:146
-msgid "Send local \"@\" replies to Twitter."
-msgstr "Skicka lokala \"@\" svar till Twitter."
+#: actions/recoverpassword.php:97
+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."
 
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-msgid "Subscribe to my Twitter friends here."
-msgstr "Prenumerera på mina Twitter vänner här."
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
+msgstr "Kunde inte uppdatera användaren med bekräftad emailadress."
 
-#: actions/twittersettings.php:122
+#: actions/recoverpassword.php:152
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
 msgstr ""
-"Användarnamn får bara innehålla nummer, stora och små bokstäver, och "
-"underscore(_). 15 tecken max."
 
-#: actions/twittersettings.php:128 actions/twittersettings.php:334
-msgid "Could not verify your Twitter credentials!"
-msgstr "Kunde inte verifiera din Twitter!"
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
+msgstr ""
 
-#: 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/recoverpassword.php:188
+msgid "Password recovery"
+msgstr ""
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-msgid "Unable to save your Twitter settings!"
-msgstr "Kunde inte spara dina Twitter inställningar!"
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
+msgstr ""
 
-#: actions/twittersettings.php:174 actions/twittersettings.php:376
-msgid "Twitter settings saved."
-msgstr "Twitter inställningar sparade."
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
+msgstr "Ditt användarnamn på denna server eller registrerad epost adress."
 
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-msgid "That is not your Twitter account."
-msgstr "Det är inte ditt Twitter konto."
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
+msgstr "Återställ"
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
-msgid "Couldn't remove Twitter user."
-msgstr "Kunde inte tabort Twitter användaren."
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "Återställ lösenord"
 
-#: actions/twittersettings.php:212 actions/twittersettings.php:407
-msgid "Twitter account removed."
-msgstr "Twitterkontot borttaget."
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr "Återställ lösenord"
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
-msgid "Couldn't save Twitter preferences."
-msgstr "Kunde inte spara Twitter inställningar."
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
+msgstr "Förfrågan om återställning av lösenord"
 
-#: actions/twittersettings.php:245 actions/twittersettings.php:461
-msgid "Twitter preferences saved."
-msgstr ""
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
+msgstr "Okänd funktion"
 
-#: actions/userauthorization.php:84 actions/userauthorization.php:86
-msgid "Please check these details to make sure "
-msgstr ""
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "Minst 6 tecken och glöm inte bort det!"
 
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
-msgid "The subscription has been authorized, but no "
-msgstr ""
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Samma som lösenordet ovan"
 
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-msgid "The subscription has been rejected, but no "
-msgstr ""
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "Återställ"
 
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-msgid "Command results"
-msgstr ""
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "Skriv in ett smeknamn eller en epostadress."
 
-#: classes/Channel.php:148 classes/Channel.php:204
-msgid "Command complete"
-msgstr ""
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
+msgstr "Ingen användare med den emailadressen eller användarnamn."
 
-#: classes/Channel.php:158 classes/Channel.php:215
-msgid "Command failed"
-msgstr ""
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr "Ingen registrerad epost adress för den användaren."
 
-#: classes/Command.php:39 classes/Command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr ""
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "Fel uppstog när adressen skulle bekräftas."
 
-#: classes/Command.php:96 classes/Command.php:113
-#, php-format
-msgid "Subscriptions: %1$s\n"
+#: actions/recoverpassword.php:325
+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 "
 
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
-msgid "User has no last notice"
-msgstr ""
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
+msgstr "Oväntad rensning av lösenord."
 
-#: classes/Command.php:146 classes/Command.php:166
-msgid "Notice marked as fave."
-msgstr ""
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "Lösenordet måste vara 6 tecken eller fler."
 
-#: classes/Command.php:166 classes/Command.php:189
-#, php-format
-msgid "%1$s (%2$s)"
-msgstr "%1$s (%2$s)"
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
+msgstr "Lösenord och bekräftelse matchar inte."
 
-#: classes/Command.php:169 classes/Command.php:192
-#, php-format
-msgid "Fullname: %s"
-msgstr "Fullt namn: %s"
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
+msgstr "Nya lösenordet har blivit sparat. Du är nu även inloggad."
 
-#: classes/Command.php:172 classes/Command.php:195
-#, php-format
-msgid "Location: %s"
-msgstr "Plats: %s"
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
+msgstr ""
 
-#: classes/Command.php:175 classes/Command.php:198
-#, php-format
-msgid "Homepage: %s"
-msgstr "Hemsida: %s"
+#: actions/register.php:92
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "Fel uppstog med bekräftelsekoden."
 
-#: classes/Command.php:178 classes/Command.php:201
-#, php-format
-msgid "About: %s"
-msgstr "Om: %s"
+#: actions/register.php:112
+msgid "Registration successful"
+msgstr "Registreringen är genomförd"
 
-#: classes/Command.php:200 classes/Command.php:228
-#, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
-msgstr ""
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "Registrera"
 
-#: classes/Command.php:214 classes/Command.php:245
-#, php-format
-msgid "Direct message to %s sent"
-msgstr ""
+#: actions/register.php:135
+msgid "Registration not allowed."
+msgstr "Registrering är inte möjlig."
 
-#: classes/Command.php:216 classes/Command.php:247
-msgid "Error sending direct message."
-msgstr ""
+#: actions/register.php:198
+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."
 
-#: classes/Command.php:263 classes/Command.php:300
-msgid "Specify the name of the user to subscribe to"
-msgstr ""
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "Det är ingen giltig epost adress."
 
-#: classes/Command.php:270 classes/Command.php:307
-#, php-format
-msgid "Subscribed to %s"
-msgstr ""
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "Epostadressen finns redan."
 
-#: classes/Command.php:288 classes/Command.php:328
-msgid "Specify the name of the user to unsubscribe from"
-msgstr ""
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "Felaktigt användarnamn eller lösenord."
 
-#: classes/Command.php:295 classes/Command.php:335
-#, php-format
-msgid "Unsubscribed from %s"
+#: actions/register.php:342
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
-msgid "Command not yet implemented."
+#: actions/register.php:424
+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."
 
-#: classes/Command.php:313 classes/Command.php:356
-msgid "Notification off."
-msgstr ""
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr "6 eller fler tecken. Måste fyllas i."
 
-#: classes/Command.php:315 classes/Command.php:358
-msgid "Can't turn off notification."
-msgstr ""
+#: actions/register.php:433
+msgid "Same as password above. Required."
+msgstr "Samma som lösenordet ovan. Måste fyllas i."
 
-#: classes/Command.php:333 classes/Command.php:379
-msgid "Notification on."
-msgstr ""
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "Epost"
 
-#: classes/Command.php:335 classes/Command.php:381
-msgid "Can't turn on notification."
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
+"Används endast för uppdateringar, annonsering och återställning av lösenord"
 
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
-msgstr ""
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
+msgstr "Långt namn, förslagsvis ditt \"riktiga\" namn"
 
-#: classes/Message.php:53 classes/Message.php:56
-msgid "Could not insert message."
-msgstr ""
+#: actions/register.php:493
+msgid "My text and files are available under "
+msgstr "Min text och filer finns tillgängliga under"
 
-#: classes/Message.php:63 classes/Message.php:66
-msgid "Could not update message with new URI."
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
+#: actions/register.php:496
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
 msgstr ""
+"förutom det här, som är privat: lösenord, epostadress, IM-adress, "
+"telefonnummer."
 
-#: lib/mail.php:147 lib/mail.php:289
+#: actions/register.php:537
 #, php-format
 msgid ""
-"You have a new posting address on %1$s.\n"
+"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."
 
-#: lib/mail.php:249 lib/mail.php:508
-#, php-format
-msgid "New private message from %s"
+#: actions/register.php:561
+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)"
 
-#: lib/mail.php:253 lib/mail.php:512
+#: actions/remotesubscribe.php:98
 #, php-format
 msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+"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."
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr ""
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr "Fjärrprenumerera"
 
-#: lib/openid.php:195 lib/openid.php:203
-msgid "This form should automatically submit itself. "
-msgstr ""
+#: actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Prenumerera på mina Twitter vänner här."
 
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-msgid "Favorites"
-msgstr ""
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "Användarens smeknamn"
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-#, php-format
-msgid "%s's favorite notices"
-msgstr ""
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr "Smeknamnet på användaren du vill följa"
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-msgid "User"
-msgstr ""
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "Profil URL"
 
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-msgid "Inbox"
-msgstr ""
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "URL till din profil på en annan kompatibel mikroblogg"
 
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-msgid "Your incoming messages"
-msgstr ""
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
+msgstr "Prenumerera"
 
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-msgid "Outbox"
-msgstr ""
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr "Nåt är fel med profil URL (Format fel)"
 
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-msgid "Your sent messages"
-msgstr ""
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "Det är ingen giltig profil URL (ingen YADIS angiven)."
 
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-msgid "Twitter"
+#: actions/remotesubscribe.php:176
+msgid "That’s a local profile! Login to subscribe."
 msgstr ""
 
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "Kunde inte få en förfrågan token."
+
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
+#, php-format
+msgid "Replies to %s"
+msgstr "Svarat på %s"
+
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %s, page %d"
+msgstr "Svarat på %s"
+
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Inlägg flöde för %s"
+
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Inlägg flöde för %s"
+
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Inlägg flöde för %s"
+
+#: actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
 msgstr ""
 
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-msgid "To"
+#: actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
 msgstr ""
 
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-msgid "Could not parse message."
+#: actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "%s and friends, page %d"
-msgstr "%s med vänner"
+msgid "Replies to %1$s on %2$s!"
+msgstr "Meddelande till %1$s på %2$s"
 
-#: actions/avatarsettings.php:76
-#, fuzzy
-msgid "You can upload your personal avatar."
-msgstr "Du kan uppdatera din personliga profil här"
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "%s favoriter"
 
-#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
-#, fuzzy
-msgid "Avatar settings"
-msgstr "Twitter inställningar"
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
+msgstr "Kunde inte ta emot favoritinläggen."
 
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-msgid "Original"
+#: actions/showfavorites.php:170
+#, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Flöden för $s vänner"
+
+#: actions/showfavorites.php:177
+#, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Flöden för $s vänner"
+
+#: actions/showfavorites.php:184
+#, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Flöden för $s vänner"
+
+#: actions/showfavorites.php:205
+msgid ""
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""
 
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-msgid "Preview"
+#: actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
 msgstr ""
 
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
-msgid "Crop"
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
 msgstr ""
 
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-#, fuzzy
-msgid "There was a problem with your session token. "
-msgstr "Det var något problem med din session. Försök igen, tack."
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
 
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-msgid "Pick a square area of the image to be your avatar"
+#: actions/showgroup.php:82 lib/groupnav.php:86
+#, php-format
+msgid "%s group"
 msgstr ""
 
-#: actions/avatarsettings.php:327 actions/grouplogo.php:384
-msgid "Lost our file data."
+#: actions/showgroup.php:84
+#, php-format
+msgid "%s group, page %d"
 msgstr ""
 
-#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: actions/showgroup.php:218
 #, fuzzy
-msgid "Lost our file."
+msgid "Group profile"
 msgstr "Inget sådant inlägg."
 
-#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
-#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
-#, fuzzy
-msgid "Unknown file type"
-msgstr "okänd fil typ"
-
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-#, fuzzy
-msgid "No profile specified."
-msgstr "Ingen mottagare tillagd."
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
+msgid "URL"
+msgstr ""
 
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
 #, fuzzy
-msgid "No profile with that ID."
-msgstr "Ingen status hittad med det ID"
+msgid "Note"
+msgstr "Inlägg"
 
-#: actions/block.php:111
-#, fuzzy
-msgid "Block user"
-msgstr "Ingen sådan användare"
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
 
-#: actions/block.php:129
-#, fuzzy
-msgid "Are you sure you want to block this user? "
-msgstr "Är du säker på att du vill tabort detta inlägg?"
+#: actions/showgroup.php:293
+msgid "Group actions"
+msgstr ""
 
-#: actions/block.php:162
-#, fuzzy
-msgid "You have already blocked this user."
-msgstr "Du prenumererar redan på dessa användare:"
+#: actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Inlägg flöde för %s"
 
-#: actions/block.php:167
-msgid "Failed to save block information."
-msgstr ""
+#: actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Inlägg flöde för %s"
 
-#: actions/confirmaddress.php:159
+#: actions/showgroup.php:340
 #, fuzzy, php-format
-msgid "The address \"%s\" has been "
-msgstr "Adressen är borttagen."
+msgid "Notice feed for %s group (Atom)"
+msgstr "Inlägg flöde för %s"
 
-#: actions/deletenotice.php:73
-#, fuzzy
-msgid "You are about to permanently delete a notice. "
-msgstr ""
-"Du håller på att tabort inlägget permanent. När det väl är gjort kan du inte "
-"ångra dig."
+#: actions/showgroup.php:345
+#, php-format
+msgid "FOAF for %s group"
+msgstr "Outbox för %s"
 
-#: actions/disfavor.php:94
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
 #, fuzzy
-msgid "Add to favorites"
-msgstr "Feed för %s favoriter"
+msgid "Members"
+msgstr "Medlem sedan"
 
-#: actions/editgroup.php:54
-#, php-format
-msgid "Edit %s group"
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/tagcloudsection.php:71
+msgid "(None)"
 msgstr ""
 
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-msgid "Inboxes must be enabled for groups to work"
+#: actions/showgroup.php:392
+msgid "All members"
 msgstr ""
 
-#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-#, fuzzy
-msgid "You must be logged in to create a group."
-msgstr "du måste vara inloggad för att kunna bjuda in andra användare till %s"
-
-#: actions/editgroup.php:87 actions/grouplogo.php:87
-#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
-#, fuzzy
-msgid "No nickname"
-msgstr "Inget användarnamn"
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "Statistik"
 
-#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
-#: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
+#: actions/showgroup.php:432
 #, fuzzy
-msgid "No such group"
-msgstr "Ingen sådan användare"
+msgid "Created"
+msgstr "Skapa"
 
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
-#, fuzzy
-msgid "You must be an admin to edit the group"
-msgstr "du måste vara inloggad för att kunna bjuda in andra användare till %s"
+#: actions/showgroup.php:448
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
 
-#: actions/editgroup.php:157
-msgid "Use this form to edit the group."
+#: actions/showgroup.php:454
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
 msgstr ""
 
-#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
-#, fuzzy
-msgid "Nickname must have only lowercase letters "
+#: actions/showgroup.php:482
+msgid "Admins"
 msgstr ""
-"Smeknamnet får endast innehålla små bokstäver eller siffror, inga mellanslag."
 
-#: actions/editgroup.php:198 actions/newgroup.php:149
-#, fuzzy
-msgid "description is too long (max 140 chars)."
-msgstr "Biografin är för lång (max 140 tecken)"
+#: actions/showmessage.php:81
+msgid "No such message."
+msgstr "Inget sådant meddelande."
 
-#: actions/editgroup.php:218
-#, fuzzy
-msgid "Could not update group."
-msgstr "Kunde inte uppdatera användare."
+#: actions/showmessage.php:98
+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:108
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr "Meddelande till %1$s på %2$s"
 
-#: actions/editgroup.php:226
+#: actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr "Meddelande från %1$s på %2$s"
+
+#: actions/shownotice.php:90
 #, fuzzy
-msgid "Options saved."
-msgstr "Inställningar sparade."
+msgid "Notice deleted."
+msgstr "Inlägg"
 
-#: actions/emailsettings.php:107 actions/imsettings.php:108
+#: actions/showstream.php:73
 #, fuzzy, php-format
-msgid "Awaiting confirmation on this address. "
-msgstr "Väntar bekräftelse på detta telefonnummer. "
+msgid " tagged %s"
+msgstr "Inlägg taggade med %s"
 
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-#, fuzzy
-msgid "Make a new email address for posting to; "
-msgstr "Ny emailadress för att skicka till %s"
+#: actions/showstream.php:79
+#, fuzzy, php-format
+msgid "%s, page %d"
+msgstr "Inbox för %s - sida %d"
 
-#: actions/emailsettings.php:157
-#, fuzzy
-msgid "Send me email when someone "
-msgstr "Skicka mig ett email när någon sänder ett privat meddelande."
+#: actions/showstream.php:122
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Inlägg flöde för %s"
 
-#: actions/emailsettings.php:168
-msgid "Allow friends to nudge me and send me an email."
-msgstr ""
+#: actions/showstream.php:129
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Inlägg flöde för %s"
 
-#: actions/emailsettings.php:321
-#, fuzzy
-msgid "That email address already belongs "
-msgstr "Den emailadressen tillhör redan en annan användare."
+#: actions/showstream.php:136
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Inlägg flöde för %s"
 
-#: actions/emailsettings.php:343
-#, fuzzy
-msgid "A confirmation code was sent to the email address you added. "
+#: actions/showstream.php:143
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Inlägg flöde för %s"
+
+#: actions/showstream.php:148
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Outbox för %s"
+
+#: actions/showstream.php:191
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
 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/facebookhome.php:110
-msgid "Server error - couldn't get user!"
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
 msgstr ""
 
-#: actions/facebookhome.php:196
+#: actions/showstream.php:198
 #, php-format
-msgid "If you would like the %s app to automatically update "
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#: actions/showstream.php:234
 #, php-format
-msgid "Allow %s to update my Facebook status"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/facebookhome.php:218
-msgid "Skip"
+#: actions/showstream.php:239
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
 msgstr ""
 
-#: actions/facebookhome.php:235
-#, fuzzy
-msgid "No notice content!"
-msgstr "Inget innehåll!"
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "SMS Inställningar"
 
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-msgid "Pagination"
-msgstr ""
+#: actions/smssettings.php:69
+#, 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%%."
 
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/smssettings.php:91
 #, fuzzy
-msgid "After"
-msgstr "« Nyare"
+msgid "SMS is not available."
+msgstr "Denna sida är inte tillgänglig i den mediatyp du accepterat"
 
-#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
-#, fuzzy
-msgid "Before"
-msgstr "Tidigare »"
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Nuvarande bekäftat SMS telefonnummer"
 
-#: actions/facebookinvite.php:70
-#, php-format
-msgid "Thanks for inviting your friends to use %s"
-msgstr ""
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
+msgstr "Väntar bekräftelse på detta telefonnummer. "
 
-#: actions/facebookinvite.php:72
-#, fuzzy
-msgid "Invitations have been sent to the following users:"
-msgstr "Inbjudan(ar) är skickade till följande personer:"
+#: actions/smssettings.php:130
+msgid "Confirmation code"
+msgstr "Bekräftelsekod"
 
-#: actions/facebookinvite.php:96
-#, fuzzy, php-format
-msgid "You have been invited to %s"
-msgstr "Du är identifierad. Skriv in"
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
+msgstr "Fyll i koden du mottog i din telefon."
 
-#: actions/facebookinvite.php:105
-#, fuzzy, php-format
-msgid "Invite your friends to use %s"
-msgstr "Flöden för $s vänner"
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
+msgstr "SMS Telefonnummer"
 
-#: actions/facebookinvite.php:113
-#, php-format
-msgid "Friends already using %s:"
-msgstr ""
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "Telefonnummer, inga punkter eller mellanslag, med landskod"
 
-#: actions/facebookinvite.php:130
-#, php-format
-msgid "Send invitations"
+#: actions/smssettings.php:174
+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/facebookremove.php:56
-#, fuzzy
-msgid "Couldn't remove Facebook user."
-msgstr "Kunde inte tabort Twitter användaren."
+#: actions/smssettings.php:306
+msgid "No phone number."
+msgstr "Inget telefonnummer."
 
-#: actions/facebooksettings.php:65
-#, fuzzy
-msgid "There was a problem saving your sync preferences!"
-msgstr "Det var något problem med din session. Försök igen, tack."
+#: actions/smssettings.php:311
+msgid "No carrier selected."
+msgstr "Ingen operatör vald."
 
-#: actions/facebooksettings.php:67
-#, fuzzy
-msgid "Sync preferences saved."
-msgstr "Inställningar sparade."
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
+msgstr "Det är redan ditt telefonnummer."
 
-#: actions/facebooksettings.php:90
-#, fuzzy
-msgid "Automatically update my Facebook status with my notices."
-msgstr "Skicka automatiskt mina inlägg till Twitter."
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
+msgstr "Det numret tillhör en annan användare."
 
-#: actions/facebooksettings.php:97
+#: actions/smssettings.php:347
 #, fuzzy
-msgid "Send \"@\" replies to Facebook."
-msgstr "Skicka lokala \"@\" svar till Twitter."
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"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/smssettings.php:374
+msgid "That is the wrong confirmation number."
+msgstr "Det är fel nummer i bekräftelsen"
+
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
+msgstr "Det är inte ditt telefonnummer."
 
-#: actions/facebooksettings.php:106
+#: actions/smssettings.php:465
 #, fuzzy
-msgid "Prefix"
-msgstr "Profil"
+msgid "Mobile carrier"
+msgstr "Välj en operatör"
 
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
-msgstr ""
+#: actions/smssettings.php:469
+msgid "Select a carrier"
+msgstr "Välj en operatör"
 
-#: actions/facebooksettings.php:124
+#: actions/smssettings.php:476
 #, php-format
-msgid "If you would like %s to automatically update "
+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/facebooksettings.php:147
-#, fuzzy
-msgid "Sync preferences"
-msgstr "Inställningar"
+#: actions/smssettings.php:498
+msgid "No code entered"
+msgstr "Ingen kod är ifylld"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/subedit.php:70
 #, fuzzy
-msgid "Disfavor favorite"
-msgstr "Avfavorisera"
+msgid "You are not subscribed to that profile."
+msgstr "Du skickade inte oss den profilen"
 
-#: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
+#: actions/subedit.php:83
 #, fuzzy
-msgid "Popular notices"
-msgstr "Inget sådant inlägg."
+msgid "Could not save subscription."
+msgstr "Kunde inte skapa prenumeration."
 
-#: actions/favorited.php:67
-#, fuzzy, php-format
-msgid "Popular notices, page %d"
-msgstr "Inget sådant inlägg."
+#: actions/subscribe.php:55
+#, fuzzy
+msgid "Not a local user."
+msgstr "Ingen sådan användare"
 
-#: actions/favorited.php:79
+#: actions/subscribe.php:69
 #, fuzzy
-msgid "The most popular notices on the site right now."
-msgstr "Visar dom populäraste taggarna ifrån den senaste veckan."
+msgid "Subscribed"
+msgstr "Prenumerera"
 
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
-msgid "Featured users"
-msgstr ""
+#: actions/subscribers.php:50
+#, fuzzy, php-format
+msgid "%s subscribers"
+msgstr "Prenumerant"
 
-#: actions/featured.php:71
+#: actions/subscribers.php:52
 #, php-format
-msgid "Featured users, page %d"
+msgid "%s subscribers, page %d"
 msgstr ""
 
-#: actions/featured.php:99
+#: actions/subscribers.php:63
+msgid "These are the people who listen to your notices."
+msgstr "Dessa personer är dom som lyssnar på dina inlägg."
+
+#: actions/subscribers.php:67
 #, php-format
-msgid "A selection of some of the great users on %s"
-msgstr ""
+msgid "These are the people who listen to %s's notices."
+msgstr "Dessa personer är dom som lyssnar på %s inlägg."
 
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
 msgstr ""
 
-#: actions/groupbyid.php:79
-msgid "No ID"
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
 
-#: actions/grouplogo.php:138 actions/grouplogo.php:191
-msgid "Group logo"
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
 msgstr ""
 
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
-msgstr ""
+#: actions/subscriptions.php:52
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "Alla prenumerationer"
 
-#: actions/grouplogo.php:448
-#, fuzzy
-msgid "Logo updated."
-msgstr "Användarbilden uppdaterad."
+#: actions/subscriptions.php:54
+#, fuzzy, php-format
+msgid "%s subscriptions, page %d"
+msgstr "Alla prenumerationer"
 
-#: actions/grouplogo.php:450
-#, fuzzy
-msgid "Failed updating logo."
-msgstr "Uppdatering av profilbild misslyckades."
+#: actions/subscriptions.php:65
+msgid "These are the people whose notices you listen to."
+msgstr "Detta är personer och inlägg som du lyssnar på."
 
-#: actions/groupmembers.php:93 lib/groupnav.php:91
+#: actions/subscriptions.php:69
 #, php-format
-msgid "%s group members"
-msgstr ""
+msgid "These are the people whose notices %s listens to."
+msgstr "Detta är personer och inlägg som %s lyssnar på."
 
-#: actions/groupmembers.php:96
+#: actions/subscriptions.php:121
 #, php-format
-msgid "%s group members, page %d"
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
 msgstr ""
 
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
-msgstr ""
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s lyssnar nu på dina meddelanden i %2$s."
 
-#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
-msgid "Groups"
-msgstr ""
+#: actions/subscriptions.php:194
+#, fuzzy
+msgid "Jabber"
+msgstr "Inget Jabber ID."
 
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr ""
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
+msgstr "SMS"
 
-#: actions/groups.php:90
-#, php-format
-msgid "%%%%site.name%%%% groups let you find and talk with "
-msgstr ""
+#: actions/tagother.php:33
+#, fuzzy
+msgid "Not logged in"
+msgstr "Inte inloggad."
 
-#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: actions/tagother.php:39
 #, fuzzy
-msgid "Create a new group"
-msgstr "Skapa ett nytt konto"
+msgid "No id argument."
+msgstr "Inget sådant dokument."
 
-#: actions/groupsearch.php:57
+#: actions/tagother.php:65
 #, fuzzy, php-format
-msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-msgstr ""
-"Sök efter personer på %%site.name%% efter deras namn, plats eller intressen."
-
-#: actions/groupsearch.php:63
-#, fuzzy
-msgid "Group search"
-msgstr "Sökning personer"
+msgid "Tag %s"
+msgstr "Taggar"
 
-#: actions/imsettings.php:70
+#: actions/tagother.php:77 lib/userprofile.php:75
 #, fuzzy
-msgid "You can send and receive notices through "
-msgstr "Du kan inte skicka meddelande till den användaren."
+msgid "User profile"
+msgstr "Användaren har ingen profil."
 
-#: actions/imsettings.php:120
-#, php-format
-msgid "Jabber or GTalk address, "
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
 msgstr ""
 
-#: actions/imsettings.php:147
+#: actions/tagother.php:141
 #, fuzzy
-msgid "Send me replies through Jabber/GTalk "
-msgstr "Skicka inlägg till mig via Jabber/GTalk."
+msgid "Tag user"
+msgstr "Taggar"
 
-#: actions/imsettings.php:321
-#, fuzzy, php-format
-msgid "A confirmation code was sent "
-msgstr "Ingen bekräftelsekod."
+#: actions/tagother.php:151
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
 
-#: actions/joingroup.php:65
-#, fuzzy
-msgid "You must be logged in to join a group."
-msgstr "du måste vara inloggad för att kunna bjuda in andra användare till %s"
+#: actions/tagother.php:193
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
 
-#: actions/joingroup.php:95
+#: actions/tagother.php:200
 #, fuzzy
-msgid "You are already a member of that group"
-msgstr "Du prenumererar redan på dessa användare:"
+msgid "Could not save tags."
+msgstr "Kunde inte spara informationen om användarbild"
+
+#: actions/tagother.php:236
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
 
-#: actions/joingroup.php:128
+#: actions/tag.php:68
 #, fuzzy, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Kunde inte följa användaren: Användaren kunde inte hittas."
+msgid "Notices tagged with %s, page %d"
+msgstr "Inlägg taggade med %s"
 
-#: actions/joingroup.php:135
+#: actions/tag.php:86
 #, fuzzy, php-format
-msgid "%s joined group %s"
-msgstr "%s / Favoriter från %s"
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Inlägg flöde för %s"
 
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
-msgstr ""
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Inlägg flöde för %s"
 
-#: actions/leavegroup.php:65
-#, fuzzy
-msgid "You must be logged in to leave a group."
-msgstr "du måste vara inloggad för att kunna bjuda in andra användare till %s"
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Inlägg flöde för %s"
 
-#: actions/leavegroup.php:88
+#: actions/tagrss.php:35
 #, fuzzy
-msgid "No such group."
+msgid "No such tag."
 msgstr "Inget sådant meddelande."
 
-#: actions/leavegroup.php:95
-#, fuzzy
-msgid "You are not a member of that group."
-msgstr "Du skickade inte oss den profilen"
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
+msgstr "API-metoden är under uppbyggnad."
 
-#: actions/leavegroup.php:100
+#: actions/unsubscribe.php:77
 #, fuzzy
-msgid "You may not leave a group while you are its administrator."
-msgstr "Du kan inte tabort nån annan användares status."
+msgid "No profile id in request."
+msgstr "Ingen profil URL lämnades ut av servern."
 
-#: actions/leavegroup.php:130
+#: actions/unsubscribe.php:84
 #, fuzzy
-msgid "Could not find membership record."
-msgstr "Kunde inte uppdatera användarens inställningar."
+msgid "No profile with that id."
+msgstr "Ingen status hittad med det ID"
 
-#: actions/leavegroup.php:138
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "Kunde inte följa användaren: Användaren kunde inte hittas."
+#: actions/unsubscribe.php:98
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Lämnar pren."
 
-#: actions/leavegroup.php:145
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
 #, php-format
-msgid "%s left group %s"
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
-#: actions/login.php:225 lib/facebookaction.php:304
-msgid "Login to site"
-msgstr ""
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "Tillåt prenumeration."
 
-#: actions/microsummary.php:69
-msgid "No current status"
+#: actions/userauthorization.php:110
+#, fuzzy
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
 msgstr ""
+"Kontrollera dessa detajer noga så att du verkligen vet att du vill "
+"prenumerera på denna användares inlägg. Om du inte frågade efter att "
+"prenumerera på någons inlägg, klicka på \"Cancel\""
 
-#: actions/newgroup.php:53
-msgid "New group"
+#: actions/userauthorization.php:188
+msgid "License"
 msgstr ""
 
-#: actions/newgroup.php:115
-msgid "Use this form to create a new group."
-msgstr ""
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "Acceptera"
 
-#: actions/newgroup.php:177
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
 #, fuzzy
-msgid "Could not create group."
-msgstr "Kunde inte skapa favorit."
+msgid "Subscribe to this user"
+msgstr "Prenumerera på mina Twitter vänner här."
 
-#: actions/newgroup.php:191
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "Kunde inte skapa prenumeration."
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "Avvisa"
 
-#: actions/newmessage.php:119 actions/newnotice.php:132
+#: actions/userauthorization.php:212
 #, fuzzy
-msgid "That's too long. "
-msgstr "Filen är för stor."
+msgid "Reject this subscription"
+msgstr "Alla prenumerationer"
 
-#: actions/newmessage.php:134
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
+msgstr "Ingen rättighet förfrågan!"
+
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+msgstr "Prenumeration accepterad"
+
+#: actions/userauthorization.php:249
 #, fuzzy
-msgid "Don't send a message to yourself; "
-msgstr "Du kan inte skicka meddelande till den användaren."
+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 ""
+"Prenumerationen har blivit bekräftad, men ingen URL har gått igenom. Kolla "
+"med sidans instruktioner hur du bekräftar en prenumeration. Din "
+"prenumerering token är:"
+
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
+msgstr "Prenumeration avvisad"
 
-#: actions/newnotice.php:166
+#: actions/userauthorization.php:261
 #, fuzzy
-msgid "Notice posted"
-msgstr "Inlägg"
+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 ""
+"Prenumerationen har blivit avvisad, men inga URL har gått igenom. Kolla med "
+"sidans instruktioner hur du avvisar en prenumeration."
 
-#: actions/newnotice.php:200 classes/Channel.php:163
-msgid "Ajax Error"
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
 msgstr ""
 
-#: actions/nudge.php:85
-msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
 msgstr ""
 
-#: actions/nudge.php:94
-msgid "Nudge sent"
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr ""
 
-#: actions/nudge.php:97
-msgid "Nudge sent!"
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr ""
 
-#: actions/openidlogin.php:97
-#, fuzzy
-msgid "OpenID login"
-msgstr "OpenID inloggning"
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
 
-#: actions/openidsettings.php:128
-#, fuzzy
-msgid "Removing your only OpenID "
-msgstr "Ta bort OpenID"
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Kan inte läsa användarbild URL '%s'"
 
-#: actions/othersettings.php:60
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Fel filtyp för bild '%s'"
+
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr "Inget id."
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
 #, fuzzy
-msgid "Other Settings"
-msgstr "Twitter inställningar"
+msgid "Profile design"
+msgstr "Profil inställningar"
 
-#: actions/othersettings.php:71
-msgid "Manage various other options."
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
 msgstr ""
 
-#: actions/othersettings.php:93
-msgid "URL Auto-shortening"
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
 msgstr ""
 
-#: actions/othersettings.php:112
-#, fuzzy
-msgid "Service"
-msgstr "Sök"
-
-#: actions/othersettings.php:113
-msgid "Automatic shortening service to use."
+#: actions/usergroups.php:64
+#, php-format
+msgid "%s groups, page %d"
 msgstr ""
 
-#: actions/othersettings.php:144
-#, fuzzy
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "Språket är för långt(max 50 tecken)."
+#: actions/usergroups.php:130
+msgid "Search for more groups"
+msgstr ""
 
-#: actions/passwordsettings.php:69
-#, fuzzy
-msgid "Change your password."
-msgstr "Ändra ditt lösenord"
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "Du skickade inte oss den profilen"
 
-#: actions/passwordsettings.php:89
-#, fuzzy
-msgid "Password change"
-msgstr "Lösenord är sparat."
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
 
-#: actions/peopletag.php:35
-#, fuzzy, php-format
-msgid "Not a valid people tag: %s"
-msgstr "Ingen giltig emailadress"
+#: classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
 
-#: actions/peopletag.php:47
+#: classes/File.php:147
 #, php-format
-msgid "Users self-tagged with %s - page %d"
+msgid "A file this large would exceed your user quota of %d bytes."
 msgstr ""
 
-#: actions/peopletag.php:91
+#: classes/File.php:154
 #, php-format
-msgid "These are users who have tagged themselves \"%s\" "
+msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
-#: actions/profilesettings.php:91
+#: classes/Message.php:55
+msgid "Could not insert message."
+msgstr ""
+
+#: classes/Message.php:65
+msgid "Could not update message with new URI."
+msgstr ""
+
+#: classes/Notice.php:164
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "DB error vid infog av hashtag: %s"
+
+#: classes/Notice.php:179
 #, fuzzy
-msgid "Profile information"
-msgstr "Okänd profil"
+msgid "Problem saving notice. Too long."
+msgstr "Det var ett problem när inlägget sparades."
+
+#: classes/Notice.php:183
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Det var ett problem när inlägget sparades."
 
-#: actions/profilesettings.php:124
+#: classes/Notice.php:188
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: actions/profilesettings.php:144
-#, fuzzy
-msgid "Automatically subscribe to whoever "
+#: classes/Notice.php:194
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
 msgstr ""
-"Automatisk prenummeration på den som prenumererar på mig. (Bäst för icke "
-"mänsklig användare) "
 
-#: actions/profilesettings.php:229 actions/tagother.php:176
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Ogiltig hemsideadress '%s'"
+#: classes/Notice.php:202
+msgid "You are banned from posting notices on this site."
+msgstr ""
 
-#: actions/profilesettings.php:311
-#, fuzzy
-msgid "Couldn't save tags."
-msgstr "Kunde inte spara profil."
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
+msgstr "Det var ett problem när inlägget sparades."
+
+#: classes/Notice.php:1120
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "Databasfel för svar: %s"
 
-#: actions/public.php:107
+#: classes/User.php:347
 #, fuzzy, php-format
-msgid "Public timeline, page %d"
-msgstr "Publik tidslinje"
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Meddelande till %1$s på %2$s"
+
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Profil"
 
-#: actions/public.php:173
+#: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
+msgstr "Ändra dina profilinställningar"
+
+#: lib/accountsettingsaction.php:112
 #, fuzzy
-msgid "Could not retrieve public stream."
-msgstr "Kunde inte ta emot favoritinläggen."
+msgid "Upload an avatar"
+msgstr "Uppdatering av profilbild misslyckades."
 
-#: actions/public.php:220
-#, php-format
-msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr "Ändra ditt lösenord"
+
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
+msgstr "Ändra email hantering"
+
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
 msgstr ""
 
-#: actions/publictagcloud.php:57
+#: lib/accountsettingsaction.php:124
 #, fuzzy
-msgid "Public tag cloud"
-msgstr "Publik ström"
+msgid "Design your profile"
+msgstr "Användaren har ingen profil."
 
-#: actions/publictagcloud.php:63
-#, php-format
-msgid "These are most popular recent tags on %s "
+#: lib/accountsettingsaction.php:128
+msgid "Other"
 msgstr ""
 
-#: actions/publictagcloud.php:119
-msgid "Tag cloud"
+#: lib/accountsettingsaction.php:128
+msgid "Other options"
 msgstr ""
 
-#: actions/register.php:139 actions/register.php:349
-msgid "Sorry, only invited people can register."
-msgstr ""
+#: lib/action.php:144
+#, fuzzy, php-format
+msgid "%s - %s"
+msgstr "%s(%s)"
 
-#: actions/register.php:149
-#, fuzzy
-msgid "You can't register if you don't "
-msgstr "Du kan inte registrera dig om du inte godkänner licensvillkor."
+#: lib/action.php:159
+msgid "Untitled page"
+msgstr ""
 
-#: actions/register.php:286
-msgid "With this form you can create "
+#: lib/action.php:424
+msgid "Primary site navigation"
 msgstr ""
 
-#: actions/register.php:368
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, "
-msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag"
+#: lib/action.php:430
+msgid "Home"
+msgstr "Hem"
 
-#: actions/register.php:382 actions/register.php:386
-#, fuzzy
-msgid "Used only for updates, announcements, "
+#: lib/action.php:430
+msgid "Personal profile and friends timeline"
 msgstr ""
-"Används endast för uppdateringar, annonsering och återställning av lösenord"
 
-#: actions/register.php:398
+#: lib/action.php:432
 #, fuzzy
-msgid "URL of your homepage, blog, "
-msgstr "URL till din hemsida, blog eller profil på en annan sida."
+msgid "Account"
+msgstr "Om"
 
-#: actions/register.php:404
+#: lib/action.php:432
 #, fuzzy
-msgid "Describe yourself and your "
-msgstr "Berätta om dig själv och dina intressen inom 140 tecken"
+msgid "Change your email, avatar, password, profile"
+msgstr "Ändra ditt lösenord"
 
-#: actions/register.php:410
-#, fuzzy
-msgid "Where you are, like \"City, "
-msgstr "Var du håller till, såsom \"Stad, Län, Land\""
+#: lib/action.php:435
+msgid "Connect"
+msgstr "Anslut"
 
-#: actions/register.php:432
+#: lib/action.php:435
 #, fuzzy
-msgid " except this private data: password, "
-msgstr ""
-"förutom det här, som är privat: lösenord, epostadress, IM-adress, "
-"telefonnummer."
+msgid "Connect to services"
+msgstr "Kunde inte skicka vidare till servern: %s"
 
-#: actions/register.php:471
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
+msgstr "Bjud in"
+
+#: lib/action.php:440 lib/subgroupnav.php:106
 #, fuzzy, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
+msgid "Invite friends and colleagues to join you on %s"
+msgstr ""
+"Använd detta formulär för att bjuda in dina vänner och kollegor till denna "
+"sida."
+
+#: lib/action.php:445
+msgid "Logout"
+msgstr "Logga ut"
+
+#: lib/action.php:445
+msgid "Logout from the site"
 msgstr ""
-"Gratulerar, %s! Välkommen till %%%%site.name%%%%. Härifrån vill du kanske..."
 
-#: actions/register.php:495
+#: lib/action.php:450
 #, fuzzy
-msgid "(You should receive a message by email "
-msgstr "(Du kommer inom kort få ett email med"
+msgid "Create an account"
+msgstr "Skapa ett nytt konto"
 
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
+#: lib/action.php:453
+msgid "Login to the site"
 msgstr ""
 
-#: actions/replies.php:118
-#, fuzzy, php-format
-msgid "Replies to %s, page %d"
-msgstr "Svarat på %s"
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
+msgstr "Hjälp"
 
-#: actions/showfavorites.php:79
-#, fuzzy, php-format
-msgid "%s favorite notices, page %d"
-msgstr "%s favoriter"
+#: lib/action.php:456
+#, fuzzy
+msgid "Help me!"
+msgstr "Hjälp"
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
-#, php-format
-msgid "%s group"
-msgstr ""
+#: lib/action.php:459
+msgid "Search"
+msgstr "Sök"
 
-#: actions/showgroup.php:79
-#, php-format
-msgid "%s group, page %d"
+#: lib/action.php:459
+msgid "Search for people or text"
 msgstr ""
 
-#: actions/showgroup.php:206
+#: lib/action.php:480
 #, fuzzy
-msgid "Group profile"
-msgstr "Inget sådant inlägg."
+msgid "Site notice"
+msgstr "Nytt inlägg"
 
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
-msgid "URL"
+#: lib/action.php:546
+msgid "Local views"
 msgstr ""
 
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: lib/action.php:612
 #, fuzzy
-msgid "Note"
-msgstr "Inlägg"
+msgid "Page notice"
+msgstr "Nytt inlägg"
 
-#: actions/showgroup.php:270
-msgid "Group actions"
+#: lib/action.php:714
+#, fuzzy
+msgid "Secondary site navigation"
+msgstr "Prenumerationer"
+
+#: lib/action.php:721
+msgid "About"
+msgstr "Om"
+
+#: lib/action.php:723
+msgid "FAQ"
+msgstr "Frågor & svar"
+
+#: lib/action.php:727
+msgid "TOS"
 msgstr ""
 
-#: actions/showgroup.php:323
-#, fuzzy, php-format
-msgid "Notice feed for %s group"
-msgstr "Inlägg flöde för %s"
+#: lib/action.php:730
+msgid "Privacy"
+msgstr "Sekretesspolicy"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
-#, fuzzy
-msgid "Members"
-msgstr "Medlem sedan"
+#: lib/action.php:732
+msgid "Source"
+msgstr "Källa"
 
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
-msgid "(None)"
+#: lib/action.php:734
+msgid "Contact"
+msgstr "Kontakta"
+
+#: lib/action.php:736
+msgid "Badge"
 msgstr ""
 
-#: actions/showgroup.php:370
-msgid "All members"
+#: lib/action.php:764
+msgid "StatusNet software license"
 msgstr ""
 
-#: actions/showgroup.php:378
+#: lib/action.php:767
 #, php-format
 msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"**%%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%%)"
 
-#: actions/showmessage.php:98
-#, fuzzy
-msgid "Only the sender and recipient "
-msgstr "Endast den som skickat och mottagaren kan läsa detta meddelande."
+#: lib/action.php:769
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** är en mikroblogg service."
 
-#: actions/showstream.php:73
-#, fuzzy, php-format
-msgid "%s, page %d"
-msgstr "Inbox för %s - sida %d"
+#: lib/action.php:771
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+"Det drivs med [StatusNet](http://status.net/) mikroblogging software, "
+"version %s, tillgängligt under [GNU Affero General Public License](http://"
+"www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#: actions/showstream.php:143
+#: lib/action.php:785
 #, fuzzy
-msgid "'s profile"
-msgstr "Profil"
+msgid "Site content license"
+msgstr "Sök innehåll i inlägg"
 
-#: actions/showstream.php:236 actions/tagother.php:77
-#, fuzzy
-msgid "User profile"
-msgstr "Användaren har ingen profil."
+#: lib/action.php:794
+msgid "All "
+msgstr ""
 
-#: actions/showstream.php:240 actions/tagother.php:81
-msgid "Photo"
+#: lib/action.php:799
+msgid "license."
 msgstr ""
 
-#: actions/showstream.php:317
-#, fuzzy
-msgid "User actions"
-msgstr "Okänd funktion"
+#: lib/action.php:1052
+msgid "Pagination"
+msgstr ""
 
-#: actions/showstream.php:342
+#: lib/action.php:1061
 #, fuzzy
-msgid "Send a direct message to this user"
-msgstr "Du kan inte skicka meddelande till den användaren."
+msgid "After"
+msgstr "« Nyare"
 
-#: actions/showstream.php:343
+#: lib/action.php:1069
 #, fuzzy
-msgid "Message"
-msgstr "Nytt meddelande"
+msgid "Before"
+msgstr "Tidigare »"
 
-#: actions/showstream.php:451
+#: lib/action.php:1117
 #, fuzzy
-msgid "All subscribers"
-msgstr "Prenumerant"
+msgid "There was a problem with your session token."
+msgstr "Det var något problem med din session. Försök igen, tack."
 
-#: actions/showstream.php:533
-msgid "All groups"
+#: lib/attachmentlist.php:87
+msgid "Attachments"
 msgstr ""
 
-#: actions/showstream.php:542
-#, php-format
-msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+#: lib/attachmentlist.php:265
+msgid "Author"
 msgstr ""
 
-#: actions/smssettings.php:128
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, "
-msgstr "Telefonnummer, inga punkter eller mellanslag, med landskod"
-
-#: actions/smssettings.php:162
+#: lib/attachmentlist.php:278
 #, fuzzy
-msgid "Send me notices through SMS; "
-msgstr "Skicka inlägg till mig via Jabber/GTalk."
+msgid "Provider"
+msgstr "Profil"
 
-#: actions/smssettings.php:335
-#, fuzzy
-msgid "A confirmation code was sent to the phone number you added. "
-msgstr "Väntar bekräftelse på detta telefonnummer. "
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
 
-#: actions/smssettings.php:453
-#, fuzzy
-msgid "Mobile carrier"
-msgstr "Välj en operatör"
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
 
-#: actions/subedit.php:70
-#, fuzzy
-msgid "You are not subscribed to that profile."
-msgstr "Du skickade inte oss den profilen"
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
+msgstr ""
 
-#: actions/subedit.php:83
-#, fuzzy
-msgid "Could not save subscription."
-msgstr "Kunde inte skapa prenumeration."
+#: lib/channel.php:210
+msgid "Command complete"
+msgstr ""
 
-#: actions/subscribe.php:55
-#, fuzzy
-msgid "Not a local user."
-msgstr "Ingen sådan användare"
+#: lib/channel.php:221
+msgid "Command failed"
+msgstr ""
 
-#: actions/subscribe.php:69
-#, fuzzy
-msgid "Subscribed"
-msgstr "Prenumerera"
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
 
-#: actions/subscribers.php:50
+#: lib/command.php:88
 #, fuzzy, php-format
-msgid "%s subscribers"
-msgstr "Prenumerant"
+msgid "Could not find a user with nickname %s"
+msgstr "Kunde inte uppdatera användaren med bekräftad emailadress."
 
-#: actions/subscribers.php:52
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
 #, php-format
-msgid "%s subscribers, page %d"
+msgid "Nudge sent to %s"
 msgstr ""
 
-#: actions/subscribers.php:63
-#, fuzzy
-msgid "These are the people who listen to "
-msgstr "Dessa personer är dom som lyssnar på %s inlägg."
+#: lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
 
-#: actions/subscribers.php:67
-#, fuzzy, php-format
-msgid "These are the people who "
-msgstr "Dessa personer är dom som lyssnar på %s inlägg."
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
 
-#: actions/subscriptions.php:52
-#, fuzzy, php-format
-msgid "%s subscriptions"
-msgstr "Alla prenumerationer"
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
+msgstr ""
 
-#: actions/subscriptions.php:54
-#, fuzzy, php-format
-msgid "%s subscriptions, page %d"
-msgstr "Alla prenumerationer"
+#: lib/command.php:190
+msgid "Notice marked as fave."
+msgstr ""
 
-#: actions/subscriptions.php:65
-#, fuzzy
-msgid "These are the people whose notices "
-msgstr "Detta är personer och inlägg som %s lyssnar på."
+#: lib/command.php:315
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
 
-#: actions/subscriptions.php:69
-#, fuzzy, php-format
-msgid "These are the people whose "
-msgstr "Dessa personer är dom som lyssnar på %s inlägg."
+#: lib/command.php:318
+#, php-format
+msgid "Fullname: %s"
+msgstr "Fullt namn: %s"
 
-#: actions/subscriptions.php:122
-#, fuzzy
-msgid "Jabber"
-msgstr "Inget Jabber ID."
+#: lib/command.php:321
+#, php-format
+msgid "Location: %s"
+msgstr "Plats: %s"
 
-#: actions/tag.php:43
-#, fuzzy, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Inlägg taggade med %s"
+#: lib/command.php:324
+#, php-format
+msgid "Homepage: %s"
+msgstr "Hemsida: %s"
 
-#: actions/tag.php:66
+#: lib/command.php:327
 #, php-format
-msgid "Messages tagged \"%s\", most recent first"
+msgid "About: %s"
+msgstr "Om: %s"
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: actions/tagother.php:33
-#, fuzzy
-msgid "Not logged in"
-msgstr "Inte inloggad."
+#: lib/command.php:377
+msgid "Error sending direct message."
+msgstr ""
 
-#: actions/tagother.php:39
-#, fuzzy
-msgid "No id argument."
-msgstr "Inget sådant dokument."
+#: lib/command.php:431
+#, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr ""
 
-#: actions/tagother.php:65
+#: lib/command.php:439
 #, fuzzy, php-format
-msgid "Tag %s"
-msgstr "Taggar"
+msgid "Reply to %s sent"
+msgstr "Svara på detta inlägg"
 
-#: actions/tagother.php:141
+#: lib/command.php:441
 #, fuzzy
-msgid "Tag user"
-msgstr "Taggar"
+msgid "Error saving notice."
+msgstr "Det var ett problem när inlägget sparades."
 
-#: actions/tagother.php:149
-msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: actions/tagother.php:164
-#, fuzzy
-msgid "There was a problem with your session token."
-msgstr "Det var något problem med din session. Försök igen, tack."
+#: lib/command.php:502
+#, php-format
+msgid "Subscribed to %s"
+msgstr ""
 
-#: actions/tagother.php:191
-msgid ""
-"You can only tag people you are subscribed to or who are subscribed to you."
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: actions/tagother.php:198
-#, fuzzy
-msgid "Could not save tags."
-msgstr "Kunde inte spara informationen om användarbild"
+#: lib/command.php:530
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr ""
 
-#: actions/tagother.php:233
-msgid "Use this form to add tags to your subscribers or subscriptions."
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
 msgstr ""
 
-#: actions/tagrss.php:35
-#, fuzzy
-msgid "No such tag."
-msgstr "Inget sådant meddelande."
+#: lib/command.php:551
+msgid "Notification off."
+msgstr ""
 
-#: actions/tagrss.php:66
-#, fuzzy, php-format
-msgid "Microblog tagged with %s"
-msgstr "Inlägg taggade med %s"
+#: lib/command.php:553
+msgid "Can't turn off notification."
+msgstr ""
 
-#: actions/twitapiblocks.php:47
-msgid "Block user failed."
+#: lib/command.php:574
+msgid "Notification on."
 msgstr ""
 
-#: actions/twitapiblocks.php:69
-msgid "Unblock user failed."
+#: lib/command.php:576
+msgid "Can't turn on notification."
 msgstr ""
 
-#: actions/twitapiusers.php:48
-#, fuzzy
-msgid "Not found."
-msgstr "Hittades inte"
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Kan inte skapa OpenID formulär: %s"
 
-#: actions/twittersettings.php:71
-#, fuzzy
-msgid "Add your Twitter account to automatically send "
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
-"Lägg till ditt Twitter konto för att automatiskt skicka dina inlägg till "
-"Twitter,"
 
-#: actions/twittersettings.php:119
+#: lib/command.php:618
 #, fuzzy
-msgid "Twitter user name"
-msgstr "Twitter användarnamn"
+msgid "You are not subscribed to anyone."
+msgstr "Du skickade inte oss den profilen"
 
-#: actions/twittersettings.php:126
+#: lib/command.php:620
 #, fuzzy
-msgid "Twitter password"
-msgstr "Twitter lösenord"
+msgid "You are subscribed to these people: "
+msgstr "Du skickade inte oss den profilen"
 
-#: actions/twittersettings.php:228
+#: lib/command.php:637
 #, fuzzy
-msgid "Twitter Friends"
-msgstr "Twitter inställningar"
-
-#: actions/twittersettings.php:327
-msgid "Username must have only numbers, "
-msgstr ""
-
-#: actions/twittersettings.php:341
-#, fuzzy, php-format
-msgid "Unable to retrieve account information "
-msgstr "Kunde inte mottaga konto information för \"%s\" Twitter."
+msgid "No one is subscribed to you."
+msgstr "Kunde inte prenumerera på annat åt dig."
 
-#: actions/unblock.php:108
+#: lib/command.php:639
 #, fuzzy
-msgid "Error removing the block."
-msgstr "Fel uppstog när användaren skulle sparas."
+msgid "These people are subscribed to you: "
+msgstr "Fjärrprenumerera"
 
-#: actions/unsubscribe.php:50
+#: lib/command.php:656
 #, fuzzy
-msgid "No profile id in request."
-msgstr "Ingen profil URL lämnades ut av servern."
+msgid "You are not a member of any groups."
+msgstr "Du skickade inte oss den profilen"
 
-#: actions/unsubscribe.php:57
+#: lib/command.php:658
 #, fuzzy
-msgid "No profile with that id."
-msgstr "Ingen status hittad med det ID"
+msgid "You are a member of these groups: "
+msgstr "Du skickade inte oss den profilen"
 
-#: actions/unsubscribe.php:71
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "Lämnar pren."
+#: lib/command.php:670
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+
+#: lib/common.php:192
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Ingen bekräftelsekod."
 
-#: actions/usergroups.php:63
-#, php-format
-msgid "%s groups"
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: actions/usergroups.php:65
-#, php-format
-msgid "%s groups, page %d"
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: classes/Notice.php:104
-#, fuzzy
-msgid "Problem saving notice. Unknown user."
-msgstr "Det var ett problem när inlägget sparades."
-
-#: classes/Notice.php:109
-msgid ""
-"Too many notices too fast; take a breather and post again in a few minutes."
+#: lib/common.php:195
+msgid "Go to the installer."
 msgstr ""
 
-#: classes/Notice.php:116
-msgid "You are banned from posting notices on this site."
-msgstr ""
+#: lib/connectsettingsaction.php:110
+msgid "IM"
+msgstr "IM"
 
-#: lib/accountsettingsaction.php:108
-#, fuzzy
-msgid "Upload an avatar"
-msgstr "Uppdatering av profilbild misslyckades."
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Uppdateringar via instant messenger (IM)"
 
-#: lib/accountsettingsaction.php:119
-msgid "Other"
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
+msgstr "Uppdateringar via SMS"
+
+#: lib/dberroraction.php:60
+msgid "Database error"
 msgstr ""
 
-#: lib/accountsettingsaction.php:120
-msgid "Other options"
+#: lib/designsettings.php:101
+msgid "Change background image"
 msgstr ""
 
-#: lib/action.php:130
-#, fuzzy, php-format
-msgid "%s - %s"
-msgstr "%s(%s)"
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Ladda upp"
 
-#: lib/action.php:145
-msgid "Untitled page"
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 
-#: lib/action.php:316
-msgid "Primary site navigation"
+#: lib/designsettings.php:139
+msgid "On"
 msgstr ""
 
-#: lib/action.php:322
-msgid "Personal profile and friends timeline"
+#: lib/designsettings.php:155
+msgid "Off"
 msgstr ""
 
-#: lib/action.php:325
-msgid "Search for people or text"
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
 msgstr ""
 
-#: lib/action.php:328
-#, fuzzy
-msgid "Account"
-msgstr "Om"
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
 
-#: lib/action.php:328
+#: lib/designsettings.php:170
 #, fuzzy
-msgid "Change your email, avatar, password, profile"
+msgid "Change colours"
 msgstr "Ändra ditt lösenord"
 
-#: lib/action.php:330
-msgid "Connect to IM, SMS, Twitter"
-msgstr ""
-
-#: lib/action.php:332
-msgid "Logout from the site"
-msgstr ""
-
-#: lib/action.php:335
-msgid "Login to the site"
+#: lib/designsettings.php:178
+msgid "Background"
 msgstr ""
 
-#: lib/action.php:338
+#: lib/designsettings.php:191
 #, fuzzy
-msgid "Create an account"
-msgstr "Skapa ett nytt konto"
+msgid "Content"
+msgstr "Anslut"
 
-#: lib/action.php:341
+#: lib/designsettings.php:204
 #, fuzzy
-msgid "Login with OpenID"
-msgstr "Det existerar inget sådant OpenID"
+msgid "Sidebar"
+msgstr "Sök"
 
-#: lib/action.php:344
-#, fuzzy
-msgid "Help me!"
-msgstr "Hjälp"
+#: lib/designsettings.php:217
+msgid "Text"
+msgstr "Text"
 
-#: lib/action.php:362
+#: lib/designsettings.php:230
 #, fuzzy
-msgid "Site notice"
-msgstr "Nytt inlägg"
+msgid "Links"
+msgstr "Logga in"
 
-#: lib/action.php:417
-msgid "Local views"
+#: lib/designsettings.php:247
+msgid "Use defaults"
 msgstr ""
 
-#: lib/action.php:472
-#, fuzzy
-msgid "Page notice"
-msgstr "Nytt inlägg"
-
-#: lib/action.php:562
-#, fuzzy
-msgid "Secondary site navigation"
-msgstr "Prenumerationer"
-
-#: lib/action.php:602 lib/action.php:623
-msgid "StatusNet software license"
+#: lib/designsettings.php:248
+msgid "Restore default designs"
 msgstr ""
 
-#: lib/action.php:630
-msgid "All "
+#: lib/designsettings.php:254
+msgid "Reset back to default"
 msgstr ""
 
-#: lib/action.php:635
-msgid "license."
+#: lib/designsettings.php:257
+msgid "Save design"
 msgstr ""
 
-#: lib/blockform.php:123 lib/blockform.php:153
-#, fuzzy
-msgid "Block this user"
-msgstr "Ingen sådan användare"
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
+msgstr ""
 
-#: lib/blockform.php:153
-msgid "Block"
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
 msgstr ""
 
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
@@ -4647,30 +4023,35 @@ msgstr ""
 msgid "Disfavor this notice"
 msgstr "%s favoriter"
 
-#: lib/facebookaction.php:268
-#, php-format
-msgid "To use the %s Facebook Application you need to login "
-msgstr ""
-
-#: lib/facebookaction.php:271
-#, fuzzy
-msgid " a new account."
-msgstr "Skapa ett nytt konto"
-
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-#, fuzzy
-msgid "Published"
-msgstr "Publik"
-
 #: lib/favorform.php:114 lib/favorform.php:140
 #, fuzzy
 msgid "Favor this notice"
 msgstr "%s favoriter"
 
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr "Favorisera"
+
 #: lib/feedlist.php:64
 msgid "Export data"
 msgstr ""
 
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr ""
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr ""
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr ""
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr ""
+
 #: lib/galleryaction.php:121
 #, fuzzy
 msgid "Filter tags"
@@ -4680,63 +4061,89 @@ msgstr "Feed för taggar %s"
 msgid "All"
 msgstr ""
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Välj en operatör"
+
+#: lib/galleryaction.php:140
 #, fuzzy
 msgid "Tag"
 msgstr "Taggar"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr ""
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:163
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "URL till din hemsida, blog eller profil på en annan sida."
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:168
 #, fuzzy
-msgid "Description"
-msgstr "Prenumerationer"
+msgid "Describe the group or topic"
+msgstr "Berätta om dig själv och dina intressen inom 140 tecken"
 
-#: lib/groupeditform.php:153
-#, fuzzy
-msgid "Describe the group or topic in 140 chars"
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
 msgstr "Berätta om dig själv och dina intressen inom 140 tecken"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:172
+#, fuzzy
+msgid "Description"
+msgstr "Prenumerationer"
+
+#: lib/groupeditform.php:179
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr "Var du håller till, såsom \"Stad, Län, Land\""
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
-msgid "Group"
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:100
-msgid "Admin"
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+msgid "Group"
 msgstr ""
 
 #: lib/groupnav.php:101
+#, fuzzy
+msgid "Blocked"
+msgstr "Ingen sådan användare"
+
+#: lib/groupnav.php:102
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Ingen sådan användare"
+
+#: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
 msgstr ""
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:113
 #, fuzzy
 msgid "Logo"
 msgstr "Logga ut"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:114
 #, php-format
 msgid "Add or edit %s logo"
 msgstr ""
 
+#: lib/groupnav.php:120
+#, php-format
+msgid "Add or edit %s design"
+msgstr ""
+
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr ""
@@ -4751,10 +4158,45 @@ msgid "Tags in %s group's notices"
 msgstr ""
 
 #: lib/htmloutputter.php:104
-#, fuzzy
-msgid "This page is not available in a "
+msgid "This page is not available in a media type you accept"
 msgstr "Denna sida är inte tillgänglig i den mediatyp du accepterat"
 
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Du kan uppdatera din personliga profil här"
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr "Bitvis uppladdad."
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr "Systemfel när filen laddades upp."
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr "Det verkar inte vara en bildfil, annars korrupt."
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr "Bildfilens format stödjs inte."
+
+#: lib/imagefile.php:118
+#, fuzzy
+msgid "Lost our file."
+msgstr "Inget sådant inlägg."
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+#, fuzzy
+msgid "Unknown file type"
+msgstr "okänd fil typ"
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr ""
+
 #: lib/joinform.php:114
 #, fuzzy
 msgid "Join"
@@ -4765,109 +4207,318 @@ msgstr "Logga in"
 msgid "Leave"
 msgstr "Spara"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:80
 #, fuzzy
 msgid "Login with a username and password"
 msgstr "Logga in med ditt användarnamn och lösenord."
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:86
 #, fuzzy
 msgid "Sign up for a new account"
 msgstr "Skapa ett nytt konto"
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
 msgstr ""
 
-#: lib/mail.php:175
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr "från"
+
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "Bekräfta epostadress"
+
+#: lib/mail.php:174
 #, php-format
 msgid ""
 "Hey, %s.\n"
 "\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%s\n"
+"\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
 msgstr ""
 
-#: lib/mail.php:236
-#, fuzzy, php-format
-msgid "%1$s is now listening to "
+#: lib/mail.php:235
+#, 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:254
+#: lib/mail.php:240
+#, fuzzy, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
+"%1$s lyssnar nu på dina meddelanden i %1$s.\n"
+"\n"
+"\tHälsningar,\n"
+"%4$s.\n"
+
+#: lib/mail.php:253
 #, fuzzy, php-format
 msgid "Location: %s\n"
 msgstr "Plats: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:255
 #, fuzzy, php-format
 msgid "Homepage: %s\n"
 msgstr "Hemsida: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:461
+#: lib/mail.php:285
+#, php-format
+msgid "New email address for posting to %s"
+msgstr "Ny emailadress för att skicka till %s"
+
+#: lib/mail.php:288
+#, 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"
+
+#: lib/mail.php:412
+#, php-format
+msgid "%s status"
+msgstr "%s status"
+
+#: lib/mail.php:438
+msgid "SMS confirmation"
+msgstr "SMS Bekräftelse"
+
+#: lib/mail.php:462
 #, fuzzy, php-format
 msgid "You've been nudged by %s"
 msgstr "Du är identifierad. Skriv in"
 
-#: lib/mail.php:465
+#: lib/mail.php:466
 #, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
 msgstr ""
 
-#: lib/mail.php:555
+#: lib/mail.php:509
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:513
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%5$s\n"
+msgstr ""
+
+#: lib/mail.php:554
 #, fuzzy, php-format
-msgid "%1$s just added your notice from %2$s"
-msgstr "%1$s la just in ditt inlägg ifrån %2$s som en av deras favorit."
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s la till ditt inlägg som favorit"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
-#, fuzzy
-msgid "From"
-msgstr "från"
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, php-format
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+msgstr ""
 
-#: lib/messageform.php:110
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+msgid "Could not determine file's mime-type!"
+msgstr "Kunde inte ta emot favoritinläggen."
+
+#: lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: lib/messageform.php:120
 #, fuzzy
 msgid "Send a direct notice"
 msgstr "Tabort inlägg"
 
-#: lib/noticeform.php:125
-#, fuzzy
-msgid "Send a notice"
-msgstr "Skicka ett meddelande"
+#: lib/messageform.php:146
+msgid "To"
+msgstr ""
 
-#: lib/noticeform.php:152
+#: lib/messageform.php:162 lib/noticeform.php:173
 #, fuzzy
 msgid "Available characters"
 msgstr "Minst 6 tecken"
 
-#: lib/noticelist.php:426
+#: lib/noticeform.php:145
 #, fuzzy
-msgid "in reply to"
-msgstr "svar till..."
+msgid "Send a notice"
+msgstr "Skicka ett meddelande"
+
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
+msgstr "Vad är på gång, %s?"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "Inget innehåll!"
+
+#: lib/noticelist.php:498
 #, fuzzy
 msgid "Reply to this notice"
 msgstr "Svara på detta inlägg"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:499
 #, fuzzy
 msgid "Reply"
 msgstr "svar"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
-#, fuzzy
-msgid "Delete this notice"
-msgstr "Ta bort inlägg"
-
-#: lib/noticelist.php:474
-#, fuzzy
-msgid "Delete"
-msgstr "Ta bort"
-
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr ""
@@ -4881,42 +4532,142 @@ msgstr ""
 msgid "Send a nudge to this user"
 msgstr "Du kan inte skicka meddelande till den användaren."
 
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "Fel uppstog när nya profilen skulle läggas till"
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "Fel uppstog när användarbild skulle läggas till"
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "Fel uppstog när fjärrprofilen skulle läggas till"
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Tabort inlägg"
+
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
+msgstr "Kunde inte lägga till ny prenumeration."
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "Personlig"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "Svar"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr ""
+
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr ""
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr ""
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr ""
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr ""
+
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/profilelist.php:182
-msgid "(none)"
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "Prenumerationer"
+
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "Alla prenumerationer"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "Prenumerant"
+
+#: lib/profileaction.php:157
+#, fuzzy
+msgid "All subscribers"
+msgstr "Prenumerant"
+
+#: lib/profileaction.php:177
+msgid "User ID"
 msgstr ""
 
-#: lib/publicgroupnav.php:76
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "Medlem sedan"
+
+#: lib/profileaction.php:235
+msgid "All groups"
+msgstr ""
+
+#: lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Publik"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr ""
 
-#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 #, fuzzy
 msgid "Recent tags"
 msgstr "Tidigare taggar"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr ""
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:92
 #, fuzzy
 msgid "Popular"
 msgstr "Personer"
 
+#: lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Sök"
+
+#: lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Sök"
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "Personer"
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr "Sök personer på denna sida"
+
 #: lib/searchgroupnav.php:82
 #, fuzzy
 msgid "Notice"
 msgstr "Inlägg"
 
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr "Sök innehåll i inlägg"
+
 #: lib/searchgroupnav.php:85
 #, fuzzy
 msgid "Find groups on this site"
@@ -4926,37 +4677,64 @@ msgstr "Sök personer på denna sida"
 msgid "Untitled section"
 msgstr ""
 
-#: lib/subgroupnav.php:81
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: lib/subgroupnav.php:83
 #, fuzzy, php-format
 msgid "People %s subscribes to"
 msgstr "Fjärrprenumerera"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:91
 #, fuzzy, php-format
 msgid "People subscribed to %s"
 msgstr "Fjärrprenumerera"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:104
-#, fuzzy, php-format
-msgid "Invite friends and colleagues to join you on %s"
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
 msgstr ""
-"Använd detta formulär för att bjuda in dina vänner och kollegor till denna "
-"sida."
 
-#: lib/subs.php:53
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr ""
+
+#: lib/subs.php:48
+msgid "Already subscribed!"
+msgstr ""
+
+#: lib/subs.php:52
 #, fuzzy
 msgid "User has blocked you."
 msgstr "Användaren har ingen profil."
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: lib/subs.php:56
+msgid "Could not subscribe."
+msgstr "Kunde inte prenumerera."
+
+#: lib/subs.php:75
+msgid "Could not subscribe other to you."
+msgstr "Kunde inte prenumerera på annat åt dig."
+
+#: lib/subs.php:124
 #, fuzzy
-msgid "Subscribe to this user"
-msgstr "Prenumerera på mina Twitter vänner här."
+msgid "Not subscribed!"
+msgstr "Ingen prenumerant!"
+
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
+msgstr "Kunde inte radera prenumerationen. "
 
 #: lib/tagcloudsection.php:56
 #, fuzzy
@@ -4967,51 +4745,109 @@ msgstr "Nej"
 msgid "Top posters"
 msgstr ""
 
-#: lib/unblockform.php:120 lib/unblockform.php:150
-#, fuzzy
-msgid "Unblock this user"
-msgstr "Ingen sådan användare"
-
-#: lib/unblockform.php:150
-msgid "Unblock"
-msgstr ""
-
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr ""
 
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "Lämnar pren."
+
+#: lib/userprofile.php:116
 #, fuzzy
-#~ msgid "Code not yet ready."
-#~ msgstr "Kunde inte tabort favoriten."
+msgid "Edit Avatar"
+msgstr "Användarbild"
 
+#: lib/userprofile.php:236
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "Skapa ett nytt konto"
+msgid "User actions"
+msgstr "Okänd funktion"
 
+#: lib/userprofile.php:248
 #, fuzzy
-#~ msgid "Delete my account confirmation"
-#~ msgstr "Kunde inte radera epost bekräftelsen."
+msgid "Edit profile settings"
+msgstr "Profil inställningar"
 
+#: lib/userprofile.php:249
+msgid "Edit"
+msgstr ""
+
+#: lib/userprofile.php:272
 #, fuzzy
-#~ msgid "Check if you are sure you want to delete your account."
-#~ msgstr "Är du säker på att du vill tabort detta inlägg?"
+msgid "Send a direct message to this user"
+msgstr "Du kan inte skicka meddelande till den användaren."
 
+#: lib/userprofile.php:273
 #, fuzzy
-#~ msgid "Showing recently popular notices"
-#~ msgstr "Sök innehåll i inlägg"
+msgid "Message"
+msgstr "Nytt meddelande"
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "Kunde inte bekräfta epost"
+#: lib/util.php:821
+msgid "a few seconds ago"
+msgstr "ett par sekunder sedan"
 
-#~ msgid "Email address"
-#~ msgstr "Epostadress"
+#: lib/util.php:823
+msgid "about a minute ago"
+msgstr "för nån minut sedan"
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Fel uppstog när inlägget skulle läggas till"
+#: lib/util.php:825
+#, php-format
+msgid "about %d minutes ago"
+msgstr "för %d minuter sedan"
+
+#: lib/util.php:827
+msgid "about an hour ago"
+msgstr "för en timma sedan"
+
+#: lib/util.php:829
+#, php-format
+msgid "about %d hours ago"
+msgstr "för %d timmar sedan"
+
+#: lib/util.php:831
+msgid "about a day ago"
+msgstr "för en dag sedan"
+
+#: lib/util.php:833
+#, php-format
+msgid "about %d days ago"
+msgstr "för %d dagar sedan"
 
-#~ 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 ""
-#~ "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."
+#: lib/util.php:835
+msgid "about a month ago"
+msgstr "för en månad sedan"
+
+#: lib/util.php:837
+#, php-format
+msgid "about %d months ago"
+msgstr "för %d månader sedan"
+
+#: lib/util.php:839
+msgid "about a year ago"
+msgstr "för ett år sedan"
+
+#: lib/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "Hemsidan har ingen giltig URL"
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr ""
+
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr "Inte registrerad användare."
+
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr "Ledsen, men det är inte din inkommande emailadress."
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr "Ledsen, men inga inkommande email är tillåtna."
diff --git a/locale/te/LC_MESSAGES/statusnet.mo b/locale/te/LC_MESSAGES/statusnet.mo
index 5cfa0c3fb..059365e86 100644
--- a/locale/te/LC_MESSAGES/statusnet.mo
+++ b/locale/te/LC_MESSAGES/statusnet.mo
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index 4576f3613..b45d8a5a9 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -1,4561 +1,3960 @@
-# #-#-#-#-#  statusnet.pot (PACKAGE VERSION)  #-#-#-#-#
-# StatusNet Telugu Translation
-# Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the StatusNet package.
-# Veeven <veeven@gmail.com>, 2008.
-#
-# #-#-#-#-#  statusnet.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.
+# Translation of StatusNet to Telugu
 #
+# Author@translatewiki.net: Veeven
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-04-18 06:18+0000\n"
-"Last-Translator: Veeven <veeven@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:44:17+0000\n"
+"Language-Team: Telugu\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: te\n"
+"X-Message-Group: out-statusnet\n"
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+msgid "No such page"
+msgstr "అటువంటి పేజీ లేదు"
+
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
+msgstr "అటువంటి వాడుకరి లేరు."
 
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/all.php:84
 #, 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
-#: actions/finishopenidlogin.php:110
-msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr "ఈ అంతరంగిక భోగట్టా తప్ప: సంకేతపదం, ఈమెయిల్ చిరునామా, IM చిరునామా, ఫోన్ నంబర్."
+msgid "%s and friends, page %d"
+msgstr "%s మరియు మిత్రులు, పేజీ %d"
 
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr " నుండి "
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#, php-format
+msgid "%s and friends"
+msgstr "%s మరియు మిత్రులు"
 
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/all.php:99
 #, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "%s యొక్క మిత్రుల ఫీడు (RSS 1.0)"
 
-#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
+#: actions/all.php:107
 #, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "%s యొక్క మిత్రుల ఫీడు (RSS 2.0)"
 
-#: ../actions/invite.php:170
+#: actions/all.php:115
 #, 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 "Feed for friends of %s (Atom)"
+msgstr "%s యొక్క మిత్రుల ఫీడు (ఆటమ్)"
 
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: actions/all.php:127
 #, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr ""
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr "ఇది %s మరియు మిత్రుల కాలరేఖ కానీ ఇంకా ఎవరూ ఏమీ రాయలేదు."
 
-#: ../lib/mail.php:126
+#: actions/all.php:132
 #, 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"
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/all.php:134
 #, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
 #, php-format
-msgid "%1$s's status on %2$s"
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
 msgstr ""
 
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
-#, php-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: actions/all.php:165
+msgid "You and friends"
+msgstr "మీరు మరియు మీ స్నేహితులు"
 
-#: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
 #, php-format
-msgid "%s Public Stream"
-msgstr "%s ప్రజా వాహిని"
+msgid "Updates from %1$s and friends on %2$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
-#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
-#, php-format
-msgid "%s and friends"
-msgstr "%s మరియు మిత్రులు"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
+msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
-#, php-format
-msgid "%s public timeline"
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
 msgstr ""
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
-#, php-format
-msgid "%s status"
-msgstr "%s స్థితి"
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
 
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
-#, php-format
-msgid "%s timeline"
-msgstr "%s కాలరేఖ"
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
 #, 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.)"
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
 msgstr ""
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
-#, fuzzy, php-format
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
 msgstr ""
-"[%%site.broughtby%%](%%site.broughtbyurl%%) వారు అందిస్తున్న ఈ **%%site.name%%** "
-"అనేది మైక్రో బ్లాగింగు సదుపాయం."
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
-#, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** అనేది మైక్రో బ్లాగింగు సదుపాయం."
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "వాడుకరికి ప్రొఫైలు లేదు."
+
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "ప్రొఫైలుని భద్రపరచలేకున్నాం."
 
-#: ../lib/util.php:274 lib/util.php:290
-msgid ". Contributors should be attributed by full name or nickname."
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
+msgstr "వాడుకరి నిరోధం విఫలమైంది."
+
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
-#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామచిహ్నాలు మరియు ఖాళీలు తప్ప"
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "సందేశపు పాఠ్యం లేదు!"
 
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "చాలా పొడవుంది. గరిష్ఠ సందేశ పరిమాణం %d అక్షరాలు."
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
 msgstr ""
 
-#: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు"
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
 
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
-msgid "6 or more characters, and don't forget it!"
-msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు, మర్చిపోకండి!"
+#: actions/apidirectmessage.php:89
+#, php-format
+msgid "Direct messages from %s"
+msgstr ""
 
-#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
-msgid "6 or more characters. Required."
+#: actions/apidirectmessage.php:93
+#, php-format
+msgid "All the direct messages sent from %s"
 msgstr ""
 
-#: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/apidirectmessage.php:101
 #, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+msgid "Direct messages to %s"
 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."
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
 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 actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 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 actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
-msgid "API method under construction."
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
 msgstr ""
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
-msgid "About"
-msgstr "గురించి"
+#: actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
+msgstr "ఈ నోటీసు ఇప్పటికే మీ ఇష్టాంశం!"
 
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
-msgid "Accept"
-msgstr "అంగీకరించు"
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+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 actions/emailsettings.php:120
-#: actions/imsettings.php:127 actions/openidsettings.php:111
-#: actions/smssettings.php:133 actions/twittersettings.php:163
-msgid "Add"
-msgstr "చేర్చు"
+#: actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
+msgstr ""
 
-#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
-msgstr "ఓపెన్ఐడీని చేర్చు"
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr ""
 
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-msgid "Add or remove OpenIDs"
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
 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
-#: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
-msgstr "చిరునామా"
+#: actions/apifriendshipscreate.php:118
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr ""
 
-#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-msgid "Addresses of friends to invite (one per line)"
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "ఓపెన్ఐడీ ఫారమును సృష్టించలేకపోయాం: %s"
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
 msgstr ""
 
-#: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
-msgid "All subscriptions"
-msgstr "అన్ని చందాలు"
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
+msgstr ""
 
-#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
-#, php-format
-msgid "All updates for %s"
-msgstr "%s కోసం అన్ని తాజాకరణలూ"
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
 
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
-#, php-format
-msgid "All updates matching search term \"%s\""
-msgstr "\"%s\"తో సరిపోలే అన్ని తాజాకరణలు"
+#: actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+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
-#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
-msgid "Already logged in."
-msgstr "ఇప్పటికే లోనికి ప్రవేశించారు."
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
+msgid "Could not create group."
+msgstr "గుంపుని సృష్టించలేకపోయాం."
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
-msgid "Already subscribed!."
-msgstr "ఇప్పటికే చేరారు!"
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
+msgid "Could not create aliases."
+msgstr "మారుపేర్లని సృష్టించలేకపోయాం."
 
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
-msgid "Are you sure you want to delete this notice?"
-msgstr "మీరు నిజంగానే ఈ నోటీసుని తొలగించాలనుకుంటున్నారా?"
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "చందాని సృష్టించలేకపోయాం."
 
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
-msgid "Authorize subscription"
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
 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/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr "ఆ పేరుని ఇప్పటికే వాడుతున్నారు. మరోటి ప్రయత్నించండి."
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr ""
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "సరైన పేరు కాదు."
 
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34 actions/avatarsettings.php:65
-#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
-msgid "Avatar"
-msgstr "అవతారం"
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "హోమ్ పేజీ URL సరైనది కాదు."
 
-#: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
-msgid "Avatar updated."
-msgstr "అవతారాన్ని తాజాకరించాం."
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "పూర్తి పేరు చాలా పెద్దగా ఉంది (గరిష్ఠంగా 255 అక్షరాలు)."
 
-#: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/apigroupcreate.php:261
 #, 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 ""
+msgid "Description is too long (max %d chars)."
+msgstr "వివరణ చాలా పెద్దగా ఉంది (%d అక్షరాలు గరిష్ఠం)."
 
-#: ../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/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "ప్రాంతం పేరు మరీ పెద్దగా ఉంది (255 అక్షరాలు గరిష్ఠం)."
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "చాలా మారుపేర్లు! %d గరిష్ఠం."
 
-#: ../lib/util.php:1318 lib/util.php:1452
-#, fuzzy
-msgid "Before »"
-msgstr "ఇంతక్రితం »"
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "తప్పుడు మారుపేరు: \"%s\""
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
-#: actions/profilesettings.php:82 actions/register.php:184
-#: actions/profilesettings.php:112 actions/register.php:402
-msgid "Bio"
-msgstr "స్వపరిచయం"
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "\"%s\" అన్న మారుపేరుని ఇప్పటికే వాడుతున్నారు. మరొకటి ప్రయత్నించండి."
 
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
-#: actions/register.php:89 actions/updateprofile.php:104
-#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
-msgid "Bio is too long (max 140 chars)."
-msgstr "స్వపరిచయం చాలా పెద్దగా ఉంది (140 అక్షరాలు గరిష్ఠం)."
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr "మారుపేరు పేరుతో సమానంగా ఉండకూడదు."
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
-msgid "Can't delete this notice."
-msgstr "ఈ నోటీసుని తొలగించలేము."
+#: actions/apigroupjoin.php:110
+msgid "You are already a member of that group."
+msgstr "మీరు ఇప్పటికే ఆ గుంపులో సభ్యులు."
 
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
-#, php-format
-msgid "Can't read avatar URL '%s'"
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
 msgstr ""
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404 actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-msgid "Can't save new password."
-msgstr "కొత్త సంకేతపదాన్ని భద్రపరచలేము."
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "ఓపెన్ఐడీ ఫారమును సృష్టించలేకపోయాం: %s"
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62 actions/emailsettings.php:58
-#: actions/imsettings.php:59 actions/smssettings.php:62
-#: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
-msgstr "రద్దుచేయి"
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
 
-#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-msgid "Cannot instantiate OpenID consumer object."
-msgstr ""
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "ఓపెన్ఐడీ ఫారమును సృష్టించలేకపోయాం: %s"
 
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
-msgstr ""
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "%s గుంపులు"
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
-msgid "Cannot normalize that email address"
-msgstr ""
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr "%s పై గుంపులు"
 
-#: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
-msgstr "మార్చు"
+#: actions/apigrouplist.php:95
+#, php-format
+msgid "%s's groups"
+msgstr "%s యొక్క గుంపులు"
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
+
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
 msgstr ""
 
-#: ../actions/password.php:32 actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr "సంకేతపదం మార్చుకోండి"
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
+msgstr "ఇతర వాడుకరుల స్థితిని మీరు తొలగించలేరు."
 
-#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
-msgid "Change your password"
-msgstr ""
+#: actions/apistatusesshow.php:138
+msgid "Status deleted."
+msgstr "స్థితిని తొలగించాం."
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-msgid "Change your profile settings"
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
 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
-#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
-#: actions/register.php:376 actions/smssettings.php:122
-msgid "Confirm"
-msgstr "నిర్థారించు"
-
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "చిరునామాని నిర్ధారించు"
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "ఇది చాలా పొడవుంది. గరిష్ఠ సందేశ పరిమాణం 140 అక్షరాలు."
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245 actions/emailsettings.php:256
-#: actions/imsettings.php:230 actions/smssettings.php:253
-#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
-msgid "Confirmation cancelled."
-msgstr "నిర్ధారణ రద్దయింది."
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
+msgstr "దొరకలేదు"
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
-msgid "Confirmation code"
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
 
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-msgid "Confirmation code not found."
-msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+msgid "Unsupported format."
+msgstr ""
 
-#: ../actions/register.php:202
+#: actions/apitimelinefavorites.php:107
 #, 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."
+msgid "%s / Favorites from %s"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
-msgid "Connect"
-msgstr "అనుసంధానించు"
-
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
-msgid "Connect existing account"
-msgstr "ఇప్పటికే ఉన్న ఖాతాతో అనుసంధానించండి"
-
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
-msgid "Contact"
-msgstr "సంప్రదించు"
+#: actions/apitimelinefavorites.php:119
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr ""
 
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "ఓపెన్ఐడీ ఫారమును సృష్టించలేకపోయాం: %s"
+msgid "%s timeline"
+msgstr "%s కాలరేఖ"
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
-msgid "Could not follow user: %s is already on your list."
+msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
-msgid "Could not follow user: User not found."
+#: actions/apitimelinementions.php:116
+#, php-format
+msgid "%1$s / Updates mentioning %2$s"
 msgstr ""
 
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: actions/apitimelinementions.php:126
 #, php-format
-msgid "Could not redirect to server: %s"
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
-msgid "Could not save avatar info"
-msgstr "అవతారపు సమాచారాన్ని భద్రపరచలేకున్నాం"
-
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
-msgid "Could not save new profile info"
-msgstr "కొత్త ప్రొఫైలు సమాచారాన్ని భద్రపరచలేకున్నాం"
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#, php-format
+msgid "%s public timeline"
+msgstr "%s బహిరంగ కాలరేఖ"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
-msgid "Could not subscribe other to you."
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#, php-format
+msgid "%s updates from everyone!"
 msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
-msgid "Could not subscribe."
+#: actions/apitimelinetag.php:101 actions/tag.php:66
+#, php-format
+msgid "Notices tagged with %s"
 msgstr ""
 
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
-msgstr ""
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "%s యొక్క మైక్రోబ్లాగు"
 
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-msgid "Couldn't convert request tokens to access tokens."
-msgstr ""
+#: actions/apiusershow.php:96
+msgid "Not found."
+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
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-msgid "Couldn't delete email confirmation."
-msgstr "ఈమెయిల్ నిర్ధారణని తొలగించలేకున్నాం."
+#: actions/attachment.php:73
+msgid "No such attachment."
+msgstr "అటువంటి జోడింపు లేదు."
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
-msgid "Couldn't delete subscription."
-msgstr "చందాని తొలగించలేకపోయాం."
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+#, fuzzy
+msgid "No nickname."
+msgstr "పేరు లేదు."
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
-msgid "Couldn't find any statuses."
-msgstr ""
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "పరిమాణం లేదు."
 
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-msgid "Couldn't get a request token."
-msgstr ""
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+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
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
-msgid "Couldn't insert confirmation code."
-msgstr "నిర్ధారణ సంకేతాన్ని చేర్చలేకపోయాం."
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "అవతారం"
 
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-msgid "Couldn't save profile."
-msgstr "ప్రొఫైలుని భద్రపరచలేకున్నాం."
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
 msgstr ""
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
-msgid "Couldn't update user record."
-msgstr ""
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+msgid "Avatar settings"
+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
-#: actions/confirmaddress.php:114 actions/emailsettings.php:280
-#: actions/emailsettings.php:411 actions/imsettings.php:252
-#: actions/imsettings.php:395 actions/othersettings.php:162
-#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
-msgid "Couldn't update user."
-msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr "అసలు"
 
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
-msgid "Create"
-msgstr "సృష్టించు"
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr "మునుజూపు"
 
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
-msgid "Create a new user with this nickname."
-msgstr "ఈ పేరుతో కొత్త వాడుకరిని సృష్టించు"
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+msgid "Delete"
+msgstr "తొలగించు"
 
-#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
-msgid "Create new account"
-msgstr "కొత్త ఖాతా సృష్టించుకోండి"
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+msgstr "ఎగుమతించు"
 
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
-msgid "Creating new account for OpenID that already has a user."
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
+msgstr "కత్తిరించు"
+
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "ప్రస్తుతం నిర్ధారించిన Jabber/GTalk చిరునామా"
-
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
+#: actions/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
 msgstr ""
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-msgid "Current confirmed email address."
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
-msgstr "ప్రస్తుతం"
-
-#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
-#, php-format
-msgid "DB error inserting hashtag: %s"
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
 msgstr ""
 
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr ""
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+msgstr "అవతారాన్ని తాజాకరించాం."
 
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
-msgid "Delete notice"
-msgstr ""
+#: actions/avatarsettings.php:363
+msgid "Failed updating avatar."
+msgstr "అవతారపు తాజాకరణ విఫలమైంది."
 
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి 140 అక్షరాల్లో చెప్పండి"
+#: actions/avatarsettings.php:387
+msgid "Avatar deleted."
+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 actions/register.php:381
-#: actions/register.php:385 lib/accountsettingsaction.php:113
-msgid "Email"
-msgstr "ఈమెయిల్"
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+#, fuzzy
+msgid "No nickname"
+msgstr "పేరు లేదు."
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-msgid "Email Address"
-msgstr "ఈమెయిల్ చిరునామా"
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
+msgstr "అటువంటి గుంపు లేదు"
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
-msgstr "ఈమెయిల్ అమరికలు"
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "వాడుకరికి ప్రొఫైలు లేదు."
 
-#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-msgid "Email address already exists."
-msgstr "ఈమెయిల్ చిరునామా ఇప్పటికే ఉంది."
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s మరియు మిత్రులు"
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
-msgid "Email address confirmation"
-msgstr "ఈమెయిల్ చిరునామా నిర్ధారణ"
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr ""
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
-msgstr "ఈమెయిల్ చిరునామా, \"username@example.org\" వలె"
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "అటువంటి వాడుకరి లేరు."
 
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-msgid "Email addresses"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
 msgstr ""
 
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
-msgid "Enter a nickname or email address."
-msgstr "పేరు లేదా ఈమెయిల్ చిరునామా ఇవ్వండి."
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+#, fuzzy
+msgid "Unblock this user"
+msgstr "అటువంటి వాడుకరి లేరు."
 
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "లోనికి ప్రవేశించలేదు."
+
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
 msgstr ""
 
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
-msgid "Error authorizing token"
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
-msgid "Error connecting user to OpenID."
-msgstr "వాడుకరిని ఓపెన్ఐడీకి అనుసంధానించటంలో పొరపాటు."
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+msgid "Block user"
+msgstr "వాడుకరిని నిరోధించు"
 
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
-msgstr "వాడుకరిని అనుసంధానించడంలో పొరపాటు."
+#: actions/block.php:136
+msgid ""
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-#, fuzzy
-msgid "Error inserting avatar"
-msgstr "అవతారాన్ని పెట్టడంలో పొరపాటు"
+#: actions/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
+msgid "No"
+msgstr "కాదు"
 
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
-msgstr "కొత్త ప్రొపైలుని చేర్చటంలో పొరపాటు"
+#: actions/block.php:149
+msgid "Do not block this user"
+msgstr "ఈ వాడుకరిని నిరోధించకు"
 
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
-msgstr "దూరపు ప్రొపైలుని చేర్చటంలో పొరపాటు"
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
+msgstr "అవును"
 
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
-msgid "Error saving address confirmation."
-msgstr "చిరునామా నిర్ధారణని భద్రపరచడంలో పొరపాటు."
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+msgid "Block this user"
+msgstr "ఈ వాడుకరిని నిరోధించు"
 
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
-msgid "Error saving remote profile"
-msgstr "దూరపు ప్రొఫైలుని భద్రపరచడంలో పొరపాటు"
+#: actions/block.php:165
+msgid "You have already blocked this user."
+msgstr "మీరు ఇప్పటికే ఈ వాడుకరిని నిరోధించారు."
 
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-msgid "Error saving the profile."
-msgstr "ప్రొఫైలుని భద్రపరచడంలో పొరపాటు."
+#: actions/block.php:170
+msgid "Failed to save block information."
+msgstr "నిరోధపు సమాచారాన్ని భద్రపరచడంలో విఫలమయ్యాం."
 
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-msgid "Error saving the user."
-msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు."
+#: actions/bookmarklet.php:50
+msgid "Post to "
+msgstr ""
 
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
-msgid "Error saving user; invalid."
-msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు: సరికాదు."
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+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 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-msgid "Error setting user."
-msgstr ""
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
 
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr "ప్రొపైలుని తాజాకరించటంలో పొరపాటు"
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "ఆ నిర్ధారణా సంకేతం మీది కాదు!"
 
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
-msgstr "దూరపు ప్రొపైలుని తాజాకరించటంలో పొరపాటు"
+#: actions/confirmaddress.php:90
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr "గుర్తుతెలియని చిరునామా రకం %s"
 
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr "నిర్ధారణ సంకేతంలో పొరపాటు."
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr "ఆ చిరునామా ఇప్పటికే నిర్ధారితమైంది."
 
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
-msgid "Existing nickname"
-msgstr "ప్రస్తుత పేరు"
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
-#, fuzzy
-msgid "FAQ"
-msgstr "తవసం"
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr "ఈమెయిల్ నిర్ధారణని తొలగించలేకున్నాం."
 
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
-msgid "Failed updating avatar."
-msgstr "అవతారపు తాజాకరణ విఫలమైంది."
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "చిరునామాని నిర్ధారించు"
 
-#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/confirmaddress.php:159
 #, php-format
-msgid "Feed for friends of %s"
-msgstr "%s యొక్క మిత్రుల ఫీడు"
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "\"%s\" అనే చిరునామా మీ ఖాతాకి నిర్ధారితమైంది."
 
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
-#, php-format
-msgid "Feed for replies to %s"
-msgstr "%sకి వచ్చిన స్పందనల ఫీడు"
+#: actions/conversation.php:99
+msgid "Conversation"
+msgstr "సంభాషణ"
 
-#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
-#, php-format
-msgid "Feed for tag %s"
-msgstr ""
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
+msgstr "సందేశాలు"
 
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
-msgstr ""
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
+msgstr "అటువంటి సందేశమేమీ లేదు."
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
-msgstr ""
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "ఈ నోటీసుని తొలగించలేము."
 
-#: ../actions/login.php:122
+#: actions/deletenotice.php:103
 msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
 msgstr ""
-"భద్రతా కారణాల దృష్ట్యా, అమరికలు మార్చే ముందు మీ వాడుకరి పేరుని మరియు సంకేతపదాన్ని మరోసారి ఇవ్వండి."
-
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
-#: actions/profilesettings.php:77 actions/register.php:178
-#: actions/profilesettings.php:103 actions/register.php:391
-#: actions/showgroup.php:235 actions/showstream.php:262
-#: actions/tagother.php:105 lib/groupeditform.php:142
-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
-#: actions/editgroup.php:195 actions/newgroup.php:146
-#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
-msgid "Full name is too long (max 255 chars)."
-msgstr "పూర్తి పేరు చాలా పెద్దగా ఉంది (గరిష్ఠంగా 255 అక్షరాలు)."
-
-#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
-msgid "Help"
-msgstr "సహాయం"
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr "నోటీసుని తొలగించు"
 
-#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
-#, fuzzy
-msgid "Home"
-msgstr "వాకిలి"
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr "మీరు నిజంగానే ఈ నోటీసుని తొలగించాలనుకుంటున్నారా?"
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
+#: actions/deletenotice.php:145
 #, fuzzy
-msgid "Homepage"
-msgstr "హోమ్ పేజీ"
+msgid "Do not delete this notice"
+msgstr "ఈ నోటీసుని తొలగించలేము."
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
-msgid "Homepage is not a valid URL."
-msgstr "హోమ్ పేజీ URL సరైనది కాదు."
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+msgid "Delete this notice"
+msgstr "ఈ నోటీసుని తొలగించు"
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
-msgid "I want to post notices by email."
+#: actions/deletenotice.php:157
+msgid "There was a problem with your session token.  Try again, please."
 msgstr ""
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
 msgstr ""
 
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
-msgstr "IM చిరునామా"
-
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
-msgstr "IM అమరికలు"
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "ఇష్టాంశాలకు చేర్చు"
 
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
-msgstr ""
-"మీకు ఇప్పటికే ఖాతా ఉంటే, మీ వాడుకరిపేరు మరియు సంకేతపదంతో లోనికి ప్రవేశించి మీ ఓపెన్ఐడీని మీ ఖాతాకి "
-"జతచేసుకోండి."
+#: actions/doc.php:69
+msgid "No such document."
+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/editgroup.php:56
+#, php-format
+msgid "Edit %s group"
+msgstr "%s గుంపుని మార్చు"
 
-#: ../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."
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
 msgstr ""
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-#: actions/emailsettings.php:127 actions/smssettings.php:140
-msgid "Incoming email"
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+msgid "You must be an admin to edit the group"
 msgstr ""
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
-msgid "Incoming email address removed."
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
 msgstr ""
 
-#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
-msgid "Incorrect old password"
-msgstr "పాత సంకేతపదం తప్పు"
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, php-format
+msgid "description is too long (max %d chars)."
+msgstr "వివరణ చాలా పెద్దదిగా ఉంది (140 అక్షరాలు గరిష్ఠం)."
 
-#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
-msgid "Incorrect username or password."
-msgstr "వాడుకరిపేరు లేదా సంకేతపదం తప్పు."
+#: actions/editgroup.php:253
+#, fuzzy
+msgid "Could not update group."
+msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
 
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
-msgstr "మీ సంకేతపదాన్ని తిరిగి పొందడానికై అవసరమైన సూచనలని మీ ఖాతాతో నమోదైన ఈమెయిల్ చిరునామాకి పంపించాం."
+#: actions/editgroup.php:269
+msgid "Options saved."
+msgstr "ఎంపికలు భద్రమయ్యాయి."
 
-#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "'%s' అనే అవతారపు URL తప్పు"
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "ఈమెయిల్ అమరికలు"
 
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/emailsettings.php:71
 #, php-format
-msgid "Invalid email address: %s"
+msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
-#, php-format
-msgid "Invalid homepage '%s'"
-msgstr "'%s' అనే హోమ్ పేజీ సరైనదికాదు"
-
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
-#, php-format
-msgid "Invalid license URL '%s'"
-msgstr "తప్పుడు లైసెన్సు URL '%s'"
-
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
-msgstr "సందేశపు విషయం సరైనది కాదు"
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "చిరునామా"
 
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
-msgstr "సందేశపు URI తప్పు"
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr ""
 
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
-msgstr "సందేశపు URL తప్పు"
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "తొలగించు"
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "ప్రొపైల్ URL '%s' తప్పు."
+#: actions/emailsettings.php:113
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
 
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
-msgstr "ప్రొపైల్ URL తప్పు (చెడు ఫార్మాట్)"
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "రద్దుచేయి"
 
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
-msgstr ""
+#: actions/emailsettings.php:121
+msgid "Email Address"
+msgstr "ఈమెయిల్ చిరునామా"
 
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
-#: actions/avatarbynickname.php:69
-msgid "Invalid size."
-msgstr "తప్పుడు పరిమాణం."
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr "ఈమెయిల్ చిరునామా, \"username@example.org\" వలె"
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111 actions/finishopenidlogin.php:241
-#: actions/register.php:103 actions/register.php:121
-#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
-msgid "Invalid username or password."
-msgstr "వాడుకరిపేరు లేదా సంకేతపదం తప్పు."
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "చేర్చు"
 
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-msgid "Invitation(s) sent"
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
 msgstr ""
 
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-msgid "Invitation(s) sent to the following people:"
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
 msgstr ""
 
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
-msgid "Invite"
-msgstr "ఆహ్వానించు"
-
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-msgid "Invite new users"
+#: actions/emailsettings.php:145 actions/smssettings.php:162
+msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
-#, php-format
-msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
-msgstr ""
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
+msgstr "కొత్తది"
 
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
-msgstr "Jabber ID ఇప్పటికే వేరొకరికి ఉంది."
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
+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."
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
-msgid "Language"
-msgstr "భాష"
-
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
-msgid "Language is too long (max 50 chars)."
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
-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
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
-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
-#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
-#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
-#, php-format
-msgid "Login"
-msgstr "ప్రవేశించండి"
-
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "[ఓపెన్ఐడీ](%%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%"
-"%). "
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
-msgid "Logout"
-msgstr "నిష్క్రమించు"
-
-#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
-msgid "Longer name, preferably your \"real\" name"
+#: actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
-#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
-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."
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#: actions/emailsettings.php:71
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
 msgstr ""
 
-#: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
-msgid "Member since"
-msgstr "సభ్యులైన తేదీ"
-
-#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
-#, fuzzy, 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."
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-msgid "My text and files are available under "
-msgstr ""
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "భద్రపరచు"
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#: actions/emailsettings.php:142 actions/smssettings.php:152
-msgid "New"
-msgstr ""
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+msgstr "అభిరుచులు భద్రమయ్యాయి."
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
-#, php-format
-msgid "New email address for posting to %s"
-msgstr ""
+#: actions/emailsettings.php:319
+msgid "No email address."
+msgstr "ఈమెయిలు చిరునామా లేదు."
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
-msgid "New incoming email address added."
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
-msgid "New nickname"
-msgstr "కొత్త పేరు"
+#: actions/emailsettings.php:330
+msgid "Not a valid email address"
+msgstr "సరైన ఈమెయిలు చిరునామా కాదు"
 
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
-msgstr "కొత్త సందేశం"
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
+msgstr "అది ఇప్పటికే మీ ఈమెయిల్ చిరునామా."
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-msgid "New password"
-msgstr "కొత్త సంకేతపదం"
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another user."
+msgstr "ఆ ఈమెయిల్ చిరునామా ఇప్పటేకే ఇతర వాడుకరికి సంబంధించినది."
 
-#: ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
-msgstr "మీ కొత్త సంకేతపదం భద్రమైంది. మీరు ఇప్పుడు లోనికి ప్రవేశించారు."
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+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
-#: actions/login.php:228 actions/profilesettings.php:98
-#: actions/register.php:367 actions/showgroup.php:224
-#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
-msgid "Nickname"
-msgstr "పేరు"
+#: actions/emailsettings.php:358
+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/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69 actions/finishopenidlogin.php:181
-#: actions/profilesettings.php:225 actions/register.php:76
-#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
-msgid "Nickname already in use. Try another one."
-msgstr "ఆ పేరుని ఇప్పటికే వాడుతున్నారు. మరోటి ప్రయత్నించండి."
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
+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
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "ఆ IM చిరునామా సరైనది కాదు."
 
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
-msgid "Nickname not allowed."
-msgstr "ఆ పేరుని అనుమతించము."
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "నిర్ధారణ రద్దయింది."
 
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
-msgstr ""
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
+msgstr "అది మీ ఈమెయిలు చిరునామా కాదు."
 
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
-msgid "Nickname or email"
-msgstr "పేరు లేదా ఈమెయిల్"
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "ఆ చిరునామాని తొలగించాం."
 
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
-msgid "No"
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
 msgstr ""
 
-#: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
-msgstr "Jabber ID లేదు."
-
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
-msgid "No authorization request!"
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
 msgstr ""
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
-msgid "No carrier selected."
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
 msgstr ""
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
 msgstr ""
 
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
-#: actions/confirmaddress.php:75
-msgid "No confirmation code."
-msgstr "నిర్ధారణ సంకేతం లేదు."
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+msgid "Popular notices"
+msgstr "ప్రాచుర్య నోటీసులు"
 
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
-#: actions/newnotice.php:126 classes/Command.php:223
-msgid "No content!"
-msgstr "విషయం లేదు!"
+#: actions/favorited.php:67
+#, php-format
+msgid "Popular notices, page %d"
+msgstr "ప్రాచుర్య నోటీసులు, పేజీ %d"
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
-msgid "No email address."
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
 msgstr ""
 
-#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
-msgid "No id."
-msgstr "ఐడీ లేదు."
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
 
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
-msgid "No incoming email address."
+#: actions/favorited.php:153
+msgid ""
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr "దూరపు సర్వర్ పేరుని ఇవ్వలేదు."
+#: actions/favorited.php:156
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
+msgstr ""
 
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
-#, fuzzy
-msgid "No nickname."
-msgstr "పేరు లేదు."
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
+msgstr "%sకి ఇష్టమైన నోటీసులు"
 
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229 actions/emailsettings.php:240
-#: actions/imsettings.php:214 actions/smssettings.php:237
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
-msgid "No pending confirmation to cancel."
-msgstr "రద్దుచేయడానికి వేచివున్న నిర్ధారణలేమీ లేవు."
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "%s యొక్క మైక్రోబ్లాగు"
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
-msgstr ""
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "ఈ నోటీసు ఇప్పటికే మీ ఇష్టాంశం!"
 
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
 msgstr ""
 
-#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
-msgid "No registered email address for that user."
-msgstr "ఈ వాడుకరికై నమోదైన ఈమెయిల్ చిరునామాలు ఏమీ లేవు."
-
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr "అభ్యర్థనలేమీ కనబడలేదు!"
-
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
-msgid "No results"
-msgstr "ఫలితాలేమీ లేవు"
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr "విశేష వాడుకరులు"
 
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
-msgstr "పరిమాణం లేదు."
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr "విశేష వాడుకరులు, పేజీ %d"
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
-msgid "No status found with that ID."
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
-msgid "No status with that ID found."
-msgstr ""
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "కొత్త సందేశం"
 
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
-msgstr "అటువంటి ఓపెన్ఐడీ లేదు."
+#: actions/file.php:38
+msgid "No notice"
+msgstr "సందేశం లేదు"
 
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
-msgid "No such document."
-msgstr "అటువంటి పత్రమేమీ లేదు."
+#: actions/file.php:42
+msgid "No attachments"
+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 actions/shownotice.php:87
-#: lib/deleteaction.php:51
-msgid "No such notice."
-msgstr "అటువంటి సందేశమేమీ లేదు."
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr "ఎక్కించిన జోడింపులేమీ లేవు"
 
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
+#: actions/finishremotesubscribe.php:69
+msgid "Not expecting this response!"
 msgstr ""
 
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-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 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
-msgid "No such user."
-msgstr "అటువంటి వాడుకరి లేరు."
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-msgid "No user with that email address or username."
+#: actions/finishremotesubscribe.php:80
+msgid "User being listened to does not exist."
 msgstr ""
 
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
 msgstr ""
 
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
+#: actions/finishremotesubscribe.php:106
+msgid "You are not authorized."
 msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
-msgid "Not a supported data format."
+#: actions/finishremotesubscribe.php:109
+msgid "Could not convert request token to access token."
 msgstr ""
 
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
-msgstr "సరైన Jabber ఐడీ కాదు"
+#: actions/finishremotesubscribe.php:114
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr ""
 
-#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-msgid "Not a valid OpenID."
-msgstr "సరైన ఓపెన్ఐడీ కాదు."
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "దూరపు ప్రొపైలుని తాజాకరించటంలో పొరపాటు"
 
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
-msgid "Not a valid email address"
-msgstr ""
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+msgid "No such group."
+msgstr "అటువంటి గుంపు లేదు."
 
-#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-msgid "Not a valid email address."
-msgstr "సరైన ఈమెయిల్ చిరునామా కాదు:"
+#: actions/getfile.php:75
+msgid "No such file."
+msgstr "అటువంటి ఫైలు లేదు."
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-#: actions/editgroup.php:186 actions/newgroup.php:137
-#: actions/profilesettings.php:195 actions/register.php:161
-msgid "Not a valid nickname."
-msgstr "సరైన పేరు కాదు."
+#: actions/getfile.php:79
+msgid "Cannot read file."
+msgstr "ఫైలుని చదవలేకపోతున్నాం."
 
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr ""
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr "నిర్వాహకులు మాత్రమే గుంపు సభ్యులను నిరోధించగలరు."
 
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr ""
+#: actions/groupblock.php:95
+msgid "User is already blocked from group."
+msgstr "వాడుకరిని ఇప్పటికే గుంపునుండి నిరోధించారు."
 
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
-msgid "Not an image or corrupt file."
-msgstr "బొమ్మ కాదు లేదా పాడైపోయిన ఫైలు."
+#: actions/groupblock.php:100
+msgid "User is not a member of group."
+msgstr "వాడుకరి ఈ గుంపులో సభ్యులు కాదు."
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
-msgid "Not authorized."
-msgstr ""
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+msgid "Block user from group"
+msgstr "వాడుకరిని గుంపు నుండి నిరోధించు"
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
-msgid "Not expecting this response!"
+#: actions/groupblock.php:162
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
-msgid "Not found"
+#: actions/groupblock.php:178
+msgid "Do not block this user from this group"
 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 actions/block.php:59 actions/disfavor.php:61
-#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
-#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
-#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
-#: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "లోనికి ప్రవేశించలేదు."
+#: actions/groupblock.php:179
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "అటువంటి వాడుకరి లేరు."
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
-msgid "Not subscribed!."
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
 msgstr ""
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
+#: actions/groupbyid.php:74
+msgid "No ID"
 msgstr ""
 
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
-#, php-format
-msgid "Notice feed for %s"
-msgstr "%s యొక్క సందేశముల ఫీడు"
+#: actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
+msgstr "గుంపుని మార్చడానికి మీరు ప్రవేశించి ఉండాలి."
 
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
-msgstr ""
+#: actions/groupdesignsettings.php:141
+msgid "Group design"
+msgstr "గుంపు అలంకారం"
 
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
-msgid "Notices"
-msgstr "సందేశాలు"
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
-#, php-format
-msgid "Notices tagged with %s"
+#: actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
 msgstr ""
 
-#: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
-msgstr "పాత సంకేతపదం"
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
-msgid "OpenID"
-msgstr "ఓపెన్ఐడీ"
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+msgid "Unable to save your design settings!"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
 #, fuzzy
-msgid "OpenID Account Setup"
-msgstr "ఓపెన్ఐడీ ఖాతా అమర్పు"
+msgid "Design preferences saved."
+msgstr "అభిరుచులు భద్రమయ్యాయి."
+
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
+msgstr "గుంపు చిహ్నం"
 
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-msgid "OpenID Auto-Submit"
+#: actions/grouplogo.php:150
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
 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
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-msgid "OpenID Login"
-msgstr "ఓపెన్ఐడీ ప్రవేశం"
+#: actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
+msgstr ""
 
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-#: actions/openidlogin.php:102 actions/openidsettings.php:101
-msgid "OpenID URL"
-msgstr "ఓపెన్ఐడీ URL"
+#: actions/grouplogo.php:396
+#, fuzzy
+msgid "Logo updated."
+msgstr "అవతారాన్ని తాజాకరించాం."
 
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
-msgid "OpenID authentication cancelled."
-msgstr "ఓపెన్ఐడీ అధీకరణ రద్దు చేయబడింది."
+#: actions/grouplogo.php:398
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "అవతారపు తాజాకరణ విఫలమైంది."
 
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/groupmembers.php:93 lib/groupnav.php:92
 #, php-format
-msgid "OpenID authentication failed: %s"
-msgstr "ఓపెన్ఐడీ అధీకరణ విఫలమైంది: %s"
+msgid "%s group members"
+msgstr "%s గుంపు సభ్యులు"
 
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: actions/groupmembers.php:96
 #, php-format
-msgid "OpenID failure: %s"
-msgstr "ఓపెన్ఐడీ వైఫల్యం: %s"
-
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr "ఓపెన్ఐడీని తొలగించాం."
+msgid "%s group members, page %d"
+msgstr "%s గుంపు సభ్యులు, పేజీ %d"
 
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
-msgstr "ఓపెన్ఐడీ అమరికలు"
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr "ఈ గుంపులో వాడుకరులు జాబితా."
 
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-msgid "Optionally add a personal message to the invitation."
+#: actions/groupmembers.php:175 lib/groupnav.php:107
+msgid "Admin"
 msgstr ""
 
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
-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 actions/finishopenidlogin.php:118
-#: actions/login.php:231 actions/register.php:372
-#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-msgid "Password"
-msgstr "సంకేతపదం"
-
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
-msgid "Password and confirmation do not match."
-msgstr "సంకేతపదం మరియు నిర్ధారణ సరిపోలేదు."
-
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
-msgid "Password must be 6 chars or more."
-msgstr "సంకేతపదం 6 లేదా అంతకంటే ఎక్కవ అక్షరాలుండాలి."
+#: actions/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
+msgstr "నిరోధించు"
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-msgid "Password recovery requested"
+#: actions/groupmembers.php:441
+msgid "Make user an admin of the group"
 msgstr ""
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-msgid "Password saved."
-msgstr "సంకేతపదం భద్రమయ్యింది."
+#: actions/groupmembers.php:473
+msgid "Make Admin"
+msgstr "నిర్వాహకున్ని చేయి"
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-msgid "Passwords don't match."
-msgstr "సంకేతపదాలు సరిపోలలేదు."
-
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
-msgstr ""
-
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
 msgstr ""
 
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
-msgstr "వ్యక్తుల అన్వేషణ"
-
-#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
-msgid "Personal"
-msgstr "వ్యక్తిగత"
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "%s యొక్క మైక్రోబ్లాగు"
 
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-msgid "Personal message"
+#: actions/groupsearch.php:52
+#, fuzzy, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
+"%%site.name%%లో వ్యక్తులను వారి పేరు, ప్రాంతం, లేదా ఆసక్తులను బట్టి వెతకండి. అన్వేషించే పదాలను "
+"ఖాళీలతో వేరుచేయండి; ఒక్కో పదంలో 3 లేదా అంతకంటే ఎక్కువ అక్షరాలు ఉండాలి."
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
+#: actions/groupsearch.php:58
+msgid "Group search"
+msgstr "గుంపుల అన్వేషణ"
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+msgid "No results."
+msgstr "ఫలితాలేమీ లేవు."
 
-#: ../actions/userauthorization.php:78
+#: actions/groupsearch.php:82
+#, php-format
 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\"."
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
 msgstr ""
 
-#: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
-msgid "Post a notice when my Jabber/GTalk status changes."
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
 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 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
-msgid "Preferences"
-msgstr "అభిరుచులు"
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
+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
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
-msgid "Preferences saved."
-msgstr "అభిరుచులు భద్రమయ్యాయి."
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "గుంపులు, పేజీ %d"
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
-msgid "Preferred language"
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
 msgstr ""
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
-msgid "Privacy"
-msgstr "అంతరంగికత"
-
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-msgid "Problem saving notice."
-msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "కొత్త గుంపుని సృష్టించు"
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
-msgid "Profile"
-msgstr "ప్రొఫైలు"
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
 
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
-msgstr "ప్రొఫైలు URL"
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "వాడుకరికి ప్రొఫైలు లేదు."
 
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
-msgstr "ఫ్రొఫైలు అమరికలు"
+#: actions/groupunblock.php:128 actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు."
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-msgid "Profile unknown"
-msgstr "అజ్ఞాత ప్రొఫైలు"
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "IM అమరికలు"
 
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
-msgid "Public Stream Feed"
-msgstr "ప్రజా వాహిని ఫీడు"
+#: actions/imsettings.php:70
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
 
-#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
-msgid "Public timeline"
-msgstr "ప్రజా కాలరేఖ"
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "హోమ్ పేజీ URL సరైనది కాదు."
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "ప్రస్తుతం నిర్ధారించిన Jabber/GTalk చిరునామా"
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
-msgid "Publish a MicroID for my email address."
+#: actions/imsettings.php:114
+#, 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/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "IM చిరునామా"
 
-#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
-msgid "Recover"
+#: actions/imsettings.php:126
+#, 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/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
-msgid "Recover password"
+#: actions/imsettings.php:143
+msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-msgid "Recovery code for unknown user."
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
 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
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-msgid "Register"
-msgstr "నమోదు"
-
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
-msgid "Registration not allowed."
+#: actions/imsettings.php:153
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
-msgid "Registration successful"
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
-msgid "Reject"
-msgstr "తిరస్కరించు"
-
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
-msgid "Remember me"
-msgstr "నన్ను గుర్తుంచుకో"
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "Jabber ID లేదు."
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
-msgid "Remote profile with no matching profile"
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
-msgstr ""
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "సరైన Jabber ఐడీ కాదు"
 
-#: ../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 actions/emailsettings.php:101
-#: actions/emailsettings.php:134 actions/imsettings.php:102
-#: actions/openidsettings.php:166 actions/smssettings.php:103
-#: actions/smssettings.php:146 actions/twittersettings.php:115
-msgid "Remove"
-msgstr "తొలగించు"
+#: actions/imsettings.php:299
+msgid "That is already your Jabber ID."
+msgstr "ఈ Jabber ID మీకు ఇప్పటికే ఉంది"
 
-#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
-msgstr "ఓపెన్ఐడీని తొలగించండి"
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr "Jabber ID ఇప్పటికే వేరొకరికి ఉంది."
 
-#: ../actions/openidsettings.php:73
+#: actions/imsettings.php:327
+#, php-format
 msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
 msgstr ""
-"మీకున్న ఒకే ఓపెన్ఐడీని తొలగిస్తే మీరు లోనికి ప్రవేశించడం అసాధ్యమవవచ్చు. మీరు దాన్ని తొలగించాలనుకుంటే, "
-"ముందు వేరే ఓపెన్ఐడీని చేర్చండి."
 
-#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
-msgid "Replies"
-msgstr "స్పందనలు"
+#: actions/imsettings.php:387
+msgid "That is not your Jabber ID."
+msgstr "ఇది మీ Jabber ID కాదు"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
-#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
-#: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: actions/inbox.php:59
 #, php-format
-msgid "Replies to %s"
-msgstr "%sకి స్పందనలు"
-
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
-msgid "Reset"
+msgid "Inbox for %s - page %d"
 msgstr ""
 
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
-msgid "Reset password"
+#: actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
 msgstr ""
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-msgid "SMS"
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
-msgid "SMS Phone number"
+#: actions/invite.php:39
+msgid "Invites have been disabled."
 msgstr ""
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
+#: actions/invite.php:41
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
-msgid "SMS confirmation"
+#: actions/invite.php:72
+#, php-format
+msgid "Invalid email address: %s"
 msgstr ""
 
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
-msgid "Same as password above"
-msgstr "పై సంకేతపదం వలెనే"
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
+msgstr "ఆహ్వానము(ల)ని పంపించాం"
 
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
-msgid "Same as password above. Required."
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr "కొత్త వాడుకరులని ఆహ్వానించండి"
+
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
 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 actions/emailsettings.php:182
-#: actions/facebooksettings.php:114 actions/imsettings.php:157
-#: actions/othersettings.php:117 actions/profilesettings.php:150
-#: actions/smssettings.php:169 actions/subscriptions.php:124
-#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
-msgid "Save"
-msgstr "భద్రపరచు"
+#: actions/invite.php:131 actions/invite.php:139
+#, php-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
-msgid "Search"
-msgstr "వెతుకు"
+#: actions/invite.php:136
+msgid ""
+"These people are already users and you were automatically subscribed to them:"
+msgstr ""
 
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
-msgstr "అన్వేషణ వాహిని ఫీడు"
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
-#, php-format
+#: actions/invite.php:150
 msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 msgstr ""
-"%%site.name%%లోని సందేశాలను వెతకండి. అన్వేషణ పదాలను ఖాళీలతో వేరుచేయండి; ఒక్కో పదంలో 3 లేదా "
-"అంతకంటే ఎక్కువ అక్షరాలు ఉండాలి."
 
-#: ../actions/peoplesearch.php:28
-#, php-format
+#: actions/invite.php:162
 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."
+"Use this form to invite your friends and colleagues to use this service."
 msgstr ""
-"%%site.name%%లో వ్యక్తులను వారి పేరు, ప్రాంతం, లేదా ఆసక్తులను బట్టి వెతకండి. అన్వేషించే పదాలను "
-"ఖాళీలతో వేరుచేయండి; ఒక్కో పదంలో 3 లేదా అంతకంటే ఎక్కువ అక్షరాలు ఉండాలి."
 
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
-msgid "Select a carrier"
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "ఈమెయిలు చిరునామాలు"
+
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
 msgstr ""
 
-#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
-#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
-msgid "Send"
-msgstr "పంపించు"
+#: actions/invite.php:192
+msgid "Personal message"
+msgstr "వ్యక్తిగత సందేశం"
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
-msgstr ""
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
+msgstr "పంపించు"
 
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
-msgid "Send me notices through Jabber/GTalk."
+#: actions/invite.php:226
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
 
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/invite.php:228
+#, php-format
 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."
+"%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/util.php:304 lib/util.php:320 lib/facebookaction.php:215
-msgid "Settings"
-msgstr "అమరికలు"
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
+msgstr "గుంపుల్లో చేరడానికి మీరు ప్రవేశించి ఉండాలి."
 
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
-msgid "Settings saved."
-msgstr "అమరికలు భద్రమయ్యాయి."
+#: actions/joingroup.php:90 lib/command.php:217
+msgid "You are already a member of that group"
+msgstr "మీరు ఇప్పటికే ఆ గుంపులో సభ్యులు"
 
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
+#: actions/joingroup.php:128 lib/command.php:234
+#, php-format
+msgid "Could not join user %s to group %s"
 msgstr ""
 
-#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:114
-msgid "Someone else already has this OpenID."
-msgstr "ఈ ఓపెన్ఐడీని ఇప్పటికే ఎవరో వాడుతున్నారు."
-
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
-msgstr "జరగకూడనిదేదో జరిగింది."
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
+#: actions/joingroup.php:135 lib/command.php:239
+#, php-format
+msgid "%s joined group %s"
 msgstr ""
 
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
-msgid "Source"
-msgstr "మూలము"
-
-#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
-msgid "Statistics"
-msgstr "గణాంకాలు"
-
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-msgid "Stored OpenID not found."
+#: actions/leavegroup.php:90 lib/command.php:268
+msgid "You are not a member of that group."
 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
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
-msgid "Subscribe"
+#: actions/leavegroup.php:119 lib/command.php:278
+msgid "Could not find membership record."
 msgstr ""
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
-msgid "Subscribers"
-msgstr "చందాదార్లు"
+#: actions/leavegroup.php:127 lib/command.php:284
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "ఓపెన్ఐడీ ఫారమును సృష్టించలేకపోయాం: %s"
 
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
-msgid "Subscription authorized"
-msgstr ""
+#: actions/leavegroup.php:134 lib/command.php:289
+#, php-format
+msgid "%s left group %s"
+msgstr "%2$s గుంపు నుండి %1$s వైదొలిగారు"
 
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
-msgid "Subscription rejected"
-msgstr "చందాని తిరస్కరించారు."
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+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
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
-msgid "Subscriptions"
-msgstr "చందాలు"
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "సందేశపు విషయం సరైనది కాదు"
 
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
-msgid "System error uploading file."
-msgstr ""
+#: actions/login.php:143
+msgid "Incorrect username or password."
+msgstr "వాడుకరిపేరు లేదా సంకేతపదం తప్పు."
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
-#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
-msgid "Tags"
+#: actions/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
 msgstr ""
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "పాఠ్యం"
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "ప్రవేశించండి"
 
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
-msgid "Text search"
-msgstr "పాఠ్య అన్వేషణ"
+#: actions/login.php:243
+msgid "Login to site"
+msgstr ""
 
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
-msgstr "ఆ ఓపెన్ఐడీ మీది కాదు."
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "పేరు"
 
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
-msgstr "ఆ చిరునామా ఇప్పటికే నిర్ధారితమైంది."
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "సంకేతపదం"
 
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
-msgstr "ఆ నిర్ధారణా సంకేతం మీది కాదు!"
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "నన్ను గుర్తుంచుకో"
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr "ఆ ఈమెయిల్ చిరునామా ఇప్పటేకే ఇతర వాడుకరికి సంబంధించినది."
+#: actions/login.php:253 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
+msgstr "భవిష్యత్తులో ఆటోమెటిగ్గా లోనికి ప్రవేశించు; బయటి కంప్యూర్ల కొరకు కాదు!"
 
-#: ../actions/avatar.php:80 actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
-msgstr "ఆ ఫైలు చాలా పెద్దగా ఉంది."
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "మీ సంకేతపదం మర్చిపోయారా?"
 
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
-msgid "That is already your Jabber ID."
-msgstr "ఈ Jabber ID మీకు ఇప్పటికే ఉంది"
+#: actions/login.php:282
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr ""
+"భద్రతా కారణాల దృష్ట్యా, అమరికలు మార్చే ముందు మీ వాడుకరి పేరుని మరియు సంకేతపదాన్ని మరోసారి ఇవ్వండి."
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
-msgid "That is already your email address."
-msgstr "అది ఇప్పటికే మీ ఈమెయిల్ చిరునామా."
+#: actions/login.php:286
+#, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
-msgid "That is already your phone number."
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
 msgstr ""
 
-#: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
-msgid "That is not your Jabber ID."
-msgstr "ఇది మీ Jabber ID కాదు"
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
-msgid "That is not your email address."
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
 msgstr ""
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
 msgstr ""
 
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-#: actions/emailsettings.php:367 actions/imsettings.php:349
-msgid "That is the wrong IM address."
-msgstr "ఆ IM చిరునామా సరైనది కాదు."
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr "ప్రస్తుత స్థితి ఏమీ లేదు"
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
-msgstr ""
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr "కొత్త గుంపు"
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-msgid "That phone number already belongs to another user."
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
 msgstr ""
 
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49 actions/twitapistatuses.php:330
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-msgid "That's too long. Max notice size is 140 chars."
-msgstr "ఇది చాలా పొడవుంది. గరిష్ఠ సందేశ పరిమాణం 140 అక్షరాలు."
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr "కొత్త సందేశం"
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
-msgid "That's too long. Max notice size is 255 chars."
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
 msgstr ""
 
-#: ../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
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
-msgid "The address was removed."
-msgstr "ఆ చిరునామాని తొలగించాం."
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+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:"
+#: actions/newmessage.php:158
+msgid "No recipient specified."
 msgstr ""
 
-#: ../actions/userauthorization.php:322
+#: actions/newmessage.php:164 lib/command.php:370
 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."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/newmessage.php:181
+msgid "Message sent"
+msgstr "సందేశాన్ని పంపించాం"
+
+#: actions/newmessage.php:185 lib/command.php:375
 #, php-format
-msgid "These are the people who listen to %s's notices."
+msgid "Direct message to %s sent"
 msgstr ""
 
-#: ../actions/subscribers.php:33 actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
 msgstr ""
 
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
-#, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr ""
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "కొత్త సందేశం"
 
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr ""
+#: actions/newnotice.php:199
+#, fuzzy
+msgid "Notice posted"
+msgstr "సందేశాలు"
 
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/noticesearch.php:68
+#, php-format
 msgid ""
-"These people are already users and you were automatically subscribed to them:"
+"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/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
-msgstr "ఈ నిర్ధారణ సంకేతం చాలా పాతది. మళ్ళీ మొదలుపెట్టండి."
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "పాఠ్య అన్వేషణ"
 
-#: ../lib/openid.php:195
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "\"%s\"కై అన్వేషణ వాహిని"
+
+#: actions/noticesearch.php:121
+#, php-format
 msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/noticesearch.php:124
 #, 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."
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-msgid "This method requires a POST or DELETE."
-msgstr ""
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "%s యొక్క మైక్రోబ్లాగు"
 
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
-msgid "This method requires a POST."
-msgstr ""
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "\"%s\"తో సరిపోలే అన్ని తాజాకరణలు"
 
-#: ../lib/util.php:164 lib/util.php:246
-msgid "This page is not available in a media type you accept"
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
-msgid "Timezone"
+#: actions/nudge.php:94
+msgid "Nudge sent"
 msgstr ""
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
-msgid "Timezone not selected."
+#: actions/nudge.php:97
+msgid "Nudge sent!"
 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."
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
-msgid "Two user ids or screen_names must be supplied."
+#: actions/oembed.php:86 actions/shownotice.php:180
+#, php-format
+msgid "%1$s's status on %2$s"
 msgstr ""
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వేరే సేటులోని మీ ప్రొఫైలు యొక్క చిరునామా"
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "అనుసంధానించు"
 
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-msgid "URL of your profile on another compatible microblogging service"
-msgstr ""
+#: actions/oembed.php:160
+msgid "Only "
+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 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-msgid "Unexpected form submission."
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
 msgstr ""
 
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
-msgid "Unexpected password reset."
-msgstr ""
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "ప్రజల అన్వేషణ"
 
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-msgid "Unknown action"
-msgstr ""
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "నోటీసుల అన్వేషణ"
 
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-msgid "Unknown version of OMB protocol."
-msgstr ""
+#: actions/othersettings.php:60
+msgid "Other Settings"
+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 "
+#: actions/othersettings.php:71
+msgid "Manage various other options."
 msgstr ""
 
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
-#, php-format
-msgid "Unrecognized address type %s"
-msgstr "గుర్తుతెలియని చిరునామా రకం %s"
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr " (స్వేచ్ఛా సేవ)"
 
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
-msgstr ""
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
+msgstr "URL కుదింపు సేవ"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-msgid "Unsupported OMB version"
-msgstr ""
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
+msgstr "ఉపయోగించాల్సిన యాంత్రిక కుదింపు సేవ."
 
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
-msgid "Unsupported image file format."
-msgstr ""
+#: actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "ఫ్రొఫైలు అమరికలు"
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
 msgstr ""
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
-msgstr ""
+#: actions/othersettings.php:153
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "URL కుదింపు సేవ మరీ పెద్దగా ఉంది (50 అక్షరాలు గరిష్ఠం)."
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/outbox.php:58
 #, php-format
-msgid "Updates from %1$s and friends on %2$s!"
+msgid "Outbox for %s - page %d"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/outbox.php:61
 #, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
-#: ../actions/avatar.php:68 actions/profilesettings.php:161
-#: actions/avatarsettings.php:162 actions/grouplogo.php:232
-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."
+msgid "Outbox for %s"
 msgstr ""
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
+#: actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
-#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
-msgstr ""
+#: actions/passwordsettings.php:58
+msgid "Change password"
+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/passwordsettings.php:69
+msgid "Change your password."
+msgstr "మీ సంకేతపదం మార్చుకోండి."
 
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
-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
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-msgid "User has no profile."
-msgstr "వాడుకరికి ప్రొఫైలు లేదు."
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#, fuzzy
+msgid "Password change"
+msgstr "సంకేతపదం భద్రమయ్యింది."
 
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
-msgstr "వాడుకరి పేరు"
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "పాత సంకేతపదం"
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr ""
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "కొత్త సంకేతపదం"
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
-msgid "What timezone are you normally in?"
-msgstr ""
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు"
 
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
-#, php-format
-msgid "What's up, %s?"
-msgstr "%s, సంగతులేమిటి?"
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "నిర్థారించు"
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-#: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "మీరు ఎక్కడ నుండి, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\""
+#: actions/passwordsettings.php:113
+msgid "same as password above"
+msgstr "పై సంకేతపదం వలెనే"
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
-#, php-format
-msgid "Wrong image type for '%s'"
-msgstr "'%s' కొరకు తప్పుడు బొమ్మ రకం"
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "మార్చు"
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
-#, php-format
-msgid "Wrong size image at '%s'"
+#: actions/passwordsettings.php:154 actions/register.php:230
+msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
-msgid "Yes"
-msgstr "అవును"
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "సంకేతపదాలు సరిపోలలేదు."
 
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-msgid "You already have this OpenID!"
-msgstr "ఈ ఓపెన్ఐడీ మీకు ఇప్పటికే ఉంది!"
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+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/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు: సరికాదు."
 
-#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
-msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "కొత్త సంకేతపదాన్ని భద్రపరచలేము."
 
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-msgid "You are already subscribed to these users:"
-msgstr ""
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "సంకేతపదం భద్రమయ్యింది."
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
-msgid "You are not friends with the specified user."
+#: actions/peoplesearch.php:52
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+"Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
+"%%site.name%%లో వ్యక్తులను వారి పేరు, ప్రాంతం, లేదా ఆసక్తులను బట్టి వెతకండి. అన్వేషించే పదాలను "
+"ఖాళీలతో వేరుచేయండి; ఒక్కో పదంలో 3 లేదా అంతకంటే ఎక్కువ అక్షరాలు ఉండాలి."
 
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr "మీ సంకేతపదాన్ని ఇక్కడ మార్చుకోవచ్చు. మంచిది ఎంచుకోండి!"
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "వ్యక్తుల అన్వేషణ"
 
-#: ../actions/register.php:135 actions/register.php:145
-msgid "You can create a new account to start posting notices."
-msgstr "సందేశాలు పంపించడానికి మీరు కొత్త ఖాతా సృష్టించుకోవచ్చు."
+#: actions/peopletag.php:70
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "సరైన ఈమెయిల్ చిరునామా కాదు:"
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
+#: actions/peopletag.php:144
 #, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
+msgid "Users self-tagged with %s - page %d"
 msgstr ""
 
-#: ../actions/openidsettings.php:86
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr "\"తొలగించు\" అనే బొత్తంపై నొక్కడం ద్వారా ఒక ఓపెన్ఐడీని మీ ఖాతా నుండి తొలగించుకోవచ్చు."
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "సందేశపు విషయం సరైనది కాదు"
 
-#: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/postnotice.php:90
 #, php-format
-msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
-#: ../actions/profilesettings.php:27
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "ఫ్రొఫైలు అమరికలు"
+
+#: actions/profilesettings.php:71
 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
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
-msgstr ""
+#: actions/profilesettings.php:99
+msgid "Profile information"
+msgstr "ప్రొఫైలు సమాచారం"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
-msgid "You can't register if you don't agree to the license."
-msgstr ""
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామచిహ్నాలు మరియు ఖాళీలు తప్ప"
 
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
-msgid "You did not send us that profile"
-msgstr ""
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full 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/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "హోమ్ పేజీ"
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
-msgid "You may not delete another user's status."
-msgstr ""
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వేరే సేటులోని మీ ప్రొఫైలు యొక్క చిరునామా"
 
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/profilesettings.php:122 actions/register.php:460
 #, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr ""
+msgid "Describe yourself and your interests in %d chars"
+msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి %d అక్షరాల్లో చెప్పండి"
 
-#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
+#: actions/profilesettings.php:125 actions/register.php:463
+msgid "Describe yourself and your interests"
+msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి చెప్పండి"
 
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr "మిమ్మల్ని గుర్తించాం. కొత్త సంకేతపదాన్ని క్రింద ఇవ్వండి."
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "స్వపరిచయం"
 
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
-msgid "Your OpenID URL"
-msgstr "మీ ఓపెన్ఐడీ URL"
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "ప్రాంతం"
 
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
-msgstr "ఈ సర్వరులో మీ పేరు, లేదా నమౌదైన మీ ఈమెయిల్ చిరునామా."
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "మీరు ఎక్కడ నుండి, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\""
 
-#: ../actions/openidsettings.php:28
-#, php-format
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
+msgstr "ట్యాగులు"
+
+#: actions/profilesettings.php:140
 msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
-"account.  Manage your associated OpenIDs from here."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
-"ఒకే వాడుకరి ఖాతాతో చాలా సైట్లలోనికి ప్రవేశించే వీలుని [ఓపెన్ఐడీ](%%doc.openid%%) కల్పిస్తుంది. మీ "
-"ఓపెన్ఐడీలను ఇక్కడ సంభాళించుకోండి."
-
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
-msgid "a few seconds ago"
-msgstr "కొన్ని క్షణాల క్రితం"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
-#, php-format
-msgid "about %d days ago"
-msgstr "%d రోజుల క్రితం"
+#: actions/profilesettings.php:144
+msgid "Language"
+msgstr "భాష"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
-#, php-format
-msgid "about %d hours ago"
-msgstr "%d గంటల క్రితం"
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr "ప్రాథాన్యతా భాష"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
-#, php-format
-msgid "about %d minutes ago"
-msgstr "%d నిమిషాల క్రితం"
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr "కాలమండలం"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
-#, php-format
-msgid "about %d months ago"
-msgstr "%d నెలల క్రితం"
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
+msgstr ""
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
-msgid "about a day ago"
-msgstr "ఓ రోజు క్రితం"
+#: actions/profilesettings.php:160
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
-msgid "about a minute ago"
-msgstr "ఓ నిమిషం క్రితం"
+#: actions/profilesettings.php:221 actions/register.php:223
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "స్వపరిచయం చాలా పెద్దగా ఉంది (140 అక్షరాలు గరిష్ఠం)."
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
-msgid "about a month ago"
-msgstr "ఓ నెల క్రితం"
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr "కాలమండలాన్ని ఎంచుకోలేదు."
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
-msgid "about a year ago"
-msgstr "ఒక సంవత్సరం క్రితం"
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr "భాష మరీ పెద్దగా ఉంది (50 అక్షరాలు గరిష్ఠం)."
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
-msgid "about an hour ago"
-msgstr "ఒక గంట క్రితం"
+#: actions/profilesettings.php:246 actions/tagother.php:178
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "'%s' అనే హోమ్ పేజీ సరైనదికాదు"
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
 msgstr ""
 
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117 actions/noticesearch.php:136
-#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
-msgid "in reply to..."
-msgstr "దీనికి స్పందనగా..."
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+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 actions/noticesearch.php:194
-msgid "reply"
-msgstr "స్పందించు"
+#: actions/profilesettings.php:336
+msgid "Couldn't save tags."
+msgstr "ట్యాగులని భద్రపరచలేకున్నాం."
 
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-msgid "same as password above"
-msgstr "పై సంకేతపదం వలెనే"
+#: actions/profilesettings.php:344
+msgid "Settings saved."
+msgstr "అమరికలు భద్రమయ్యాయి."
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
-msgid "unsupported file type"
+#: actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
 msgstr ""
 
-#: ../lib/util.php:1309 lib/util.php:1443
-#, fuzzy
-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
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-msgid "There was a problem with your session token. Try again, please."
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
 msgstr ""
 
-#: actions/disfavor.php:55 actions/disfavor.php:81
-msgid "This notice is not a favorite!"
-msgstr ""
+#: actions/public.php:129
+#, php-format
+msgid "Public timeline, page %d"
+msgstr "ప్రజా కాలరేఖ, పేజీ %d"
 
-#: actions/disfavor.php:63 actions/disfavor.php:87
-msgid "Could not delete favorite."
-msgstr ""
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr "ప్రజా కాలరేఖ"
 
-#: actions/disfavor.php:72 lib/favorform.php:140
-msgid "Favor"
-msgstr ""
+#: actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "ప్రజా వాహిని ఫీడు"
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
-msgstr ""
+#: actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "ప్రజా వాహిని ఫీడు"
 
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-msgid "Send me email when someone sends me a private message."
-msgstr ""
+#: actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "ప్రజా వాహిని ఫీడు"
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
-msgid "This notice is already a favorite!"
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
 msgstr ""
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132 actions/favor.php:86
-#: actions/twitapifavorites.php:125 classes/Command.php:152
-msgid "Could not create favorite."
+#: actions/public.php:182
+msgid "Be the first to post!"
 msgstr ""
 
-#: actions/favor.php:70
-msgid "Disfavor"
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/public.php:233
 #, php-format
-msgid "%s favorite notices"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/public.php:238
 #, php-format
-msgid "Feed of favorite notices of %s"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
 msgstr ""
 
-#: actions/inbox.php:28 actions/inbox.php:59
+#: actions/publictagcloud.php:57
+#, fuzzy
+msgid "Public tag cloud"
+msgstr "ప్రజా వాహిని ఫీడు"
+
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "Inbox for %s - page %d"
+msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/inbox.php:30 actions/inbox.php:62
+#: actions/publictagcloud.php:69
 #, php-format
-msgid "Inbox for %s"
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
 
-#: actions/inbox.php:53 actions/inbox.php:115
-msgid "This is your inbox, which lists your incoming private messages."
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
 msgstr ""
 
-#: actions/invite.php:178 actions/invite.php:213
+#: actions/publictagcloud.php:75
 #, php-format
 msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
 msgstr ""
 
-#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-msgid "Automatically login in the future; "
-msgstr ""
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
+msgstr "ట్యాగు మేఘం"
 
-#: actions/login.php:122 actions/login.php:264
-msgid "For security reasons, please re-enter your "
-msgstr ""
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
 
-#: actions/login.php:126 actions/login.php:268
-msgid "Login with your username and password. "
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
 msgstr ""
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
-msgid "That's too long. Max message size is 140 chars."
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
 msgstr ""
 
-#: actions/newmessage.php:65 actions/newmessage.php:128
-msgid "No recipient specified."
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
 msgstr ""
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206 actions/newmessage.php:131
-#: actions/newmessage.php:168 classes/Command.php:237
-msgid "You can't send a message to this user."
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "నిర్ధారణ సంకేతంలో పొరపాటు."
+
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
+msgstr "ఈ నిర్ధారణ సంకేతం చాలా పాతది. మళ్ళీ మొదలుపెట్టండి."
+
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
 msgstr ""
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: actions/recoverpassword.php:152
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
 msgstr ""
 
-#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
-msgid "No such user"
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
-#: actions/newmessage.php:117 actions/newmessage.php:67
-msgid "New message"
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
 msgstr ""
 
-#: actions/noticesearch.php:95 actions/noticesearch.php:146
-msgid "Notice without matching profile"
-msgstr ""
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
+msgstr "ముద్దుపేరు లేదా ఈమెయిలు చిరునామా"
 
-#: actions/openidsettings.php:28 actions/openidsettings.php:70
-#, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr ""
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
+msgstr "ఈ సర్వరులో మీ పేరు, లేదా నమౌదైన మీ ఈమెయిల్ చిరునామా."
 
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
 msgstr ""
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
+#: actions/recoverpassword.php:208
+msgid "Reset password"
 msgstr ""
 
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-msgid "You can remove an OpenID from your account "
+#: actions/recoverpassword.php:209
+msgid "Recover password"
 msgstr ""
 
-#: actions/outbox.php:28 actions/outbox.php:58
-#, php-format
-msgid "Outbox for %s - page %d"
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
 msgstr ""
 
-#: actions/outbox.php:30 actions/outbox.php:61
-#, php-format
-msgid "Outbox for %s"
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
 msgstr ""
 
-#: actions/outbox.php:53 actions/outbox.php:116
-msgid "This is your outbox, which lists private messages you have sent."
-msgstr ""
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు, మర్చిపోకండి!"
 
-#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
-#, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
-msgstr ""
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "పై సంకేతపదం వలెనే"
 
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
-msgid "You can update your personal profile info here "
+#: actions/recoverpassword.php:243
+msgid "Reset"
 msgstr ""
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
-msgid "User without matching profile"
-msgstr ""
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "పేరు లేదా ఈమెయిల్ చిరునామా ఇవ్వండి."
 
-#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
 msgstr ""
 
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
-msgstr ""
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr "ఈ వాడుకరికై నమోదైన ఈమెయిల్ చిరునామాలు ఏమీ లేవు."
 
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a "
-msgstr ""
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "చిరునామా నిర్ధారణని భద్రపరచడంలో పొరపాటు."
 
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-msgid "Your nickname on this server, "
-msgstr ""
+#: actions/recoverpassword.php:325
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr "మీ సంకేతపదాన్ని తిరిగి పొందడానికై అవసరమైన సూచనలని మీ ఖాతాతో నమోదైన ఈమెయిల్ చిరునామాకి పంపించాం."
 
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-msgid "Instructions for recovering your password "
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
 msgstr ""
 
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
-msgid "New password successfully saved. "
-msgstr ""
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "సంకేతపదం 6 లేదా అంతకంటే ఎక్కవ అక్షరాలుండాలి."
 
-#: actions/register.php:95 actions/register.php:180
-msgid "Password must be 6 or more characters."
-msgstr ""
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
+msgstr "సంకేతపదం మరియు నిర్ధారణ సరిపోలేదు."
 
-#: actions/register.php:216
-#, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
-msgstr ""
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
+msgstr "మీ కొత్త సంకేతపదం భద్రమైంది. మీరు ఇప్పుడు లోనికి ప్రవేశించారు."
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
-msgstr ""
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
+msgstr "క్షమించండి, ఆహ్వానితులు మాత్రమే నమోదుకాగలరు."
 
-#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
-#, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr ""
+#: actions/register.php:92
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "నిర్ధారణ సంకేతంలో పొరపాటు."
 
-#: actions/showfavorites.php:61 actions/showfavorites.php:145
-#, php-format
-msgid "Feed for favorites of %s"
-msgstr ""
+#: actions/register.php:112
+msgid "Registration successful"
+msgstr "నమోదు విజయవంతం"
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-msgid "Could not retrieve favorite notices."
-msgstr ""
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "నమోదు"
 
-#: actions/showmessage.php:33 actions/showmessage.php:81
-msgid "No such message."
+#: actions/register.php:135
+msgid "Registration not allowed."
 msgstr ""
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
+#: actions/register.php:198
+msgid "You can't register if you don't agree to the license."
 msgstr ""
 
-#: actions/showmessage.php:61 actions/showmessage.php:108
-#, php-format
-msgid "Message to %1$s on %2$s"
-msgstr ""
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "సరైన ఈమెయిల్ చిరునామా కాదు:"
 
-#: actions/showmessage.php:66 actions/showmessage.php:113
-#, php-format
-msgid "Message from %1$s on %2$s"
-msgstr ""
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "ఈమెయిల్ చిరునామా ఇప్పటికే ఉంది."
 
-#: actions/showstream.php:154
-msgid "Send a message"
-msgstr ""
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "వాడుకరిపేరు లేదా సంకేతపదం తప్పు."
 
-#: actions/smssettings.php:312 actions/smssettings.php:464
-#, php-format
-msgid "Mobile carrier for your phone. "
+#: actions/register.php:342
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
-#, php-format
-msgid "Direct messages to %s"
+#: actions/register.php:424
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
-#, php-format
-msgid "All the direct messages sent to %s"
-msgstr ""
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు. తప్పనిసరి."
 
-#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-msgid "Direct Messages You've Sent"
-msgstr ""
+#: actions/register.php:433
+msgid "Same as password above. Required."
+msgstr "పై సంకేతపదం మరోసారి. తప్పనిసరి."
 
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
-#, php-format
-msgid "All the direct messages sent from %s"
-msgstr ""
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "ఈమెయిల్"
 
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-msgid "No message text!"
-msgstr ""
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
+msgstr "తాజా విశేషాలు, ప్రకటనలు, మరియు సంకేతపదం పోయినప్పుడు మాత్రమే ఉపయోగిస్తాం."
 
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-msgid "Recipient user not found."
-msgstr ""
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
+msgstr "పొడుగాటి పేరు, మీ \"అసలు\" పేరైతే మంచిది"
 
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-msgid "Can't send direct messages to users who aren't your friend."
+#: actions/register.php:493
+msgid "My text and files are available under "
 msgstr ""
 
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
-#, php-format
-msgid "%s / Favorites from %s"
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
-#, php-format
-msgid "%s updates favorited by %s / %s."
-msgstr ""
+#: actions/register.php:496
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr "ఈ అంతరంగిక భోగట్టా తప్ప: సంకేతపదం, ఈమెయిల్ చిరునామా, IM చిరునామా, ఫోన్ నంబర్."
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/register.php:537
 #, php-format
-msgid "%s added your notice as a favorite"
+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/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
-#, php-format
+#: actions/register.php:561
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/remotesubscribe.php:98
+#, php-format
 msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+"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/twittersettings.php:41 actions/twittersettings.php:60
-msgid "Twitter settings"
-msgstr "ట్విట్టర్ అమరికలు"
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr ""
 
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-msgid "Twitter Account"
-msgstr "ట్విట్టర్ ఖాతా"
+#: actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "చందాదార్లు"
 
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-msgid "Current verified Twitter account."
-msgstr ""
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "వాడుకరి పేరు"
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
 msgstr ""
 
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-msgid "No spaces, please."
-msgstr ""
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "ప్రొఫైలు URL"
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-msgid "Automatically send my notices to Twitter."
-msgstr ""
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
+msgstr "చందాచేరు"
 
-#: actions/twittersettings.php:75 actions/twittersettings.php:146
-msgid "Send local \"@\" replies to Twitter."
-msgstr ""
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr "ప్రొపైల్ URL తప్పు (చెడు ఫార్మాట్)"
 
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-msgid "Subscribe to my Twitter friends here."
+#: actions/remotesubscribe.php:168
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
 msgstr ""
 
-#: actions/twittersettings.php:122
-msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+#: actions/remotesubscribe.php:176
+msgid "That’s a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/twittersettings.php:128 actions/twittersettings.php:334
-msgid "Could not verify your Twitter credentials!"
+#: actions/remotesubscribe.php:183
+msgid "Couldn’t get a request token."
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
 #, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr ""
+msgid "Replies to %s"
+msgstr "%sకి స్పందనలు"
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-msgid "Unable to save your Twitter settings!"
-msgstr ""
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %s, page %d"
+msgstr "%sకి స్పందనలు"
 
-#: actions/twittersettings.php:174 actions/twittersettings.php:376
-msgid "Twitter settings saved."
-msgstr ""
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "%s యొక్క సందేశముల ఫీడు"
 
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-msgid "That is not your Twitter account."
-msgstr ""
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "%s యొక్క సందేశముల ఫీడు"
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
-msgid "Couldn't remove Twitter user."
-msgstr ""
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "%s యొక్క సందేశముల ఫీడు"
 
-#: actions/twittersettings.php:212 actions/twittersettings.php:407
-msgid "Twitter account removed."
+#: actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
 msgstr ""
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
-msgid "Couldn't save Twitter preferences."
+#: actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
 msgstr ""
 
-#: actions/twittersettings.php:245 actions/twittersettings.php:461
-msgid "Twitter preferences saved."
+#: actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: actions/userauthorization.php:84 actions/userauthorization.php:86
-msgid "Please check these details to make sure "
-msgstr ""
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "%sకి స్పందనలు"
 
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
-msgid "The subscription has been authorized, but no "
-msgstr ""
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "అటువంటి సందేశమేమీ లేదు."
 
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-msgid "The subscription has been rejected, but no "
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
 msgstr ""
 
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-msgid "Command results"
-msgstr ""
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "%s యొక్క మిత్రుల ఫీడు"
 
-#: classes/Channel.php:148 classes/Channel.php:204
-msgid "Command complete"
-msgstr ""
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "%s యొక్క మిత్రుల ఫీడు"
 
-#: classes/Channel.php:158 classes/Channel.php:215
-msgid "Command failed"
-msgstr ""
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "%s యొక్క మిత్రుల ఫీడు"
 
-#: classes/Command.php:39 classes/Command.php:44
-msgid "Sorry, this command is not yet implemented."
+#: actions/showfavorites.php:205
+msgid ""
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""
 
-#: classes/Command.php:96 classes/Command.php:113
+#: actions/showfavorites.php:207
 #, php-format
-msgid "Subscriptions: %1$s\n"
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
-msgid "User has no last notice"
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
 msgstr ""
 
-#: classes/Command.php:146 classes/Command.php:166
-msgid "Notice marked as fave."
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
 msgstr ""
 
-#: classes/Command.php:166 classes/Command.php:189
+#: actions/showgroup.php:82 lib/groupnav.php:86
 #, php-format
-msgid "%1$s (%2$s)"
-msgstr ""
+msgid "%s group"
+msgstr "%s గుంపు"
 
-#: classes/Command.php:169 classes/Command.php:192
+#: actions/showgroup.php:84
 #, php-format
-msgid "Fullname: %s"
-msgstr "పూర్తిపేరు: %s"
+msgid "%s group, page %d"
+msgstr "%s గుంపు, పేజీ %d"
 
-#: classes/Command.php:172 classes/Command.php:195
-#, php-format
-msgid "Location: %s"
-msgstr "ప్రాంతం: %s"
+#: actions/showgroup.php:218
+msgid "Group profile"
+msgstr "గుంపు ప్రొఫైలు"
 
-#: classes/Command.php:175 classes/Command.php:198
-#, php-format
-msgid "Homepage: %s"
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
+msgid "URL"
 msgstr ""
 
-#: classes/Command.php:178 classes/Command.php:201
-#, php-format
-msgid "About: %s"
-msgstr "గురించి: %s"
-
-#: classes/Command.php:200 classes/Command.php:228
-#, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
-msgstr ""
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
+msgid "Note"
+msgstr "గమనిక"
 
-#: classes/Command.php:214 classes/Command.php:245
-#, php-format
-msgid "Direct message to %s sent"
-msgstr ""
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr "మారుపేర్లు"
 
-#: classes/Command.php:216 classes/Command.php:247
-msgid "Error sending direct message."
-msgstr ""
+#: actions/showgroup.php:293
+msgid "Group actions"
+msgstr "గుంపు చర్యలు"
 
-#: classes/Command.php:263 classes/Command.php:300
-msgid "Specify the name of the user to subscribe to"
-msgstr ""
+#: actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "%s యొక్క సందేశముల ఫీడు"
 
-#: classes/Command.php:270 classes/Command.php:307
-#, php-format
-msgid "Subscribed to %s"
-msgstr ""
+#: actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "%s యొక్క సందేశముల ఫీడు"
 
-#: classes/Command.php:288 classes/Command.php:328
-msgid "Specify the name of the user to unsubscribe from"
-msgstr ""
+#: actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "%s యొక్క సందేశముల ఫీడు"
 
-#: classes/Command.php:295 classes/Command.php:335
+#: actions/showgroup.php:345
 #, php-format
-msgid "Unsubscribed from %s"
-msgstr ""
+msgid "FOAF for %s group"
+msgstr "%s గుంపు"
 
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
-msgid "Command not yet implemented."
-msgstr ""
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
+msgid "Members"
+msgstr "సభ్యులు"
 
-#: classes/Command.php:313 classes/Command.php:356
-msgid "Notification off."
-msgstr ""
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/tagcloudsection.php:71
+msgid "(None)"
+msgstr "(ఏమీలేదు)"
 
-#: classes/Command.php:315 classes/Command.php:358
-msgid "Can't turn off notification."
-msgstr ""
+#: actions/showgroup.php:392
+msgid "All members"
+msgstr "అందరు సభ్యులూ"
 
-#: classes/Command.php:333 classes/Command.php:379
-msgid "Notification on."
-msgstr ""
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "గణాంకాలు"
 
-#: classes/Command.php:335 classes/Command.php:381
-msgid "Can't turn on notification."
-msgstr ""
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "సృష్టించు"
 
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
+#: actions/showgroup.php:448
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: classes/Message.php:53 classes/Message.php:56
-msgid "Could not insert message."
+#: actions/showgroup.php:454
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
 msgstr ""
 
-#: classes/Message.php:63 classes/Message.php:66
-msgid "Could not update message with new URI."
-msgstr ""
+#: actions/showgroup.php:482
+msgid "Admins"
+msgstr "నిర్వాహకులు"
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
-msgstr ""
+#: actions/showmessage.php:81
+msgid "No such message."
+msgstr "అటువంటి సందేశం లేదు."
 
-#: lib/mail.php:147 lib/mail.php:289
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: lib/mail.php:249 lib/mail.php:508
+#: actions/showmessage.php:108
 #, php-format
-msgid "New private message from %s"
+msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: lib/mail.php:253 lib/mail.php:512
+#: actions/showmessage.php:113
 #, php-format
-msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
-msgstr ""
-
-#: lib/mailbox.php:43 lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
+msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: lib/openid.php:195 lib/openid.php:203
-msgid "This form should automatically submit itself. "
-msgstr ""
+#: actions/shownotice.php:90
+msgid "Notice deleted."
+msgstr "నోటీసుని తొలగించాం."
 
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-msgid "Favorites"
+#: actions/showstream.php:73
+#, php-format
+msgid " tagged %s"
 msgstr ""
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/showstream.php:79
 #, php-format
-msgid "%s's favorite notices"
-msgstr ""
+msgid "%s, page %d"
+msgstr "%s, పేజీ %d"
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-msgid "User"
-msgstr "వాడుకరి"
+#: actions/showstream.php:122
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "%s యొక్క సందేశముల ఫీడు"
 
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-msgid "Inbox"
-msgstr ""
+#: actions/showstream.php:129
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "%s యొక్క సందేశముల ఫీడు"
 
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-msgid "Your incoming messages"
-msgstr "మీకు వచ్చిన సందేశాలు"
+#: actions/showstream.php:136
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "%s యొక్క సందేశముల ఫీడు"
 
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-msgid "Outbox"
+#: actions/showstream.php:143
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "%s యొక్క సందేశముల ఫీడు"
+
+#: actions/showstream.php:148
+#, php-format
+msgid "FOAF for %s"
 msgstr ""
 
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-msgid "Your sent messages"
-msgstr "మీరు పంపిన సందేశాలు"
+#: actions/showstream.php:191
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
 
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-msgid "Twitter"
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
 msgstr ""
 
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
+#: actions/showstream.php:198
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-msgid "To"
+#: actions/showstream.php:234
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-msgid "Could not parse message."
+#: actions/showstream.php:239
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
 msgstr ""
 
-#: actions/all.php:63 actions/facebookhome.php:162
-#, fuzzy, php-format
-msgid "%s and friends, page %d"
-msgstr "%s మరియు మిత్రులు"
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "SMS అమరికలు"
 
-#: actions/avatarsettings.php:76
-msgid "You can upload your personal avatar."
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/smssettings.php:91
 #, fuzzy
-msgid "Avatar settings"
-msgstr "ట్విట్టర్ అమరికలు"
+msgid "SMS is not available."
+msgstr "హోమ్ పేజీ URL సరైనది కాదు."
 
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-msgid "Original"
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-msgid "Preview"
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
-msgid "Crop"
-msgstr ""
+#: actions/smssettings.php:130
+msgid "Confirmation code"
+msgstr "నిర్ధారణ సంకేతం"
 
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-msgid "There was a problem with your session token. "
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
 msgstr ""
 
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-msgid "Pick a square area of the image to be your avatar"
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
 msgstr ""
 
-#: actions/avatarsettings.php:327 actions/grouplogo.php:384
-msgid "Lost our file data."
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
-#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
-#, fuzzy
-msgid "Lost our file."
-msgstr "అటువంటి సందేశమేమీ లేదు."
-
-#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
-#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
-msgid "Unknown file type"
+#: actions/smssettings.php:174
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
 msgstr ""
 
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
+#: actions/smssettings.php:306
+msgid "No phone number."
 msgstr ""
 
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
+#: actions/smssettings.php:311
+msgid "No carrier selected."
 msgstr ""
 
-#: actions/block.php:111
-#, fuzzy
-msgid "Block user"
-msgstr "అటువంటి వాడుకరి లేరు."
-
-#: actions/block.php:129
-msgid "Are you sure you want to block this user? "
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
 msgstr ""
 
-#: actions/block.php:162
-#, fuzzy
-msgid "You have already blocked this user."
-msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
-
-#: actions/block.php:167
-msgid "Failed to save block information."
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
 msgstr ""
 
-#: actions/confirmaddress.php:159
-#, fuzzy, php-format
-msgid "The address \"%s\" has been "
-msgstr "ఆ చిరునామాని తొలగించాం."
-
-#: actions/deletenotice.php:73
-msgid "You are about to permanently delete a notice. "
-msgstr ""
+#: actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr "ఆ నిర్ధారణా సంకేతం మీది కాదు!"
 
-#: actions/disfavor.php:94
-msgid "Add to favorites"
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
 msgstr ""
 
-#: actions/editgroup.php:54
-#, php-format
-msgid "Edit %s group"
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
 msgstr ""
 
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-msgid "Inboxes must be enabled for groups to work"
+#: actions/smssettings.php:465
+msgid "Mobile carrier"
 msgstr ""
 
-#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-msgid "You must be logged in to create a group."
+#: actions/smssettings.php:469
+msgid "Select a carrier"
 msgstr ""
 
-#: actions/editgroup.php:87 actions/grouplogo.php:87
-#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
-#, fuzzy
-msgid "No nickname"
-msgstr "పేరు లేదు."
-
-#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
-#: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
-#, fuzzy
-msgid "No such group"
-msgstr "అటువంటి సందేశమేమీ లేదు."
-
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
-msgid "You must be an admin to edit the group"
+#: actions/smssettings.php:476
+#, 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/editgroup.php:157
-msgid "Use this form to edit the group."
+#: actions/smssettings.php:498
+msgid "No code entered"
 msgstr ""
 
-#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
-msgid "Nickname must have only lowercase letters "
+#: actions/subedit.php:70
+msgid "You are not subscribed to that profile."
 msgstr ""
 
-#: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/subedit.php:83
 #, fuzzy
-msgid "description is too long (max 140 chars)."
-msgstr "స్వపరిచయం చాలా పెద్దగా ఉంది (140 అక్షరాలు గరిష్ఠం)."
+msgid "Could not save subscription."
+msgstr "చందాని సృష్టించలేకపోయాం."
 
-#: actions/editgroup.php:218
+#: actions/subscribe.php:55
 #, fuzzy
-msgid "Could not update group."
-msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
+msgid "Not a local user."
+msgstr "అటువంటి వాడుకరి లేరు."
 
-#: actions/editgroup.php:226
+#: actions/subscribe.php:69
 #, fuzzy
-msgid "Options saved."
-msgstr "అమరికలు భద్రమయ్యాయి."
+msgid "Subscribed"
+msgstr "చందాదార్లు"
 
-#: actions/emailsettings.php:107 actions/imsettings.php:108
-#, fuzzy, php-format
-msgid "Awaiting confirmation on this address. "
-msgstr "నిర్ధారణ సంకేతంలో పొరపాటు."
+#: actions/subscribers.php:50
+#, php-format
+msgid "%s subscribers"
+msgstr "%s చందాదార్లు"
 
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-msgid "Make a new email address for posting to; "
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %d"
 msgstr ""
 
-#: actions/emailsettings.php:157
-msgid "Send me email when someone "
+#: actions/subscribers.php:63
+msgid "These are the people who listen to your notices."
 msgstr ""
 
-#: actions/emailsettings.php:168
-msgid "Allow friends to nudge me and send me an email."
+#: actions/subscribers.php:67
+#, php-format
+msgid "These are the people who listen to %s's notices."
 msgstr ""
 
-#: actions/emailsettings.php:321
-#, fuzzy
-msgid "That email address already belongs "
-msgstr "ఆ ఈమెయిల్ చిరునామా ఇప్పటేకే ఇతర వాడుకరికి సంబంధించినది."
-
-#: actions/emailsettings.php:343
-#, fuzzy
-msgid "A confirmation code was sent to the email address you added. "
-msgstr "ఆ నిర్ధారణా సంకేతం మీది కాదు!"
-
-#: actions/facebookhome.php:110
-msgid "Server error - couldn't get user!"
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
 msgstr ""
 
-#: actions/facebookhome.php:196
+#: actions/subscribers.php:110
 #, php-format
-msgid "If you would like the %s app to automatically update "
+msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
 
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#: actions/subscribers.php:114
 #, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr ""
-
-#: actions/facebookhome.php:218
-msgid "Skip"
-msgstr ""
-
-#: actions/facebookhome.php:235
-#, fuzzy
-msgid "No notice content!"
-msgstr "విషయం లేదు!"
-
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-msgid "Pagination"
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
 msgstr ""
 
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-#, fuzzy
-msgid "After"
-msgstr "« తర్వాత"
-
-#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
-#, fuzzy
-msgid "Before"
-msgstr "ఇంతక్రితం »"
+#: actions/subscriptions.php:52
+#, php-format
+msgid "%s subscriptions"
+msgstr "%s చందాలు"
 
-#: actions/facebookinvite.php:70
+#: actions/subscriptions.php:54
 #, php-format
-msgid "Thanks for inviting your friends to use %s"
-msgstr ""
+msgid "%s subscriptions, page %d"
+msgstr "%s చందాలు, పేజీ %d"
 
-#: actions/facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
+#: actions/subscriptions.php:65
+msgid "These are the people whose notices you listen to."
 msgstr ""
 
-#: actions/facebookinvite.php:96
+#: actions/subscriptions.php:69
 #, php-format
-msgid "You have been invited to %s"
+msgid "These are the people whose notices %s listens to."
 msgstr ""
 
-#: actions/facebookinvite.php:105
-#, fuzzy, php-format
-msgid "Invite your friends to use %s"
-msgstr "%s యొక్క మిత్రుల ఫీడు"
-
-#: actions/facebookinvite.php:113
+#: actions/subscriptions.php:121
 #, php-format
-msgid "Friends already using %s:"
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
 msgstr ""
 
-#: actions/facebookinvite.php:130
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
 #, php-format
-msgid "Send invitations"
+msgid "%s is not listening to anyone."
 msgstr ""
 
-#: actions/facebookremove.php:56
+#: actions/subscriptions.php:194
 #, fuzzy
-msgid "Couldn't remove Facebook user."
-msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
+msgid "Jabber"
+msgstr "Jabber ID లేదు."
 
-#: actions/facebooksettings.php:65
-msgid "There was a problem saving your sync preferences!"
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
 msgstr ""
 
-#: actions/facebooksettings.php:67
+#: actions/tagother.php:33
+msgid "Not logged in"
+msgstr "లోనికి ప్రవేశించలేదు"
+
+#: actions/tagother.php:39
 #, fuzzy
-msgid "Sync preferences saved."
-msgstr "అభిరుచులు భద్రమయ్యాయి."
+msgid "No id argument."
+msgstr "అటువంటి పత్రమేమీ లేదు."
 
-#: actions/facebooksettings.php:90
-msgid "Automatically update my Facebook status with my notices."
+#: actions/tagother.php:65
+#, php-format
+msgid "Tag %s"
 msgstr ""
 
-#: actions/facebooksettings.php:97
-msgid "Send \"@\" replies to Facebook."
-msgstr ""
+#: actions/tagother.php:77 lib/userprofile.php:75
+msgid "User profile"
+msgstr "వాడుకరి ప్రొఫైలు"
 
-#: actions/facebooksettings.php:106
-#, fuzzy
-msgid "Prefix"
-msgstr "ప్రొఫైలు"
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
+msgstr "ఫొటో"
 
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
+#: actions/tagother.php:141
+msgid "Tag user"
 msgstr ""
 
-#: actions/facebooksettings.php:124
-#, php-format
-msgid "If you would like %s to automatically update "
+#: actions/tagother.php:151
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
 msgstr ""
 
-#: actions/facebooksettings.php:147
-#, fuzzy
-msgid "Sync preferences"
-msgstr "అభిరుచులు"
+#: actions/tagother.php:193
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
 
-#: actions/favor.php:94 lib/disfavorform.php:140
-msgid "Disfavor favorite"
+#: actions/tagother.php:200
+msgid "Could not save tags."
+msgstr "ట్యాగులని భద్రపరచలేకపోయాం."
+
+#: actions/tagother.php:236
+msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
-#, fuzzy
-msgid "Popular notices"
-msgstr "అటువంటి సందేశమేమీ లేదు."
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "%s యొక్క మైక్రోబ్లాగు"
 
-#: actions/favorited.php:67
+#: actions/tag.php:86
 #, fuzzy, php-format
-msgid "Popular notices, page %d"
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "%s యొక్క సందేశముల ఫీడు"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "%s యొక్క సందేశముల ఫీడు"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "%s యొక్క సందేశముల ఫీడు"
+
+#: actions/tagrss.php:35
+#, fuzzy
+msgid "No such tag."
 msgstr "అటువంటి సందేశమేమీ లేదు."
 
-#: actions/favorited.php:79
-msgid "The most popular notices on the site right now."
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
 msgstr ""
 
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
-msgid "Featured users"
+#: actions/unsubscribe.php:77
+msgid "No profile id in request."
 msgstr ""
 
-#: actions/featured.php:71
-#, php-format
-msgid "Featured users, page %d"
+#: actions/unsubscribe.php:84
+msgid "No profile with that id."
 msgstr ""
 
-#: actions/featured.php:99
+#: actions/unsubscribe.php:98
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "చందాదార్లు"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
 #, php-format
-msgid "A selection of some of the great users on %s"
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
 msgstr ""
 
-#: actions/groupbyid.php:79
-msgid "No ID"
+#: actions/userauthorization.php:110
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
 msgstr ""
 
-#: actions/grouplogo.php:138 actions/grouplogo.php:191
-msgid "Group logo"
-msgstr ""
+#: actions/userauthorization.php:188
+msgid "License"
+msgstr "లైసెన్సు"
 
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
-msgstr ""
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "అంగీకరించు"
 
-#: actions/grouplogo.php:448
-#, fuzzy
-msgid "Logo updated."
-msgstr "అవతారాన్ని తాజాకరించాం."
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "ఈ వాడుకరికి చందాచేరు"
+
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "తిరస్కరించు"
 
-#: actions/grouplogo.php:450
+#: actions/userauthorization.php:212
 #, fuzzy
-msgid "Failed updating logo."
-msgstr "అవతారపు తాజాకరణ విఫలమైంది."
+msgid "Reject this subscription"
+msgstr "అన్ని చందాలు"
 
-#: actions/groupmembers.php:93 lib/groupnav.php:91
-#, php-format
-msgid "%s group members"
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
 msgstr ""
 
-#: actions/groupmembers.php:96
-#, php-format
-msgid "%s group members, page %d"
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
 msgstr ""
 
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
+#: actions/userauthorization.php:249
+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/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
-msgid "Groups"
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
+msgstr "చందాని తిరస్కరించారు."
+
+#: actions/userauthorization.php:261
+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/groups.php:64
+#: actions/userauthorization.php:296
 #, php-format
-msgid "Groups, page %d"
+msgid "Listener URI ‘%s’ not found here"
 msgstr ""
 
-#: actions/groups.php:90
+#: actions/userauthorization.php:301
 #, php-format
-msgid "%%%%site.name%%%% groups let you find and talk with "
+msgid "Listenee URI ‘%s’ is too long."
 msgstr ""
 
-#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-#, fuzzy
-msgid "Create a new group"
-msgstr "కొత్త ఖాతా సృష్టించుకోండి"
-
-#: actions/groupsearch.php:57
-#, fuzzy, php-format
-msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr ""
-"%%site.name%%లో వ్యక్తులను వారి పేరు, ప్రాంతం, లేదా ఆసక్తులను బట్టి వెతకండి. అన్వేషించే పదాలను "
-"ఖాళీలతో వేరుచేయండి; ఒక్కో పదంలో 3 లేదా అంతకంటే ఎక్కువ అక్షరాలు ఉండాలి."
-
-#: actions/groupsearch.php:63
-#, fuzzy
-msgid "Group search"
-msgstr "వ్యక్తుల అన్వేషణ"
 
-#: actions/imsettings.php:70
-msgid "You can send and receive notices through "
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr ""
 
-#: actions/imsettings.php:120
+#: actions/userauthorization.php:338
 #, php-format
-msgid "Jabber or GTalk address, "
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr ""
 
-#: actions/imsettings.php:147
-msgid "Send me replies through Jabber/GTalk "
-msgstr ""
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "'%s' అనే అవతారపు URL తప్పు"
 
-#: actions/imsettings.php:321
+#: actions/userauthorization.php:348
 #, fuzzy, php-format
-msgid "A confirmation code was sent "
-msgstr "నిర్ధారణ సంకేతం లేదు."
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "'%s' కొరకు తప్పుడు బొమ్మ రకం"
 
-#: actions/joingroup.php:65
-msgid "You must be logged in to join a group."
-msgstr ""
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr "ఐడీ లేదు."
 
-#: actions/joingroup.php:95
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
 #, fuzzy
-msgid "You are already a member of that group"
-msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
+msgid "Profile design"
+msgstr "ఫ్రొఫైలు అమరికలు"
 
-#: actions/joingroup.php:128
-#, php-format
-msgid "Could not join user %s to group %s"
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
 msgstr ""
 
-#: actions/joingroup.php:135
-#, php-format
-msgid "%s joined group %s"
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
 msgstr ""
 
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
+#: actions/usergroups.php:64
+#, php-format
+msgid "%s groups, page %d"
 msgstr ""
 
-#: actions/leavegroup.php:65
-msgid "You must be logged in to leave a group."
+#: actions/usergroups.php:130
+msgid "Search for more groups"
 msgstr ""
 
-#: actions/leavegroup.php:88
-#, fuzzy
-msgid "No such group."
-msgstr "అటువంటి సందేశమేమీ లేదు."
-
-#: actions/leavegroup.php:95
-msgid "You are not a member of that group."
-msgstr ""
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
 
-#: actions/leavegroup.php:100
-msgid "You may not leave a group while you are its administrator."
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
 
-#: actions/leavegroup.php:130
-msgid "Could not find membership record."
+#: classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
 msgstr ""
 
-#: actions/leavegroup.php:138
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "ఓపెన్ఐడీ ఫారమును సృష్టించలేకపోయాం: %s"
-
-#: actions/leavegroup.php:145
+#: classes/File.php:147
 #, php-format
-msgid "%s left group %s"
+msgid "A file this large would exceed your user quota of %d bytes."
 msgstr ""
 
-#: actions/login.php:225 lib/facebookaction.php:304
-msgid "Login to site"
+#: classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
-#: actions/microsummary.php:69
-msgid "No current status"
+#: classes/Message.php:55
+msgid "Could not insert message."
 msgstr ""
 
-#: actions/newgroup.php:53
-msgid "New group"
+#: classes/Message.php:65
+msgid "Could not update message with new URI."
 msgstr ""
 
-#: actions/newgroup.php:115
-msgid "Use this form to create a new group."
+#: classes/Notice.php:164
+#, php-format
+msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: actions/newgroup.php:177
+#: classes/Notice.php:179
 #, fuzzy
-msgid "Could not create group."
-msgstr "అవతారపు సమాచారాన్ని భద్రపరచలేకున్నాం"
-
-#: actions/newgroup.php:191
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "చందాని సృష్టించలేకపోయాం."
-
-#: actions/newmessage.php:119 actions/newnotice.php:132
-#, fuzzy
-msgid "That's too long. "
-msgstr "ఆ ఫైలు చాలా పెద్దగా ఉంది."
-
-#: actions/newmessage.php:134
-msgid "Don't send a message to yourself; "
-msgstr ""
+msgid "Problem saving notice. Too long."
+msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
 
-#: actions/newnotice.php:166
+#: classes/Notice.php:183
 #, fuzzy
-msgid "Notice posted"
-msgstr "సందేశాలు"
+msgid "Problem saving notice. Unknown user."
+msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
 
-#: actions/newnotice.php:200 classes/Channel.php:163
-msgid "Ajax Error"
+#: classes/Notice.php:188
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: actions/nudge.php:85
+#: classes/Notice.php:194
 msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
 msgstr ""
 
-#: actions/nudge.php:94
-msgid "Nudge sent"
+#: classes/Notice.php:202
+msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: actions/nudge.php:97
-msgid "Nudge sent!"
-msgstr ""
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
+msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
 
-#: actions/openidlogin.php:97
-#, fuzzy
-msgid "OpenID login"
-msgstr "ఓపెన్ఐడీ ప్రవేశం"
+#: classes/Notice.php:1120
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr ""
 
-#: actions/openidsettings.php:128
-#, fuzzy
-msgid "Removing your only OpenID "
-msgstr "ఓపెన్ఐడీని తొలగించండి"
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "@%2$s, %1$sకి స్వాగతం!"
 
-#: actions/othersettings.php:60
-#, fuzzy
-msgid "Other Settings"
-msgstr "ట్విట్టర్ అమరికలు"
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "ప్రొఫైలు"
 
-#: actions/othersettings.php:71
-msgid "Manage various other options."
+#: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
 msgstr ""
 
-#: actions/othersettings.php:93
-msgid "URL Auto-shortening"
-msgstr ""
+#: lib/accountsettingsaction.php:112
+msgid "Upload an avatar"
+msgstr "ఒక అవతారాన్ని ఎక్కించండి"
 
-#: actions/othersettings.php:112
-#, fuzzy
-msgid "Service"
-msgstr "వెతుకు"
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr "మీ సంకేతపదాన్ని మార్చుకోండి"
 
-#: actions/othersettings.php:113
-msgid "Automatic shortening service to use."
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
 msgstr ""
 
-#: actions/othersettings.php:144
-#, fuzzy
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "ప్రాంతం పేరు మరీ పెద్దగా ఉంది (255 అక్షరాలు గరిష్ఠం)."
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
+msgstr "రూపురేఖలు"
 
-#: actions/passwordsettings.php:69
+#: lib/accountsettingsaction.php:124
 #, fuzzy
-msgid "Change your password."
-msgstr "సంకేతపదం మార్చుకోండి"
+msgid "Design your profile"
+msgstr "వాడుకరికి ప్రొఫైలు లేదు."
 
-#: actions/passwordsettings.php:89
-#, fuzzy
-msgid "Password change"
-msgstr "సంకేతపదం భద్రమయ్యింది."
+#: lib/accountsettingsaction.php:128
+msgid "Other"
+msgstr "ఇతర"
 
-#: actions/peopletag.php:35
-#, fuzzy, php-format
-msgid "Not a valid people tag: %s"
-msgstr "సరైన ఈమెయిల్ చిరునామా కాదు:"
+#: lib/accountsettingsaction.php:128
+msgid "Other options"
+msgstr "ఇతర ఎంపికలు"
 
-#: actions/peopletag.php:47
+#: lib/action.php:144
 #, php-format
-msgid "Users self-tagged with %s - page %d"
-msgstr ""
+msgid "%s - %s"
+msgstr "%s - %s"
 
-#: actions/peopletag.php:91
-#, php-format
-msgid "These are users who have tagged themselves \"%s\" "
+#: lib/action.php:159
+msgid "Untitled page"
 msgstr ""
 
-#: actions/profilesettings.php:91
-#, fuzzy
-msgid "Profile information"
-msgstr "అజ్ఞాత ప్రొఫైలు"
-
-#: actions/profilesettings.php:124
-msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+#: lib/action.php:424
+msgid "Primary site navigation"
 msgstr ""
 
-#: actions/profilesettings.php:144
-msgid "Automatically subscribe to whoever "
+#: lib/action.php:430
+msgid "Home"
+msgstr "ముంగిలి"
+
+#: lib/action.php:430
+msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: actions/profilesettings.php:229 actions/tagother.php:176
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "'%s' అనే హోమ్ పేజీ సరైనదికాదు"
+#: lib/action.php:432
+msgid "Account"
+msgstr "ఖాతా"
 
-#: actions/profilesettings.php:311
-#, fuzzy
-msgid "Couldn't save tags."
-msgstr "ప్రొఫైలుని భద్రపరచలేకున్నాం."
+#: lib/action.php:432
+msgid "Change your email, avatar, password, profile"
+msgstr ""
 
-#: actions/public.php:107
-#, fuzzy, php-format
-msgid "Public timeline, page %d"
-msgstr "ప్రజా కాలరేఖ"
+#: lib/action.php:435
+msgid "Connect"
+msgstr "అనుసంధానించు"
 
-#: actions/public.php:173
-msgid "Could not retrieve public stream."
+#: lib/action.php:435
+msgid "Connect to services"
 msgstr ""
 
-#: actions/public.php:220
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
+msgstr "ఆహ్వానించు"
+
+#: lib/action.php:440 lib/subgroupnav.php:106
 #, php-format
-msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
+msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: actions/publictagcloud.php:57
-#, fuzzy
-msgid "Public tag cloud"
-msgstr "ప్రజా వాహిని ఫీడు"
+#: lib/action.php:445
+msgid "Logout"
+msgstr "నిష్క్రమించు"
 
-#: actions/publictagcloud.php:63
-#, php-format
-msgid "These are most popular recent tags on %s "
+#: lib/action.php:445
+msgid "Logout from the site"
 msgstr ""
 
-#: actions/publictagcloud.php:119
-msgid "Tag cloud"
-msgstr ""
+#: lib/action.php:450
+msgid "Create an account"
+msgstr "కొత్త ఖాతా సృష్టించు"
 
-#: actions/register.php:139 actions/register.php:349
-msgid "Sorry, only invited people can register."
+#: lib/action.php:453
+msgid "Login to the site"
 msgstr ""
 
-#: actions/register.php:149
-msgid "You can't register if you don't "
-msgstr ""
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
+msgstr "సహాయం"
 
-#: actions/register.php:286
-msgid "With this form you can create "
+#: lib/action.php:456
+#, fuzzy
+msgid "Help me!"
+msgstr "సహాయం"
+
+#: lib/action.php:459
+msgid "Search"
+msgstr "వెతుకు"
+
+#: lib/action.php:459
+msgid "Search for people or text"
 msgstr ""
 
-#: actions/register.php:368
+#: lib/action.php:480
 #, fuzzy
-msgid "1-64 lowercase letters or numbers, "
-msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామచిహ్నాలు మరియు ఖాళీలు తప్ప"
+msgid "Site notice"
+msgstr "కొత్త సందేశం"
 
-#: actions/register.php:382 actions/register.php:386
-#, fuzzy
-msgid "Used only for updates, announcements, "
-msgstr "తాజా విశేషాలు, ప్రకటనలు, మరియు సంకేతపదం పోయినప్పుడు మాత్రమే ఉపయోగిస్తాం."
+#: lib/action.php:546
+msgid "Local views"
+msgstr ""
 
-#: actions/register.php:398
+#: lib/action.php:612
 #, fuzzy
-msgid "URL of your homepage, blog, "
-msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వేరే సేటులోని మీ ప్రొఫైలు యొక్క చిరునామా"
+msgid "Page notice"
+msgstr "కొత్త సందేశం"
 
-#: actions/register.php:404
+#: lib/action.php:714
 #, fuzzy
-msgid "Describe yourself and your "
-msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి 140 అక్షరాల్లో చెప్పండి"
+msgid "Secondary site navigation"
+msgstr "చందాలు"
 
-#: actions/register.php:410
-#, fuzzy
-msgid "Where you are, like \"City, "
-msgstr "మీరు ఎక్కడ నుండి, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\""
+#: lib/action.php:721
+msgid "About"
+msgstr "గురించి"
 
-#: actions/register.php:432
-#, fuzzy
-msgid " except this private data: password, "
-msgstr "ఈ అంతరంగిక భోగట్టా తప్ప: సంకేతపదం, ఈమెయిల్ చిరునామా, IM చిరునామా, ఫోన్ నంబర్."
+#: lib/action.php:723
+msgid "FAQ"
+msgstr "ప్రశ్నలు"
 
-#: actions/register.php:471
-#, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
-msgstr ""
+#: lib/action.php:727
+msgid "TOS"
+msgstr "సేవా నియమాలు"
 
-#: actions/register.php:495
-msgid "(You should receive a message by email "
-msgstr ""
+#: lib/action.php:730
+msgid "Privacy"
+msgstr "అంతరంగికత"
 
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
-msgstr ""
+#: lib/action.php:732
+msgid "Source"
+msgstr "మూలము"
 
-#: actions/replies.php:118
-#, fuzzy, php-format
-msgid "Replies to %s, page %d"
-msgstr "%sకి స్పందనలు"
+#: lib/action.php:734
+msgid "Contact"
+msgstr "సంప్రదించు"
 
-#: actions/showfavorites.php:79
-#, php-format
-msgid "%s favorite notices, page %d"
+#: lib/action.php:736
+msgid "Badge"
 msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
-#, php-format
-msgid "%s group"
+#: lib/action.php:764
+msgid "StatusNet software license"
 msgstr ""
 
-#: actions/showgroup.php:79
+#: lib/action.php:767
 #, php-format
-msgid "%s group, page %d"
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
+"**%%site.name%%** అనేది [%%site.broughtby%%](%%site.broughtbyurl%%) వారు "
+"అందిస్తున్న మైక్రో బ్లాగింగు సదుపాయం. "
 
-#: actions/showgroup.php:206
-#, fuzzy
-msgid "Group profile"
-msgstr "అటువంటి సందేశమేమీ లేదు."
+#: lib/action.php:769
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** అనేది మైక్రో బ్లాగింగు సదుపాయం."
 
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
-msgid "URL"
+#: lib/action.php:771
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
+"ఇది [గ్నూ ఆఫెరో జెనరల్ పబ్లిక్ లైసెన్సు](http://www.fsf.org/licensing/licenses/agpl-3.0."
+"html) కింద లభ్యమయ్యే [స్టేటస్&zwnj;నెట్](http://status.net/) మైక్రోబ్లాగింగ్ ఉపకరణం సంచిక %s "
+"పై నడుస్తుంది."
 
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: lib/action.php:785
 #, fuzzy
-msgid "Note"
-msgstr "సందేశాలు"
+msgid "Site content license"
+msgstr "కొత్త సందేశం"
 
-#: actions/showgroup.php:270
-msgid "Group actions"
-msgstr ""
+#: lib/action.php:794
+msgid "All "
+msgstr "అన్నీ "
 
-#: actions/showgroup.php:323
-#, fuzzy, php-format
-msgid "Notice feed for %s group"
-msgstr "%s యొక్క సందేశముల ఫీడు"
+#: lib/action.php:799
+msgid "license."
+msgstr ""
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
-#, fuzzy
-msgid "Members"
-msgstr "సభ్యులైన తేదీ"
+#: lib/action.php:1052
+msgid "Pagination"
+msgstr "పేజీకరణ"
 
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
-msgid "(None)"
-msgstr ""
+#: lib/action.php:1061
+msgid "After"
+msgstr "తర్వాత"
 
-#: actions/showgroup.php:370
-msgid "All members"
-msgstr ""
+#: lib/action.php:1069
+msgid "Before"
+msgstr "ఇంతక్రితం"
 
-#: actions/showgroup.php:378
-#, php-format
-msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+#: lib/action.php:1117
+msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/showmessage.php:98
-msgid "Only the sender and recipient "
-msgstr ""
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr "జోడింపులు"
 
-#: actions/showstream.php:73
-#, php-format
-msgid "%s, page %d"
-msgstr ""
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr "రచయిత"
 
-#: actions/showstream.php:143
+#: lib/attachmentlist.php:278
 #, fuzzy
-msgid "'s profile"
+msgid "Provider"
 msgstr "ప్రొఫైలు"
 
-#: actions/showstream.php:236 actions/tagother.php:77
-#, fuzzy
-msgid "User profile"
-msgstr "వాడుకరికి ప్రొఫైలు లేదు."
-
-#: actions/showstream.php:240 actions/tagother.php:81
-msgid "Photo"
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
 msgstr ""
 
-#: actions/showstream.php:317
-msgid "User actions"
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
 msgstr ""
 
-#: actions/showstream.php:342
-msgid "Send a direct message to this user"
-msgstr ""
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
+msgstr "ఆదేశ ఫలితాలు"
 
-#: actions/showstream.php:343
-msgid "Message"
-msgstr ""
+#: lib/channel.php:210
+msgid "Command complete"
+msgstr "ఆదేశం పూర్తయ్యింది"
 
-#: actions/showstream.php:451
-#, fuzzy
-msgid "All subscribers"
-msgstr "చందాదార్లు"
+#: lib/channel.php:221
+msgid "Command failed"
+msgstr "ఆదేశం విఫలమైంది"
 
-#: actions/showstream.php:533
-msgid "All groups"
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: actions/showstream.php:542
+#: lib/command.php:88
 #, php-format
-msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
-msgstr ""
+msgid "Could not find a user with nickname %s"
+msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
 
-#: actions/smssettings.php:128
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, "
-msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామచిహ్నాలు మరియు ఖాళీలు తప్ప"
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
 
-#: actions/smssettings.php:162
-msgid "Send me notices through SMS; "
+#: lib/command.php:99
+#, php-format
+msgid "Nudge sent to %s"
 msgstr ""
 
-#: actions/smssettings.php:335
-#, fuzzy
-msgid "A confirmation code was sent to the phone number you added. "
-msgstr "ఆ నిర్ధారణా సంకేతం మీది కాదు!"
+#: lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+"చందాలు: %1$s\n"
+"చందాదార్లు: %2$s\n"
+"నోటీసులు: %3$s"
 
-#: actions/smssettings.php:453
-msgid "Mobile carrier"
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
 msgstr ""
 
-#: actions/subedit.php:70
-msgid "You are not subscribed to that profile."
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
 msgstr ""
 
-#: actions/subedit.php:83
-#, fuzzy
-msgid "Could not save subscription."
-msgstr "చందాని సృష్టించలేకపోయాం."
+#: lib/command.php:190
+msgid "Notice marked as fave."
+msgstr ""
 
-#: actions/subscribe.php:55
-#, fuzzy
-msgid "Not a local user."
-msgstr "అటువంటి వాడుకరి లేరు."
+#: lib/command.php:315
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
 
-#: actions/subscribe.php:69
-#, fuzzy
-msgid "Subscribed"
-msgstr "చందాదార్లు"
+#: lib/command.php:318
+#, php-format
+msgid "Fullname: %s"
+msgstr "పూర్తిపేరు: %s"
 
-#: actions/subscribers.php:50
-#, fuzzy, php-format
-msgid "%s subscribers"
-msgstr "చందాదార్లు"
+#: lib/command.php:321
+#, php-format
+msgid "Location: %s"
+msgstr "ప్రాంతం: %s"
 
-#: actions/subscribers.php:52
+#: lib/command.php:324
 #, php-format
-msgid "%s subscribers, page %d"
+msgid "Homepage: %s"
 msgstr ""
 
-#: actions/subscribers.php:63
-msgid "These are the people who listen to "
-msgstr ""
+#: lib/command.php:327
+#, php-format
+msgid "About: %s"
+msgstr "గురించి: %s"
 
-#: actions/subscribers.php:67
+#: lib/command.php:358 scripts/xmppdaemon.php:321
 #, php-format
-msgid "These are the people who "
+msgid "Message too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: actions/subscriptions.php:52
-#, fuzzy, php-format
-msgid "%s subscriptions"
-msgstr "అన్ని చందాలు"
-
-#: actions/subscriptions.php:54
-#, fuzzy, php-format
-msgid "%s subscriptions, page %d"
-msgstr "అన్ని చందాలు"
-
-#: actions/subscriptions.php:65
-msgid "These are the people whose notices "
+#: lib/command.php:377
+msgid "Error sending direct message."
 msgstr ""
 
-#: actions/subscriptions.php:69
+#: lib/command.php:431
 #, php-format
-msgid "These are the people whose "
-msgstr ""
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "నోటిసు చాలా పొడవుగా ఉంది - %d అక్షరాలు గరిష్ఠం, మీరు %d పంపించారు"
 
-#: actions/subscriptions.php:122
-#, fuzzy
-msgid "Jabber"
-msgstr "Jabber ID లేదు."
-
-#: actions/tag.php:43
+#: lib/command.php:439
 #, fuzzy, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "%s యొక్క మైక్రోబ్లాగు"
-
-#: actions/tag.php:66
-#, php-format
-msgid "Messages tagged \"%s\", most recent first"
-msgstr ""
+msgid "Reply to %s sent"
+msgstr "%sకి స్పందనలు"
 
-#: actions/tagother.php:33
+#: lib/command.php:441
 #, fuzzy
-msgid "Not logged in"
-msgstr "లోనికి ప్రవేశించలేదు."
+msgid "Error saving notice."
+msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
 
-#: actions/tagother.php:39
-#, fuzzy
-msgid "No id argument."
-msgstr "అటువంటి పత్రమేమీ లేదు."
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
 
-#: actions/tagother.php:65
+#: lib/command.php:502
 #, php-format
-msgid "Tag %s"
+msgid "Subscribed to %s"
 msgstr ""
 
-#: actions/tagother.php:141
-msgid "Tag user"
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: actions/tagother.php:149
-msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+#: lib/command.php:530
+#, php-format
+msgid "Unsubscribed from %s"
 msgstr ""
 
-#: actions/tagother.php:164
-msgid "There was a problem with your session token."
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
 msgstr ""
 
-#: actions/tagother.php:191
-msgid ""
-"You can only tag people you are subscribed to or who are subscribed to you."
+#: lib/command.php:551
+msgid "Notification off."
 msgstr ""
 
-#: actions/tagother.php:198
-#, fuzzy
-msgid "Could not save tags."
-msgstr "అవతారపు సమాచారాన్ని భద్రపరచలేకున్నాం"
-
-#: actions/tagother.php:233
-msgid "Use this form to add tags to your subscribers or subscriptions."
+#: lib/command.php:553
+msgid "Can't turn off notification."
 msgstr ""
 
-#: actions/tagrss.php:35
-#, fuzzy
-msgid "No such tag."
-msgstr "అటువంటి సందేశమేమీ లేదు."
-
-#: actions/tagrss.php:66
-#, fuzzy, php-format
-msgid "Microblog tagged with %s"
-msgstr "%s యొక్క మైక్రోబ్లాగు"
-
-#: actions/twitapiblocks.php:47
-msgid "Block user failed."
+#: lib/command.php:574
+msgid "Notification on."
 msgstr ""
 
-#: actions/twitapiblocks.php:69
-msgid "Unblock user failed."
+#: lib/command.php:576
+msgid "Can't turn on notification."
 msgstr ""
 
-#: actions/twitapiusers.php:48
-#, fuzzy
-msgid "Not found."
-msgstr "అభ్యర్థనలేమీ కనబడలేదు!"
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "ఓపెన్ఐడీ ఫారమును సృష్టించలేకపోయాం: %s"
 
-#: actions/twittersettings.php:71
-msgid "Add your Twitter account to automatically send "
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: actions/twittersettings.php:119
+#: lib/command.php:618
 #, fuzzy
-msgid "Twitter user name"
-msgstr "ట్విట్టర్ అమరికలు"
+msgid "You are not subscribed to anyone."
+msgstr "%sకి స్పందనలు"
 
-#: actions/twittersettings.php:126
+#: lib/command.php:620
 #, fuzzy
-msgid "Twitter password"
-msgstr "కొత్త సంకేతపదం"
+msgid "You are subscribed to these people: "
+msgstr "%sకి స్పందనలు"
 
-#: actions/twittersettings.php:228
+#: lib/command.php:637
 #, fuzzy
-msgid "Twitter Friends"
-msgstr "ట్విట్టర్ అమరికలు"
-
-#: actions/twittersettings.php:327
-msgid "Username must have only numbers, "
-msgstr ""
-
-#: actions/twittersettings.php:341
-#, fuzzy, php-format
-msgid "Unable to retrieve account information "
-msgstr "ఈమెయిల్ నిర్ధారణని తొలగించలేకున్నాం."
+msgid "No one is subscribed to you."
+msgstr "%sకి స్పందనలు"
 
-#: actions/unblock.php:108
+#: lib/command.php:639
 #, fuzzy
-msgid "Error removing the block."
-msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు."
-
-#: actions/unsubscribe.php:50
-msgid "No profile id in request."
-msgstr ""
-
-#: actions/unsubscribe.php:57
-msgid "No profile with that id."
-msgstr ""
+msgid "These people are subscribed to you: "
+msgstr "%sకి స్పందనలు"
 
-#: actions/unsubscribe.php:71
+#: lib/command.php:656
 #, fuzzy
-msgid "Unsubscribed"
-msgstr "చందాదార్లు"
-
-#: actions/usergroups.php:63
-#, php-format
-msgid "%s groups"
-msgstr ""
-
-#: actions/usergroups.php:65
-#, php-format
-msgid "%s groups, page %d"
-msgstr ""
+msgid "You are not a member of any groups."
+msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
 
-#: classes/Notice.php:104
+#: lib/command.php:658
 #, fuzzy
-msgid "Problem saving notice. Unknown user."
-msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
+msgid "You are a member of these groups: "
+msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
 
-#: classes/Notice.php:109
+#: lib/command.php:670
 msgid ""
-"Too many notices too fast; take a breather and post again in a few minutes."
-msgstr ""
-
-#: classes/Notice.php:116
-msgid "You are banned from posting notices on this site."
-msgstr ""
-
-#: lib/accountsettingsaction.php:108
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+
+#: lib/common.php:192
 #, fuzzy
-msgid "Upload an avatar"
-msgstr "అవతారపు తాజాకరణ విఫలమైంది."
+msgid "No configuration file found. "
+msgstr "నిర్ధారణ సంకేతం లేదు."
 
-#: lib/accountsettingsaction.php:119
-msgid "Other"
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/accountsettingsaction.php:120
-msgid "Other options"
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/action.php:130
-#, php-format
-msgid "%s - %s"
+#: lib/common.php:195
+msgid "Go to the installer."
 msgstr ""
 
-#: lib/action.php:145
-msgid "Untitled page"
+#: lib/connectsettingsaction.php:110
+msgid "IM"
 msgstr ""
 
-#: lib/action.php:316
-msgid "Primary site navigation"
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
 msgstr ""
 
-#: lib/action.php:322
-msgid "Personal profile and friends timeline"
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
 msgstr ""
 
-#: lib/action.php:325
-msgid "Search for people or text"
+#: lib/dberroraction.php:60
+msgid "Database error"
 msgstr ""
 
-#: lib/action.php:328
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr "నేపథ్య చిత్రాన్ని మార్చు"
+
+#: lib/designsettings.php:105
 #, fuzzy
-msgid "Account"
-msgstr "గురించి"
+msgid "Upload file"
+msgstr "ఎగుమతించు"
 
-#: lib/action.php:328
-msgid "Change your email, avatar, password, profile"
-msgstr ""
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr "మీ స్వంత నేపథ్యపు చిత్రాన్ని మీరు ఎక్కించవచ్చు. గరిష్ఠ ఫైలు పరిమాణం 2మెబై."
 
-#: lib/action.php:330
-msgid "Connect to IM, SMS, Twitter"
+#: lib/designsettings.php:139
+msgid "On"
 msgstr ""
 
-#: lib/action.php:332
-msgid "Logout from the site"
+#: lib/designsettings.php:155
+msgid "Off"
 msgstr ""
 
-#: lib/action.php:335
-msgid "Login to the site"
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
 msgstr ""
 
-#: lib/action.php:338
-#, fuzzy
-msgid "Create an account"
-msgstr "కొత్త ఖాతా సృష్టించుకోండి"
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
 
-#: lib/action.php:341
-#, fuzzy
-msgid "Login with OpenID"
-msgstr "అటువంటి ఓపెన్ఐడీ లేదు."
+#: lib/designsettings.php:170
+msgid "Change colours"
+msgstr "రంగులను మార్చు"
 
-#: lib/action.php:344
-#, fuzzy
-msgid "Help me!"
-msgstr "సహాయం"
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr "నేపథ్యం"
 
-#: lib/action.php:362
+#: lib/designsettings.php:191
 #, fuzzy
-msgid "Site notice"
-msgstr "కొత్త సందేశం"
+msgid "Content"
+msgstr "అనుసంధానించు"
 
-#: lib/action.php:417
-msgid "Local views"
-msgstr ""
+#: lib/designsettings.php:204
+msgid "Sidebar"
+msgstr "పక్కపట్టీ"
 
-#: lib/action.php:472
-#, fuzzy
-msgid "Page notice"
-msgstr "కొత్త సందేశం"
+#: lib/designsettings.php:217
+msgid "Text"
+msgstr "పాఠ్యం"
 
-#: lib/action.php:562
-#, fuzzy
-msgid "Secondary site navigation"
-msgstr "చందాలు"
+#: lib/designsettings.php:230
+msgid "Links"
+msgstr "లంకెలు"
 
-#: lib/action.php:602 lib/action.php:623
-msgid "StatusNet software license"
+#: lib/designsettings.php:247
+msgid "Use defaults"
 msgstr ""
 
-#: lib/action.php:630
-msgid "All "
+#: lib/designsettings.php:248
+msgid "Restore default designs"
 msgstr ""
 
-#: lib/action.php:635
-msgid "license."
+#: lib/designsettings.php:254
+msgid "Reset back to default"
 msgstr ""
 
-#: lib/blockform.php:123 lib/blockform.php:153
-#, fuzzy
-msgid "Block this user"
-msgstr "అటువంటి వాడుకరి లేరు."
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr "రూపురేఖలని భద్రపరచు"
 
-#: lib/blockform.php:153
-msgid "Block"
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
 msgstr ""
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
-msgid "Disfavor this notice"
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
 msgstr ""
 
-#: lib/facebookaction.php:268
-#, php-format
-msgid "To use the %s Facebook Application you need to login "
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
 msgstr ""
 
-#: lib/facebookaction.php:271
-#, fuzzy
-msgid " a new account."
-msgstr "కొత్త ఖాతా సృష్టించుకోండి"
-
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-#, fuzzy
-msgid "Published"
-msgstr "ప్రజా"
-
 #: lib/favorform.php:114 lib/favorform.php:140
 #, fuzzy
 msgid "Favor this notice"
 msgstr "అటువంటి సందేశమేమీ లేదు."
 
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr ""
+
 #: lib/feedlist.php:64
 msgid "Export data"
 msgstr ""
 
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr ""
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr ""
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr ""
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr ""
 
 #: lib/galleryaction.php:131
 msgid "All"
+msgstr "అన్నీ"
+
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
 msgstr ""
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr ""
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:143
 msgid "Go"
-msgstr ""
+msgstr "వెళ్ళు"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:163
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వేరే సేటులోని మీ ప్రొఫైలు యొక్క చిరునామా"
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:168
 #, fuzzy
-msgid "Description"
-msgstr "చందాలు"
+msgid "Describe the group or topic"
+msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి 140 అక్షరాల్లో చెప్పండి"
 
-#: lib/groupeditform.php:153
-#, fuzzy
-msgid "Describe the group or topic in 140 chars"
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
 msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి 140 అక్షరాల్లో చెప్పండి"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:172
+msgid "Description"
+msgstr "వివరణ"
+
+#: lib/groupeditform.php:179
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr "మీరు ఎక్కడ నుండి, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\""
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
-msgid "Group"
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:100
-msgid "Admin"
-msgstr ""
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+msgid "Group"
+msgstr "గుంపు"
 
 #: lib/groupnav.php:101
+#, fuzzy
+msgid "Blocked"
+msgstr "అటువంటి వాడుకరి లేరు."
+
+#: lib/groupnav.php:102
+#, php-format
+msgid "%s blocked users"
+msgstr "%s నిరోధిత వాడుకరులు"
+
+#: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
 msgstr ""
 
-#: lib/groupnav.php:106
-#, fuzzy
+#: lib/groupnav.php:113
 msgid "Logo"
-msgstr "నిష్క్రమించు"
+msgstr "చిహ్నం"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:114
 #, php-format
 msgid "Add or edit %s logo"
 msgstr ""
 
+#: lib/groupnav.php:120
+#, php-format
+msgid "Add or edit %s design"
+msgstr ""
+
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
-msgstr ""
+msgstr "ఎక్కువమంది సభ్యులున్న గుంపులు"
 
 #: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
-msgstr ""
+msgstr "ఎక్కువ టపాలున్న గుంపులు"
 
 #: lib/grouptagcloudsection.php:56
 #, php-format
@@ -4563,117 +3962,346 @@ msgid "Tags in %s group's notices"
 msgstr ""
 
 #: lib/htmloutputter.php:104
+msgid "This page is not available in a media type you accept"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "ఇది చాలా పొడవుంది. గరిష్ఠ సందేశ పరిమాణం 140 అక్షరాలు."
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr "పాక్షిక ఎగుమతి."
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr ""
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr "బొమ్మ కాదు లేదా పాడైపోయిన ఫైలు."
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr ""
+
+#: lib/imagefile.php:118
 #, fuzzy
-msgid "This page is not available in a "
-msgstr "హోమ్ పేజీ URL సరైనది కాదు."
+msgid "Lost our file."
+msgstr "అటువంటి సందేశమేమీ లేదు."
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr "తెలియని ఫైలు రకం"
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr "[%s]"
 
 #: lib/joinform.php:114
-#, fuzzy
 msgid "Join"
-msgstr "ప్రవేశించండి"
+msgstr "చేరు"
 
 #: lib/leaveform.php:114
-#, fuzzy
 msgid "Leave"
-msgstr "భద్రపరచు"
+msgstr "వైదొలగు"
 
-#: lib/logingroupnav.php:76
-#, fuzzy
+#: lib/logingroupnav.php:80
 msgid "Login with a username and password"
-msgstr "వాడుకరిపేరు లేదా సంకేతపదం తప్పు."
+msgstr "వాడుకరిపేరు మరియు సంకేతపదాలతో ప్రవేశించండి"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:86
 #, fuzzy
 msgid "Sign up for a new account"
 msgstr "కొత్త ఖాతా సృష్టించుకోండి"
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mail.php:175
+#: lib/mailbox.php:227 lib/noticelist.php:424
+msgid "from"
+msgstr "నుండి"
+
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "ఈమెయిల్ చిరునామా నిర్ధారణ"
+
+#: lib/mail.php:174
 #, php-format
 msgid ""
 "Hey, %s.\n"
 "\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%s\n"
+"\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
 msgstr ""
 
-#: lib/mail.php:236
+#: lib/mail.php:235
 #, php-format
-msgid "%1$s is now listening to "
+msgid "%1$s is now listening to your notices on %2$s."
 msgstr ""
 
-#: lib/mail.php:254
-#, fuzzy, php-format
+#: lib/mail.php:240
+#, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
+
+#: lib/mail.php:253
+#, php-format
 msgid "Location: %s\n"
 msgstr "ప్రాంతం: %s\n"
 
-#: lib/mail.php:256
-#, fuzzy, php-format
+#: lib/mail.php:255
+#, php-format
 msgid "Homepage: %s\n"
-msgstr "హోమ్ పేజీ\n"
+msgstr "హోమ్ పేజీ: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:461
+#: lib/mail.php:285
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: lib/mail.php:288
+#, 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 ""
+
+#: lib/mail.php:412
+#, php-format
+msgid "%s status"
+msgstr "%s స్థితి"
+
+#: lib/mail.php:438
+msgid "SMS confirmation"
+msgstr "SMS నిర్ధారణ"
+
+#: lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr ""
 
-#: lib/mail.php:465
+#: lib/mail.php:466
 #, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
+msgstr ""
+
+#: lib/mail.php:509
+#, php-format
+msgid "New private message from %s"
+msgstr "%s నుండి కొత్త అంతరంగిక సందేశం"
+
+#: lib/mail.php:513
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%5$s\n"
 msgstr ""
 
-#: lib/mail.php:555
+#: lib/mail.php:554
 #, php-format
-msgid "%1$s just added your notice from %2$s"
+msgid "%s (@%s) added your notice as a favorite"
 msgstr ""
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
-msgid "From"
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, php-format
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+msgstr ""
+
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
+
+#: lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
 msgstr ""
 
-#: lib/messageform.php:110
+#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr ""
 
-#: lib/noticeform.php:125
+#: lib/messageform.php:146
+msgid "To"
+msgstr ""
+
+#: lib/messageform.php:162 lib/noticeform.php:173
+msgid "Available characters"
+msgstr "అందుబాటులో ఉన్న అక్షరాలు"
+
+#: lib/noticeform.php:145
 #, fuzzy
 msgid "Send a notice"
 msgstr "కొత్త సందేశం"
 
-#: lib/noticeform.php:152
-#, fuzzy
-msgid "Available characters"
-msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు"
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
+msgstr "%s, సంగతులేమిటి?"
 
-#: lib/noticelist.php:426
-#, fuzzy
-msgid "in reply to"
-msgstr "దీనికి స్పందనగా..."
+#: lib/noticeform.php:180
+msgid "Attach"
+msgstr "జోడించు"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
-msgid "Reply to this notice"
-msgstr ""
+#: lib/noticeform.php:184
+msgid "Attach a file"
+msgstr "ఒక ఫైలుని జోడించు"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:478
 #, fuzzy
-msgid "Reply"
-msgstr "స్పందించు"
+msgid "in context"
+msgstr "విషయం లేదు!"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
-msgid "Delete this notice"
-msgstr ""
+#: lib/noticelist.php:498
+msgid "Reply to this notice"
+msgstr "ఈ నోటీసుపై స్పందించండి"
 
-#: lib/noticelist.php:474
-msgid "Delete"
-msgstr ""
+#: lib/noticelist.php:499
+msgid "Reply"
+msgstr "స్పందించండి"
 
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
@@ -4687,41 +4315,140 @@ msgstr ""
 msgid "Send a nudge to this user"
 msgstr ""
 
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "కొత్త ప్రొపైలుని చేర్చటంలో పొరపాటు"
+
+#: lib/oauthstore.php:291
+#, fuzzy
+msgid "Error inserting avatar"
+msgstr "అవతారాన్ని పెట్టడంలో పొరపాటు"
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "దూరపు ప్రొపైలుని చేర్చటంలో పొరపాటు"
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "కొత్త సందేశం"
+
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
+msgstr ""
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "వ్యక్తిగత"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "స్పందనలు"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr "ఇష్టాంశాలు"
+
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr "వాడుకరి"
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr ""
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr "మీకు వచ్చిన సందేశాలు"
+
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr ""
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr "మీరు పంపిన సందేశాలు"
+
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/profilelist.php:182
-msgid "(none)"
-msgstr ""
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "చందాలు"
+
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "అన్ని చందాలు"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "చందాదార్లు"
+
+#: lib/profileaction.php:157
+msgid "All subscribers"
+msgstr "అందరు చందాదార్లు"
+
+#: lib/profileaction.php:177
+msgid "User ID"
+msgstr "వాడుకరి ID"
+
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "సభ్యులైన తేదీ"
+
+#: lib/profileaction.php:235
+msgid "All groups"
+msgstr "అన్ని గుంపులు"
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "ప్రజా"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:82
 msgid "User groups"
-msgstr ""
+msgstr "వాడుకరి గుంపులు"
 
-#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
-msgstr ""
+msgstr "ఇటీవలి ట్యాగులు"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:88
 msgid "Featured"
-msgstr ""
+msgstr "విశేషం"
 
-#: lib/publicgroupnav.php:90
-#, fuzzy
+#: lib/publicgroupnav.php:92
 msgid "Popular"
-msgstr "వ్యక్తుల అన్వేషణ"
+msgstr "ప్రాచుర్యం"
+
+#: lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "వెతుకు"
+
+#: lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "వెతుకు"
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "ప్రజలు"
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr ""
 
 #: lib/searchgroupnav.php:82
 #, fuzzy
 msgid "Notice"
 msgstr "సందేశాలు"
 
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr ""
+
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr ""
@@ -4730,71 +4457,171 @@ msgstr ""
 msgid "Untitled section"
 msgstr ""
 
-#: lib/subgroupnav.php:81
+#: lib/section.php:106
+msgid "More..."
+msgstr "మరింత..."
+
+#: lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr ""
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:91
 #, fuzzy, php-format
 msgid "People subscribed to %s"
 msgstr "%sకి స్పందనలు"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
+msgstr "%s సభ్యులుగా ఉన్న గుంపులు"
+
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
 msgstr ""
 
-#: lib/subgroupnav.php:104
-#, php-format
-msgid "Invite friends and colleagues to join you on %s"
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
 msgstr ""
 
-#: lib/subs.php:53
-#, fuzzy
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(ఏమీలేవు)"
+
+#: lib/subs.php:48
+msgid "Already subscribed!"
+msgstr ""
+
+#: lib/subs.php:52
 msgid "User has blocked you."
-msgstr "వాడుకరికి ప్రొఫైలు లేదు."
+msgstr "వాడుకరి మిమ్మల్ని నిరోధించారు."
+
+#: lib/subs.php:56
+msgid "Could not subscribe."
+msgstr ""
+
+#: lib/subs.php:75
+msgid "Could not subscribe other to you."
+msgstr ""
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: lib/subs.php:124
 #, fuzzy
-msgid "Subscribe to this user"
+msgid "Not subscribed!"
 msgstr "చందాదార్లు"
 
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
+msgstr "చందాని తొలగించలేకపోయాం."
+
 #: lib/tagcloudsection.php:56
 msgid "None"
-msgstr ""
+msgstr "ఏమీలేదు"
 
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr ""
 
-#: lib/unblockform.php:120 lib/unblockform.php:150
-#, fuzzy
-msgid "Unblock this user"
-msgstr "అటువంటి వాడుకరి లేరు."
-
-#: lib/unblockform.php:150
-msgid "Unblock"
-msgstr ""
-
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr ""
 
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "చందామాను"
+
+#: lib/userprofile.php:116
+msgid "Edit Avatar"
+msgstr "అవతారాన్ని మార్చు"
+
+#: lib/userprofile.php:236
+msgid "User actions"
+msgstr "వాడుకరి చర్యలు"
+
+#: lib/userprofile.php:248
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "కొత్త ఖాతా సృష్టించుకోండి"
+msgid "Edit profile settings"
+msgstr "ఫ్రొఫైలు అమరికలు"
+
+#: lib/userprofile.php:249
+msgid "Edit"
+msgstr "మార్చు"
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "ఈమెయిలుని నిర్ధారించలేకున్నాం."
+#: lib/userprofile.php:272
+msgid "Send a direct message to this user"
+msgstr ""
 
-#~ msgid "Email address"
-#~ msgstr "ఈమెయిల్ చిరునామా"
+#: lib/userprofile.php:273
+msgid "Message"
+msgstr "సందేశం"
 
-#~ msgid "Error inserting notice"
-#~ msgstr "సందేశాన్ని చేర్చటంలో పొరపాటు"
+#: lib/util.php:821
+msgid "a few seconds ago"
+msgstr "కొన్ని క్షణాల క్రితం"
 
-#~ 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 "మీరు మీ సంకేతపదాన్ని మర్చిపోతే, మీ ఖాతాలో భద్రపరచిన ఈమెయిలుకి కొత్తదాన్ని పంపించుకోవచ్చు."
+#: lib/util.php:823
+msgid "about a minute ago"
+msgstr "ఓ నిమిషం క్రితం"
+
+#: lib/util.php:825
+#, php-format
+msgid "about %d minutes ago"
+msgstr "%d నిమిషాల క్రితం"
+
+#: lib/util.php:827
+msgid "about an hour ago"
+msgstr "ఒక గంట క్రితం"
+
+#: lib/util.php:829
+#, php-format
+msgid "about %d hours ago"
+msgstr "%d గంటల క్రితం"
+
+#: lib/util.php:831
+msgid "about a day ago"
+msgstr "ఓ రోజు క్రితం"
+
+#: lib/util.php:833
+#, php-format
+msgid "about %d days ago"
+msgstr "%d రోజుల క్రితం"
+
+#: lib/util.php:835
+msgid "about a month ago"
+msgstr "ఓ నెల క్రితం"
+
+#: lib/util.php:837
+#, php-format
+msgid "about %d months ago"
+msgstr "%d నెలల క్రితం"
+
+#: lib/util.php:839
+msgid "about a year ago"
+msgstr "ఒక సంవత్సరం క్రితం"
+
+#: lib/webcolor.php:82
+#, php-format
+msgid "%s is not a valid color!"
+msgstr "%s అనేది సరైన రంగు కాదు!"
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr ""
+
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr "నమోదైన వాడుకరి కాదు."
+
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr ""
diff --git a/locale/tr/LC_MESSAGES/statusnet.mo b/locale/tr/LC_MESSAGES/statusnet.mo
index d49c7093d..84e32897a 100644
--- a/locale/tr/LC_MESSAGES/statusnet.mo
+++ b/locale/tr/LC_MESSAGES/statusnet.mo
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 4dbc221d1..78261edbb 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -1,4559 +1,3955 @@
-# #-#-#-#-#  statusnet.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.
+# Translation of StatusNet to Turkish
 #
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-01-26 00:13+0000\n"
-"Last-Translator: Egemen Metin Turan <emturan@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:44:20+0000\n"
+"Language-Team: Turkish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
-"X-Poedit-Language: Turkish\n"
-"X-Poedit-Country: TURKEY\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: tr\n"
+"X-Message-Group: out-statusnet\n"
 
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
-#, php-format
-msgid " Search Stream for \"%s\""
-msgstr " \"%s\" için arama sonuçları"
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "Böyle bir durum mesajı yok."
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-#: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
-msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr ""
-"bu özel veriler haricinde: parola, eposta adresi, IM adresi, telefon "
-"numarası."
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
+msgstr "Böyle bir kullanıcı yok."
 
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr ""
+#: actions/all.php:84
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s ve arkadaşları"
 
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
+msgid "%s and friends"
+msgstr "%s ve arkadaşları"
 
-#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
+#: actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "%s için arkadaş güncellemeleri RSS beslemesi"
 
-#: ../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/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "%s için arkadaş güncellemeleri RSS beslemesi"
 
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s %2$s'da durumunuzu takip ediyor"
+#: actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "%s için arkadaş güncellemeleri RSS beslemesi"
 
-#: ../lib/mail.php:126
+#: actions/all.php:127
 #, 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"
+"This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
-"%1$s %2$s durum mesajlarınızı takip etmeye başladı.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Kendisini durumsuz bırakmayın!,\n"
-"%4$s.\n"
 
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/all.php:132
 #, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
 msgstr ""
 
-#: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/all.php:134
 #, 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 actions/invite.php:91
-#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
-#, php-format
-msgid "%s (%s)"
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
 #, php-format
-msgid "%s Public Stream"
-msgstr "%s Genel Durum Mesajları"
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+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
-#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
-#, php-format
-msgid "%s and friends"
+#: actions/all.php:165
+#, fuzzy
+msgid "You and friends"
 msgstr "%s ve arkadaşları"
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
 #, php-format
-msgid "%s public timeline"
+msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
-#, php-format
-msgid "%s status"
-msgstr "%s durum"
-
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
-#, php-format
-msgid "%s timeline"
-msgstr ""
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
+msgstr "Onay kodu bulunamadı."
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
-#, php-format
-msgid "%s updates from everyone!"
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
 msgstr ""
 
-#: ../actions/register.php:213
+#: actions/apiaccountupdatedeliverydevice.php:105
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
 msgstr ""
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Kullanıcı güncellenemedi."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
 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:275 lib/action.php:607
-#, 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:290
-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/finishopenidlogin.php:79 actions/profilesettings.php:76
-#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
 msgstr ""
-"1-64 küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin "
-"verilmez"
 
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Kullanıcı güncellenemedi."
 
-#: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr "6 veya daha fazla karakter"
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Kullanıcının profili yok."
 
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
-msgid "6 or more characters, and don't forget it!"
-msgstr "Unutmayın, 6 veya daha fazla karakter"
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Profil kaydedilemedi."
 
-#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
-msgid "6 or more characters. Required."
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
 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."
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
 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 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."
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
 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 actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
-msgid "API method not found!"
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
 msgstr ""
+"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
 
-#: ../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 actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
-msgid "API method under construction."
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
 msgstr ""
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
-msgid "About"
-msgstr "Hakkında"
-
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
-msgid "Accept"
-msgstr "Kabul et"
-
-#: ../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 actions/emailsettings.php:120
-#: actions/imsettings.php:127 actions/openidsettings.php:111
-#: actions/smssettings.php:133 actions/twittersettings.php:163
-msgid "Add"
-msgstr "Ekle"
-
-#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
-msgstr "OpenID ekle"
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-msgid "Add or remove OpenIDs"
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
 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
-#: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
-msgstr "Adres"
-
-#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-msgid "Addresses of friends to invite (one per line)"
+#: actions/apidirectmessage.php:89
+#, php-format
+msgid "Direct messages from %s"
 msgstr ""
 
-#: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
-msgid "All subscriptions"
-msgstr "Bütün abonelikler"
-
-#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/apidirectmessage.php:93
 #, php-format
-msgid "All updates for %s"
-msgstr "%s için bütün güncellemeler"
+msgid "All the direct messages sent from %s"
+msgstr ""
 
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/apidirectmessage.php:101
 #, php-format
-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:31
-#: actions/openidlogin.php:29 actions/register.php:30
-#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
-msgid "Already logged in."
-msgstr "Zaten giriş yapılmış."
-
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
-msgid "Already subscribed!."
-msgstr "Zaten abone olunmuş!."
+msgid "Direct messages to %s"
+msgstr ""
 
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
-msgid "Are you sure you want to delete this notice?"
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
-msgid "Authorize subscription"
-msgstr "Takip isteğini onayla"
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr ""
 
-#: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
-msgid "Automatically login in the future; not for shared computers!"
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
 msgstr ""
-"Gelecekte kendiliğinden giriş yap, paylaşılan bilgisayarlar için değildir!"
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+#: actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
 msgstr ""
 
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34 actions/avatarsettings.php:65
-#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
-msgid "Avatar"
-msgstr "Avatar"
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+msgstr ""
 
-#: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
-msgid "Avatar updated."
-msgstr "Avatar güncellendi."
+#: actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
+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?)"
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
 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 actions/emailsettings.php:55
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
 msgstr ""
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
-msgid "Awaiting confirmation on this phone number."
+#: actions/apifriendshipscreate.php:118
+#, php-format
+msgid "Could not follow user: %s is already on your list."
 msgstr ""
 
-#: ../lib/util.php:1318 lib/util.php:1452
+#: actions/apifriendshipsdestroy.php:109
 #, fuzzy
-msgid "Before »"
-msgstr "Önce »"
-
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
-#: actions/profilesettings.php:82 actions/register.php:184
-#: actions/profilesettings.php:112 actions/register.php:402
-msgid "Bio"
-msgstr "Hakkında"
+msgid "Could not unfollow user: User not found."
+msgstr "Sunucuya yönlendirme yapılamadı: %s"
 
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
-#: actions/register.php:89 actions/updateprofile.php:104
-#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
-msgid "Bio is too long (max 140 chars)."
-msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
-msgid "Can't delete this notice."
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
-#, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr "Avatar URLi '%s' okunamıyor"
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Kullanıcı güncellenemedi."
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404 actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-msgid "Can't save new password."
-msgstr "Yeni parola kaydedilemedi."
+#: actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Kullanıcı güncellenemedi."
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62 actions/emailsettings.php:58
-#: actions/imsettings.php:59 actions/smssettings.php:62
-#: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
-msgstr "İptal et"
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
+#, fuzzy
+msgid "Could not create group."
+msgstr "Avatar bilgisi kaydedilemedi"
 
-#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "OpenID işlemlerinde hata oluştu."
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Avatar bilgisi kaydedilemedi"
 
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
-msgstr "Jabber işlemlerinde bir hata oluştu."
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Abonelik oluşturulamadı."
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
-msgid "Cannot normalize that email address"
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
+"Takma ad sadece küçük harflerden ve rakamlardan oluşabilir, boşluk "
+"kullanılamaz. "
 
-#: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
-msgstr "Değiştir"
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr "Takma ad kullanımda. Başka bir tane deneyin."
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
-msgstr ""
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "Geçersiz bir takma ad."
 
-#: ../actions/password.php:32 actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr "Parolayı değiştir"
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
 
-#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
-msgid "Change your password"
-msgstr ""
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "Tam isim çok uzun (azm: 255 karakter)."
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-msgid "Change your profile settings"
-msgstr ""
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
 
-#: ../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
-#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
-#: actions/register.php:376 actions/smssettings.php:122
-msgid "Confirm"
-msgstr "Onayla"
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "Yer bilgisi çok uzun (azm: 255 karakter)."
 
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "Adresi Onayla"
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+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
-#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
-msgid "Confirmation cancelled."
-msgstr "Onaylama iptal edildi."
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "%s Geçersiz başlangıç sayfası"
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
-msgid "Confirmation code"
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Takma ad kullanımda. Başka bir tane deneyin."
+
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
 msgstr ""
 
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-msgid "Confirmation code not found."
-msgstr "Onay kodu bulunamadı."
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Zaten giriş yapmış durumdasıznız!"
 
-#: ../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."
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
-msgid "Connect"
-msgstr "Bağlan"
-
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
-msgid "Connect existing account"
-msgstr "Varolan hesaba bağlan"
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Sunucuya yönlendirme yapılamadı: %s"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
-msgid "Contact"
-msgstr "İletişim"
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Bize o profili yollamadınız"
 
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
-#, php-format
-msgid "Could not create OpenID form: %s"
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
 msgstr "OpenID formu yaratılamadı: %s"
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
 #, php-format
-msgid "Could not follow user: %s is already on your list."
+msgid "%s groups"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
-msgid "Could not follow user: User not found."
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
 msgstr ""
 
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Sunucuya yönlendirme yapılamadı: %s"
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "Profil"
 
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
-msgid "Could not save avatar info"
-msgstr "Avatar bilgisi kaydedilemedi"
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Bize o profili yollamadınız"
 
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
-msgid "Could not save new profile info"
-msgstr "Yeni profil bilgisi kaydedilemedi"
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
+msgstr ""
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
-msgid "Could not subscribe other to you."
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
 msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
-msgid "Could not subscribe."
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "Avatar güncellendi."
+
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
 msgstr ""
 
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
 msgstr ""
+"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
 
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-msgid "Couldn't convert request tokens to access tokens."
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
 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
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-msgid "Couldn't delete email confirmation."
-msgstr "Eposta onayı silinemedi."
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
-msgid "Couldn't delete subscription."
-msgstr "Abonelik silinemedi."
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Desteklenmeyen görüntü dosyası biçemi."
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
-msgid "Couldn't find any statuses."
+#: actions/apitimelinefavorites.php:107
+#, php-format
+msgid "%s / Favorites from %s"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-msgid "Couldn't get a request token."
+#: actions/apitimelinefavorites.php:119
+#, php-format
+msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#  Note: Bu federation ozelligi nasilsa simdi kullanilmayacak
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206 actions/emailsettings.php:223
-#: actions/imsettings.php:195 actions/smssettings.php:214
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
-msgid "Couldn't insert confirmation code."
-msgstr "Onay kodu eklenemedi."
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
+#, php-format
+msgid "%s timeline"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
-msgstr "Yeni abonelik eklenemedi."
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-msgid "Couldn't save profile."
-msgstr "Profil kaydedilemedi."
+#: actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s'in %2$s'deki durum mesajları "
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
+#: actions/apitimelinementions.php:126
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
-msgid "Couldn't update user record."
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#, php-format
+msgid "%s public timeline"
 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
-#: actions/confirmaddress.php:114 actions/emailsettings.php:280
-#: actions/emailsettings.php:411 actions/imsettings.php:252
-#: actions/imsettings.php:395 actions/othersettings.php:162
-#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
-msgid "Couldn't update user."
-msgstr "Kullanıcı güncellenemedi."
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
-msgid "Create"
-msgstr "Yarat"
+#: actions/apitimelinetag.php:101 actions/tag.php:66
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
-msgid "Create a new user with this nickname."
-msgstr "Bu takma ad ile yeni bir kullanıcı oluştur."
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "%s adli kullanicinin durum mesajlari"
 
-#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
-msgid "Create new account"
-msgstr "Yeni hesap oluştur"
+#: actions/apiusershow.php:96
+#, fuzzy
+msgid "Not found."
+msgstr "İstek bulunamadı!"
 
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
-msgid "Creating new account for OpenID that already has a user."
-msgstr "OpenID kullanıcısı için hesap oluşturuluyor"
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "Böyle bir belge yok."
 
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "Onaylanmış Jabber/Gtalk adresi."
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+msgstr "Takma ad yok"
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
+#: actions/avatarbynickname.php:64
+msgid "No size."
 msgstr ""
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-msgid "Current confirmed email address."
-msgstr ""
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "Geçersiz büyüklük."
 
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
-msgstr "Şu anda"
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "Avatar"
 
-#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: actions/avatarsettings.php:78
 #, php-format
-msgid "DB error inserting hashtag: %s"
+msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Cevap eklenirken veritabanı hatası: %s"
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
-msgid "Delete notice"
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
 msgstr ""
 
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "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:172
-#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
-#: actions/register.php:385 lib/accountsettingsaction.php:113
-msgid "Email"
-msgstr "Eposta"
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+#, fuzzy
+msgid "Avatar settings"
+msgstr "Ayarlar"
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-msgid "Email Address"
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
 msgstr ""
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
 msgstr ""
 
-#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-msgid "Email address already exists."
-msgstr "Eposta adresi zaten var."
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+msgid "Delete"
+msgstr ""
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
-msgid "Email address confirmation"
-msgstr "Eposta adresi onayı"
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+msgstr "Yükle"
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
 msgstr ""
 
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-msgid "Email addresses"
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
-msgid "Enter a nickname or email address."
-msgstr "Bir takma ad veya eposta adresi girin."
+#: actions/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Beklenmeğen form girdisi."
 
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
-msgid "Error authorizing token"
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
-msgid "Error connecting user to OpenID."
-msgstr "Kullanıcıyı OpenID'ye bağlarken hata oluştu."
-
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
-msgstr "Kullanıcı bağlamada hata oluştu."
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+msgstr "Avatar güncellendi."
 
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
-msgstr "Avatar eklemede hata oluştu"
+#: actions/avatarsettings.php:363
+msgid "Failed updating avatar."
+msgstr "Avatar güncellemede hata."
 
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
-msgstr "Yeni profil eklemede hata oluştu"
+#: actions/avatarsettings.php:387
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Avatar güncellendi."
 
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
-msgstr "Uzak profil eklemede hata oluştu"
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+#, fuzzy
+msgid "No nickname"
+msgstr "Takma ad yok"
 
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
-msgid "Error saving address confirmation."
-msgstr "Adres onayını kaydetmede hata."
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+#, fuzzy
+msgid "No such group"
+msgstr "Böyle bir durum mesajı yok."
 
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
-msgid "Error saving remote profile"
-msgstr "Uzaktaki profili kaydetmede hata oluştu"
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "Kullanıcının profili yok."
 
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-msgid "Error saving the profile."
-msgstr "Profili kaydetmede hata oluştu."
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s ve arkadaşları"
 
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-msgid "Error saving the user."
-msgstr "Kullanıcıyı kaydetmede hata oluştu."
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr ""
 
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
-msgid "Error saving user; invalid."
-msgstr "Kullanıcıyı kaydetmede hata oluştu; geçersiz."
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Böyle bir kullanıcı yok."
 
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
-#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
-#: actions/register.php:108 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-msgid "Error setting user."
-msgstr "Kullanıcı ayarlamada hata oluştu."
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
+msgstr ""
 
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr "Profil güncellemede hata oluştu"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+#, fuzzy
+msgid "Unblock this user"
+msgstr "Böyle bir kullanıcı yok."
 
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
-msgstr "Uzaktaki profili güncellemede hata oluştu"
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Giriş yapılmadı."
 
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr "Onay kodu hatası."
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
-msgid "Existing nickname"
-msgstr "Varolan takma ad"
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
+msgstr ""
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
-msgid "FAQ"
-msgstr "SSS"
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#, fuzzy
+msgid "Block user"
+msgstr "Böyle bir kullanıcı yok."
 
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
-msgid "Failed updating avatar."
-msgstr "Avatar güncellemede hata."
+#: actions/block.php:136
+msgid ""
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
+msgstr ""
 
-#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
-#, php-format
-msgid "Feed for friends of %s"
-msgstr "%s için arkadaş güncellemeleri RSS beslemesi"
+#: actions/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
+msgid "No"
+msgstr ""
 
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
-#, php-format
-msgid "Feed for replies to %s"
-msgstr "Cevaplar için RSS Beslemesi: %s"
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Böyle bir kullanıcı yok."
 
-#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
-#, php-format
-msgid "Feed for tag %s"
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
 msgstr ""
 
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
-msgstr ""
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "Böyle bir kullanıcı yok."
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
+#: actions/block.php:165
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "Zaten giriş yapmış durumdasıznız!"
+
+#: actions/block.php:170
+msgid "Failed to save block information."
 msgstr ""
 
-#: ../actions/login.php:122
-msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
+#: actions/bookmarklet.php:50
+msgid "Post to "
 msgstr ""
-"Güvenliğiniz için, ayarlarınızı değiştirmeden önce lütfen kullanıcı adınızı "
-"ve parolanızı tekrar giriniz."
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
-#: actions/profilesettings.php:77 actions/register.php:178
-#: actions/profilesettings.php:103 actions/register.php:391
-#: actions/showgroup.php:235 actions/showstream.php:262
-#: actions/tagother.php:105 lib/groupeditform.php:142
-msgid "Full name"
-msgstr "Tam İsim"
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+msgstr "Onay kodu yok."
 
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
-#: actions/register.php:86 actions/updateprofile.php:94
-#: actions/editgroup.php:195 actions/newgroup.php:146
-#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
-msgid "Full name is too long (max 255 chars)."
-msgstr "Tam isim çok uzun (azm: 255 karakter)."
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "Onay kodu bulunamadı."
 
-#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
-msgid "Help"
-msgstr "Yardım"
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "O onay kodu sizin için değil!"
 
-#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
-msgid "Home"
-msgstr "Başlangıç"
+#: actions/confirmaddress.php:90
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr "Tanınmayan adres türü %s"
 
-#  Belki Durum Merkezi falan denebilir mi ki?
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
-msgid "Homepage"
-msgstr "Başlangıç Sayfası"
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr "O adres daha önce onaylanmış."
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
-msgid "Homepage is not a valid URL."
-msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "Kullanıcı güncellenemedi."
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
-msgid "I want to post notices by email."
-msgstr ""
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr "Eposta onayı silinemedi."
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
-msgstr ""
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "Adresi Onayla"
 
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
-msgstr "IM adresi"
+#: actions/confirmaddress.php:159
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "\"%s\" adresi hesabınız için onaylandı."
 
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
-msgstr "IM Ayarları"
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Yer"
 
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
-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."
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
+msgstr "Durum mesajları"
 
-#: ../actions/openidsettings.php:45
-msgid ""
-"If you want to add an OpenID to your account, enter it in the box below and "
-"click \"Add\"."
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
+msgstr "Böyle bir durum mesajı yok."
+
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
 msgstr ""
-"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
+#: actions/deletenotice.php:103
 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."
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
 msgstr ""
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-#: actions/emailsettings.php:127 actions/smssettings.php:140
-msgid "Incoming email"
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
 msgstr ""
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
-msgid "Incoming email address removed."
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
 msgstr ""
 
-#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
-msgid "Incorrect old password"
-msgstr "Eski parola yanlış"
+#: actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "Böyle bir durum mesajı yok."
 
-#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
-msgid "Incorrect username or password."
-msgstr "Yanlış kullanıcı adı veya parola."
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+msgid "Delete this notice"
+msgstr ""
 
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
+#: actions/deletenotice.php:157
+msgid "There was a problem with your session token.  Try again, please."
 msgstr ""
-"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:115
-#: actions/updateprofile.php:118
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "Geçersiz avatar URLi '%s'"
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr ""
 
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
-#, php-format
-msgid "Invalid email address: %s"
+#: actions/disfavor.php:94
+msgid "Add to favorites"
 msgstr ""
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
-#, php-format
-msgid "Invalid homepage '%s'"
-msgstr "%s Geçersiz başlangıç sayfası"
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "Böyle bir belge yok."
 
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/editgroup.php:56
 #, php-format
-msgid "Invalid license URL '%s'"
-msgstr "Geçersiz lisans URLi '%s'"
-
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
-msgstr "Geçersiz durum mesajı"
-
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
-msgstr "Geçersiz durum adresi"
-
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
-msgstr "Geçersiz durum adresi"
+msgid "Edit %s group"
+msgstr ""
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "'%s' geçersiz profil adresi."
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
+msgstr ""
 
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+msgid "You must be an admin to edit the group"
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
 msgstr ""
 
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
-#: actions/avatarbynickname.php:69
-msgid "Invalid size."
-msgstr "Geçersiz büyüklük."
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111 actions/finishopenidlogin.php:241
-#: actions/register.php:103 actions/register.php:121
-#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
-msgid "Invalid username or password."
-msgstr "Geçersiz kullanıcı adı veya parola."
+#: actions/editgroup.php:253
+#, fuzzy
+msgid "Could not update group."
+msgstr "Kullanıcı güncellenemedi."
 
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-msgid "Invitation(s) sent"
-msgstr ""
+#: actions/editgroup.php:269
+#, fuzzy
+msgid "Options saved."
+msgstr "Ayarlar kaydedildi."
 
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-msgid "Invitation(s) sent to the following people:"
+#: actions/emailsettings.php:60
+msgid "Email Settings"
 msgstr ""
 
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
-msgid "Invite"
+#: actions/emailsettings.php:71
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-msgid "Invite new users"
-msgstr ""
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "Adres"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
-#, php-format
-msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
 msgstr ""
-"nedurum.com [GNU Affero General Public License](http://www.fsf.org/licensing/"
-"licenses/agpl-3.0.html) lisansı ile korunan [StatusNet](http://status.net/) "
-"microbloglama yazılımının %s. versiyonunu kullanmaktadır."
 
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
-msgstr "Jabber ID başka bir kullanıcıya ait."
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "Kaldır"
 
-#: ../actions/imsettings.php:62 actions/imsettings.php:63
-#, php-format
+#: actions/emailsettings.php:113
 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."
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
 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 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
-msgid "Language"
-msgstr ""
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "İptal et"
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
-msgid "Language is too long (max 50 chars)."
+#: actions/emailsettings.php:121
+msgid "Email Address"
 msgstr ""
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
-msgid "Location"
-msgstr "Yer"
-
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
-#: actions/register.php:92 actions/updateprofile.php:109
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
-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:97
-#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
-#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
-#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
-#, php-format
-msgid "Login"
-msgstr "Giriş"
-
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Bir [OpenID](%%doc.openid%%) hesabı ile giriş yapın."
-
-#: ../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%"
-"%). "
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
 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."
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
-msgid "Logout"
-msgstr "Çıkış"
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "Ekle"
 
-#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
-msgid "Longer name, preferably your \"real\" name"
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
 msgstr ""
 
-#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
-msgid "Lost or forgotten password?"
-msgstr "Parolamı unuttum veya kaybettim"
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
+msgstr ""
 
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-#: actions/emailsettings.php:81 actions/smssettings.php:89
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 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:71
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
 msgstr ""
 
-#: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
-msgid "Member since"
-msgstr "Üyelik başlangıcı"
-
-#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
-#, php-format
-msgid "Microblog by %s"
-msgstr "%s adli kullanicinin durum mesajlari"
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
+msgstr "Tercihler"
 
-#: ../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."
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-msgid "My text and files are available under "
-msgstr "Durum mesajlarim ve dosyalarim şu lisans ile korunmaktadır: "
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#: actions/emailsettings.php:142 actions/smssettings.php:152
-msgid "New"
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
-#, php-format
-msgid "New email address for posting to %s"
+#: actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
-msgid "New incoming email address added."
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
-msgid "New nickname"
-msgstr "Yeni takma ad"
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
+msgstr ""
 
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
-msgstr "Yeni durum mesajı"
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
+msgstr ""
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-msgid "New password"
-msgstr "Yeni parola"
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Kaydet"
 
-#: ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
-msgstr "Yeni parola başarıyla kaydedildi. Şimdi giriş yaptınız."
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+msgstr "Tercihler kaydedildi."
 
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151 actions/login.php:101
-#: actions/profilesettings.php:74 actions/register.php:165
-#: actions/login.php:228 actions/profilesettings.php:98
-#: actions/register.php:367 actions/showgroup.php:224
-#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
-msgid "Nickname"
-msgstr "Takma ad"
+#: actions/emailsettings.php:319
+msgid "No email address."
+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
-#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
-msgid "Nickname already in use. Try another one."
-msgstr "Takma ad kullanımda. Başka bir tane deneyin."
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
+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
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#: actions/emailsettings.php:330
+msgid "Not a valid email address"
 msgstr ""
-"Takma ad sadece küçük harflerden ve rakamlardan oluşabilir, boşluk "
-"kullanılamaz. "
 
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
-msgid "Nickname not allowed."
-msgstr "Takma ada izin verilmiyor."
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
+msgstr ""
 
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
-msgstr "Takip etmek istediğiniz kullanıcının takma adı"
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another user."
+msgstr ""
 
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
-msgid "Nickname or email"
-msgstr "Takma ad veya eposta"
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+msgstr "Onay kodu eklenemedi."
 
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
-msgid "No"
+#: actions/emailsettings.php:358
+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/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
-msgstr "JabberID yok."
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
+msgstr "İptal etmek için beklenen onay yok."
 
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
-msgid "No authorization request!"
-msgstr "Yetkilendirme isteği yok!"
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "Yanlış IM adresi."
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
-msgid "No carrier selected."
-msgstr ""
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "Onaylama iptal edildi."
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
 msgstr ""
 
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
-#: actions/confirmaddress.php:75
-msgid "No confirmation code."
-msgstr "Onay kodu yok."
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "Bu adres kaldırılmıştı."
 
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
-#: actions/newnotice.php:126 classes/Command.php:223
-msgid "No content!"
-msgstr "İçerik yok!"
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
+msgstr ""
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
-msgid "No email address."
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
 msgstr ""
 
-#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
-msgid "No id."
-msgstr "Kullanıcı numarası yok"
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
+msgstr ""
 
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
-msgid "No incoming email address."
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr "Uzaktaki sunucu tarafından bir takma ad sağlanmadı."
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+#, fuzzy
+msgid "Popular notices"
+msgstr "Böyle bir durum mesajı yok."
 
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
-msgid "No nickname."
-msgstr "Takma ad yok"
+#: actions/favorited.php:67
+#, fuzzy, php-format
+msgid "Popular notices, page %d"
+msgstr "Böyle bir durum mesajı yok."
 
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229 actions/emailsettings.php:240
-#: actions/imsettings.php:214 actions/smssettings.php:237
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
-msgid "No pending confirmation to cancel."
-msgstr "İptal etmek için beklenen onay yok."
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
+msgstr ""
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
+#: actions/favorited.php:153
+msgid ""
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
 msgstr ""
 
-#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
-msgid "No registered email address for that user."
-msgstr "Kullanıcı için kaydedilmiş eposta adresi yok."
+#: actions/favorited.php:156
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
+msgstr ""
 
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr "İstek bulunamadı!"
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
 
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
-msgid "No results"
-msgstr "Sonuç yok"
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "%s adli kullanicinin durum mesajlari"
 
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
-msgid "No status found with that ID."
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
-msgid "No status with that ID found."
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
 msgstr ""
 
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
-msgstr "Böyle bir OpenID yok."
-
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
-msgid "No such document."
-msgstr "Böyle bir belge yok."
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+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 actions/shownotice.php:87
-#: lib/deleteaction.php:51
-msgid "No such notice."
-msgstr "Böyle bir durum mesajı yok."
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
+msgstr ""
 
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr "Böyle bir geri alma kodu yok."
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "Yeni durum mesajı"
 
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-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/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 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
-msgid "No such user."
-msgstr "Böyle bir kullanıcı yok."
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Yeni durum mesajı"
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-msgid "No user with that email address or username."
+#: actions/file.php:42
+msgid "No attachments"
 msgstr ""
 
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
-msgstr "Gösterecek hiç kimse yok!"
-
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr "Bir geri alma kodu değil."
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
+#: actions/file.php:51
+msgid "No uploaded attachments"
 msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
-msgid "Not a supported data format."
+#: actions/finishremotesubscribe.php:69
+msgid "Not expecting this response!"
 msgstr ""
 
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
-msgstr "Geçersiz bir Jabber ID"
+#: actions/finishremotesubscribe.php:80
+msgid "User being listened to does not exist."
+msgstr ""
 
-#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-msgid "Not a valid OpenID."
-msgstr "Geçersiz bir OpenID."
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+msgstr "Yerel aboneliği kullanabilirsiniz!"
 
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
-msgid "Not a valid email address"
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-msgid "Not a valid email address."
-msgstr "Geçersiz bir eposta adresi."
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "Yetkilendirilmemiş."
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-#: actions/editgroup.php:186 actions/newgroup.php:137
-#: actions/profilesettings.php:195 actions/register.php:161
-msgid "Not a valid nickname."
-msgstr "Geçersiz bir takma ad."
+#: actions/finishremotesubscribe.php:109
+msgid "Could not convert request token to access token."
+msgstr ""
 
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
-msgstr "Geçersiz profil adresi (yanlış hizmetler)."
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "OMB protokolünün bilinmeğen sürümü."
 
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr "Geçersiz profil adresi (tanımlanmış XRDS yok)."
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "Uzaktaki profili güncellemede hata oluştu"
 
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr "Geçersiz profil adresi (YADIS belgesi yok)."
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+#, fuzzy
+msgid "No such group."
+msgstr "Böyle bir durum mesajı yok."
 
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
-msgid "Not an image or corrupt file."
-msgstr "Bu bir resim dosyası değil ya da dosyada hata var"
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "Böyle bir durum mesajı yok."
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
-msgid "Not authorized."
-msgstr "Yetkilendirilmemiş."
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Böyle bir durum mesajı yok."
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
-msgid "Not expecting this response!"
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
-msgid "Not found"
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
 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 actions/block.php:59 actions/disfavor.php:61
-#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
-#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
-#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
-#: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Giriş yapılmadı."
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "Kullanıcının profili yok."
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
-msgid "Not subscribed!."
-msgstr "Bu kullanıcıyı zaten takip etmiyorsunuz!"
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "Bize o profili yollamadınız"
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
-msgstr ""
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "Böyle bir kullanıcı yok."
 
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
+#: actions/groupblock.php:162
 #, php-format
-msgid "Notice feed for %s"
-msgstr "%s için durum RSS beslemesi"
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
 
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
-msgstr "Bu durum mesajının ait oldugu kullanıcı profili yok"
+#: actions/groupblock.php:178
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "Sunucuya yönlendirme yapılamadı: %s"
 
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
-msgid "Notices"
-msgstr "Durum mesajları"
+#: actions/groupblock.php:179
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "Böyle bir kullanıcı yok."
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
-#, php-format
-msgid "Notices tagged with %s"
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
 msgstr ""
 
-#: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
-msgstr "Eski parola"
+#: actions/groupbyid.php:74
+msgid "No ID"
+msgstr ""
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
-msgid "OpenID"
-msgstr "OpenID"
+#: actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
-msgid "OpenID Account Setup"
-msgstr "OpenID Hesabı Kurulumu"
+#: actions/groupdesignsettings.php:141
+msgid "Group design"
+msgstr ""
 
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-msgid "OpenID Auto-Submit"
+#: actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
 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
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-msgid "OpenID Login"
-msgstr "OpenID Girişi"
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Kullanıcı güncellenemedi."
 
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-#: actions/openidlogin.php:102 actions/openidsettings.php:101
-msgid "OpenID URL"
-msgstr "OpenID URLi"
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+msgid "Unable to save your design settings!"
+msgstr ""
 
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
-msgid "OpenID authentication cancelled."
-msgstr "OpenID yetkilendirilmesi iptal edildi."
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Tercihler kaydedildi."
 
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr "OpenID yetkilendirmesi başarız oldu: %s"
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
+msgstr ""
 
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: actions/grouplogo.php:150
 #, php-format
-msgid "OpenID failure: %s"
-msgstr "OpenID hatası: %s"
-
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr "OpenID kaldırıldı."
-
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
-msgstr "OpenID ayarları"
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
 
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-msgid "Optionally add a personal message to the invitation."
+#: actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
-msgid "Partial upload."
-msgstr "Kısmi yükleme."
+#: actions/grouplogo.php:396
+#, fuzzy
+msgid "Logo updated."
+msgstr "Avatar güncellendi."
 
-#: ../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 actions/finishopenidlogin.php:118
-#: actions/login.php:231 actions/register.php:372
-#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-msgid "Password"
-msgstr "Parola"
+#: actions/grouplogo.php:398
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "Avatar güncellemede hata."
 
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
-msgid "Password and confirmation do not match."
-msgstr "Parola ve onaylaması birbirini tutmuyor."
+#: actions/groupmembers.php:93 lib/groupnav.php:92
+#, php-format
+msgid "%s group members"
+msgstr ""
 
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
-msgid "Password must be 6 chars or more."
-msgstr "Parola 6 veya daha fazla karakterden oluşmalıdır."
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
+msgstr ""
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-msgid "Password recovery requested"
-msgstr "Parola geri alma isteği"
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr ""
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-msgid "Password saved."
-msgstr "Parola kaydedildi."
+#: actions/groupmembers.php:175 lib/groupnav.php:107
+msgid "Admin"
+msgstr ""
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-msgid "Passwords don't match."
-msgstr "Parolalar birbirini tutmuyor."
+#: actions/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
+msgstr ""
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
+#: actions/groupmembers.php:441
+msgid "Make user an admin of the group"
 msgstr ""
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
+#: actions/groupmembers.php:473
+msgid "Make Admin"
 msgstr ""
 
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
-msgstr "Kişi Arama"
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
 
-#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
-msgid "Personal"
-msgstr "Kişisel"
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "%s adli kullanicinin durum mesajlari"
 
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-msgid "Personal message"
+#: actions/groupsearch.php:52
+#, fuzzy, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
+"%%site.name%% ü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:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
+#: actions/groupsearch.php:58
+#, fuzzy
+msgid "Group search"
+msgstr "Kişi Arama"
 
-#: ../actions/userauthorization.php:78
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "Sonuç yok"
+
+#: actions/groupsearch.php:82
+#, php-format
 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\"."
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
 msgstr ""
-"Lütfen bu kullanıcının durumunu takip etmek istediğinizden emin olmak için "
-"detayları gözden geçirin. Kimsenin durumunu taki etme isteğinde "
-"bulunmadıysanız \"İptal\" tuşuna basın. "
 
-#: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
-msgid "Post a notice when my Jabber/GTalk status changes."
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
 msgstr ""
-"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/emailsettings.php:86
-#: actions/imsettings.php:68 actions/smssettings.php:94
-#: actions/twittersettings.php:70 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
-msgid "Preferences"
-msgstr "Tercihler"
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
+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
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
-msgid "Preferences saved."
-msgstr "Tercihler kaydedildi."
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
-msgid "Preferred language"
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
 msgstr ""
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
-msgid "Privacy"
-msgstr "Gizlilik"
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+#, fuzzy
+msgid "Create a new group"
+msgstr "Yeni hesap oluştur"
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-msgid "Problem saving notice."
-msgstr "Durum mesajını kaydederken hata oluştu."
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
-msgid "Profile"
-msgstr "Profil"
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "Kullanıcının profili yok."
 
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
-msgstr "Profil Adresi"
+#: actions/groupunblock.php:128 actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Kullanıcıyı kaydetmede hata oluştu."
 
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
-msgstr "Profil ayarları"
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "IM Ayarları"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-msgid "Profile unknown"
-msgstr "Profil bilinmiyor"
+#: actions/imsettings.php:70
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+"Jabber/GTalk kullanarak durum mesaji gÖnderip alabilirsiniz. IM adres "
+"ayarlarinizi aşağıda yapın."
 
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
-msgid "Public Stream Feed"
-msgstr "Genel Durum Akış RSS Beslemesi"
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
 
-#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
-msgid "Public timeline"
-msgstr "Genel zaman çizgisi"
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Onaylanmış Jabber/Gtalk adresi."
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#: actions/imsettings.php:114
+#, 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 ""
+"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:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
-msgid "Publish a MicroID for my email address."
-msgstr ""
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "IM adresi"
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
+#: actions/imsettings.php:126
+#, 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 veya Gtalk adresi: \"KullaniciAdi@ornek.org\" gibi. Öncelikle %s, IM "
+"istemcisi veya Gtalk arkadaşlar listenize eklenmiş olmalıdır."
 
-#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
-msgid "Recover"
-msgstr "Geri al"
-
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
-msgid "Recover password"
-msgstr "Parolanı geri al"
-
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-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:152 actions/register.php:207 lib/util.php:328
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-msgid "Register"
-msgstr "Kayıt"
+#: actions/imsettings.php:143
+msgid "Send me notices through Jabber/GTalk."
+msgstr "Durum mesajlarını Jabber/GTalk üzerinden gönder."
 
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
-msgid "Registration not allowed."
+#: actions/imsettings.php:148
+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"
 
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
-msgid "Registration successful"
+#: actions/imsettings.php:153
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
-msgid "Reject"
-msgstr "Reddet"
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
 
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
-msgid "Remember me"
-msgstr "Beni hatırla"
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "JabberID yok."
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
-msgid "Remote profile with no matching profile"
-msgstr ""
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr "Jabber işlemlerinde bir hata oluştu."
 
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
-msgstr "Uzaktan abonelik"
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "Geçersiz bir Jabber ID"
 
-#: ../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 actions/emailsettings.php:101
-#: actions/emailsettings.php:134 actions/imsettings.php:102
-#: actions/openidsettings.php:166 actions/smssettings.php:103
-#: actions/smssettings.php:146 actions/twittersettings.php:115
-msgid "Remove"
-msgstr "Kaldır"
+#: actions/imsettings.php:299
+msgid "That is already your Jabber ID."
+msgstr "Bu zaten sizin Jabber ID'niz."
 
-#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
-msgstr "OpenID'yi kaldır"
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr "Jabber ID başka bir kullanıcıya ait."
 
-#: ../actions/openidsettings.php:73
+#: actions/imsettings.php:327
+#, php-format
 msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
 msgstr ""
-"OpenID'nizi sistemden silerseniz giriş yapamazsınız! Eğer silmek "
-"istiyorsanuz, önce yeni bir OpenID ekleyin"
+"Eklemiş olduğunuz IM adresine bir onay kodu gönderildi. %s tarafından size "
+"mesaj yollanabilmesi için onaylamanız gerekmektedir."
 
-#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
-msgid "Replies"
-msgstr "Cevaplar"
+#: actions/imsettings.php:387
+msgid "That is not your Jabber ID."
+msgstr "Bu sizin Jabber ID'niz değil."
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
-#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
-#: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: actions/inbox.php:59
 #, php-format
-msgid "Replies to %s"
-msgstr "%s için cevaplar"
+msgid "Inbox for %s - page %d"
+msgstr ""
 
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
-msgid "Reset"
-msgstr "Sıfırla"
+#: actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
 
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
-msgid "Reset password"
-msgstr "Parolayı sıfırla"
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-msgid "SMS"
+#: actions/invite.php:39
+msgid "Invites have been disabled."
 msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
-msgid "SMS Phone number"
+#: actions/invite.php:41
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
 msgstr ""
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
+#: actions/invite.php:72
+#, php-format
+msgid "Invalid email address: %s"
 msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
-msgid "SMS confirmation"
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
 msgstr ""
 
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
-msgid "Same as password above"
-msgstr "yukarıdaki parolanın aynısı"
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr ""
 
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
-msgid "Same as password above. Required."
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
 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 actions/emailsettings.php:182
-#: actions/facebooksettings.php:114 actions/imsettings.php:157
-#: actions/othersettings.php:117 actions/profilesettings.php:150
-#: actions/smssettings.php:169 actions/subscriptions.php:124
-#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
-msgid "Save"
-msgstr "Kaydet"
+#: actions/invite.php:131 actions/invite.php:139
+#, php-format
+msgid "%s (%s)"
+msgstr ""
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
-msgid "Search"
-msgstr "Ara"
+#: actions/invite.php:136
+msgid ""
+"These people are already users and you were automatically subscribed to them:"
+msgstr ""
 
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
 msgstr ""
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
-#, php-format
+#: actions/invite.php:150
 msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 msgstr ""
-"%%site.name%%'da durum mesajlarının içeriğinde arama yap. Anahtar kelimeleri "
-"boşluk ile ayırın. Anahtar kelime 3 veya daha fazla karakterden oluşmalı."
 
-#: ../actions/peoplesearch.php:28
-#, php-format
+#: actions/invite.php:162
 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."
+"Use this form to invite your friends and colleagues to use this service."
 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ı. "
 
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
-msgid "Select a carrier"
+#: actions/invite.php:187
+msgid "Email addresses"
 msgstr ""
 
-#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
-#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
-msgid "Send"
-msgstr "Gönder"
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
+#: actions/invite.php:192
+msgid "Personal message"
 msgstr ""
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
-msgid "Send me notices through Jabber/GTalk."
-msgstr "Durum mesajlarını Jabber/GTalk üzerinden gönder."
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
+msgstr "Gönder"
 
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
-msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
+#: actions/invite.php:226
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#: actions/invite.php:228
+#, 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/util.php:304 lib/util.php:320 lib/facebookaction.php:215
-msgid "Settings"
-msgstr "Ayarlar"
-
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
-msgid "Settings saved."
-msgstr "Ayarlar kaydedildi."
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
 msgstr ""
 
-#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:114
-msgid "Someone else already has this OpenID."
-msgstr "Bir başkası zaten bu OpenID'ye sahip."
+#: actions/joingroup.php:90 lib/command.php:217
+#, fuzzy
+msgid "You are already a member of that group"
+msgstr "Zaten giriş yapmış durumdasıznız!"
 
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
-msgstr "Garip bir şey oldu."
+#: actions/joingroup.php:128 lib/command.php:234
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s"
+msgstr "Sunucuya yönlendirme yapılamadı: %s"
 
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
+#: actions/joingroup.php:135 lib/command.php:239
+#, php-format
+msgid "%s joined group %s"
 msgstr ""
 
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
-msgid "Source"
-msgstr "Kaynak"
-
-#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
-msgid "Statistics"
-msgstr "İstatistikler"
+#: actions/leavegroup.php:90 lib/command.php:268
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "Bize o profili yollamadınız"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-msgid "Stored OpenID not found."
-msgstr "Kaydedilmiş OpenID bulunamadı."
+#: actions/leavegroup.php:119 lib/command.php:278
+msgid "Could not find membership record."
+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
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
-msgid "Subscribe"
-msgstr "Abone ol"
+#: actions/leavegroup.php:127 lib/command.php:284
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "OpenID formu yaratılamadı: %s"
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
-msgid "Subscribers"
-msgstr "Abone olanlar"
+#: actions/leavegroup.php:134 lib/command.php:289
+#, php-format
+msgid "%s left group %s"
+msgstr ""
 
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
-msgid "Subscription authorized"
-msgstr "Takip talebine izin verildi"
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "Zaten giriş yapılmış."
 
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
-msgid "Subscription rejected"
-msgstr "Abonelik reddedildi."
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Geçersiz durum mesajı"
 
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27 actions/showstream.php:240
-#: actions/showstream.php:322 actions/subscriptions.php:27
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
-msgid "Subscriptions"
-msgstr "Abonelikler"
+#: actions/login.php:143
+msgid "Incorrect username or password."
+msgstr "Yanlış kullanıcı adı veya parola."
 
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
-msgid "System error uploading file."
-msgstr "Dosya yüklemede sistem hatası."
+#: actions/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
+msgstr "Kullanıcı ayarlamada hata oluştu."
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
-#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
-msgid "Tags"
-msgstr ""
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "Giriş"
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
+#: actions/login.php:243
+msgid "Login to site"
 msgstr ""
 
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
-msgid "Text search"
-msgstr "Metin arama"
-
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
-msgstr "Bu OpenID size ait değil."
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Takma ad"
 
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
-msgstr "O adres daha önce onaylanmış."
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Parola"
 
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
-msgstr "O onay kodu sizin için değil!"
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "Beni hatırla"
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
+#: actions/login.php:253 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
+"Gelecekte kendiliğinden giriş yap, paylaşılan bilgisayarlar için değildir!"
 
-#: ../actions/avatar.php:80 actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
-msgstr "Dosya çok büyük."
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "Parolamı unuttum veya kaybettim"
 
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
-msgid "That is already your Jabber ID."
-msgstr "Bu zaten sizin Jabber ID'niz."
+#: actions/login.php:282
+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."
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
-msgid "That is already your email address."
+#: actions/login.php:286
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
 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."
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
-msgid "That is already your phone number."
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
 msgstr ""
 
-#: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
-msgid "That is not your Jabber ID."
-msgstr "Bu sizin Jabber ID'niz değil."
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
-msgid "That is not your email address."
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
 msgstr ""
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
 msgstr ""
 
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-#: actions/emailsettings.php:367 actions/imsettings.php:349
-msgid "That is the wrong IM address."
-msgstr "Yanlış IM adresi."
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr ""
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
+#: actions/newgroup.php:53
+msgid "New group"
 msgstr ""
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-msgid "That phone number already belongs to another user."
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
 msgstr ""
 
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49 actions/twitapistatuses.php:330
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-msgid "That's too long. Max notice size is 140 chars."
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
 msgstr ""
-"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
-msgid "That's too long. Max notice size is 255 chars."
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
 msgstr ""
 
-#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
-#, php-format
-msgid "The address \"%s\" has been confirmed for your account."
-msgstr "\"%s\" adresi hesabınız için onaylandı."
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+msgstr "İçerik yok!"
 
-#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274 actions/emailsettings.php:282
-#: actions/imsettings.php:258 actions/smssettings.php:282
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
-msgid "The address was removed."
-msgstr "Bu adres kaldırılmıştı."
+#: actions/newmessage.php:158
+msgid "No recipient specified."
+msgstr ""
 
-#: ../actions/userauthorization.php:312
+#: actions/newmessage.php:164 lib/command.php:370
 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:"
+"Don't send a message to yourself; just say it to yourself quietly instead."
 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."
+#: actions/newmessage.php:181
+msgid "Message sent"
 msgstr ""
 
-#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/newmessage.php:185 lib/command.php:375
 #, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr "%s adlı kullanıcının durumunu takip edenler"
+msgid "Direct message to %s sent"
+msgstr ""
 
-#: ../actions/subscribers.php:33 actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr "Sizin durumunuzu takip edenler"
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
+msgstr ""
 
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
-#, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr "%s adlı kullanıcının durumlarını takip ettiği kullanıcılar"
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "Yeni durum mesajı"
 
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr "Sizin durumlarını takip ettiğiniz kullanıcılar"
+#: actions/newnotice.php:199
+#, fuzzy
+msgid "Notice posted"
+msgstr "Durum mesajları"
 
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/noticesearch.php:68
+#, php-format
 msgid ""
-"These people are already users and you were automatically subscribed to them:"
+"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ı."
 
-#: ../actions/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
-msgstr "Onay kodu çok eski. Lütfen tekrar başlayınız."
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "Metin arama"
 
-#: ../lib/openid.php:195
-msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
-msgstr ""
-"Bu form kendiliğinden gönderilmeli. Eğer yönlendirilmediyseniz, OpenID "
-"servis sağlayıcınıza yönlenmek için düğmeye basın."
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr " \"%s\" için arama sonuçları"
 
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/noticesearch.php:121
 #, 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'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
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-msgid "This method requires a POST or DELETE."
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 msgstr ""
 
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
-msgid "This method requires a POST."
+#: actions/noticesearch.php:124
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#: ../lib/util.php:164 lib/util.php:246
-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 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
-msgid "Timezone"
-msgstr ""
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "%s adli kullanicinin durum mesajlari"
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
-msgid "Timezone not selected."
-msgstr ""
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "\"%s\" kelimesinin geçtiği tüm güncellemeler"
 
-#: ../actions/remotesubscribe.php:43
-#, php-format
+#: actions/nudge.php:85
 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."
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
 
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
-msgid "Two user ids or screen_names must be supplied."
+#: actions/nudge.php:94
+msgid "Nudge sent"
 msgstr ""
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
-msgid "URL of your homepage, blog, or profile on another site"
+#: actions/nudge.php:97
+msgid "Nudge sent!"
 msgstr ""
-"Web Sitenizin, blogunuzun ya da varsa başka bir sitedeki profilinizin adresi"
 
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-msgid "URL of your profile on another compatible microblogging service"
-msgstr ""
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+msgstr "Bu durum mesajının ait oldugu kullanıcı profili yok"
 
-#: ../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 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-msgid "Unexpected form submission."
-msgstr "Beklenmeğen form girdisi."
+#: actions/oembed.php:86 actions/shownotice.php:180
+#, php-format
+msgid "%1$s's status on %2$s"
+msgstr "%1$s'in %2$s'deki durum mesajları "
 
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
-msgid "Unexpected password reset."
-msgstr "Beklemeğen parola sıfırlaması."
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Bağlan"
 
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-msgid "Unknown action"
+#: actions/oembed.php:160
+msgid "Only "
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-msgid "Unknown version of OMB protocol."
-msgstr "OMB protokolünün bilinmeğen sürümü."
-
-#: ../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 "
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
 msgstr ""
-"Aksi ifade edilmedikce, bu sitedeki içerik yaratıcılarına aittir ve şu "
-"lisans ile korunmaktadır: "
-
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
-#, php-format
-msgid "Unrecognized address type %s"
-msgstr "Tanınmayan adres türü %s"
 
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
-msgstr "Aboneliği sonlandır"
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr ""
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-msgid "Unsupported OMB version"
-msgstr "Desteklenmeyen OMB sürümü"
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr ""
 
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
-msgid "Unsupported image file format."
-msgstr "Desteklenmeyen görüntü dosyası biçemi."
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "Ayarlar"
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
+#: actions/othersettings.php:71
+msgid "Manage various other options."
 msgstr ""
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
+#: actions/othersettings.php:108
+msgid " (free service)"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
-#, php-format
-msgid "Updates from %1$s on %2$s!"
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
 msgstr ""
 
-#: ../actions/avatar.php:68 actions/profilesettings.php:161
-#: actions/avatarsettings.php:162 actions/grouplogo.php:232
-msgid "Upload"
-msgstr "Yükle"
+#: actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "Profil ayarları"
 
-#: ../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."
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
 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
-msgid "Upload a new profile image"
+#: actions/othersettings.php:153
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Yer bilgisi çok uzun (azm: 255 karakter)."
+
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %s - page %d"
 msgstr ""
 
-#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
+#: actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
 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"
+#: actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
-"Sadece sistem güncellemeleri, duyurular ve parola geri alma için kullanılır."
 
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
-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
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-msgid "User has no profile."
-msgstr "Kullanıcının profili yok."
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "Parolayı değiştir"
 
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
-msgstr "Kullanıcı takma adı"
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "Parolayı değiştir"
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr ""
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#, fuzzy
+msgid "Password change"
+msgstr "Parola kaydedildi."
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
-msgid "What timezone are you normally in?"
-msgstr ""
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "Eski parola"
 
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
-#, php-format
-msgid "What's up, %s?"
-msgstr "N'aber %s?"
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "Yeni parola"
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-#: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi"
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6 veya daha fazla karakter"
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
-#, php-format
-msgid "Wrong image type for '%s'"
-msgstr "%s için yanlış resim türü"
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "Onayla"
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
-#, php-format
-msgid "Wrong size image at '%s'"
-msgstr "%s'de yanlış resim boyutu"
+#: actions/passwordsettings.php:113
+msgid "same as password above"
+msgstr "yukaridaki parola ile aynı"
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
-msgid "Yes"
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "Değiştir"
+
+#: actions/passwordsettings.php:154 actions/register.php:230
+msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-msgid "You already have this OpenID!"
-msgstr "Zaten bu OpenID'ye sahipsiniz!"
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "Parolalar birbirini tutmuyor."
 
-#: ../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/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "Eski parola yanlış"
 
-#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
-msgstr "Zaten giriş yapmış durumdasıznız!"
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "Kullanıcıyı kaydetmede hata oluştu; geçersiz."
 
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-msgid "You are already subscribed to these users:"
-msgstr ""
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "Yeni parola kaydedilemedi."
+
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "Parola kaydedildi."
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
-msgid "You are not friends with the specified user."
+#: actions/peoplesearch.php:52
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+"Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
+"%%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/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/peoplesearch.php:58
+msgid "People search"
+msgstr "Kişi Arama"
 
-#: ../actions/register.php:135 actions/register.php:145
-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/peopletag.php:70
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Geçersiz bir eposta adresi."
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
+#: actions/peopletag.php:144
 #, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
+msgid "Users self-tagged with %s - page %d"
 msgstr ""
 
-#: ../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."
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "Geçersiz durum mesajı"
 
-#: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/postnotice.php:90
 #, php-format
-msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
-"Jabber/GTalk kullanarak durum mesaji gÖnderip alabilirsiniz. IM adres "
-"ayarlarinizi aşağıda yapın."
 
-#: ../actions/profilesettings.php:27
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "Profil ayarları"
+
+#: actions/profilesettings.php:71
 msgid ""
 "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."
 
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
-msgstr "Yerel aboneliği kullanabilirsiniz!"
+#: actions/profilesettings.php:99
+#, fuzzy
+msgid "Profile information"
+msgstr "Profil bilinmiyor"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
-msgid "You can't register if you don't agree to the license."
-msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+"1-64 küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin "
+"verilmez"
 
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
-msgid "You did not send us that profile"
-msgstr "Bize o profili yollamadınız"
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full name"
+msgstr "Tam İsim"
 
-#: ../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/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "Başlangıç Sayfası"
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
-msgid "You may not delete another user's status."
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
+"Web Sitenizin, blogunuzun ya da varsa başka bir sitedeki profilinizin adresi"
 
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr ""
+#: actions/profilesettings.php:122 actions/register.php:460
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
 
-#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
+#: actions/profilesettings.php:125 actions/register.php:463
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
 
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr "Harika, sizi tanıdık. Simdi yeni parolanızı girin."
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "Hakkında"
 
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
-msgid "Your OpenID URL"
-msgstr "OpenID URLniz"
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "Yer"
 
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
-msgstr "Bu sunucudaki takma adınız  veya kaydedilmiş eposta adresiniz."
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi"
 
-#: ../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."
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
 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:992 lib/util.php:945
-msgid "a few seconds ago"
-msgstr "birkaç saniye önce"
+#: actions/profilesettings.php:140
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
-#, php-format
-msgid "about %d days ago"
-msgstr "yaklaşık %d gün önce"
+#: actions/profilesettings.php:144
+msgid "Language"
+msgstr ""
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
-#, php-format
-msgid "about %d hours ago"
-msgstr "yaklaşık %d saat önce"
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr ""
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
-#, php-format
-msgid "about %d minutes ago"
-msgstr "yaklaşık %d dakika önce"
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr ""
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
-#, php-format
-msgid "about %d months ago"
-msgstr "yaklaşık %d ay önce"
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
+msgstr ""
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
-msgid "about a day ago"
-msgstr "yaklaşık bir gün önce"
+#: actions/profilesettings.php:160
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
-msgid "about a minute ago"
-msgstr "yaklaşık bir dakika önce"
+#: actions/profilesettings.php:221 actions/register.php:223
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
-msgid "about a month ago"
-msgstr "yaklaşık bir ay önce"
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr ""
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
-msgid "about a year ago"
-msgstr "yaklaşık bir yıl önce"
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr ""
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
-msgid "about an hour ago"
-msgstr "yaklaşık bir saat önce"
+#: actions/profilesettings.php:246 actions/tagother.php:178
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "%s Geçersiz başlangıç sayfası"
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
 msgstr ""
 
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117 actions/noticesearch.php:136
-#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
-msgid "in reply to..."
-msgstr "...cevap olarak"
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+msgstr "Profil kaydedilemedi."
 
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124 actions/noticesearch.php:143
-#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
-msgid "reply"
-msgstr "cevapla"
+#: actions/profilesettings.php:336
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Profil kaydedilemedi."
 
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-msgid "same as password above"
-msgstr "yukaridaki parola ile aynı"
+#: actions/profilesettings.php:344
+msgid "Settings saved."
+msgstr "Ayarlar kaydedildi."
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
-msgid "unsupported file type"
+#: actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
 msgstr ""
 
-#: ../lib/util.php:1309 lib/util.php:1443
-#, fuzzy
-msgid "« After"
-msgstr "« Sonra"
-
-#: 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
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-msgid "There was a problem with your session token. Try again, please."
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
 msgstr ""
 
-#: actions/disfavor.php:55 actions/disfavor.php:81
-msgid "This notice is not a favorite!"
-msgstr ""
+#: actions/public.php:129
+#, fuzzy, php-format
+msgid "Public timeline, page %d"
+msgstr "Genel zaman çizgisi"
 
-#: actions/disfavor.php:63 actions/disfavor.php:87
-msgid "Could not delete favorite."
-msgstr ""
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr "Genel zaman çizgisi"
 
-#: actions/disfavor.php:72 lib/favorform.php:140
-msgid "Favor"
-msgstr ""
+#: actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Genel Durum Akış RSS Beslemesi"
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
-msgstr ""
+#: actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Genel Durum Akış RSS Beslemesi"
 
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-msgid "Send me email when someone sends me a private message."
-msgstr ""
+#: actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Genel Durum Akış RSS Beslemesi"
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
-msgid "This notice is already a favorite!"
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
 msgstr ""
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132 actions/favor.php:86
-#: actions/twitapifavorites.php:125 classes/Command.php:152
-msgid "Could not create favorite."
+#: actions/public.php:182
+msgid "Be the first to post!"
 msgstr ""
 
-#: actions/favor.php:70
-msgid "Disfavor"
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/public.php:233
 #, php-format
-msgid "%s favorite notices"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/public.php:238
 #, php-format
-msgid "Feed of favorite notices of %s"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
 msgstr ""
 
-#: actions/inbox.php:28 actions/inbox.php:59
+#: actions/publictagcloud.php:57
+#, fuzzy
+msgid "Public tag cloud"
+msgstr "Genel Durum Akış RSS Beslemesi"
+
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "Inbox for %s - page %d"
+msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/inbox.php:30 actions/inbox.php:62
+#: actions/publictagcloud.php:69
 #, php-format
-msgid "Inbox for %s"
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
 
-#: actions/inbox.php:53 actions/inbox.php:115
-msgid "This is your inbox, which lists your incoming private messages."
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
 msgstr ""
 
-#: actions/invite.php:178 actions/invite.php:213
+#: actions/publictagcloud.php:75
 #, php-format
 msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
 msgstr ""
 
-#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-msgid "Automatically login in the future; "
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
 msgstr ""
 
-#: actions/login.php:122 actions/login.php:264
-msgid "For security reasons, please re-enter your "
-msgstr ""
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "Zaten giriş yapmış durumdasıznız!"
 
-#: actions/login.php:126 actions/login.php:268
-msgid "Login with your username and password. "
-msgstr ""
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "Böyle bir geri alma kodu yok."
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
-msgid "That's too long. Max message size is 140 chars."
-msgstr ""
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "Bir geri alma kodu değil."
 
-#: actions/newmessage.php:65 actions/newmessage.php:128
-msgid "No recipient specified."
-msgstr ""
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr "Bilinmeye kullanıcı için geri alma kodu"
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206 actions/newmessage.php:131
-#: actions/newmessage.php:168 classes/Command.php:237
-msgid "You can't send a message to this user."
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "Onay kodu hatası."
+
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
+msgstr "Onay kodu çok eski. Lütfen tekrar başlayınız."
+
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
 msgstr ""
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: actions/recoverpassword.php:152
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
 msgstr ""
 
-#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
-msgid "No such user"
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
-#: actions/newmessage.php:117 actions/newmessage.php:67
-msgid "New message"
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
 msgstr ""
 
-#: actions/noticesearch.php:95 actions/noticesearch.php:146
-msgid "Notice without matching profile"
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
 msgstr ""
 
-#: actions/openidsettings.php:28 actions/openidsettings.php:70
-#, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr ""
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
+msgstr "Bu sunucudaki takma adınız  veya kaydedilmiş eposta adresiniz."
 
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
-msgstr ""
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
+msgstr "Geri al"
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr ""
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "Parolayı sıfırla"
 
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-msgid "You can remove an OpenID from your account "
-msgstr ""
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr "Parolanı geri al"
 
-#: actions/outbox.php:28 actions/outbox.php:58
-#, php-format
-msgid "Outbox for %s - page %d"
-msgstr ""
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
+msgstr "Parola geri alma isteği"
 
-#: actions/outbox.php:30 actions/outbox.php:61
-#, php-format
-msgid "Outbox for %s"
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
 msgstr ""
 
-#: actions/outbox.php:53 actions/outbox.php:116
-msgid "This is your outbox, which lists private messages you have sent."
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "Unutmayın, 6 veya daha fazla karakter"
+
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "yukarıdaki parolanın aynısı"
+
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "Sıfırla"
+
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "Bir takma ad veya eposta adresi girin."
+
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
 msgstr ""
 
-#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
-#, php-format
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr "Kullanıcı için kaydedilmiş eposta adresi yok."
+
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "Adres onayını kaydetmede hata."
+
+#: actions/recoverpassword.php:325
 msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+"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."
 
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
-msgid "You can update your personal profile info here "
-msgstr ""
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
+msgstr "Beklemeğen parola sıfırlaması."
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
-msgid "User without matching profile"
-msgstr ""
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "Parola 6 veya daha fazla karakterden oluşmalıdır."
 
-#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
-msgstr ""
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
+msgstr "Parola ve onaylaması birbirini tutmuyor."
 
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
-msgstr ""
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
+msgstr "Yeni parola başarıyla kaydedildi. Şimdi giriş yaptınız."
 
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a "
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-msgid "Your nickname on this server, "
-msgstr ""
+#: actions/register.php:92
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "Onay kodu hatası."
 
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-msgid "Instructions for recovering your password "
+#: actions/register.php:112
+msgid "Registration successful"
 msgstr ""
 
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
-msgid "New password successfully saved. "
-msgstr ""
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "Kayıt"
 
-#: actions/register.php:95 actions/register.php:180
-msgid "Password must be 6 or more characters."
+#: actions/register.php:135
+msgid "Registration not allowed."
 msgstr ""
 
-#: actions/register.php:216
-#, php-format
+#: actions/register.php:198
+msgid "You can't register if you don't agree to the license."
+msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
+
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "Geçersiz bir eposta adresi."
+
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "Eposta adresi zaten var."
+
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "Geçersiz kullanıcı adı veya parola."
+
+#: actions/register.php:342
 msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
 msgstr ""
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
+#: actions/register.php:424
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 
-#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
-#, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
+#: actions/register.php:429
+msgid "6 or more characters. Required."
 msgstr ""
 
-#: actions/showfavorites.php:61 actions/showfavorites.php:145
-#, php-format
-msgid "Feed for favorites of %s"
+#: actions/register.php:433
+msgid "Same as password above. Required."
 msgstr ""
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-msgid "Could not retrieve favorite notices."
-msgstr ""
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "Eposta"
 
-#: actions/showmessage.php:33 actions/showmessage.php:81
-msgid "No such message."
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
+"Sadece sistem güncellemeleri, duyurular ve parola geri alma için kullanılır."
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
-#: actions/showmessage.php:61 actions/showmessage.php:108
-#, php-format
-msgid "Message to %1$s on %2$s"
-msgstr ""
+#: actions/register.php:493
+msgid "My text and files are available under "
+msgstr "Durum mesajlarim ve dosyalarim şu lisans ile korunmaktadır: "
 
-#: actions/showmessage.php:66 actions/showmessage.php:113
-#, php-format
-msgid "Message from %1$s on %2$s"
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
-#: actions/showstream.php:154
-msgid "Send a message"
+#: actions/register.php:496
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
 msgstr ""
+"bu özel veriler haricinde: parola, eposta adresi, IM adresi, telefon "
+"numarası."
 
-#: actions/smssettings.php:312 actions/smssettings.php:464
+#: actions/register.php:537
 #, php-format
-msgid "Mobile carrier for your phone. "
+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/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
-#, php-format
-msgid "Direct messages to %s"
+#: actions/register.php:561
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/remotesubscribe.php:98
 #, php-format
-msgid "All the direct messages sent to %s"
+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/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-msgid "Direct Messages You've Sent"
-msgstr ""
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr "Uzaktan abonelik"
 
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
-#, php-format
-msgid "All the direct messages sent from %s"
-msgstr ""
+#: actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Takip talebine izin verildi"
 
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-msgid "No message text!"
-msgstr ""
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "Kullanıcı takma adı"
 
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-msgid "Recipient user not found."
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr "Takip etmek istediğiniz kullanıcının takma adı"
+
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "Profil Adresi"
+
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-msgid "Can't send direct messages to users who aren't your friend."
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
+msgstr "Abone ol"
+
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
 msgstr ""
 
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
-#, php-format
-msgid "%s / Favorites from %s"
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "Geçersiz profil adresi (YADIS belgesi yok)."
+
+#: actions/remotesubscribe.php:176
+msgid "That’s a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
-#, php-format
-msgid "%s updates favorited by %s / %s."
+#: actions/remotesubscribe.php:183
+msgid "Couldn’t get a request token."
 msgstr ""
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
 #, php-format
-msgid "%s added your notice as a favorite"
-msgstr ""
+msgid "Replies to %s"
+msgstr "%s için cevaplar"
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %s, page %d"
+msgstr "%s için cevaplar"
+
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "%s için durum RSS beslemesi"
+
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "%s için durum RSS beslemesi"
+
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "%s için durum RSS beslemesi"
+
+#: actions/replies.php:198
 #, php-format
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
 msgstr ""
 
-#: actions/twittersettings.php:27
+#: actions/replies.php:203
+#, php-format
 msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
-msgstr ""
-
-#: actions/twittersettings.php:41 actions/twittersettings.php:60
-msgid "Twitter settings"
-msgstr ""
-
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-msgid "Twitter Account"
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
 msgstr ""
 
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-msgid "Current verified Twitter account."
+#: actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr ""
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "%s için cevaplar"
 
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-msgid "No spaces, please."
-msgstr ""
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "Böyle bir durum mesajı yok."
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
 msgstr ""
 
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-msgid "Automatically send my notices to Twitter."
-msgstr ""
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "%s için arkadaş güncellemeleri RSS beslemesi"
 
-#: actions/twittersettings.php:75 actions/twittersettings.php:146
-msgid "Send local \"@\" replies to Twitter."
-msgstr ""
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "%s için arkadaş güncellemeleri RSS beslemesi"
 
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-msgid "Subscribe to my Twitter friends here."
-msgstr ""
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "%s için arkadaş güncellemeleri RSS beslemesi"
 
-#: actions/twittersettings.php:122
+#: actions/showfavorites.php:205
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""
 
-#: actions/twittersettings.php:128 actions/twittersettings.php:334
-msgid "Could not verify your Twitter credentials!"
+#: actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/showfavorites.php:211
 #, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
 msgstr ""
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-msgid "Unable to save your Twitter settings!"
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
 msgstr ""
 
-#: actions/twittersettings.php:174 actions/twittersettings.php:376
-msgid "Twitter settings saved."
+#: actions/showgroup.php:82 lib/groupnav.php:86
+#, php-format
+msgid "%s group"
 msgstr ""
 
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-msgid "That is not your Twitter account."
+#: actions/showgroup.php:84
+#, php-format
+msgid "%s group, page %d"
 msgstr ""
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
-msgid "Couldn't remove Twitter user."
-msgstr ""
+#: actions/showgroup.php:218
+#, fuzzy
+msgid "Group profile"
+msgstr "Böyle bir durum mesajı yok."
 
-#: actions/twittersettings.php:212 actions/twittersettings.php:407
-msgid "Twitter account removed."
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
+msgid "URL"
 msgstr ""
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
-msgid "Couldn't save Twitter preferences."
-msgstr ""
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
+#, fuzzy
+msgid "Note"
+msgstr "Durum mesajları"
 
-#: actions/twittersettings.php:245 actions/twittersettings.php:461
-msgid "Twitter preferences saved."
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
 msgstr ""
 
-#: actions/userauthorization.php:84 actions/userauthorization.php:86
-msgid "Please check these details to make sure "
+#: actions/showgroup.php:293
+msgid "Group actions"
 msgstr ""
 
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
-msgid "The subscription has been authorized, but no "
-msgstr ""
+#: actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "%s için durum RSS beslemesi"
 
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-msgid "The subscription has been rejected, but no "
-msgstr ""
+#: actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "%s için durum RSS beslemesi"
 
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-msgid "Command results"
-msgstr ""
+#: actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "%s için durum RSS beslemesi"
 
-#: classes/Channel.php:148 classes/Channel.php:204
-msgid "Command complete"
-msgstr ""
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "%s için durum RSS beslemesi"
 
-#: classes/Channel.php:158 classes/Channel.php:215
-msgid "Command failed"
-msgstr ""
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
+#, fuzzy
+msgid "Members"
+msgstr "Üyelik başlangıcı"
 
-#: classes/Command.php:39 classes/Command.php:44
-msgid "Sorry, this command is not yet implemented."
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/tagcloudsection.php:71
+msgid "(None)"
 msgstr ""
 
-#: classes/Command.php:96 classes/Command.php:113
-#, php-format
-msgid "Subscriptions: %1$s\n"
+#: actions/showgroup.php:392
+msgid "All members"
 msgstr ""
 
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
-msgid "User has no last notice"
-msgstr ""
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "İstatistikler"
 
-#: classes/Command.php:146 classes/Command.php:166
-msgid "Notice marked as fave."
-msgstr ""
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Yarat"
 
-#: classes/Command.php:166 classes/Command.php:189
+#: actions/showgroup.php:448
 #, php-format
-msgid "%1$s (%2$s)"
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: classes/Command.php:169 classes/Command.php:192
+#: actions/showgroup.php:454
 #, php-format
-msgid "Fullname: %s"
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
 msgstr ""
 
-#: classes/Command.php:172 classes/Command.php:195
-#, php-format
-msgid "Location: %s"
+#: actions/showgroup.php:482
+msgid "Admins"
 msgstr ""
 
-#: classes/Command.php:175 classes/Command.php:198
-#, php-format
-msgid "Homepage: %s"
+#: actions/showmessage.php:81
+msgid "No such message."
 msgstr ""
 
-#: classes/Command.php:178 classes/Command.php:201
-#, php-format
-msgid "About: %s"
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: classes/Command.php:200 classes/Command.php:228
+#: actions/showmessage.php:108
 #, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
+msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: classes/Command.php:214 classes/Command.php:245
+#: actions/showmessage.php:113
 #, php-format
-msgid "Direct message to %s sent"
-msgstr ""
-
-#: classes/Command.php:216 classes/Command.php:247
-msgid "Error sending direct message."
+msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: classes/Command.php:263 classes/Command.php:300
-msgid "Specify the name of the user to subscribe to"
-msgstr ""
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Durum mesajları"
 
-#: classes/Command.php:270 classes/Command.php:307
+#: actions/showstream.php:73
 #, php-format
-msgid "Subscribed to %s"
+msgid " tagged %s"
 msgstr ""
 
-#: classes/Command.php:288 classes/Command.php:328
-msgid "Specify the name of the user to unsubscribe from"
-msgstr ""
-
-#: classes/Command.php:295 classes/Command.php:335
+#: actions/showstream.php:79
 #, php-format
-msgid "Unsubscribed from %s"
-msgstr ""
-
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
-msgid "Command not yet implemented."
-msgstr ""
-
-#: classes/Command.php:313 classes/Command.php:356
-msgid "Notification off."
+msgid "%s, page %d"
 msgstr ""
 
-#: classes/Command.php:315 classes/Command.php:358
-msgid "Can't turn off notification."
-msgstr ""
+#: actions/showstream.php:122
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "%s için durum RSS beslemesi"
 
-#: classes/Command.php:333 classes/Command.php:379
-msgid "Notification on."
-msgstr ""
+#: actions/showstream.php:129
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "%s için durum RSS beslemesi"
 
-#: classes/Command.php:335 classes/Command.php:381
-msgid "Can't turn on notification."
-msgstr ""
+#: actions/showstream.php:136
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "%s için durum RSS beslemesi"
 
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
-msgstr ""
+#: actions/showstream.php:143
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "%s için durum RSS beslemesi"
 
-#: classes/Message.php:53 classes/Message.php:56
-msgid "Could not insert message."
+#: actions/showstream.php:148
+#, php-format
+msgid "FOAF for %s"
 msgstr ""
 
-#: classes/Message.php:63 classes/Message.php:66
-msgid "Could not update message with new URI."
+#: actions/showstream.php:191
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
 msgstr ""
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
 msgstr ""
 
-#: lib/mail.php:147 lib/mail.php:289
+#: actions/showstream.php:198
 #, php-format
 msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: lib/mail.php:249 lib/mail.php:508
+#: actions/showstream.php:234
 #, php-format
-msgid "New private message from %s"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: lib/mail.php:253 lib/mail.php:512
+#: actions/showstream.php:239
 #, php-format
 msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
 msgstr ""
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
+#: actions/smssettings.php:58
+msgid "SMS Settings"
 msgstr ""
 
-#: lib/openid.php:195 lib/openid.php:203
-msgid "This form should automatically submit itself. "
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-msgid "Favorites"
-msgstr ""
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-#, php-format
-msgid "%s's favorite notices"
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-msgid "User"
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-msgid "Inbox"
+#: actions/smssettings.php:130
+msgid "Confirmation code"
 msgstr ""
 
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-msgid "Your incoming messages"
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
 msgstr ""
 
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-msgid "Outbox"
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
 msgstr ""
 
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-msgid "Your sent messages"
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-msgid "Twitter"
+#: actions/smssettings.php:174
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
 msgstr ""
 
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
+#: actions/smssettings.php:306
+msgid "No phone number."
 msgstr ""
 
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-msgid "To"
+#: actions/smssettings.php:311
+msgid "No carrier selected."
 msgstr ""
 
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-msgid "Could not parse message."
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
 msgstr ""
 
-#: actions/all.php:63 actions/facebookhome.php:162
-#, fuzzy, php-format
-msgid "%s and friends, page %d"
-msgstr "%s ve arkadaşları"
-
-#: actions/avatarsettings.php:76
-msgid "You can upload your personal avatar."
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
 msgstr ""
 
-#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/smssettings.php:347
 #, fuzzy
-msgid "Avatar settings"
-msgstr "Ayarlar"
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr "O onay kodu sizin için değil!"
 
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-msgid "Original"
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
 msgstr ""
 
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-msgid "Preview"
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
 msgstr ""
 
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
-msgid "Crop"
+#: actions/smssettings.php:465
+msgid "Mobile carrier"
 msgstr ""
 
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-msgid "There was a problem with your session token. "
+#: actions/smssettings.php:469
+msgid "Select a carrier"
 msgstr ""
 
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-msgid "Pick a square area of the image to be your avatar"
+#: actions/smssettings.php:476
+#, 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/avatarsettings.php:327 actions/grouplogo.php:384
-msgid "Lost our file data."
+#: actions/smssettings.php:498
+msgid "No code entered"
 msgstr ""
 
-#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: actions/subedit.php:70
 #, fuzzy
-msgid "Lost our file."
-msgstr "Böyle bir durum mesajı yok."
-
-#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
-#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
-msgid "Unknown file type"
-msgstr ""
-
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr ""
+msgid "You are not subscribed to that profile."
+msgstr "Bize o profili yollamadınız"
 
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr ""
+#: actions/subedit.php:83
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "Abonelik oluşturulamadı."
 
-#: actions/block.php:111
+#: actions/subscribe.php:55
 #, fuzzy
-msgid "Block user"
+msgid "Not a local user."
 msgstr "Böyle bir kullanıcı yok."
 
-#: actions/block.php:129
-msgid "Are you sure you want to block this user? "
-msgstr ""
-
-#: actions/block.php:162
+#: actions/subscribe.php:69
 #, fuzzy
-msgid "You have already blocked this user."
-msgstr "Zaten giriş yapmış durumdasıznız!"
-
-#: actions/block.php:167
-msgid "Failed to save block information."
-msgstr ""
+msgid "Subscribed"
+msgstr "Abone ol"
 
-#: actions/confirmaddress.php:159
+#: actions/subscribers.php:50
 #, fuzzy, php-format
-msgid "The address \"%s\" has been "
-msgstr "Bu adres kaldırılmıştı."
+msgid "%s subscribers"
+msgstr "Abone olanlar"
 
-#: actions/deletenotice.php:73
-msgid "You are about to permanently delete a notice. "
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %d"
 msgstr ""
 
-#: actions/disfavor.php:94
-msgid "Add to favorites"
-msgstr ""
+#: actions/subscribers.php:63
+msgid "These are the people who listen to your notices."
+msgstr "Sizin durumunuzu takip edenler"
 
-#: actions/editgroup.php:54
+#: actions/subscribers.php:67
 #, php-format
-msgid "Edit %s group"
+msgid "These are the people who listen to %s's notices."
+msgstr "%s adlı kullanıcının durumunu takip edenler"
+
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
 msgstr ""
 
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-msgid "Inboxes must be enabled for groups to work"
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
 
-#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-msgid "You must be logged in to create a group."
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
 msgstr ""
 
-#: actions/editgroup.php:87 actions/grouplogo.php:87
-#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
-#, fuzzy
-msgid "No nickname"
-msgstr "Takma ad yok"
+#: actions/subscriptions.php:52
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "Bütün abonelikler"
 
-#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
-#: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
-#, fuzzy
-msgid "No such group"
-msgstr "Böyle bir durum mesajı yok."
+#: actions/subscriptions.php:54
+#, fuzzy, php-format
+msgid "%s subscriptions, page %d"
+msgstr "Bütün abonelikler"
 
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
-msgid "You must be an admin to edit the group"
-msgstr ""
+#: actions/subscriptions.php:65
+msgid "These are the people whose notices you listen to."
+msgstr "Sizin durumlarını takip ettiğiniz kullanıcılar"
 
-#: actions/editgroup.php:157
-msgid "Use this form to edit the group."
+#: actions/subscriptions.php:69
+#, php-format
+msgid "These are the people whose notices %s listens to."
+msgstr "%s adlı kullanıcının durumlarını takip ettiği kullanıcılar"
+
+#: actions/subscriptions.php:121
+#, php-format
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
 msgstr ""
 
-#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s %2$s'da durumunuzu takip ediyor"
+
+#: actions/subscriptions.php:194
 #, fuzzy
-msgid "Nickname must have only lowercase letters "
+msgid "Jabber"
+msgstr "JabberID yok."
+
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
 msgstr ""
-"Takma ad sadece küçük harflerden ve rakamlardan oluşabilir, boşluk "
-"kullanılamaz. "
 
-#: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/tagother.php:33
 #, fuzzy
-msgid "description is too long (max 140 chars)."
-msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
+msgid "Not logged in"
+msgstr "Giriş yapılmadı."
 
-#: actions/editgroup.php:218
+#: actions/tagother.php:39
 #, fuzzy
-msgid "Could not update group."
-msgstr "Kullanıcı güncellenemedi."
+msgid "No id argument."
+msgstr "Böyle bir belge yok."
 
-#: actions/editgroup.php:226
+#: actions/tagother.php:65
+#, php-format
+msgid "Tag %s"
+msgstr ""
+
+#: actions/tagother.php:77 lib/userprofile.php:75
 #, fuzzy
-msgid "Options saved."
-msgstr "Ayarlar kaydedildi."
+msgid "User profile"
+msgstr "Kullanıcının profili yok."
 
-#: actions/emailsettings.php:107 actions/imsettings.php:108
-#, fuzzy, php-format
-msgid "Awaiting confirmation on this address. "
-msgstr "Onay kodu hatası."
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
+msgstr ""
 
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-msgid "Make a new email address for posting to; "
+#: actions/tagother.php:141
+msgid "Tag user"
 msgstr ""
 
-#: actions/emailsettings.php:157
-msgid "Send me email when someone "
+#: actions/tagother.php:151
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
 msgstr ""
 
-#: actions/emailsettings.php:168
-msgid "Allow friends to nudge me and send me an email."
+#: actions/tagother.php:193
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/emailsettings.php:321
+#: actions/tagother.php:200
 #, fuzzy
-msgid "That email address already belongs "
-msgstr "Eposta adresi zaten var."
+msgid "Could not save tags."
+msgstr "Avatar bilgisi kaydedilemedi"
 
-#: actions/emailsettings.php:343
-#, fuzzy
-msgid "A confirmation code was sent to the email address you added. "
+#: actions/tagother.php:236
+msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
-"Eklemiş olduğunuz IM adresine bir onay kodu gönderildi. %s tarafından size "
-"mesaj yollanabilmesi için onaylamanız gerekmektedir."
 
-#: actions/facebookhome.php:110
-msgid "Server error - couldn't get user!"
-msgstr ""
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "%s adli kullanicinin durum mesajlari"
 
-#: actions/facebookhome.php:196
-#, php-format
-msgid "If you would like the %s app to automatically update "
-msgstr ""
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "%s için durum RSS beslemesi"
 
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr ""
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "%s için durum RSS beslemesi"
 
-#: actions/facebookhome.php:218
-msgid "Skip"
-msgstr ""
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "%s için durum RSS beslemesi"
 
-#: actions/facebookhome.php:235
+#: actions/tagrss.php:35
 #, fuzzy
-msgid "No notice content!"
-msgstr "İçerik yok!"
+msgid "No such tag."
+msgstr "Böyle bir durum mesajı yok."
 
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-msgid "Pagination"
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
 msgstr ""
 
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/unsubscribe.php:77
 #, fuzzy
-msgid "After"
-msgstr "« Sonra"
-
-#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
-#, fuzzy
-msgid "Before"
-msgstr "Önce »"
+msgid "No profile id in request."
+msgstr "Yetkilendirme isteği yok!"
 
-#: actions/facebookinvite.php:70
-#, php-format
-msgid "Thanks for inviting your friends to use %s"
+#: actions/unsubscribe.php:84
+msgid "No profile with that id."
 msgstr ""
 
-#: actions/facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr ""
+#: actions/unsubscribe.php:98
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Aboneliği sonlandır"
 
-#: actions/facebookinvite.php:96
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
 #, php-format
-msgid "You have been invited to %s"
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
-#: actions/facebookinvite.php:105
-#, fuzzy, php-format
-msgid "Invite your friends to use %s"
-msgstr "%s için arkadaş güncellemeleri RSS beslemesi"
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "Takip isteğini onayla"
 
-#: actions/facebookinvite.php:113
-#, php-format
-msgid "Friends already using %s:"
+#: actions/userauthorization.php:110
+#, fuzzy
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
 msgstr ""
+"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/facebookinvite.php:130
-#, php-format
-msgid "Send invitations"
+#: actions/userauthorization.php:188
+msgid "License"
 msgstr ""
 
-#: actions/facebookremove.php:56
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "Kabul et"
+
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
 #, fuzzy
-msgid "Couldn't remove Facebook user."
-msgstr "Kullanıcı güncellenemedi."
+msgid "Subscribe to this user"
+msgstr "Takip talebine izin verildi"
 
-#: actions/facebooksettings.php:65
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "Reddet"
 
-#: actions/facebooksettings.php:67
+#: actions/userauthorization.php:212
 #, fuzzy
-msgid "Sync preferences saved."
-msgstr "Tercihler kaydedildi."
+msgid "Reject this subscription"
+msgstr "Bütün abonelikler"
+
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
+msgstr "Yetkilendirme isteği yok!"
+
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+msgstr "Takip talebine izin verildi"
 
-#: actions/facebooksettings.php:90
-msgid "Automatically update my Facebook status with my notices."
+#: actions/userauthorization.php:249
+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/facebooksettings.php:97
-msgid "Send \"@\" replies to Facebook."
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
+msgstr "Abonelik reddedildi."
+
+#: actions/userauthorization.php:261
+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/facebooksettings.php:106
-#, fuzzy
-msgid "Prefix"
-msgstr "Profil"
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
 
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
 msgstr ""
 
-#: actions/facebooksettings.php:124
+#: actions/userauthorization.php:307
 #, php-format
-msgid "If you would like %s to automatically update "
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr ""
 
-#: actions/facebooksettings.php:147
-#, fuzzy
-msgid "Sync preferences"
-msgstr "Tercihler"
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
 
-#: actions/favor.php:94 lib/disfavorform.php:140
-msgid "Disfavor favorite"
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr ""
 
-#: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
-#, fuzzy
-msgid "Popular notices"
-msgstr "Böyle bir durum mesajı yok."
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Avatar URLi '%s' okunamıyor"
 
-#: actions/favorited.php:67
+#: actions/userauthorization.php:348
 #, fuzzy, php-format
-msgid "Popular notices, page %d"
-msgstr "Böyle bir durum mesajı yok."
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "%s için yanlış resim türü"
 
-#: actions/favorited.php:79
-msgid "The most popular notices on the site right now."
-msgstr ""
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr "Kullanıcı numarası yok"
 
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
-msgid "Featured users"
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "Profil ayarları"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
 msgstr ""
 
-#: actions/featured.php:71
-#, php-format
-msgid "Featured users, page %d"
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
 msgstr ""
 
-#: actions/featured.php:99
+#: actions/usergroups.php:64
 #, php-format
-msgid "A selection of some of the great users on %s"
+msgid "%s groups, page %d"
 msgstr ""
 
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
+#: actions/usergroups.php:130
+msgid "Search for more groups"
 msgstr ""
 
-#: actions/groupbyid.php:79
-msgid "No ID"
-msgstr ""
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "Bize o profili yollamadınız"
 
-#: actions/grouplogo.php:138 actions/grouplogo.php:191
-msgid "Group logo"
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
 
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
+#: classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
 msgstr ""
 
-#: actions/grouplogo.php:448
-#, fuzzy
-msgid "Logo updated."
-msgstr "Avatar güncellendi."
-
-#: actions/grouplogo.php:450
-#, fuzzy
-msgid "Failed updating logo."
-msgstr "Avatar güncellemede hata."
-
-#: actions/groupmembers.php:93 lib/groupnav.php:91
+#: classes/File.php:147
 #, php-format
-msgid "%s group members"
+msgid "A file this large would exceed your user quota of %d bytes."
 msgstr ""
 
-#: actions/groupmembers.php:96
+#: classes/File.php:154
 #, php-format
-msgid "%s group members, page %d"
+msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
+#: classes/Message.php:55
+msgid "Could not insert message."
 msgstr ""
 
-#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
-msgid "Groups"
+#: classes/Message.php:65
+msgid "Could not update message with new URI."
 msgstr ""
 
-#: actions/groups.php:64
+#: classes/Notice.php:164
 #, php-format
-msgid "Groups, page %d"
+msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: actions/groups.php:90
-#, php-format
-msgid "%%%%site.name%%%% groups let you find and talk with "
-msgstr ""
+#: classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Durum mesajını kaydederken hata oluştu."
 
-#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: classes/Notice.php:183
 #, fuzzy
-msgid "Create a new group"
-msgstr "Yeni hesap oluştur"
+msgid "Problem saving notice. Unknown user."
+msgstr "Durum mesajını kaydederken hata oluştu."
 
-#: actions/groupsearch.php:57
-#, fuzzy, php-format
+#: classes/Notice.php:188
 msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
+"Too many notices too fast; take a breather and post again in a few minutes."
 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ı. "
 
-#: actions/groupsearch.php:63
-#, fuzzy
-msgid "Group search"
-msgstr "Kişi Arama"
+#: classes/Notice.php:194
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
 
-#: actions/imsettings.php:70
-msgid "You can send and receive notices through "
+#: classes/Notice.php:202
+msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: actions/imsettings.php:120
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
+msgstr "Durum mesajını kaydederken hata oluştu."
+
+#: classes/Notice.php:1120
 #, php-format
-msgid "Jabber or GTalk address, "
-msgstr ""
+msgid "DB error inserting reply: %s"
+msgstr "Cevap eklenirken veritabanı hatası: %s"
 
-#: actions/imsettings.php:147
-#, fuzzy
-msgid "Send me replies through Jabber/GTalk "
-msgstr "Durum mesajlarını Jabber/GTalk üzerinden gönder."
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr ""
 
-#: actions/imsettings.php:321
-#, fuzzy, php-format
-msgid "A confirmation code was sent "
-msgstr "Onay kodu yok."
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Profil"
 
-#: actions/joingroup.php:65
-msgid "You must be logged in to join a group."
+#: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
 msgstr ""
 
-#: actions/joingroup.php:95
+#: lib/accountsettingsaction.php:112
 #, fuzzy
-msgid "You are already a member of that group"
-msgstr "Zaten giriş yapmış durumdasıznız!"
-
-#: actions/joingroup.php:128
-#, fuzzy, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Sunucuya yönlendirme yapılamadı: %s"
+msgid "Upload an avatar"
+msgstr "Avatar güncellemede hata."
 
-#: actions/joingroup.php:135
-#, php-format
-msgid "%s joined group %s"
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
 msgstr ""
 
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
 msgstr ""
 
-#: actions/leavegroup.php:65
-msgid "You must be logged in to leave a group."
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
 msgstr ""
 
-#: actions/leavegroup.php:88
-#, fuzzy
-msgid "No such group."
-msgstr "Böyle bir durum mesajı yok."
-
-#: actions/leavegroup.php:95
+#: lib/accountsettingsaction.php:124
 #, fuzzy
-msgid "You are not a member of that group."
-msgstr "Bize o profili yollamadınız"
+msgid "Design your profile"
+msgstr "Kullanıcının profili yok."
 
-#: actions/leavegroup.php:100
-msgid "You may not leave a group while you are its administrator."
+#: lib/accountsettingsaction.php:128
+msgid "Other"
 msgstr ""
 
-#: actions/leavegroup.php:130
-msgid "Could not find membership record."
+#: lib/accountsettingsaction.php:128
+msgid "Other options"
 msgstr ""
 
-#: actions/leavegroup.php:138
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "OpenID formu yaratılamadı: %s"
-
-#: actions/leavegroup.php:145
+#: lib/action.php:144
 #, php-format
-msgid "%s left group %s"
+msgid "%s - %s"
 msgstr ""
 
-#: actions/login.php:225 lib/facebookaction.php:304
-msgid "Login to site"
+#: lib/action.php:159
+msgid "Untitled page"
 msgstr ""
 
-#: actions/microsummary.php:69
-msgid "No current status"
+#: lib/action.php:424
+msgid "Primary site navigation"
 msgstr ""
 
-#: actions/newgroup.php:53
-msgid "New group"
-msgstr ""
+#: lib/action.php:430
+msgid "Home"
+msgstr "Başlangıç"
 
-#: actions/newgroup.php:115
-msgid "Use this form to create a new group."
+#: lib/action.php:430
+msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: actions/newgroup.php:177
-#, fuzzy
-msgid "Could not create group."
-msgstr "Avatar bilgisi kaydedilemedi"
-
-#  Note: Bu federation ozelligi nasilsa simdi kullanilmayacak
-#: actions/newgroup.php:191
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "Abonelik oluşturulamadı."
-
-#: actions/newmessage.php:119 actions/newnotice.php:132
+#: lib/action.php:432
 #, fuzzy
-msgid "That's too long. "
-msgstr "Dosya çok büyük."
+msgid "Account"
+msgstr "Hakkında"
 
-#: actions/newmessage.php:134
-msgid "Don't send a message to yourself; "
+#: lib/action.php:432
+msgid "Change your email, avatar, password, profile"
 msgstr ""
 
-#: actions/newnotice.php:166
+#: lib/action.php:435
+msgid "Connect"
+msgstr "Bağlan"
+
+#: lib/action.php:435
 #, fuzzy
-msgid "Notice posted"
-msgstr "Durum mesajları"
+msgid "Connect to services"
+msgstr "Sunucuya yönlendirme yapılamadı: %s"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
-msgid "Ajax Error"
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
 msgstr ""
 
-#: actions/nudge.php:85
-msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+#: lib/action.php:440 lib/subgroupnav.php:106
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: actions/nudge.php:94
-msgid "Nudge sent"
-msgstr ""
+#: lib/action.php:445
+msgid "Logout"
+msgstr "Çıkış"
 
-#: actions/nudge.php:97
-msgid "Nudge sent!"
+#: lib/action.php:445
+msgid "Logout from the site"
 msgstr ""
 
-#: actions/openidlogin.php:97
+#: lib/action.php:450
 #, fuzzy
-msgid "OpenID login"
-msgstr "OpenID Girişi"
+msgid "Create an account"
+msgstr "Yeni hesap oluştur"
 
-#: actions/openidsettings.php:128
-#, fuzzy
-msgid "Removing your only OpenID "
-msgstr "OpenID'yi kaldır"
+#: lib/action.php:453
+msgid "Login to the site"
+msgstr ""
 
-#: actions/othersettings.php:60
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
+msgstr "Yardım"
+
+#: lib/action.php:456
 #, fuzzy
-msgid "Other Settings"
-msgstr "Ayarlar"
+msgid "Help me!"
+msgstr "Yardım"
 
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr ""
+#: lib/action.php:459
+msgid "Search"
+msgstr "Ara"
 
-#: actions/othersettings.php:93
-msgid "URL Auto-shortening"
+#: lib/action.php:459
+msgid "Search for people or text"
 msgstr ""
 
-#: actions/othersettings.php:112
+#: lib/action.php:480
 #, fuzzy
-msgid "Service"
-msgstr "Ara"
+msgid "Site notice"
+msgstr "Yeni durum mesajı"
 
-#: actions/othersettings.php:113
-msgid "Automatic shortening service to use."
+#: lib/action.php:546
+msgid "Local views"
 msgstr ""
 
-#: actions/othersettings.php:144
+#: lib/action.php:612
 #, fuzzy
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "Yer bilgisi çok uzun (azm: 255 karakter)."
+msgid "Page notice"
+msgstr "Yeni durum mesajı"
 
-#: actions/passwordsettings.php:69
+#: lib/action.php:714
 #, fuzzy
-msgid "Change your password."
-msgstr "Parolayı değiştir"
+msgid "Secondary site navigation"
+msgstr "Abonelikler"
 
-#: actions/passwordsettings.php:89
-#, fuzzy
-msgid "Password change"
-msgstr "Parola kaydedildi."
+#: lib/action.php:721
+msgid "About"
+msgstr "Hakkında"
 
-#: actions/peopletag.php:35
-#, fuzzy, php-format
-msgid "Not a valid people tag: %s"
-msgstr "Geçersiz bir eposta adresi."
+#: lib/action.php:723
+msgid "FAQ"
+msgstr "SSS"
 
-#: actions/peopletag.php:47
-#, php-format
-msgid "Users self-tagged with %s - page %d"
+#: lib/action.php:727
+msgid "TOS"
 msgstr ""
 
-#: actions/peopletag.php:91
-#, php-format
-msgid "These are users who have tagged themselves \"%s\" "
-msgstr ""
+#: lib/action.php:730
+msgid "Privacy"
+msgstr "Gizlilik"
 
-#: actions/profilesettings.php:91
-#, fuzzy
-msgid "Profile information"
-msgstr "Profil bilinmiyor"
+#: lib/action.php:732
+msgid "Source"
+msgstr "Kaynak"
 
-#: actions/profilesettings.php:124
-msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
-msgstr ""
+#: lib/action.php:734
+msgid "Contact"
+msgstr "İletişim"
 
-#: actions/profilesettings.php:144
-msgid "Automatically subscribe to whoever "
+#: lib/action.php:736
+msgid "Badge"
 msgstr ""
 
-#: actions/profilesettings.php:229 actions/tagother.php:176
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "%s Geçersiz başlangıç sayfası"
-
-#: actions/profilesettings.php:311
-#, fuzzy
-msgid "Couldn't save tags."
-msgstr "Profil kaydedilemedi."
-
-#: actions/public.php:107
-#, fuzzy, php-format
-msgid "Public timeline, page %d"
-msgstr "Genel zaman çizgisi"
-
-#: actions/public.php:173
-msgid "Could not retrieve public stream."
+#: lib/action.php:764
+msgid "StatusNet software license"
 msgstr ""
 
-#: actions/public.php:220
+#: lib/action.php:767
 #, php-format
 msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
+"**%%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. "
 
-#: actions/publictagcloud.php:57
-#, fuzzy
-msgid "Public tag cloud"
-msgstr "Genel Durum Akış RSS Beslemesi"
-
-#: actions/publictagcloud.php:63
+#: lib/action.php:769
 #, php-format
-msgid "These are most popular recent tags on %s "
-msgstr ""
-
-#: actions/publictagcloud.php:119
-msgid "Tag cloud"
-msgstr ""
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** bir aninda mesajlaşma sosyal ağıdır."
 
-#: actions/register.php:139 actions/register.php:349
-msgid "Sorry, only invited people can register."
+#: lib/action.php:771
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
+"nedurum.com [GNU Affero General Public License](http://www.fsf.org/licensing/"
+"licenses/agpl-3.0.html) lisansı ile korunan [StatusNet](http://status.net/) "
+"microbloglama yazılımının %s. versiyonunu kullanmaktadır."
 
-#: actions/register.php:149
+#: lib/action.php:785
 #, fuzzy
-msgid "You can't register if you don't "
-msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
-
-#: actions/register.php:286
-msgid "With this form you can create "
-msgstr ""
+msgid "Site content license"
+msgstr "Yeni durum mesajı"
 
-#: actions/register.php:368
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, "
+#: lib/action.php:794
+msgid "All "
 msgstr ""
-"1-64 küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin "
-"verilmez"
 
-#: actions/register.php:382 actions/register.php:386
-#, fuzzy
-msgid "Used only for updates, announcements, "
+#: lib/action.php:799
+msgid "license."
 msgstr ""
-"Sadece sistem güncellemeleri, duyurular ve parola geri alma için kullanılır."
 
-#: actions/register.php:398
-#, fuzzy
-msgid "URL of your homepage, blog, "
+#: lib/action.php:1052
+msgid "Pagination"
 msgstr ""
-"Web Sitenizin, blogunuzun ya da varsa başka bir sitedeki profilinizin adresi"
 
-#: actions/register.php:404
+#: lib/action.php:1061
 #, fuzzy
-msgid "Describe yourself and your "
-msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
-
-#: actions/register.php:410
-#, fuzzy
-msgid "Where you are, like \"City, "
-msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi"
+msgid "After"
+msgstr "« Sonra"
 
-#: actions/register.php:432
+#: lib/action.php:1069
 #, fuzzy
-msgid " except this private data: password, "
-msgstr ""
-"bu özel veriler haricinde: parola, eposta adresi, IM adresi, telefon "
-"numarası."
+msgid "Before"
+msgstr "Önce »"
 
-#: actions/register.php:471
-#, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
+#: lib/action.php:1117
+msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/register.php:495
-msgid "(You should receive a message by email "
+#: lib/attachmentlist.php:87
+msgid "Attachments"
 msgstr ""
 
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
+#: lib/attachmentlist.php:265
+msgid "Author"
 msgstr ""
 
-#: actions/replies.php:118
-#, fuzzy, php-format
-msgid "Replies to %s, page %d"
-msgstr "%s için cevaplar"
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "Profil"
 
-#: actions/showfavorites.php:79
-#, php-format
-msgid "%s favorite notices, page %d"
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
 msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
-#, php-format
-msgid "%s group"
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
 msgstr ""
 
-#: actions/showgroup.php:79
-#, php-format
-msgid "%s group, page %d"
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
 msgstr ""
 
-#: actions/showgroup.php:206
-#, fuzzy
-msgid "Group profile"
-msgstr "Böyle bir durum mesajı yok."
-
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
-msgid "URL"
+#: lib/channel.php:210
+msgid "Command complete"
 msgstr ""
 
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
-#, fuzzy
-msgid "Note"
-msgstr "Durum mesajları"
-
-#: actions/showgroup.php:270
-msgid "Group actions"
+#: lib/channel.php:221
+msgid "Command failed"
 msgstr ""
 
-#: actions/showgroup.php:323
-#, fuzzy, php-format
-msgid "Notice feed for %s group"
-msgstr "%s için durum RSS beslemesi"
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
-#, fuzzy
-msgid "Members"
-msgstr "Üyelik başlangıcı"
+#: lib/command.php:88
+#, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Kullanıcı güncellenemedi."
 
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
-msgid "(None)"
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: actions/showgroup.php:370
-msgid "All members"
+#: lib/command.php:99
+#, php-format
+msgid "Nudge sent to %s"
 msgstr ""
 
-#: actions/showgroup.php:378
+#: lib/command.php:126
 #, php-format
 msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
 msgstr ""
 
-#: actions/showmessage.php:98
-msgid "Only the sender and recipient "
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
 msgstr ""
 
-#: actions/showstream.php:73
-#, php-format
-msgid "%s, page %d"
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
 msgstr ""
 
-#: actions/showstream.php:143
-#, fuzzy
-msgid "'s profile"
-msgstr "Profil"
-
-#: actions/showstream.php:236 actions/tagother.php:77
-#, fuzzy
-msgid "User profile"
-msgstr "Kullanıcının profili yok."
-
-#: actions/showstream.php:240 actions/tagother.php:81
-msgid "Photo"
+#: lib/command.php:190
+msgid "Notice marked as fave."
 msgstr ""
 
-#: actions/showstream.php:317
-msgid "User actions"
+#: lib/command.php:315
+#, php-format
+msgid "%1$s (%2$s)"
 msgstr ""
 
-#: actions/showstream.php:342
-msgid "Send a direct message to this user"
+#: lib/command.php:318
+#, php-format
+msgid "Fullname: %s"
 msgstr ""
 
-#: actions/showstream.php:343
-msgid "Message"
+#: lib/command.php:321
+#, php-format
+msgid "Location: %s"
 msgstr ""
 
-#: actions/showstream.php:451
-#, fuzzy
-msgid "All subscribers"
-msgstr "Abone olanlar"
-
-#: actions/showstream.php:533
-msgid "All groups"
+#: lib/command.php:324
+#, php-format
+msgid "Homepage: %s"
 msgstr ""
 
-#: actions/showstream.php:542
+#: lib/command.php:327
 #, php-format
-msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+msgid "About: %s"
 msgstr ""
 
-#: actions/smssettings.php:128
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, "
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
 msgstr ""
-"1-64 küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin "
-"verilmez"
-
-#: actions/smssettings.php:162
-#, fuzzy
-msgid "Send me notices through SMS; "
-msgstr "Durum mesajlarını Jabber/GTalk üzerinden gönder."
 
-#: actions/smssettings.php:335
-#, fuzzy
-msgid "A confirmation code was sent to the phone number you added. "
-msgstr "O onay kodu sizin için değil!"
-
-#: actions/smssettings.php:453
-msgid "Mobile carrier"
+#: lib/command.php:377
+msgid "Error sending direct message."
 msgstr ""
 
-#: actions/subedit.php:70
-#, fuzzy
-msgid "You are not subscribed to that profile."
-msgstr "Bize o profili yollamadınız"
-
-#  Note: Bu federation ozelligi nasilsa simdi kullanilmayacak
-#: actions/subedit.php:83
-#, fuzzy
-msgid "Could not save subscription."
-msgstr "Abonelik oluşturulamadı."
-
-#: actions/subscribe.php:55
-#, fuzzy
-msgid "Not a local user."
-msgstr "Böyle bir kullanıcı yok."
-
-#: actions/subscribe.php:69
-#, fuzzy
-msgid "Subscribed"
-msgstr "Abone ol"
-
-#: actions/subscribers.php:50
-#, fuzzy, php-format
-msgid "%s subscribers"
-msgstr "Abone olanlar"
-
-#: actions/subscribers.php:52
+#: lib/command.php:431
 #, php-format
-msgid "%s subscribers, page %d"
+msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: actions/subscribers.php:63
-#, fuzzy
-msgid "These are the people who listen to "
-msgstr "%s adlı kullanıcının durumunu takip edenler"
-
-#: actions/subscribers.php:67
-#, fuzzy, php-format
-msgid "These are the people who "
-msgstr "%s adlı kullanıcının durumunu takip edenler"
-
-#: actions/subscriptions.php:52
-#, fuzzy, php-format
-msgid "%s subscriptions"
-msgstr "Bütün abonelikler"
-
-#: actions/subscriptions.php:54
+#: lib/command.php:439
 #, fuzzy, php-format
-msgid "%s subscriptions, page %d"
-msgstr "Bütün abonelikler"
-
-#: actions/subscriptions.php:65
-#, fuzzy
-msgid "These are the people whose notices "
-msgstr "%s adlı kullanıcının durumlarını takip ettiği kullanıcılar"
-
-#: actions/subscriptions.php:69
-#, fuzzy, php-format
-msgid "These are the people whose "
-msgstr "%s adlı kullanıcının durumunu takip edenler"
+msgid "Reply to %s sent"
+msgstr "%s için cevaplar"
 
-#: actions/subscriptions.php:122
+#: lib/command.php:441
 #, fuzzy
-msgid "Jabber"
-msgstr "JabberID yok."
+msgid "Error saving notice."
+msgstr "Durum mesajını kaydederken hata oluştu."
 
-#: actions/tag.php:43
-#, fuzzy, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "%s adli kullanicinin durum mesajlari"
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
 
-#: actions/tag.php:66
+#: lib/command.php:502
 #, php-format
-msgid "Messages tagged \"%s\", most recent first"
+msgid "Subscribed to %s"
 msgstr ""
 
-#: actions/tagother.php:33
-#, fuzzy
-msgid "Not logged in"
-msgstr "Giriş yapılmadı."
-
-#: actions/tagother.php:39
-#, fuzzy
-msgid "No id argument."
-msgstr "Böyle bir belge yok."
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
 
-#: actions/tagother.php:65
+#: lib/command.php:530
 #, php-format
-msgid "Tag %s"
+msgid "Unsubscribed from %s"
 msgstr ""
 
-#: actions/tagother.php:141
-msgid "Tag user"
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
 msgstr ""
 
-#: actions/tagother.php:149
-msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+#: lib/command.php:551
+msgid "Notification off."
 msgstr ""
 
-#: actions/tagother.php:164
-msgid "There was a problem with your session token."
+#: lib/command.php:553
+msgid "Can't turn off notification."
 msgstr ""
 
-#: actions/tagother.php:191
-msgid ""
-"You can only tag people you are subscribed to or who are subscribed to you."
+#: lib/command.php:574
+msgid "Notification on."
 msgstr ""
 
-#: actions/tagother.php:198
-#, fuzzy
-msgid "Could not save tags."
-msgstr "Avatar bilgisi kaydedilemedi"
-
-#: actions/tagother.php:233
-msgid "Use this form to add tags to your subscribers or subscriptions."
+#: lib/command.php:576
+msgid "Can't turn on notification."
 msgstr ""
 
-#: actions/tagrss.php:35
-#, fuzzy
-msgid "No such tag."
-msgstr "Böyle bir durum mesajı yok."
-
-#: actions/tagrss.php:66
+#: lib/command.php:597
 #, fuzzy, php-format
-msgid "Microblog tagged with %s"
-msgstr "%s adli kullanicinin durum mesajlari"
-
-#: actions/twitapiblocks.php:47
-msgid "Block user failed."
-msgstr ""
+msgid "Could not create login token for %s"
+msgstr "OpenID formu yaratılamadı: %s"
 
-#: actions/twitapiblocks.php:69
-msgid "Unblock user failed."
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: actions/twitapiusers.php:48
+#: lib/command.php:618
 #, fuzzy
-msgid "Not found."
-msgstr "İstek bulunamadı!"
-
-#: actions/twittersettings.php:71
-msgid "Add your Twitter account to automatically send "
-msgstr ""
-
-#: actions/twittersettings.php:119
-msgid "Twitter user name"
-msgstr ""
+msgid "You are not subscribed to anyone."
+msgstr "Bize o profili yollamadınız"
 
-#: actions/twittersettings.php:126
+#: lib/command.php:620
 #, fuzzy
-msgid "Twitter password"
-msgstr "Yeni parola"
-
-#: actions/twittersettings.php:228
-msgid "Twitter Friends"
-msgstr ""
-
-#: actions/twittersettings.php:327
-msgid "Username must have only numbers, "
-msgstr ""
-
-#: actions/twittersettings.php:341
-#, fuzzy, php-format
-msgid "Unable to retrieve account information "
-msgstr "Eposta onayı silinemedi."
+msgid "You are subscribed to these people: "
+msgstr "Bize o profili yollamadınız"
 
-#: actions/unblock.php:108
+#: lib/command.php:637
 #, fuzzy
-msgid "Error removing the block."
-msgstr "Kullanıcıyı kaydetmede hata oluştu."
+msgid "No one is subscribed to you."
+msgstr "Uzaktan abonelik"
 
-#: actions/unsubscribe.php:50
+#: lib/command.php:639
 #, fuzzy
-msgid "No profile id in request."
-msgstr "Yetkilendirme isteği yok!"
-
-#: actions/unsubscribe.php:57
-msgid "No profile with that id."
-msgstr ""
+msgid "These people are subscribed to you: "
+msgstr "Uzaktan abonelik"
 
-#: actions/unsubscribe.php:71
+#: lib/command.php:656
 #, fuzzy
-msgid "Unsubscribed"
-msgstr "Aboneliği sonlandır"
-
-#: actions/usergroups.php:63
-#, php-format
-msgid "%s groups"
-msgstr ""
-
-#: actions/usergroups.php:65
-#, php-format
-msgid "%s groups, page %d"
-msgstr ""
+msgid "You are not a member of any groups."
+msgstr "Bize o profili yollamadınız"
 
-#: classes/Notice.php:104
+#: lib/command.php:658
 #, fuzzy
-msgid "Problem saving notice. Unknown user."
-msgstr "Durum mesajını kaydederken hata oluştu."
+msgid "You are a member of these groups: "
+msgstr "Bize o profili yollamadınız"
 
-#: classes/Notice.php:109
+#: lib/command.php:670
 msgid ""
-"Too many notices too fast; take a breather and post again in a few minutes."
-msgstr ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+
+#: lib/common.php:192
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Onay kodu yok."
 
-#: classes/Notice.php:116
-msgid "You are banned from posting notices on this site."
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/accountsettingsaction.php:108
-#, fuzzy
-msgid "Upload an avatar"
-msgstr "Avatar güncellemede hata."
-
-#: lib/accountsettingsaction.php:119
-msgid "Other"
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/accountsettingsaction.php:120
-msgid "Other options"
+#: lib/common.php:195
+msgid "Go to the installer."
 msgstr ""
 
-#: lib/action.php:130
-#, php-format
-msgid "%s - %s"
+#: lib/connectsettingsaction.php:110
+msgid "IM"
 msgstr ""
 
-#: lib/action.php:145
-msgid "Untitled page"
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
 msgstr ""
 
-#: lib/action.php:316
-msgid "Primary site navigation"
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
 msgstr ""
 
-#: lib/action.php:322
-msgid "Personal profile and friends timeline"
+#: lib/dberroraction.php:60
+msgid "Database error"
 msgstr ""
 
-#: lib/action.php:325
-msgid "Search for people or text"
+#: lib/designsettings.php:101
+msgid "Change background image"
 msgstr ""
 
-#: lib/action.php:328
+#: lib/designsettings.php:105
 #, fuzzy
-msgid "Account"
-msgstr "Hakkında"
+msgid "Upload file"
+msgstr "Yükle"
 
-#: lib/action.php:328
-msgid "Change your email, avatar, password, profile"
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 
-#: lib/action.php:330
-msgid "Connect to IM, SMS, Twitter"
+#: lib/designsettings.php:139
+msgid "On"
 msgstr ""
 
-#: lib/action.php:332
-msgid "Logout from the site"
+#: lib/designsettings.php:155
+msgid "Off"
 msgstr ""
 
-#: lib/action.php:335
-msgid "Login to the site"
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
 msgstr ""
 
-#: lib/action.php:338
-#, fuzzy
-msgid "Create an account"
-msgstr "Yeni hesap oluştur"
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
 
-#: lib/action.php:341
+#: lib/designsettings.php:170
 #, fuzzy
-msgid "Login with OpenID"
-msgstr "Böyle bir OpenID yok."
+msgid "Change colours"
+msgstr "Parolayı değiştir"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
 
-#: lib/action.php:344
+#: lib/designsettings.php:191
 #, fuzzy
-msgid "Help me!"
-msgstr "Yardım"
+msgid "Content"
+msgstr "Bağlan"
 
-#: lib/action.php:362
+#: lib/designsettings.php:204
 #, fuzzy
-msgid "Site notice"
-msgstr "Yeni durum mesajı"
+msgid "Sidebar"
+msgstr "Ara"
 
-#: lib/action.php:417
-msgid "Local views"
+#: lib/designsettings.php:217
+msgid "Text"
 msgstr ""
 
-#: lib/action.php:472
+#: lib/designsettings.php:230
 #, fuzzy
-msgid "Page notice"
-msgstr "Yeni durum mesajı"
+msgid "Links"
+msgstr "Giriş"
 
-#: lib/action.php:562
-#, fuzzy
-msgid "Secondary site navigation"
-msgstr "Abonelikler"
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
 
-#: lib/action.php:602 lib/action.php:623
-msgid "StatusNet software license"
+#: lib/designsettings.php:248
+msgid "Restore default designs"
 msgstr ""
 
-#: lib/action.php:630
-msgid "All "
+#: lib/designsettings.php:254
+msgid "Reset back to default"
 msgstr ""
 
-#: lib/action.php:635
-msgid "license."
+#: lib/designsettings.php:257
+msgid "Save design"
 msgstr ""
 
-#: lib/blockform.php:123 lib/blockform.php:153
-#, fuzzy
-msgid "Block this user"
-msgstr "Böyle bir kullanıcı yok."
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
+msgstr ""
 
-#: lib/blockform.php:153
-msgid "Block"
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
 msgstr ""
 
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr ""
 
-#: lib/facebookaction.php:268
-#, php-format
-msgid "To use the %s Facebook Application you need to login "
-msgstr ""
-
-#: lib/facebookaction.php:271
-#, fuzzy
-msgid " a new account."
-msgstr "Yeni hesap oluştur"
-
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-#, fuzzy
-msgid "Published"
-msgstr "Genel"
-
 #: lib/favorform.php:114 lib/favorform.php:140
 #, fuzzy
 msgid "Favor this notice"
 msgstr "Böyle bir durum mesajı yok."
 
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr ""
+
 #: lib/feedlist.php:64
 msgid "Export data"
 msgstr ""
 
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr ""
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr ""
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr ""
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr ""
@@ -4562,63 +3958,88 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
+msgstr ""
+
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr ""
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr ""
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:163
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
 msgstr ""
 "Web Sitenizin, blogunuzun ya da varsa başka bir sitedeki profilinizin adresi"
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:168
 #, fuzzy
-msgid "Description"
-msgstr "Abonelikler"
+msgid "Describe the group or topic"
+msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
 
-#: lib/groupeditform.php:153
-#, fuzzy
-msgid "Describe the group or topic in 140 chars"
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
 msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:172
+#, fuzzy
+msgid "Description"
+msgstr "Abonelikler"
+
+#: lib/groupeditform.php:179
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi"
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
-msgid "Group"
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:100
-msgid "Admin"
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+msgid "Group"
 msgstr ""
 
 #: lib/groupnav.php:101
+#, fuzzy
+msgid "Blocked"
+msgstr "Böyle bir kullanıcı yok."
+
+#: lib/groupnav.php:102
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Böyle bir kullanıcı yok."
+
+#: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
 msgstr ""
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:113
 #, fuzzy
 msgid "Logo"
 msgstr "Çıkış"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:114
 #, php-format
 msgid "Add or edit %s logo"
 msgstr ""
 
+#: lib/groupnav.php:120
+#, php-format
+msgid "Add or edit %s design"
+msgstr ""
+
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr ""
@@ -4633,10 +4054,45 @@ msgid "Tags in %s group's notices"
 msgstr ""
 
 #: lib/htmloutputter.php:104
-#, fuzzy
-msgid "This page is not available in a "
+msgid "This page is not available in a media type you accept"
 msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
 
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr ""
+"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr "Kısmi yükleme."
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr "Dosya yüklemede sistem hatası."
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr "Bu bir resim dosyası değil ya da dosyada hata var"
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr "Desteklenmeyen görüntü dosyası biçemi."
+
+#: lib/imagefile.php:118
+#, fuzzy
+msgid "Lost our file."
+msgstr "Böyle bir durum mesajı yok."
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr ""
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr ""
+
 #: lib/joinform.php:114
 #, fuzzy
 msgid "Join"
@@ -4647,104 +4103,309 @@ msgstr "Giriş"
 msgid "Leave"
 msgstr "Kaydet"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:80
 #, fuzzy
 msgid "Login with a username and password"
 msgstr "Geçersiz kullanıcı adı veya parola."
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:86
 #, fuzzy
 msgid "Sign up for a new account"
 msgstr "Yeni hesap oluştur"
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+msgid "from"
 msgstr ""
 
-#: lib/mail.php:175
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "Eposta adresi onayı"
+
+#: lib/mail.php:174
 #, php-format
 msgid ""
 "Hey, %s.\n"
 "\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%s\n"
+"\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
 msgstr ""
 
-#: lib/mail.php:236
-#, fuzzy, php-format
-msgid "%1$s is now listening to "
+#: lib/mail.php:235
+#, 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:254
+#: lib/mail.php:240
 #, fuzzy, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
+"%1$s %2$s durum mesajlarınızı takip etmeye başladı.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Kendisini durumsuz bırakmayın!,\n"
+"%4$s.\n"
+
+#: lib/mail.php:253
+#, php-format
 msgid "Location: %s\n"
 msgstr ""
 
-#  Belki Durum Merkezi falan denebilir mi ki?
-#: lib/mail.php:256
-#, fuzzy, php-format
+#: lib/mail.php:255
+#, php-format
 msgid "Homepage: %s\n"
 msgstr ""
 
-#: lib/mail.php:258
+#: lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:461
+#: lib/mail.php:285
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: lib/mail.php:288
+#, 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 ""
+
+#: lib/mail.php:412
+#, php-format
+msgid "%s status"
+msgstr "%s durum"
+
+#: lib/mail.php:438
+msgid "SMS confirmation"
+msgstr ""
+
+#: lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr ""
 
-#: lib/mail.php:465
+#: lib/mail.php:466
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
+msgstr ""
+
+#: lib/mail.php:509
 #, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
+msgid "New private message from %s"
 msgstr ""
 
-#: lib/mail.php:555
+#: lib/mail.php:513
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%5$s\n"
+msgstr ""
+
+#: lib/mail.php:554
 #, fuzzy, php-format
-msgid "%1$s just added your notice from %2$s"
+msgid "%s (@%s) added your notice as a favorite"
 msgstr "%1$s %2$s'da durumunuzu takip ediyor"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
-msgid "From"
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
 msgstr ""
 
-#: lib/messageform.php:110
-msgid "Send a direct notice"
+#: lib/mail.php:613
+#, php-format
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+msgstr ""
+
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
 msgstr ""
 
-#: lib/noticeform.php:125
+#: lib/mediafile.php:201 lib/mediafile.php:237
 #, fuzzy
-msgid "Send a notice"
-msgstr "Yeni durum mesajı"
+msgid "Could not determine file's mime-type!"
+msgstr "Kullanıcı güncellenemedi."
+
+#: lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
 
-#: lib/noticeform.php:152
+#: lib/messageform.php:120
+msgid "Send a direct notice"
+msgstr ""
+
+#: lib/messageform.php:146
+msgid "To"
+msgstr ""
+
+#: lib/messageform.php:162 lib/noticeform.php:173
 #, fuzzy
 msgid "Available characters"
 msgstr "6 veya daha fazla karakter"
 
-#: lib/noticelist.php:426
+#: lib/noticeform.php:145
 #, fuzzy
-msgid "in reply to"
-msgstr "...cevap olarak"
+msgid "Send a notice"
+msgstr "Yeni durum mesajı"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
-msgid "Reply to this notice"
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
+msgstr "N'aber %s?"
+
+#: lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:184
+msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:478
 #, fuzzy
-msgid "Reply"
-msgstr "cevapla"
+msgid "in context"
+msgstr "İçerik yok!"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
-msgid "Delete this notice"
+#: lib/noticelist.php:498
+msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:474
-msgid "Delete"
-msgstr ""
+#: lib/noticelist.php:499
+#, fuzzy
+msgid "Reply"
+msgstr "cevapla"
 
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
@@ -4758,41 +4419,141 @@ msgstr ""
 msgid "Send a nudge to this user"
 msgstr ""
 
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "Yeni profil eklemede hata oluştu"
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "Avatar eklemede hata oluştu"
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "Uzak profil eklemede hata oluştu"
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Yeni durum mesajı"
+
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
+msgstr "Yeni abonelik eklenemedi."
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "Kişisel"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "Cevaplar"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr ""
+
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr ""
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr ""
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr ""
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr ""
+
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/profilelist.php:182
-msgid "(none)"
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "Abonelikler"
+
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "Bütün abonelikler"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "Abone olanlar"
+
+#: lib/profileaction.php:157
+#, fuzzy
+msgid "All subscribers"
+msgstr "Abone olanlar"
+
+#: lib/profileaction.php:177
+msgid "User ID"
+msgstr ""
+
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "Üyelik başlangıcı"
+
+#: lib/profileaction.php:235
+msgid "All groups"
 msgstr ""
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Genel"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr ""
 
-#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr ""
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr ""
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:92
 #, fuzzy
 msgid "Popular"
 msgstr "Kişi Arama"
 
+#: lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Ara"
+
+#: lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Ara"
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr ""
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr ""
+
 #: lib/searchgroupnav.php:82
 #, fuzzy
 msgid "Notice"
 msgstr "Durum mesajları"
 
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr ""
+
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr ""
@@ -4801,35 +4562,64 @@ msgstr ""
 msgid "Untitled section"
 msgstr ""
 
-#: lib/subgroupnav.php:81
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: lib/subgroupnav.php:83
 #, fuzzy, php-format
 msgid "People %s subscribes to"
 msgstr "Uzaktan abonelik"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:91
 #, fuzzy, php-format
 msgid "People subscribed to %s"
 msgstr "Uzaktan abonelik"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:104
-#, php-format
-msgid "Invite friends and colleagues to join you on %s"
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
 msgstr ""
 
-#: lib/subs.php:53
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr ""
+
+#: lib/subs.php:48
+msgid "Already subscribed!"
+msgstr ""
+
+#: lib/subs.php:52
 #, fuzzy
 msgid "User has blocked you."
 msgstr "Kullanıcının profili yok."
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: lib/subs.php:56
+msgid "Could not subscribe."
+msgstr ""
+
+#: lib/subs.php:75
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: lib/subs.php:124
 #, fuzzy
-msgid "Subscribe to this user"
-msgstr "Takip talebine izin verildi"
+msgid "Not subscribed!"
+msgstr "Bu kullanıcıyı zaten takip etmiyorsunuz!"
+
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
+msgstr "Abonelik silinemedi."
 
 #: lib/tagcloudsection.php:56
 msgid "None"
@@ -4839,35 +4629,106 @@ msgstr ""
 msgid "Top posters"
 msgstr ""
 
-#: lib/unblockform.php:120 lib/unblockform.php:150
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+msgid "Unsubscribe from this user"
+msgstr ""
+
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "Aboneliği sonlandır"
+
+#: lib/userprofile.php:116
 #, fuzzy
-msgid "Unblock this user"
-msgstr "Böyle bir kullanıcı yok."
+msgid "Edit Avatar"
+msgstr "Avatar"
 
-#: lib/unblockform.php:150
-msgid "Unblock"
+#: lib/userprofile.php:236
+msgid "User actions"
 msgstr ""
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
-msgid "Unsubscribe from this user"
+#: lib/userprofile.php:248
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Profil ayarları"
+
+#: lib/userprofile.php:249
+msgid "Edit"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "Yeni hesap oluştur"
+#: lib/userprofile.php:272
+msgid "Send a direct message to this user"
+msgstr ""
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "Eposta onaylanamadı."
+#: lib/userprofile.php:273
+msgid "Message"
+msgstr ""
 
-#~ msgid "Email address"
-#~ msgstr "Eposta adresi"
+#: lib/util.php:821
+msgid "a few seconds ago"
+msgstr "birkaç saniye önce"
+
+#: lib/util.php:823
+msgid "about a minute ago"
+msgstr "yaklaşık bir dakika önce"
+
+#: lib/util.php:825
+#, php-format
+msgid "about %d minutes ago"
+msgstr "yaklaşık %d dakika önce"
+
+#: lib/util.php:827
+msgid "about an hour ago"
+msgstr "yaklaşık bir saat önce"
+
+#: lib/util.php:829
+#, php-format
+msgid "about %d hours ago"
+msgstr "yaklaşık %d saat önce"
+
+#: lib/util.php:831
+msgid "about a day ago"
+msgstr "yaklaşık bir gün önce"
+
+#: lib/util.php:833
+#, php-format
+msgid "about %d days ago"
+msgstr "yaklaşık %d gün önce"
+
+#: lib/util.php:835
+msgid "about a month ago"
+msgstr "yaklaşık bir ay önce"
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Durum gönderilirken hata oluştu"
+#: lib/util.php:837
+#, php-format
+msgid "about %d months ago"
+msgstr "yaklaşık %d ay önce"
+
+#: lib/util.php:839
+msgid "about a year ago"
+msgstr "yaklaşık bir yıl önce"
+
+#: lib/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr ""
 
-#~ 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 ""
-#~ "Eğer parolanızı unuttuysanız veya kaybettiyseniz, hesabınıza eklemiş "
-#~ "olduğunuz eposta adresine yeni bir tane gönderilmesini sağlayabilirsiniz."
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr ""
+
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr ""
diff --git a/locale/uk/LC_MESSAGES/statusnet.mo b/locale/uk/LC_MESSAGES/statusnet.mo
index e08dc4e9c..9cbb4440f 100644
--- a/locale/uk/LC_MESSAGES/statusnet.mo
+++ b/locale/uk/LC_MESSAGES/statusnet.mo
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 55cea21c3..2c54591aa 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -1,4269 +1,3022 @@
-# #-#-#-#-#  statusnet.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.
+# Translation of StatusNet to Ukrainian
 #
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-03-12 16:19+0000\n"
-"Last-Translator: Evan Prodromou <evan@status.net>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:44:23+0000\n"
+"Language-Team: Ukrainian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
-"X-Poedit-Language: Ukrainian\n"
-"X-Poedit-Country: UKRAINE\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: out-statusnet\n"
 
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
-#, 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
-#: actions/finishopenidlogin.php:110
-msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr ""
-" окрім цих приватних даних: пароль, електронна адреса, адреса IM, телефонний "
-"номер."
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr " від "
-
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr "%1$s / Оновленні відповіді %2$s"
-
-#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s запросив(ла) вас приєднатися до нього(неї) на %2$s"
-
-#: ../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 lib/mail.php:241
-#, 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"
-"Щиро ваші,\n"
-"%4$s.\n"
-
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "%1$s оновив(ла) цю відповідь на оновлення від %2$s / %3$s."
-
-#: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr "%1$s має статус на %2$s"
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "Такого тегу немає."
 
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
-#, php-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
+msgstr "Такого користувача немає."
 
-#: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/all.php:84
 #, php-format
-msgid "%s Public Stream"
-msgstr "%s Загальний потік"
+msgid "%s and friends, page %d"
+msgstr "%s з друзями, сторінка %d"
 
-#: ../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
-#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s з друзями"
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
-#, php-format
-msgid "%s public timeline"
-msgstr "%s загальна хронологія"
+#: actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Живлення для друзів %s"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
-#, php-format
-msgid "%s status"
-msgstr "%s статус"
+#: actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Живлення для друзів %s"
 
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
-#, php-format
-msgid "%s timeline"
-msgstr "%s хронологія"
+#: actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Живлення для друзів %s"
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/all.php:127
 #, 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.)"
+"This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
-"(Ви маєте негайно отримати листа електронною поштою, в якому знаходитимуться "
-"інструкції щодо підтвердження вашої електронної адреси.)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: actions/all.php:132
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
 msgstr ""
-"**%%site.name%%** це сервіс мікроблогів наданий вам "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: actions/all.php:134
 #, 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
-#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 літери нижнього регістра і цифри, ніякої пунктуації або інтервалів"
-
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
-"1-64 літери нижнього регістра і цифри, ніякої пунктуації або інтервалів. "
-"Неодмінно."
-
-#: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr "6 або більше знаків"
-
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
-msgid "6 or more characters, and don't forget it!"
-msgstr "6 або більше знаків, і не забудьте їх!"
 
-#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
-msgid "6 or more characters. Required."
-msgstr "6 або більше знаків. Неодмінно."
-
-#: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
 msgstr ""
-"Код підтвердження був відправлений на адресу IM, яку ви додали. Ви повинні "
-"затведити %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/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s з друзями"
 
-#: ../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/allrss.php:119 actions/apitimelinefriends.php:121
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr "Оновлення від %1$s та друзів на %2$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 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 actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
-msgid "API method not found!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+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 actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
-msgid "API method under construction."
-msgstr "API метод наразі знаходиться у розробці."
-
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
-msgid "About"
-msgstr "Про"
-
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
-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 actions/emailsettings.php:120
-#: actions/imsettings.php:127 actions/openidsettings.php:111
-#: actions/smssettings.php:133 actions/twittersettings.php:163
-msgid "Add"
-msgstr "Додати"
-
-#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
-msgstr "Додати OpenID"
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-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
-#: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
-msgstr "Адреса"
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
+msgstr "Цей метод потребує НАПИСАТИ."
 
-#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-msgid "Addresses of friends to invite (one per line)"
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
 msgstr ""
-"Адреси друзів куди надсилатимуться запрошення (кожна адреса окремим рядком)"
-
-#: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
-msgid "All subscriptions"
-msgstr "Всі підписки"
 
-#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
-#, php-format
-msgid "All updates for %s"
-msgstr "Всі оновлення для %s"
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Не вдалося оновити користувача."
 
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
 #, php-format
-msgid "All updates matching search term \"%s\""
-msgstr "Всі оновлення за збігом з \"%s\""
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+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
-#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
-msgid "Already logged in."
-msgstr "Тепер ви увійшли."
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "Не маю можливості зберегти ваші налаштування Твіттера!"
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
-msgid "Already subscribed!."
-msgstr "Тепер ви підписані!"
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Не вдалося оновити користувача."
 
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
-msgid "Are you sure you want to delete this notice?"
-msgstr "Ви впевненні, що бажаєте видалити це повідомлення?"
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Користувач не має профілю."
 
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
-msgid "Authorize subscription"
-msgstr "Авторизувати підписку"
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+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/apiblockcreate.php:108
+msgid "Block user failed."
+msgstr "Спроба заблокувати користувача невдала."
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr ""
-"Автоматично підписуватись до тих, хто підписався до мене (якщо ви бот, то це "
-"саме для вас)"
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
+msgstr "Спроба розблокувати користувача невдала."
 
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34 actions/avatarsettings.php:65
-#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
-msgid "Avatar"
-msgstr "Аватара"
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "Повідомлення без тексту!"
 
-#: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
-msgid "Avatar updated."
-msgstr "Аватару оновлено."
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Надто довго. Максимальний розмір 140 знаків."
 
-#: ../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/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+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."
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
-"Очікування підтвердження цієї адреси. Перевірте вхідну пошту (і теку зі "
-"спамом також!), там має бути повідомлення з подальшими інструкціями."
-
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
-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
-#: actions/profilesettings.php:112 actions/register.php:402
-msgid "Bio"
-msgstr "Про себе"
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "Пряме повідомлення до %s"
 
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
-#: actions/register.php:89 actions/updateprofile.php:104
-#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
-msgid "Bio is too long (max 140 chars)."
-msgstr "Ви перевищили ліміт (140 знаків це максимум)"
+#: actions/apidirectmessage.php:93
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr "Всі прямі повідомлення надіслані від %s"
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
-msgid "Can't delete this notice."
-msgstr "Не можна видалити це повідомлення."
+#: actions/apidirectmessage.php:101
+#, php-format
+msgid "Direct messages to %s"
+msgstr "Пряме повідомлення до %s"
 
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/apidirectmessage.php:105
 #, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr "Не можна прочитати URL аватари '%s'"
+msgid "All the direct messages sent to %s"
+msgstr "Всі прямі повідомлення надіслані до %s"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404 actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-msgid "Can't save new password."
-msgstr "Не можна зберегти новий пароль."
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "API метод не знайдено!"
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62 actions/emailsettings.php:58
-#: actions/imsettings.php:59 actions/smssettings.php:62
-#: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
-msgstr "Скасувати"
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
+msgstr "Жодних статусів з таким ID."
 
-#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Не можна підтвердити споживчий об'єкт OpenID."
+#: actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+msgstr "Це повідомлення вже є обраним!"
 
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
-msgstr "Не можна полагодити цей Jabber ID"
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+msgstr "Не можна позначити як обране."
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
-msgid "Cannot normalize that email address"
-msgstr "Не можна полагодити цю поштову адресу"
+#: actions/apifavoritedestroy.php:122
+#, fuzzy
+msgid "That status is not a favorite!"
+msgstr "Це повідомлення не є обраним!"
 
-#: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
-msgstr "Змінити"
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr "Не можна видалити зі списку обраних."
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
-msgstr "Змінити електронну адресу вручну"
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
+msgstr "Не вдалося додати користувача: користувача не знайдено."
 
-#: ../actions/password.php:32 actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr "Змінити пароль"
+#: actions/apifriendshipscreate.php:118
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr "Не вдалося додати користувача: %s вже присутній у вашому списку."
 
-#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
-msgid "Change your password"
-msgstr "Змінити ваш пароль"
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "Не вдалося додати користувача: користувача не знайдено."
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-msgid "Change your profile settings"
-msgstr "Змінити налаштування профілю"
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+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
-#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
-#: actions/register.php:376 actions/smssettings.php:122
-msgid "Confirm"
-msgstr "Підтвердити"
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
+msgstr "Два ID або імені_у_мережі повинні підтримуватись."
 
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "Підтвердити адресу"
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+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
-#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
-msgid "Confirmation cancelled."
-msgstr "Підтвердження скасовано."
+#: actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Жодних статусів не виявлено."
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
-msgid "Confirmation code"
-msgstr "Код підтвердження"
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
+msgid "Could not create group."
+msgstr "Не вдалося створити нову групу"
 
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-msgid "Confirmation code not found."
-msgstr "Код підтвердження не знайдено."
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+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."
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+msgid "Could not set group membership."
+msgstr "Не вдалося встановити членство."
+
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
-"Вітаємо, %s! І ласкаво просимо до %%%%site.name%%%%. Звідси ви, можливо, "
-"схочете...\n"
-"\n"
-"*Подивитись [ваш профіль](%s) та написати своє перше повідомлення.\n"
-"*Додати [адресу Jabber/GTalk](%%%%action.imsettings%%%%), так щоб мати змогу "
-"надсилати повідомлення через службу миттєвих повідомлень.\n"
-"*[Розшукати людей](%%%%action.peoplesearch%%%%), які мають спільні з вами "
-"інтереси.\n"
-"*Оновити [налаштування профілю](%%%%action.profilesettings%%%%) аби інші "
-"дізнались більше про вас.\n"
-"*Прочитати [додаткову інформацію](%%%%doc.help%%%%), аби переконатись, що ви "
-"нічого не пропустили. \n"
-"\n"
-"Дякуємо, що зареєструвались у нас, і, сподіваємось, вам сподобається наш "
-"сервіс."
+"Ім'я користувача повинно складатись з літер нижнього регістру і цифр, ніяких "
+"інтервалів."
 
-#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
-msgid "Connect"
-msgstr "З'єднання"
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr "Це ім'я вже використовується. Спробуйте інше."
 
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
-msgid "Connect existing account"
-msgstr "З'єднатись використовуючи існуючий рахунок"
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "Це недійсне ім'я користувача."
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
-msgid "Contact"
-msgstr "Контакт"
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "Веб-сторінка має недійсну URL-адресу."
 
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
-#, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "Не вдалося створити форму OpenID: %s"
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "Повне ім'я задовге (255 знаків максимум)"
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr "Не вдалося додати користувача: %s вже присутній у вашому списку."
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "опис надто довгий (140 знаків максимум)"
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
-msgid "Could not follow user: User not found."
-msgstr "Не вдалося додати користувача: користувача не знайдено."
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "Локація надто довга (255 знаків максимум)"
 
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
 #, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Невдале перенаправлення на сервер: %s"
-
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
-msgid "Could not save avatar info"
-msgstr "Не вдалося зберегти інформацію про аватару"
-
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
-msgid "Could not save new profile info"
-msgstr "Не вдалося зберегти інформацію про новий профіль"
-
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
-msgid "Could not subscribe other to you."
-msgstr "Не вдалося підписати іншого до вас."
-
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
-msgid "Could not subscribe."
-msgstr "Невдала підписка."
+msgid "Too many aliases! Maximum %d."
+msgstr ""
 
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
-msgstr "Не вдалося оновити користувача з підтвердженною електронною адресою."
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Недійсний тег: \"%s\""
 
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-msgid "Couldn't convert request tokens to access tokens."
-msgstr "Не вдалося перетворити токени запиту на токени звернення."
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+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
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-msgid "Couldn't delete email confirmation."
-msgstr "Не вдалося видалити підтвердження поштової адреси."
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
-msgid "Couldn't delete subscription."
-msgstr "Не вдалося видалити підписку."
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "Ви вже є учасником цієї групи"
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
-msgid "Couldn't find any statuses."
-msgstr "Жодних статусів не виявлено."
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
 
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-msgid "Couldn't get a request token."
-msgstr "Не вдалося отримати токен запиту."
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "Користувачеві %s не вдалось приєднатись до групи %s"
 
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206 actions/emailsettings.php:223
-#: actions/imsettings.php:195 actions/smssettings.php:214
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
-msgid "Couldn't insert confirmation code."
-msgstr "Не вдалося додати код підтвердження."
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Ви не є учасником цієї групи."
 
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
-msgstr "Не вдалося додати нову підписку."
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "Не вдалося видалити користувача %s з групи %s"
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-msgid "Couldn't save profile."
-msgstr "Не вдалося зберегти профіль."
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "Групи %s"
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
-msgstr "Не вдалося оновити користувача для автопідписки."
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Діяльність групи"
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
-msgid "Couldn't update user record."
-msgstr "Не вдалося оновити запис користувача."
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "Групи %s"
 
-#: ../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
-#: actions/confirmaddress.php:114 actions/emailsettings.php:280
-#: actions/emailsettings.php:411 actions/imsettings.php:252
-#: actions/imsettings.php:395 actions/othersettings.php:162
-#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
-msgid "Couldn't update user."
-msgstr "Не вдалося оновити користувача."
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "%s бере участь в цих групах"
 
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
-msgid "Create"
-msgstr "Створити"
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
+msgstr "Цей метод потребує або НАПИСАТИ, або ВИДАЛИТИ."
 
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
-msgid "Create a new user with this nickname."
-msgstr "Створити нового користувача з цим ім'ям."
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
+msgstr "Ви не можете видалити статус іншого користувача."
 
-#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
-msgid "Create new account"
-msgstr "Створити новий рахунок"
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "Аватару оновлено."
 
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
-msgid "Creating new account for OpenID that already has a user."
-msgstr "Створення нового рахунку для OpenID, яким ви вже користуєтесь."
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
+msgstr "Не знайдено жодних статусів з таким ID."
 
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "Поточна підтверджена адреса Jabber/GTalk."
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "Надто довго. Максимальний розмір повідомлення 140 знаків."
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "Поточний підтверджений телефонний номер."
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
+msgstr "Не знайдено"
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-msgid "Current confirmed email address."
-msgstr "Поточна підтверджена поштова адреса."
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
 
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
-msgstr "Поточне"
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Формат зображення не підтримується."
 
-#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: actions/apitimelinefavorites.php:107
 #, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "Помилка бази даних при додаванні тегу: %s"
+msgid "%s / Favorites from %s"
+msgstr "%s / Обрані від %s"
 
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: actions/apitimelinefavorites.php:119
 #, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Помилка бази даних при додаванні відповіді: %s"
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
-msgid "Delete notice"
-msgstr "Видалити повідомлення"
+msgid "%s updates favorited by %s / %s."
+msgstr "%s оновлення обраних від %s / %s."
 
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "Опишіть себе та свої інтереси (140 знаків)"
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
+#, php-format
+msgid "%s timeline"
+msgstr "%s хронологія"
 
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87 actions/register.php:172
-#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
-#: actions/register.php:385 lib/accountsettingsaction.php:113
-msgid "Email"
-msgstr "Пошта"
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "Оновлення від %1$s на %2$s!"
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-msgid "Email Address"
-msgstr "Електронна адреса"
+#: actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Оновленні відповіді %2$s"
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
-msgstr "Налаштування пошти"
+#: actions/apitimelinementions.php:126
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr "%1$s оновив(ла) цю відповідь на оновлення від %2$s / %3$s."
 
-#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-msgid "Email address already exists."
-msgstr "Ця адреса вже використовується."
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#, php-format
+msgid "%s public timeline"
+msgstr "%s загальна хронологія"
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
-msgid "Email address confirmation"
-msgstr "Підтвердження електронної адреси"
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#, php-format
+msgid "%s updates from everyone!"
+msgstr "%s оновлення від всіх!"
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
-msgstr "Електронна адреса, на зразок \"UserName@example.org\""
+#: actions/apitimelinetag.php:101 actions/tag.php:66
+#, php-format
+msgid "Notices tagged with %s"
+msgstr "Повідомлення позначені з %s"
 
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-msgid "Email addresses"
-msgstr "Електронні адреси"
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Оновлення від %1$s на %2$s!"
 
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
-msgid "Enter a nickname or email address."
-msgstr "Введіть ім'я або електронну адресу."
+#: actions/apiusershow.php:96
+msgid "Not found."
+msgstr "Не знайдено."
 
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
-msgstr "Введіть код, який ви отримали телефоном."
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "Такого документа немає."
 
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
-msgid "Error authorizing token"
-msgstr "Помилка токена авторизації"
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+msgstr "Немає імені."
 
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
-msgid "Error connecting user to OpenID."
-msgstr "Помилка при підключенні користувача до OpenID."
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "Немає розміру."
 
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
-msgstr "Помилка при підключенні користувача."
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "Недійсний розмір."
 
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
-msgstr "Помилка при додаванні аватари"
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "Аватара"
 
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
-msgstr "Помилка при додаванні нового профілю"
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "Ви можете завантажити вашу персональну аватару."
 
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
-msgstr "Помилка при додаванні віддаленого профілю"
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
+msgstr "Користувач з невідповідним профілем"
 
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
-msgid "Error saving address confirmation."
-msgstr "Помилка при збереженні підтвердження адреси."
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+msgid "Avatar settings"
+msgstr "Налаштування аватари"
 
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
-msgid "Error saving remote profile"
-msgstr "Помилка при збереженні віддаленого профілю"
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr "Оригінал"
 
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-msgid "Error saving the profile."
-msgstr "Помилка при збереженні профілю."
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr "Перегляд"
 
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-msgid "Error saving the user."
-msgstr "Помилка при збереженні користувача."
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+msgid "Delete"
+msgstr "Видалити"
 
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
-msgid "Error saving user; invalid."
-msgstr "Помилка при збереженні користувача; недійсний."
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+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 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-msgid "Error setting user."
-msgstr "Помилка в налаштуваннях користувача."
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
+msgstr "Втяти"
 
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr "Помилка при оновленні профілю"
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Виникли певні проблеми з токеном поточної сесії. Спробуйте знов, будь ласка."
 
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
-msgstr "Помилка при оновленні віддаленого профілю"
+#: actions/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Несподіване представлення форми."
 
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr "Помилка з кодом підтвердження."
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
+msgstr "Оберіть квадратну ділянку зображення, яка й буде вашою автарою."
 
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
-msgid "Existing nickname"
-msgstr "Існуюче ім'я"
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
+msgstr "Дані вашого файлу десь загубились."
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
-msgid "FAQ"
-msgstr "ЧаПи"
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+msgstr "Аватару оновлено."
 
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Оновлення аватари невдале."
 
-#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
-#, 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 actions/replies.php:134
-#: actions/repliesrss.php:71
-#, php-format
-msgid "Feed for replies to %s"
-msgstr "Живлення для відповідей %s"
-
-#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
-#, php-format
-msgid "Feed for tag %s"
-msgstr "Живлення для тегів %s"
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
-msgstr "Знайти за змістом повідомлень"
+#: actions/avatarsettings.php:387
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Аватару оновлено."
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
-msgstr "Знайти людей на цьому сайті"
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+msgid "No nickname"
+msgstr "Немає імені"
 
-#: ../actions/login.php:122
-msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
-msgstr ""
-"З міркувань безпеки, будь ласка, введіть ще раз ім'я та пароль, перед тим як "
-"змінювати налаштування."
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
+msgstr "Такої групи немає"
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
-#: actions/profilesettings.php:77 actions/register.php:178
-#: actions/profilesettings.php:103 actions/register.php:391
-#: actions/showgroup.php:235 actions/showstream.php:262
-#: actions/tagother.php:105 lib/groupeditform.php:142
-msgid "Full name"
-msgstr "Повне ім'я"
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+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
-#: actions/editgroup.php:195 actions/newgroup.php:146
-#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
-msgid "Full name is too long (max 255 chars)."
-msgstr "Повне ім'я задовге (255 знаків максимум)"
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s з друзями, сторінка %d"
 
-#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
-msgid "Help"
-msgstr "Допомога"
+#: actions/blockedfromgroup.php:108
+#, fuzzy
+msgid "A list of the users blocked from joining this group."
+msgstr "Список учасників цієї групи."
 
-#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
-msgid "Home"
-msgstr "Дім"
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Спроба розблокувати користувача невдала."
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
-msgid "Homepage"
-msgstr "Веб-сторінка"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
+msgstr "Розблокувати"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
-msgid "Homepage is not a valid URL."
-msgstr "Веб-сторінка має недійсну URL-адресу."
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+msgid "Unblock this user"
+msgstr "Розблокувати цього користувача"
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
-msgid "I want to post notices by email."
-msgstr "Я хочу надсилати повідомлення поштою."
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Не увійшли."
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
-msgstr "ІМ"
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
+msgstr "Не визначено жодного профілю."
 
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
-msgstr "Адреса IM"
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
+msgstr "Не визначено профілю з таким ID."
 
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
-msgstr "Налаштування IM"
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Блокувати користувача."
 
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/block.php:136
 msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
 msgstr ""
-"Якщо ви вже маєте рахунок, увійдіть використовуючи ім'я та пароль, щоб "
-"приєднати їх до вашого 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/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
+msgid "No"
+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/block.php:149
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Розблокувати цього користувача"
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-#: actions/emailsettings.php:127 actions/smssettings.php:140
-msgid "Incoming email"
-msgstr "Вхідна пошта"
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
+msgstr "Так"
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
-msgid "Incoming email address removed."
-msgstr "Адресу вхідної пошти видалено."
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+msgid "Block this user"
+msgstr "Блокувати користувача"
 
-#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
-msgid "Incorrect old password"
-msgstr "Старий пароль неточний"
+#: actions/block.php:165
+msgid "You have already blocked this user."
+msgstr "Цього користувача вже заблоковано."
 
-#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
-msgid "Incorrect username or password."
-msgstr "Неточне ім'я або пароль."
+#: actions/block.php:170
+msgid "Failed to save block information."
+msgstr "Збереження інформації про блокування завершилось невдачею."
 
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
-msgstr ""
-"Інструкції з відновлення паролю було надіслано на електронну адресу, яку ви "
-"вказали у налаштуваннях вашого профілю."
+#: actions/bookmarklet.php:50
+#, fuzzy
+msgid "Post to "
+msgstr "Фото"
 
-#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "Недійсна URL-адреса аватари '%s'"
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+msgstr "Немає коду підтвердження."
 
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
-#, php-format
-msgid "Invalid email address: %s"
-msgstr "Недійсна електронна адреса: %s"
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "Код підтвердження не знайдено."
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
-#, php-format
-msgid "Invalid homepage '%s'"
-msgstr "Недійсна веб-сторінка '%s'"
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "Цей код підтвердження не для вас!"
 
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/confirmaddress.php:90
 #, php-format
-msgid "Invalid license URL '%s'"
-msgstr "Недійсна ліцензія URL '%s'"
+msgid "Unrecognized address type %s"
+msgstr "Невизнаний тип адреси %s"
 
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
-msgstr "Недійсний зміст повідомлення"
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr "Цю адресу вже було підтверджено."
 
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
-msgstr "Недійсне URI повідомлення"
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "Не вдалося оновити користувача."
 
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
-msgstr "Недійсна URL-адреса повідомлення"
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr "Не вдалося видалити підтвердження поштової адреси."
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "Недійсна URL-адреса профілю '%s'."
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "Підтвердити адресу"
 
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
-msgstr "Недійсна URL-адреса профілю (неправильний формат)"
+#: actions/confirmaddress.php:159
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "Адресу \"%s\" було підтверджено для вашого рахунку."
 
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
-msgstr "Недійсну URL-адресу профілю було повернуто сервером."
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Код підтвердження"
 
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
-#: actions/avatarbynickname.php:69
-msgid "Invalid size."
-msgstr "Недійсний розмір."
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
+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
-#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
-msgid "Invalid username or password."
-msgstr "Недійсне ім'я або пароль."
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
+msgstr "Такого повідомлення немає."
 
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-msgid "Invitation(s) sent"
-msgstr "Запрошення відіслано"
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "Не можна видалити це повідомлення."
 
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-msgid "Invitation(s) sent to the following people:"
-msgstr "Запрошення були надіслани наступним особам:"
+#: actions/deletenotice.php:103
+#, fuzzy
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+"Ви видаляєте повідомлення назавжди.  Якщо ви це зробите, то пам'ятайте, що "
+"зворотня дія неможлива."
 
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
-msgid "Invite"
-msgstr "Запросити"
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr "Видалити повідомлення"
 
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-msgid "Invite new users"
-msgstr "Запросити нових користувачів"
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr "Ви впевненні, що бажаєте видалити це повідомлення?"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
-#, php-format
-msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
-msgstr ""
-"Сервіс працює на [StatusNet](http://status.net/) - програмному забезпеченні "
-"для мікроблогів, версія %s, доступному під [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+#: actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "Не можна видалити це повідомлення."
 
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
-msgstr "Jabber ID вже належить іншому користувачу."
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+msgid "Delete this notice"
+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."
+#: actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
 msgstr ""
-"Jabber або GTalk адреса, на зразок \"UserName@example.org\". Але спершу "
-"переконайтеся, що додали %s до списку контактів в своєму IM-клієнті або в "
-"GTalk."
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
-msgid "Language"
-msgstr "Мова"
+"Виникли певні проблеми з токеном поточної сесії. Спробуйте знов, будь ласка."
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
-msgid "Language is too long (max 50 chars)."
-msgstr "Мова задовга (50 знаків максимум)"
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr "Це повідомлення не є обраним!"
 
-# "Місцезнаходження", як на мене забагато літер. "Локація" - не менш вживане в українській мові слово.
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
-msgid "Location"
-msgstr "Локація"
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+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
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
-msgid "Location is too long (max 255 chars)."
-msgstr "Локація надто довга (255 знаків максимум)"
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "Такого документа немає."
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
-#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
-#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
-#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#: actions/editgroup.php:56
 #, php-format
-msgid "Login"
-msgstr "Увійти"
+msgid "Edit %s group"
+msgstr "Редагувати групу %s"
 
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Увійти з [OpenID](%%doc.openid%%)."
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
+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 ""
-"Увійти викристовуючи ім'я та пароль. Ще не маєте імені користувача? "
-"[Зареєструвати](%%action.register%%) новий акаунт, або спробувати "
-"[OpenID](%%action.openidlogin%%). "
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+msgid "You must be an admin to edit the group"
+msgstr "Ви маєте бути наділені правами адмінистратора, аби редагувати групу"
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
-msgid "Logout"
-msgstr "Вийти"
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
+msgstr "Скористайтесь цією формою, щоб відредагувати групу."
 
-#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
-msgid "Longer name, preferably your \"real\" name"
-msgstr "Довше ім'я, переважно ваше \"справжнє\" ім'я"
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "опис надто довгий (140 знаків максимум)"
 
-#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
-msgid "Lost or forgotten password?"
-msgstr "Загубили або забули пароль?"
+#: actions/editgroup.php:253
+msgid "Could not update group."
+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/editgroup.php:269
+msgid "Options saved."
+msgstr "Опції збережено."
+
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "Налаштування пошти"
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
 #: actions/emailsettings.php:71
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Зазначте, як само ви бажаєте отримувати листи з %%site.name%%."
 
-#: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
-msgid "Member since"
-msgstr "З нами від"
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "Адреса"
 
-#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
-#, php-format
-msgid "Microblog by %s"
-msgstr "Мікроблог від %s"
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr "Поточна підтверджена поштова адреса."
 
-#: ../actions/smssettings.php:304
-#, php-format
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "Видалити"
+
+#: actions/emailsettings.php:113
 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."
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
 msgstr ""
-"Оператор мобільного зв'язку. Якщо вам відомий оператор, що підтримує "
-"надсилання SMS через електронну пошту, але він тут не вказаний, напишіть нам "
-"і ми внесемо його до списку."
+"Очікування підтвердження цієї адреси. Перевірте вхідну пошту (і теку зі "
+"спамом також!), там має бути повідомлення з подальшими інструкціями."
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-msgid "My text and files are available under "
-msgstr "Мої повідомлення та файли доступні під "
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "Скасувати"
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#: actions/emailsettings.php:142 actions/smssettings.php:152
-msgid "New"
-msgstr "Нове"
+#: actions/emailsettings.php:121
+msgid "Email Address"
+msgstr "Електронна адреса"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
-#, php-format
-msgid "New email address for posting to %s"
-msgstr "Нова електронна адреса для надсилання повідомлень на %s"
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr "Електронна адреса, на зразок \"UserName@example.org\""
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
-msgid "New incoming email address added."
-msgstr "Нову адресу для вхідних повідомлень додано."
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "Додати"
 
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
-msgid "New nickname"
-msgstr "Нове ім'я"
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+msgstr "Вхідна пошта"
 
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
-msgstr "Нове повідомлення"
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
+msgstr "Надсилайте листи на цю адресу і їх буде опубліковано на сайті."
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-msgid "New password"
-msgstr "Новий пароль"
+#: actions/emailsettings.php:145 actions/smssettings.php:162
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr "Створити нову адресу для надсилання повідомлень; видалити стару."
 
-#: ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
-msgstr "Новий пароль успішно збережено. Тепер ви увійшли."
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
+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
-#: actions/login.php:228 actions/profilesettings.php:98
-#: actions/register.php:367 actions/showgroup.php:224
-#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
-msgid "Nickname"
-msgstr "Ім'я користувача"
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
+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
-#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
-msgid "Nickname already in use. Try another one."
-msgstr "Це ім'я вже використовується. Спробуйте інше."
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
+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
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
-"Ім'я користувача повинно складатись з літер нижнього регістру і цифр, ніяких "
-"інтервалів."
-
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
-msgid "Nickname not allowed."
-msgstr "Таке ім'я неприпустиме."
-
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
-msgstr "Ім'я користувача, за яким ви бажаєте слідувати"
-
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
-msgid "Nickname or email"
-msgstr "Ім'я або електронна адреса"
+"Надсилати мені листа, коли хтось додає моє повідомлення до списку обраних."
 
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
-msgid "No"
-msgstr "Ні"
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
+msgstr "Надсилати мені листа, коли хтось шле приватне повідомлення для мене."
 
-#: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
-msgstr "Немає Jabber ID."
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "Надсилати мені листа, коли хтось шле приватне повідомлення для мене."
 
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
-msgid "No authorization request!"
-msgstr "Немає запиту на авторизацію!"
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
+msgstr "Дозволити друзям \"розштовхати\" мене, надіславши мені листа."
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
-msgid "No carrier selected."
-msgstr "Оператора не обрано."
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
+msgstr "Я хочу надсилати повідомлення поштою."
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
-msgstr "Код не введено"
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
+msgstr "Позначати міткою MicroID мою електронну адресу."
 
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
-#: actions/confirmaddress.php:75
-msgid "No confirmation code."
-msgstr "Немає коду підтвердження."
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Зберегти"
 
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
-#: actions/newnotice.php:126 classes/Command.php:223
-msgid "No content!"
-msgstr "Немає змісту!"
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+msgstr "Преференції збережно."
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr "Немає електронної адреси."
 
-#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
-msgid "No id."
-msgstr "Немає ID."
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
-msgid "No incoming email address."
-msgstr "Немає адреси для вхідної пошти."
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
+msgstr "Не можна полагодити цю поштову адресу"
 
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr "На віддаленому сервері такого імені немає."
+#: actions/emailsettings.php:330
+msgid "Not a valid email address"
+msgstr "Це недійсна електронна адреса"
 
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
-msgid "No nickname."
-msgstr "Немає імені."
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
+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
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
-msgid "No pending confirmation to cancel."
-msgstr "Не очікується підтвердження для скасування."
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another user."
+msgstr "Ця електронна адреса належить іншому користувачу."
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
-msgstr "Немає телефонного номера."
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+msgstr "Не вдалося додати код підтвердження."
 
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
-msgstr "Немає URL-адреси профілю, яку б було повернуто сервером."
+#: actions/emailsettings.php:358
+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/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
-msgid "No registered email address for that user."
-msgstr "Для цього користувача немає зареєстрованої електронної адреси."
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
+msgstr "Не очікується підтвердження для скасування."
 
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr "Відповідей на запит немає!"
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "Це помилкова адреса IM."
 
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
-msgid "No results"
-msgstr "Немає результатів"
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "Підтвердження скасовано."
 
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
-msgstr "Немає розміру."
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
+msgstr "Це не ваша адреса."
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
-msgid "No status found with that ID."
-msgstr "Жодних статусів з таким ID."
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "Адресу було видалено."
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
-msgid "No status with that ID found."
-msgstr "Не знайдено жодних статусів з таким ID."
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
+msgstr "Немає адреси для вхідної пошти."
 
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
-msgstr "Такого OpenID немає."
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
+msgstr "Не вдалося оновити запис користувача."
 
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
-msgid "No such document."
-msgstr "Такого документа немає."
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
+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 actions/shownotice.php:87
-#: lib/deleteaction.php:51
-msgid "No such notice."
-msgstr "Такого повідомлення немає."
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
+msgstr "Нову адресу для вхідних повідомлень додано."
 
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr "Немає такого коду відновлення."
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+msgid "Popular notices"
+msgstr "Популярні дописи"
 
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-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 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
-msgid "No such user."
-msgstr "Такого користувача немає."
+#: actions/favorited.php:67
+#, php-format
+msgid "Popular notices, page %d"
+msgstr "Популярні дописи, сторінка %d"
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-msgid "No user with that email address or username."
-msgstr "Користувача з такою електронною адресою або ім'ям немає."
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
+msgstr "Представлено найбільш популярні дописи на сайті."
 
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
-msgstr "Об'єктів для показу немає!"
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
 
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr "Це не код оновлення."
+#: actions/favorited.php:153
+msgid ""
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
+msgstr ""
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
-msgstr "Це не зареєстрований користувач."
+#: actions/favorited.php:156
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
+msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
-msgid "Not a supported data format."
-msgstr "Такий формат даних не підтримується."
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
+msgstr "Обрані дописи %s"
 
-# "Invalid" та "Not a valid" я умовно поставив знак рівняння між ними, тому перекладаю як "недійсний", замість "не дійсний". Це не помилка.
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
-msgstr "Це недійсний Jabber ID"
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Оновлення від %1$s на %2$s!"
 
-#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-msgid "Not a valid OpenID."
-msgstr "Це недійсний OpenID."
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Це повідомлення вже є обраним!"
 
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
-msgid "Not a valid email address"
-msgstr "Це недійсна електронна адреса"
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Видалити з обраних"
 
-#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-msgid "Not a valid email address."
-msgstr "Це недійсна електронна адреса."
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr "Користувачі варті уваги"
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-#: actions/editgroup.php:186 actions/newgroup.php:137
-#: actions/profilesettings.php:195 actions/register.php:161
-msgid "Not a valid nickname."
-msgstr "Це недійсне ім'я користувача."
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr "Користувачі варті уваги, сторінка %d"
 
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
-msgstr "Це недійсна URL-адреса профілю (сервіс вказано невірно)."
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
+msgstr "Вибірка з деяких видатних користувачів на %s"
 
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr "Це недійсна URL-адреса профілю (немає певного XRDS)."
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "Нове повідомлення"
 
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr "Це недійсна URL-адреса профілю (немає документа YADIS)."
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Нове повідомлення"
 
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
-msgid "Not an image or corrupt file."
-msgstr "Це не зображення, або файл зіпсовано."
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
-msgid "Not authorized."
-msgstr "Не авторизовано."
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Ця відповідь не очікується!"
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
-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 actions/block.php:59 actions/disfavor.php:61
-#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
-#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
-#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
-#: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Не увійшли."
-
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
-msgid "Not subscribed!."
-msgstr "Не підписано!."
-
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
-msgstr "Пошук повідомлень"
-
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
-#, php-format
-msgid "Notice feed for %s"
-msgstr "Живлення повідомлень для %s"
-
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
-msgstr "Повідомлення не має профілю"
-
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
-msgid "Notices"
-msgstr "Повідомлення"
-
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
-#, php-format
-msgid "Notices tagged with %s"
-msgstr "Повідомлення позначені з %s"
-
-#: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
-msgstr "Старий пароль"
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "Користувача, який слідкував за вашими повідомленнями, більше не існує."
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
-msgid "OpenID"
-msgstr "OpenID"
-
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
-msgid "OpenID Account Setup"
-msgstr "Установки рахунку OpenID"
-
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-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
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-msgid "OpenID Login"
-msgstr "Вхід OpenID"
-
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-#: actions/openidlogin.php:102 actions/openidsettings.php:101
-msgid "OpenID URL"
-msgstr "URL-адреса OpenID"
-
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
-msgid "OpenID authentication cancelled."
-msgstr "Ідентифікацію OpenID скасовано."
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr "Ідентифікація OpenID невдала: %s"
-
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "Невдача OpenID: %s"
-
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr "OpenID видалено."
-
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
-msgstr "Налаштування OpenID"
-
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-msgid "Optionally add a personal message to the invitation."
-msgstr "Можна додати персональне повідомлення до запрошення (опціонально)."
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+msgstr "Ви можете користуватись локальними підписками!"
 
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
-msgid "Partial upload."
-msgstr "Часткове завантаження."
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
+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 actions/finishopenidlogin.php:118
-#: actions/login.php:231 actions/register.php:372
-#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-msgid "Password"
-msgstr "Пароль"
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "Не авторизовано."
 
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
-msgid "Password and confirmation do not match."
-msgstr "Пароль та підтвердження не співпадають."
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "Не вдалося перетворити токени запиту на токени звернення."
 
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
-msgid "Password must be 6 chars or more."
-msgstr "Пароль має складатись з 6-ти або більше знаків."
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Невідома версія протоколу OMB."
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-msgid "Password recovery requested"
-msgstr "Запит на відновлення паролю відправлено."
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "Помилка при оновленні віддаленого профілю"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-msgid "Password saved."
-msgstr "Пароль збережено."
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+msgid "No such group."
+msgstr "Такої групи немає."
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-msgid "Passwords don't match."
-msgstr "Паролі не співпадають."
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "Такого повідомлення немає."
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
-msgstr "Люди"
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Файл втрачено."
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
-msgstr "Пошук людей"
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "Не визначено жодного профілю."
 
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
-msgstr "Пошук людей"
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
 
-#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
-msgid "Personal"
-msgstr "Особисте"
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "Користувач заблокував вас."
 
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-msgid "Personal message"
-msgstr "Особисті повідомлення"
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "Ви не є учасником цієї групи."
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "Телефонний номер та регіональний код, ніякої пунктуації чи інтервалів"
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "Блокувати користувача."
 
-#: ../actions/userauthorization.php:78
+#: actions/groupblock.php:162
+#, php-format
 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\"."
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
 msgstr ""
-"Будь ласка, перевірте всі деталі, щоб упевнитись, що ви дійсно бажаєте "
-"підписатись на повідомлення даного користувача. Якщо ви не збирались "
-"підписуватись ні на чиї повідомлення, просто натисніть \"Відмінити\"."
 
-#: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr ""
-"Надсилати повідомлення на сайт, коли мій статус Jabber/GTalk змінюється."
+#: actions/groupblock.php:178
+#, fuzzy
+msgid "Do not block this user from this group"
+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 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
-msgid "Preferences"
-msgstr "Преференції"
+#: actions/groupblock.php:179
+#, fuzzy
+msgid "Block this user from this group"
+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
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
-msgid "Preferences saved."
-msgstr "Преференції збережно."
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
+msgstr ""
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
-msgid "Preferred language"
-msgstr "Мова, якій надаєте перевагу"
+#: actions/groupbyid.php:74
+msgid "No ID"
+msgstr "Немає ID"
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
-msgid "Privacy"
-msgstr "Конфіденційність"
+#: actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "Ви маєте спочатку увійти, аби мати змогу створити групу."
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-msgid "Problem saving notice."
-msgstr "Проблема при збереженні повідомлення."
+#: actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "Групи"
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
-msgid "Profile"
-msgstr "Профіль"
+#: actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
 
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
-msgstr "URL-адреса профілю"
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Не вдалося оновити користувача."
 
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
-msgstr "Налаштування профілю"
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "Не маю можливості зберегти ваші налаштування Твіттера!"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-msgid "Profile unknown"
-msgstr "Невідомий профіль"
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Преференції синхронізації збережно."
 
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
-msgid "Public Stream Feed"
-msgstr "Живлення загального потоку"
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
+msgstr "Логотип групи"
 
-#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
-msgid "Public timeline"
-msgstr "Загальна хронологія"
+#: actions/grouplogo.php:150
+#, fuzzy, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr "Ви маєте можливість завантажити логотип для вашої группи."
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Позначати міткою MicroID мою адресу Jabber/GTalk."
+#: actions/grouplogo.php:362
+#, fuzzy
+msgid "Pick a square area of the image to be the logo."
+msgstr "Оберіть квадратну ділянку зображення, яка й буде вашою автарою."
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
-msgid "Publish a MicroID for my email address."
-msgstr "Позначати міткою MicroID мою електронну адресу."
+#: actions/grouplogo.php:396
+msgid "Logo updated."
+msgstr "Логотип оновлено."
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr "Нові теги"
+#: actions/grouplogo.php:398
+msgid "Failed updating logo."
+msgstr "Оновлення логотипу завершилось невдачею."
 
-#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
-msgid "Recover"
-msgstr "Відновити"
+#: actions/groupmembers.php:93 lib/groupnav.php:92
+#, php-format
+msgid "%s group members"
+msgstr "Учасники групи %s"
 
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
-msgid "Recover password"
-msgstr "Відновити пароль"
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
+msgstr "Учасники групи %s, сторінка %d"
 
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-msgid "Recovery code for unknown user."
-msgstr "Код відновлення для невідомого користувача."
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+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
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-msgid "Register"
-msgstr "Реєстрація"
+#: actions/groupmembers.php:175 lib/groupnav.php:107
+msgid "Admin"
+msgstr "Адмін"
 
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
-msgid "Registration not allowed."
-msgstr "Реєстрацію не дозволено."
+#: actions/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
+msgstr "Блок"
 
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
-msgid "Registration successful"
-msgstr "Реєстрація успішна"
+#: actions/groupmembers.php:441
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "Ви маєте бути наділені правами адмінистратора, аби редагувати групу"
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
-msgid "Reject"
-msgstr "Забраковано"
+#: actions/groupmembers.php:473
+#, fuzzy
+msgid "Make Admin"
+msgstr "Адмін"
 
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
-msgid "Remember me"
-msgstr "Пам'ятати мене"
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
-msgid "Remote profile with no matching profile"
-msgstr "Віддалений профіль не співпадає з цим профілем"
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Оновлення від %1$s на %2$s!"
 
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
-msgstr "Віддалена підписка"
+#: actions/groupsearch.php:52
+#, fuzzy, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"Пошук людей на %%site.name%% за їх ім'ям, локацією або інтересами. "
+"Відокремлюйте пошукові умови інтервалами; вони повинні складатись з 3 знаків "
+"або більше."
 
-#: ../actions/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 actions/emailsettings.php:101
-#: actions/emailsettings.php:134 actions/imsettings.php:102
-#: actions/openidsettings.php:166 actions/smssettings.php:103
-#: actions/smssettings.php:146 actions/twittersettings.php:115
-msgid "Remove"
-msgstr "Видалити"
+#: actions/groupsearch.php:58
+msgid "Group search"
+msgstr "Пошук груп"
 
-#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
-msgstr "Видалити OpenID"
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "Немає результатів"
 
-#: ../actions/openidsettings.php:73
+#: actions/groupsearch.php:82
+#, php-format
 msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
 msgstr ""
-"Ви входите лише з одним єдиним OpenID, якщо ви його видалите, то не зможете "
-"увійти знову! Перед тим як видалити його, з початку додайте інший."
-
-#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
-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
-#: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: actions/groupsearch.php:85
 #, php-format
-msgid "Replies to %s"
-msgstr "Відповіді до %s"
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
 
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
-msgid "Reset"
-msgstr "Скинути"
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Групи"
 
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
-msgid "Reset password"
-msgstr "Скинути пароль"
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Групи, сторінка %d"
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-msgid "SMS"
-msgstr "СМС"
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
-msgid "SMS Phone number"
-msgstr "Телефонний номер"
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Створити нову групу"
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
-msgstr "Налаштування СМС"
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
-msgid "SMS confirmation"
-msgstr "Підтвердження СМС"
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "Користувач заблокував вас."
 
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
-msgid "Same as password above"
-msgstr "Такий само, як і пароль вище"
+#: actions/groupunblock.php:128 actions/unblock.php:108
+msgid "Error removing the block."
+msgstr "Помилка при розблокуванні."
 
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
-msgid "Same as password above. Required."
-msgstr "Такий само, як і пароль вище. Неодмінно."
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "Налаштування IM"
 
-#: ../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 actions/emailsettings.php:182
-#: actions/facebooksettings.php:114 actions/imsettings.php:157
-#: actions/othersettings.php:117 actions/profilesettings.php:150
-#: actions/smssettings.php:169 actions/subscriptions.php:124
-#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
-msgid "Save"
-msgstr "Зберегти"
+#: actions/imsettings.php:70
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+"Ви можете надсилати та отримувати повідомлення через Jabber/GTalk [службу "
+"миттєвих повідомлень](%%doc.im%%). Вкажить свою адресу і налаштуйте опції "
+"нижче."
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
-msgid "Search"
-msgstr "Пошук"
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "Ця сторінка не доступна в "
 
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
-msgstr "Живлення потоку пошуку"
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Поточна підтверджена адреса Jabber/GTalk."
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/imsettings.php:114
 #, php-format
 msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
+"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 ""
-"Пошук повідомлень на %%site.name%% за їх змістом. Відокремлюйте пошукові "
-"умови інтервалами; вони повинні складатись з 3 знаків або більше."
+"Очікування підтвердження цієї адреси. Перевірте свій Jabber/GTalk рахунок, "
+"там має бути повідомлення з подальшими інструкціями. (Ви додали %s до вашого "
+"списку контактів?)"
 
-#: ../actions/peoplesearch.php:28
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "Адреса IM"
+
+#: actions/imsettings.php:126
 #, 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."
+"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 ""
-"Пошук людей на %%site.name%% за їх ім'ям, локацією або інтересами. "
-"Відокремлюйте пошукові умови інтервалами; вони повинні складатись з 3 знаків "
-"або більше."
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
-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 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
-msgid "Send"
-msgstr "Так!"
-
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
-msgstr "Надсилайте листи на цю адресу і їх буде опубліковано на сайті."
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
-msgstr "Поівдомляти мене поштою про нові підписки."
+"Jabber або GTalk адреса, на зразок \"UserName@example.org\". Але спершу "
+"переконайтеся, що додали %s до списку контактів в своєму IM-клієнті або в "
+"GTalk."
 
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:143
 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."
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
-"Повідомляти мене за допомогою СМС; Я розімію, що, можливо, понесу надмірні "
-"витрати від мого мобільного оператора."
+"Надсилати повідомлення на сайт, коли мій статус Jabber/GTalk змінюється."
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:153
 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 lib/facebookaction.php:215
-msgid "Settings"
-msgstr "Налаштування"
-
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
-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
-#: actions/finishaddopenid.php:114
-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
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
-msgstr "Сталося щось дивне."
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-"Вибачте, але не затверджено жодної електронної адреси для вхідної пошти."
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
-msgstr "Вибачте, але це не є вашою електронною адресою для входної пошти."
-
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
-msgid "Source"
-msgstr "Джерело"
-
-#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
-msgid "Statistics"
-msgstr "Статистика"
-
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-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
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
-msgid "Subscribe"
-msgstr "Підписатись"
-
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
-msgid "Subscribers"
-msgstr "Підписчики"
-
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
-msgid "Subscription authorized"
-msgstr "Підписку авторизовано"
-
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
-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
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
-msgid "Subscriptions"
-msgstr "Підписки"
-
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
-msgid "System error uploading file."
-msgstr "Система відповіла помилкою при завантаженні цього файла."
-
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
-#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
-msgid "Tags"
-msgstr "Теги"
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "Текст"
-
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
-msgid "Text search"
-msgstr "Пошук тексту"
-
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
-msgstr "Цей OpenID вам не належить."
-
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
-msgstr "Цю адресу вже було підтверджено."
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Позначати міткою MicroID мою адресу Jabber/GTalk."
 
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
-msgstr "Цей код підтвердження не для вас!"
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "Немає Jabber ID."
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr "Ця електронна адреса належить іншому користувачу."
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr "Не можна полагодити цей Jabber ID"
 
-#: ../actions/avatar.php:80 actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
-msgstr "Цей файл надто великий."
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "Це недійсний Jabber ID"
 
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "Це і так вже ваш Jabber ID."
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
-msgid "That is already your email address."
-msgstr "Це і так вже ваша адреса."
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr "Jabber ID вже належить іншому користувачу."
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
-msgid "That is already your phone number."
-msgstr "Це і так вже ваш телефонний номер."
+#: actions/imsettings.php:327
+#, 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/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "Це не ваш Jabber ID."
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
-msgid "That is not your email address."
-msgstr "Це не ваша адреса."
-
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
-msgstr "Це не ваш телефонний номер."
-
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-#: actions/emailsettings.php:367 actions/imsettings.php:349
-msgid "That is the wrong IM address."
-msgstr "Це помилкова адреса IM."
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
-msgstr "Це помилковий код підтвердження."
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-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
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-msgid "That's too long. Max notice size is 140 chars."
-msgstr "Надто довго. Максимальний розмір повідомлення 140 знаків."
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "Надто довго. Максимальний розмір повідомлення 255 знаків."
-
-#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/inbox.php:59
 #, php-format
-msgid "The address \"%s\" has been confirmed for your account."
-msgstr "Адресу \"%s\" було підтверджено для вашого рахунку."
+msgid "Inbox for %s - page %d"
+msgstr "Вхідні для %s - сторінка %d"
 
-#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274 actions/emailsettings.php:282
-#: actions/imsettings.php:258 actions/smssettings.php:282
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
-msgid "The address was removed."
-msgstr "Адресу було видалено."
+#: actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr "Вхідні для %s"
 
-#: ../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:"
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
 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."
+#: actions/invite.php:39
+msgid "Invites have been disabled."
 msgstr ""
-"Підписку було скинуто, але URL-адреса у відповідь не передавалася. Звіртесь "
-"з інструкціями на сайті для більш конкретної інформації про те, як скинути "
-"підписку."
 
-#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/invite.php:41
 #, 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 "Тут представлені ті, хто слідкує за вашими повідомленнями."
+msgid "You must be logged in to invite other users to use %s"
+msgstr "Ви маєте спочатку увійти, аби мати змогу запросити когось до %s"
 
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/invite.php:72
 #, 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 "Тут представлені ті, за чиїми повідомленнями ви слідкуєте."
+msgid "Invalid email address: %s"
+msgstr "Недійсна електронна адреса: %s"
 
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
-msgid ""
-"These people are already users and you were automatically subscribed to them:"
-msgstr "Ці люди вже є користувачами і вас було автоматично підписано до них:"
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
+msgstr "Запрошення відіслано"
 
-#: ../actions/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
-msgstr "Цей код підтвердження застарілий. Будь ласка, розпочніть спочатку."
+#: actions/invite.php:112
+msgid "Invite new users"
+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/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr "Ви вже підписані до цих користувачів:"
 
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/invite.php:131 actions/invite.php:139
 #, 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 до локального "
-"рахунку. Ви можете також створити новий рахунок, або приєднати OpenID до "
-"вашого вже існуючого рахунку, якщо ви його маєте."
-
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-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 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
-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 "Ця сторінка не доступна для того типу медіа, з яким ви погодились"
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
-msgid "Timezone"
-msgstr "Часовий пояс"
+#: actions/invite.php:136
+msgid ""
+"These people are already users and you were automatically subscribed to them:"
+msgstr "Ці люди вже є користувачами і вас було автоматично підписано до них:"
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
-msgid "Timezone not selected."
-msgstr "Часовий пояс не обрано."
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
+msgstr "Запрошення були надіслани наступним особам:"
 
-#: ../actions/remotesubscribe.php:43
-#, php-format
+#: actions/invite.php:150
 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."
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 msgstr ""
-"Щоб підписатись, ви можете [увійти](%%action.login%%), або "
-"[зареєструвати](%%action.register%%) новий  рахунок. Якщо ви вже маєте "
-"рахунок  на [сумісному сайті](%%doc.openmublog%%),  введіть URL-адресу "
-"вашого профілю нижче."
-
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
-msgid "Two user ids or screen_names must be supplied."
-msgstr "Два ID або імені_у_мережі повинні підтримуватись."
-
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL-адреса вашої веб-сторінки, блогу, або профілю на іншому сайті"
-
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-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 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-msgid "Unexpected form submission."
-msgstr "Несподіване представлення форми."
-
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
-msgid "Unexpected password reset."
-msgstr "Несподіване скидання паролю."
-
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-msgid "Unknown action"
-msgstr "Дія невідома"
-
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-msgid "Unknown version of OMB protocol."
-msgstr "Невідома версія протоколу OMB."
+"Вас буде поінформовано, коли запрошені вами особи погодяться з запрошеннями "
+"і зареєструються на сайті. Дякуємо, що сприяєте формуванню спільноти!"
 
-#: ../lib/util.php:269 lib/util.php:285
+#: actions/invite.php:162
 msgid ""
-"Unless otherwise specified, contents of this site are copyright by the "
-"contributors and available under the "
+"Use this form to invite your friends and colleagues to use this service."
 msgstr ""
-"Якщо не зазначено інше, авторське право на вміст цього сайту належить "
-"контрибуторам і доступне під "
-
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
-#, php-format
-msgid "Unrecognized address type %s"
-msgstr "Невизнаний тип адреси %s"
+"Скористуйтесь ціїє формою аби запросити ваших друзів та колег до нашого "
+"сервісу."
 
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
-msgstr "Відписатись"
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "Електронні адреси"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-msgid "Unsupported OMB version"
-msgstr "Версія OMB не підтримується"
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+"Адреси друзів куди надсилатимуться запрошення (кожна адреса окремим рядком)"
 
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
-msgid "Unsupported image file format."
-msgstr "Формат зображення не підтримується."
+#: actions/invite.php:192
+msgid "Personal message"
+msgstr "Особисті повідомлення"
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
-msgstr "Оновлення через SMS"
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
+msgstr "Можна додати персональне повідомлення до запрошення (опціонально)."
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
-msgstr "Оновлення за допомогою служби миттєвих повідомлень (ІМ)"
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
+msgstr "Так!"
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/invite.php:226
 #, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr "Оновлення від %1$s та друзів на %2$s!"
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s запросив(ла) вас приєднатися до нього(неї) на %2$s"
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/invite.php:228
 #, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr "Оновлення від %1$s на %2$s!"
-
-#: ../actions/avatar.php:68 actions/profilesettings.php:161
-#: actions/avatarsettings.php:162 actions/grouplogo.php:232
-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 actions/invite.php:154
 msgid ""
-"Use this form to invite your friends and colleagues to use this service."
+"%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/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 "Використовується лише для оновлень, оголошень та відновлення паролю"
+"%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/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
-msgid "User being listened to doesn't exist."
-msgstr "Користувача, який слідкував за вашими повідомленнями, більше не існує."
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
+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
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-msgid "User has no profile."
-msgstr "Користувач не має профілю."
+#: actions/joingroup.php:90 lib/command.php:217
+msgid "You are already a member of that group"
+msgstr "Ви вже є учасником цієї групи"
 
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
-msgstr "Ім'я користувача"
+#: actions/joingroup.php:128 lib/command.php:234
+#, php-format
+msgid "Could not join user %s to group %s"
+msgstr "Користувачеві %s не вдалось приєднатись до групи %s"
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr "Користувача не знайдено."
+#: actions/joingroup.php:135 lib/command.php:239
+#, php-format
+msgid "%s joined group %s"
+msgstr "%s приєднався до групи %s"
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
-msgid "What timezone are you normally in?"
-msgstr "За яким часовим поясом ви живете?"
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
+msgstr "Ви повинні спочатку увійти на сайт, аби залишити групу."
 
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
-#, php-format
-msgid "What's up, %s?"
-msgstr "Що нового, %s?"
+#: actions/leavegroup.php:90 lib/command.php:268
+msgid "You are not a member of that group."
+msgstr "Ви не є учасником цієї групи."
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-#: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Де ви живете, на зразок \"Місто, область (регіон), країна\""
+#: actions/leavegroup.php:119 lib/command.php:278
+msgid "Could not find membership record."
+msgstr "Не вдалося знайти запис щодо членства."
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
 #, php-format
-msgid "Wrong image type for '%s'"
-msgstr "Неправильний тип зображення для '%s'"
+msgid "Could not remove user %s to group %s"
+msgstr "Не вдалося видалити користувача %s з групи %s"
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
-msgid "Wrong size image at '%s'"
-msgstr "Неправильний розмір зображення '%s'"
+msgid "%s left group %s"
+msgstr "%s залишив групу %s"
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
-msgid "Yes"
-msgstr "Так"
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "Тепер ви увійшли."
 
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-msgid "You already have this OpenID!"
-msgstr "Ви вже маєте цей OpenID!"
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+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/login.php:143
+msgid "Incorrect username or password."
+msgstr "Неточне ім'я або пароль."
 
-#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
-msgstr "Ви вже в системі!"
+#: actions/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
+msgstr "Помилка в налаштуваннях користувача."
 
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-msgid "You are already subscribed to these users:"
-msgstr "Ви вже підписані до цих користувачів:"
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "Увійти"
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
-msgid "You are not friends with the specified user."
-msgstr "Ви не є друзями із вказаним користувачем."
+#: actions/login.php:243
+msgid "Login to site"
+msgstr "Вхід на сайт"
 
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr "Тут ви можете замінити пароль. Оберіть собі якийсь гарний!"
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Ім'я користувача"
 
-#: ../actions/register.php:135 actions/register.php:145
-msgid "You can create a new account to start posting notices."
-msgstr "Ви можете створити новий рахунок, щоб почати писати повідомлення."
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Пароль"
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "Ви можете отримувати СМС через електронну пошту від %%site.name%%."
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "Пам'ятати мене"
 
-#: ../actions/openidsettings.php:86
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
+#: actions/login.php:253 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
 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/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "Загубили або забули пароль?"
 
-#: ../actions/profilesettings.php:27
+#: actions/login.php:282
 msgid ""
-"You can update your personal profile info here so people know more about you."
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
 msgstr ""
-"Ви можете доповнити свій особистий профіль, так що люди знатимуть про вас "
-"більше."
-
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
-msgstr "Ви можете користуватись локальними підписками!"
-
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
-msgid "You can't register if you don't agree to the license."
-msgstr "Ви не зможете зареєструватись, якщо не погодитесь з умовами ліцензії."
-
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
-msgid "You did not send us that profile"
-msgstr "Ви не надсилали нам цього профілю"
+"З міркувань безпеки, будь ласка, введіть ще раз ім'я та пароль, перед тим як "
+"змінювати налаштування."
 
-#: ../lib/mail.php:147
-#, php-format
+#: actions/login.php:286
+#, fuzzy, 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"
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
 msgstr ""
-"Ви маєте нову поштову адресу на %1$s.\n"
-"\n"
-"Надсилайте листи на %2$s, щоб друкувати нові повідомлення.\n"
-"\n"
-"Більше інформації про використання електронної пошти на %3$s.\n"
-"\n"
-"Щиро ваші,\n"
-"%4$s"
+"Увійти викристовуючи ім'я та пароль. Ще не маєте імені користувача? "
+"[Зареєструвати](%%action.register%%) новий акаунт, або спробувати [OpenID](%%"
+"action.openidlogin%%). "
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
-msgid "You may not delete another user's status."
-msgstr "Ви не можете видалити статус іншого користувача."
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
 
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/makeadmin.php:95
 #, 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 actions/invite.php:142
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+msgid "%s is already an admin for group \"%s\"."
 msgstr ""
-"Вас буде поінформовано, коли запрошені вами особи погодяться з запрошеннями "
-"і зареєструються на сайті. Дякуємо, що сприяєте формуванню спільноти!"
-
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr "Вас ідентифіковано. Введіть  новий пароль нижче. "
 
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
-msgid "Your OpenID URL"
-msgstr "URL-адреса вашого OpenID"
-
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
 msgstr ""
-"Ваше ім'я користувача на цьому сервері, або зареєстрована електронна адреса."
 
-#: ../actions/openidsettings.php:28
+#: actions/makeadmin.php:145
 #, php-format
-msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
-"account.  Manage your associated OpenIDs from here."
+msgid "Can't make %s an admin for group %s"
 msgstr ""
-"[OpenID](%%doc.openid%%) дає вам можливість реєструватися на багатьох сайтах "
-" користуючись єдиним рахунком.  Керувати вашими OpenID можна звідси."
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
-msgid "a few seconds ago"
-msgstr "мить тому"
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr "Ніякого поточного статусу"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
-#, php-format
-msgid "about %d days ago"
-msgstr "близько %d днів тому"
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr "Нова група"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
-#, php-format
-msgid "about %d hours ago"
-msgstr "близько %d годин тому"
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
+msgstr "Скористайтесь цією формою для створення нової групи."
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
-#, php-format
-msgid "about %d minutes ago"
-msgstr "близько %d хвилин тому"
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr "Нове повідомлення"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
-#, php-format
-msgid "about %d months ago"
-msgstr "близько %d місяців тому"
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
+msgstr "Ви не можете надіслати повідомлення цьому користувачеві."
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
-msgid "about a day ago"
-msgstr "день тому"
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+msgstr "Немає змісту!"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
-msgid "about a minute ago"
-msgstr "хвилину тому"
+#: actions/newmessage.php:158
+msgid "No recipient specified."
+msgstr "Жодного отримувача не визначено."
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
-msgid "about a month ago"
-msgstr "місяць тому"
+#: actions/newmessage.php:164 lib/command.php:370
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly instead."
+msgstr ""
+"Не надсилайте повідомлень самому собі; краще поговоріть з собою тихенько "
+"вголос."
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
-msgid "about a year ago"
-msgstr "рік тому"
+#: actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "Повідомлення"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
-msgid "about an hour ago"
-msgstr "годину тому"
+#: actions/newmessage.php:185 lib/command.php:375
+#, php-format
+msgid "Direct message to %s sent"
+msgstr "Пряме повідомлення до %s надіслано"
 
-#: ../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 actions/noticesearch.php:187
-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 actions/noticesearch.php:194
-msgid "reply"
-msgstr "відповісти"
-
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-msgid "same as password above"
-msgstr "такий само, як і пароль вище"
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
+msgstr "Помилка в Ajax"
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
-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
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-msgid "There was a problem with your session token. Try again, please."
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "Нове повідомлення"
+
+#: actions/newnotice.php:199
+msgid "Notice posted"
+msgstr "Повідомлення відправлено"
+
+#: actions/noticesearch.php:68
+#, php-format
+msgid ""
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
 msgstr ""
-"Виникли певні проблеми з токеном поточної сесії. Спробуйте знов, будь ласка."
+"Пошук повідомлень на %%site.name%% за їх змістом. Відокремлюйте пошукові "
+"умови інтервалами; вони повинні складатись з 3 знаків або більше."
 
-#: actions/disfavor.php:55 actions/disfavor.php:81
-msgid "This notice is not a favorite!"
-msgstr "Це повідомлення не є обраним!"
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "Пошук тексту"
 
-#: actions/disfavor.php:63 actions/disfavor.php:87
-msgid "Could not delete favorite."
-msgstr "Не можна видалити зі списку обраних."
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr " Потік пошуку для \"%s\""
 
-#: actions/disfavor.php:72 lib/favorform.php:140
-msgid "Favor"
-msgstr "Обрати"
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
+#: actions/noticesearch.php:124
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
-"Надсилати мені листа, коли хтось додає моє повідомлення до списку обраних."
 
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-msgid "Send me email when someone sends me a private message."
-msgstr "Надсилати мені листа, коли хтось шле приватне повідомлення для мене."
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Оновлення від %1$s на %2$s!"
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
-msgid "This notice is already a favorite!"
-msgstr "Це повідомлення вже є обраним!"
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Всі оновлення за збігом з \"%s\""
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132 actions/favor.php:86
-#: actions/twitapifavorites.php:125 classes/Command.php:152
-msgid "Could not create favorite."
-msgstr "Не можна позначити як обране."
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+"Цей користувач не дозволив себе \"розштовхувати\", або не підтвердив чи не "
+"налаштував преференції електронної пошти."
 
-#: actions/favor.php:70
-msgid "Disfavor"
-msgstr "Не обране"
+#: actions/nudge.php:94
+msgid "Nudge sent"
+msgstr "Спробу \"розштовхати\" зараховано"
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
-#, php-format
-msgid "%s favorite notices"
-msgstr "Обрані повідомлення %s"
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr "Спробу \"розштовхати\" зараховано!"
 
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
-#, php-format
-msgid "Feed of favorite notices of %s"
-msgstr "Живлення для обраних повідомлень від %s"
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+msgstr "Повідомлення не має профілю"
 
-#: actions/inbox.php:28 actions/inbox.php:59
+#: actions/oembed.php:86 actions/shownotice.php:180
 #, php-format
-msgid "Inbox for %s - page %d"
-msgstr "Вхідні для %s - сторінка %d"
+msgid "%1$s's status on %2$s"
+msgstr "%1$s має статус на %2$s"
 
-#: actions/inbox.php:30 actions/inbox.php:62
-#, php-format
-msgid "Inbox for %s"
-msgstr "Вхідні для %s"
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "З'єднання"
 
-#: actions/inbox.php:53 actions/inbox.php:115
-msgid "This is your inbox, which lists your incoming private messages."
+#: actions/oembed.php:160
+msgid "Only "
 msgstr ""
-"Це ваші вхідні повідомлення, тут містяться повідомлення надіслані приватно."
 
-#: actions/invite.php:178 actions/invite.php:213
-#, 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 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-msgid "Automatically login in the future; "
-msgstr "Автоматично входити у майбутньому; "
-
-#: actions/login.php:122 actions/login.php:264
-msgid "For security reasons, please re-enter your "
-msgstr "З міркувань безпеки, будь ласка, введіть ще раз свій "
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
+msgstr "Такий формат даних не підтримується."
 
-#: actions/login.php:126 actions/login.php:268
-msgid "Login with your username and password. "
-msgstr "Увійти з вашим ім'ям та паролем. "
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "Пошук людей"
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
-msgid "That's too long. Max message size is 140 chars."
-msgstr "Надто довго. Максимальний розмір 140 знаків."
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "Пошук повідомлень"
 
-#: actions/newmessage.php:65 actions/newmessage.php:128
-msgid "No recipient specified."
-msgstr "Жодного отримувача не визначено."
+#: actions/othersettings.php:60
+msgid "Other Settings"
+msgstr "Інші опції"
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206 actions/newmessage.php:131
-#: actions/newmessage.php:168 classes/Command.php:237
-msgid "You can't send a message to this user."
-msgstr "Ви не можете надіслати повідомлення цьому користувачеві."
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr "Керування деякими іншими опціями"
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
+#: actions/othersettings.php:108
+msgid " (free service)"
 msgstr ""
-"Не надсилайте повідомлень самому собі; краще поговоріть з собою тихенько "
-"вголос."
-
-#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
-msgid "No such user"
-msgstr "Немає такого користувача"
 
-#: actions/newmessage.php:117 actions/newmessage.php:67
-msgid "New message"
-msgstr "Нове повідомлення"
-
-#: actions/noticesearch.php:95 actions/noticesearch.php:146
-msgid "Notice without matching profile"
-msgstr "Повідомлення без відповідного профілю"
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
+msgstr ""
 
-#: actions/openidsettings.php:28 actions/openidsettings.php:70
-#, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr "[OpenID](%%doc.openid%%) дозволяє вам входити до багатьох сайтів "
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
+msgstr "Сервіси доступні для використання"
 
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
-msgstr "Якщо бажаєте додати OpenID до вашого рахунку, "
+#: actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "Налаштування профілю"
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr "Видалення вашого єдиного OpenID унеможливить вхід наступного разу! "
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
 
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-msgid "You can remove an OpenID from your account "
-msgstr "Ви можете видалити OpenID з вашого рахунку "
+#: actions/othersettings.php:153
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Сервіс скорочення URL-адрес надто довгий (50 знаків максимум)."
 
-#: actions/outbox.php:28 actions/outbox.php:58
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %s - page %d"
 msgstr "Вихідні для %s - сторінка %d"
 
-#: actions/outbox.php:30 actions/outbox.php:61
+#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Вихідні для %s"
 
-#: actions/outbox.php:53 actions/outbox.php:116
+#: actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Це ваші вихідні повідомлення, тут містяться повідомлення, які ви надіслали "
 "приватно."
 
-#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
-#, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
-msgstr "Пошук людей на %%site.name%% за ім'ям, локацією або інтересами. "
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "Змінити пароль"
 
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
-msgid "You can update your personal profile info here "
-msgstr "Ви можете оновити власну персональну інформацію тут "
+#: actions/passwordsettings.php:69
+msgid "Change your password."
+msgstr "Змінити пароль."
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
-msgid "User without matching profile"
-msgstr "Користувач з невідповідним профілем"
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+msgid "Password change"
+msgstr "Пароль замінено"
 
-#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
-msgstr "Цей код підтвердження застарілий. "
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "Старий пароль"
 
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
-msgstr "Якщо ви забули або загубили ваш"
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "Новий пароль"
 
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a "
-msgstr "Вас ідентифіковано. Введіть "
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6 або більше знаків"
 
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-msgid "Your nickname on this server, "
-msgstr "Ваше ім'я на цьому сервері, "
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "Підтвердити"
 
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-msgid "Instructions for recovering your password "
-msgstr "Інструкції щодо відновлення паролю "
+#: actions/passwordsettings.php:113
+msgid "same as password above"
+msgstr "такий само, як і пароль вище"
 
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
-msgid "New password successfully saved. "
-msgstr "Новий пароль успішно збережено. "
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "Змінити"
 
-#: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:154 actions/register.php:230
 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 actions/remotesubscribe.php:74
-#, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr "Аби підписатись, ви можете [увійти](%%action.login%%),"
-
-#: actions/showfavorites.php:61 actions/showfavorites.php:145
-#, php-format
-msgid "Feed for favorites of %s"
-msgstr "Живлення для обраних повідомлень від %s"
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "Паролі не співпадають."
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-msgid "Could not retrieve favorite notices."
-msgstr "Не можна відновити обрані повідомлення."
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "Старий пароль неточний"
 
-#: actions/showmessage.php:33 actions/showmessage.php:81
-msgid "No such message."
-msgstr "Немає такого повідомлення."
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "Помилка при збереженні користувача; недійсний."
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
-msgstr "Лише відправник та отримувач мають можливість читати це повідомлення."
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "Не можна зберегти новий пароль."
 
-#: actions/showmessage.php:61 actions/showmessage.php:108
-#, php-format
-msgid "Message to %1$s on %2$s"
-msgstr "Повідомлення до %1$s на %2$s"
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "Пароль збережено."
 
-#: actions/showmessage.php:66 actions/showmessage.php:113
+#: actions/peoplesearch.php:52
 #, php-format
-msgid "Message from %1$s on %2$s"
-msgstr "Повідомлення від %1$s на %2$s"
-
-#: actions/showstream.php:154
-msgid "Send a message"
-msgstr "Надіслати повідомлення"
+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:312 actions/smssettings.php:464
-#, php-format
-msgid "Mobile carrier for your phone. "
-msgstr "Оператор мобільного зв'язку. "
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "Пошук людей"
 
-#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/peopletag.php:70
 #, php-format
-msgid "Direct messages to %s"
-msgstr "Пряме повідомлення до %s"
+msgid "Not a valid people tag: %s"
+msgstr "Це недійсний особистий тег: %s"
 
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/peopletag.php:144
 #, php-format
-msgid "All the direct messages sent to %s"
-msgstr "Всі прямі повідомлення надіслані до %s"
+msgid "Users self-tagged with %s - page %d"
+msgstr "Користувачі з особистим тегом %s - сторінка %d"
 
-#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-msgid "Direct Messages You've Sent"
-msgstr "Прямі повідомлення надіслані вами"
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "Недійсний зміст повідомлення"
 
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/postnotice.php:90
 #, php-format
-msgid "All the direct messages sent from %s"
-msgstr "Всі прямі повідомлення надіслані від %s"
-
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-msgid "No message text!"
-msgstr "Повідомлення без тексту!"
-
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-msgid "Recipient user not found."
-msgstr "Отримувача не знайдено."
-
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
-"Не можна надіслати пряме повідомлення користувачеві, який не є вашим другом."
-
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
-#, php-format
-msgid "%s / Favorites from %s"
-msgstr "%s / Обрані від %s"
-
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
-#, php-format
-msgid "%s updates favorited by %s / %s."
-msgstr "%s оновлення обраних від %s / %s."
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
-#, php-format
-msgid "%s added your notice as a favorite"
-msgstr "%s додав(ла) ваше повідомлення до обраних"
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "Налаштування профілю"
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
-#, php-format
+#: actions/profilesettings.php:71
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+"You can update your personal profile info here so people know more about you."
 msgstr ""
-"%1$s щойно позначив(ла) ваше повідомлення від %2$s як одне з обраних "
-"ним(нею)\n"
-"\n"
+"Ви можете доповнити свій особистий профіль, так що люди знатимуть про вас "
+"більше."
 
-#: actions/twittersettings.php:27
-msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+#: actions/profilesettings.php:99
+msgid "Profile information"
+msgstr "Інформація профілю"
+
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
-"Додайте ваш рахунок на Твіттері для автоматичного пересилання повідомлень "
-"туди, "
+"1-64 літери нижнього регістра і цифри, ніякої пунктуації або інтервалів"
 
-#: actions/twittersettings.php:41 actions/twittersettings.php:60
-msgid "Twitter settings"
-msgstr "Налаштування Твіттера"
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full name"
+msgstr "Повне ім'я"
 
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-msgid "Twitter Account"
-msgstr "Рахунок на Твіттері"
+#: actions/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "Веб-сторінка"
 
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-msgid "Current verified Twitter account."
-msgstr "Поточний підтверджений рахунок на Твіттері."
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "URL-адреса вашої веб-сторінки, блогу, або профілю на іншому сайті"
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr "Ім'я на Твіттері"
+#: actions/profilesettings.php:122 actions/register.php:460
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Опишіть себе та свої інтереси (140 знаків)"
 
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-msgid "No spaces, please."
-msgstr "Без пробілів, будь ласка."
+#: actions/profilesettings.php:125 actions/register.php:463
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Опишіть себе та свої "
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
-msgstr "Пароль на Твіттері"
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "Про себе"
 
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-msgid "Automatically send my notices to Twitter."
-msgstr "Автоматично пересилати мої повідомлення на Твіттер."
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "Локація"
 
-#: actions/twittersettings.php:75 actions/twittersettings.php:146
-msgid "Send local \"@\" replies to Twitter."
-msgstr "Надсилати локальні \"@\" відповіді на Твіттер."
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "Де ви живете, на зразок \"Місто, область (регіон), країна\""
 
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-msgid "Subscribe to my Twitter friends here."
-msgstr "Підписатись до моїх друзів на Твіттері тут."
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
+msgstr "Теги"
 
-#: actions/twittersettings.php:122
+#: actions/profilesettings.php:140
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
-"Ім'я користувача має складатись лише з цифр, літер верхнього та нижнього "
-"регістрів та символів підкреслювання (_). 15 знаків це максимум."
-
-#: actions/twittersettings.php:128 actions/twittersettings.php:334
-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 "Не маю можливості відновити інформацію для \"%s\" з Твіттера."
-
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-msgid "Unable to save your Twitter settings!"
-msgstr "Не маю можливості зберегти ваші налаштування Твіттера!"
-
-#: actions/twittersettings.php:174 actions/twittersettings.php:376
-msgid "Twitter settings saved."
-msgstr "Налаштування Твіттера збережено."
-
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-msgid "That is not your Twitter account."
-msgstr "Це не є вашим рахунком на Твіттері."
-
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
-msgid "Couldn't remove Twitter user."
-msgstr "Не можна видалити користувача Твіттер."
-
-#: actions/twittersettings.php:212 actions/twittersettings.php:407
-msgid "Twitter account removed."
-msgstr "Твіттер рахунок видалено."
-
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
-msgid "Couldn't save Twitter preferences."
-msgstr "Не можна зберегти преференції Твіттера."
+"Позначте себе тегами (літери, цифри, -, . та _), відокремлюючи кожен комою "
+"або пробілом"
 
-#: actions/twittersettings.php:245 actions/twittersettings.php:461
-msgid "Twitter preferences saved."
-msgstr "Преференції Твіттера збережено."
+#: actions/profilesettings.php:144
+msgid "Language"
+msgstr "Мова"
 
-#: actions/userauthorization.php:84 actions/userauthorization.php:86
-msgid "Please check these details to make sure "
-msgstr "Будь ласка, перевірте деталі аби впевнитись "
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr "Мова, якій надаєте перевагу"
 
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
-msgid "The subscription has been authorized, but no "
-msgstr "Підписку було авторизовано, але не "
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr "Часовий пояс"
 
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-msgid "The subscription has been rejected, but no "
-msgstr "Підписку було скинуто, але не "
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
+msgstr "За яким часовим поясом ви живете?"
 
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-msgid "Command results"
-msgstr "Результати команди"
+#: actions/profilesettings.php:160
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+"Автоматично підписуватись до тих, хто підписався до мене (якщо ви бот, то це "
+"саме для вас)"
 
-#: classes/Channel.php:148 classes/Channel.php:204
-msgid "Command complete"
-msgstr "Команду виконано"
+#: actions/profilesettings.php:221 actions/register.php:223
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Ви перевищили ліміт (140 знаків це максимум)"
 
-#: classes/Channel.php:158 classes/Channel.php:215
-msgid "Command failed"
-msgstr "Команду не виконано"
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr "Часовий пояс не обрано."
 
-#: classes/Command.php:39 classes/Command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "Даруйте, але виконання команди ще не завершено."
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr "Мова задовга (50 знаків максимум)"
 
-#: classes/Command.php:96 classes/Command.php:113
+#: actions/profilesettings.php:246 actions/tagother.php:178
 #, php-format
-msgid "Subscriptions: %1$s\n"
-msgstr "Підписки: %1$s\n"
-
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
-msgid "User has no last notice"
-msgstr "Користувач має останнє повідомлення"
-
-#: classes/Command.php:146 classes/Command.php:166
-msgid "Notice marked as fave."
-msgstr "Повідомлення позначено як обране."
+msgid "Invalid tag: \"%s\""
+msgstr "Недійсний тег: \"%s\""
 
-#: classes/Command.php:166 classes/Command.php:189
-#, php-format
-msgid "%1$s (%2$s)"
-msgstr "%1$s (%2$s)"
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
+msgstr "Не вдалося оновити користувача для автопідписки."
 
-#: classes/Command.php:169 classes/Command.php:192
-#, php-format
-msgid "Fullname: %s"
-msgstr "Повне ім'я: %s"
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+msgstr "Не вдалося зберегти профіль."
 
-#: classes/Command.php:172 classes/Command.php:195
-#, php-format
-msgid "Location: %s"
-msgstr "Локація: %s"
+#: actions/profilesettings.php:336
+msgid "Couldn't save tags."
+msgstr "Не вдалося зберегти теги."
 
-#: classes/Command.php:175 classes/Command.php:198
-#, php-format
-msgid "Homepage: %s"
-msgstr "Веб-сторінка: %s"
+#: actions/profilesettings.php:344
+msgid "Settings saved."
+msgstr "Налаштування збережено."
 
-#: classes/Command.php:178 classes/Command.php:201
+#: actions/public.php:83
 #, php-format
-msgid "About: %s"
-msgstr "Про мене: %s"
+msgid "Beyond the page limit (%s)"
+msgstr ""
 
-#: classes/Command.php:200 classes/Command.php:228
-#, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
-msgstr "Повідомлення надто довге - максимум 140 знаків, а ви надрукували %d"
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
+msgstr "Не вдається відновити загальний потік."
 
-#: classes/Command.php:214 classes/Command.php:245
+#: actions/public.php:129
 #, php-format
-msgid "Direct message to %s sent"
-msgstr "Пряме повідомлення до %s надіслано"
+msgid "Public timeline, page %d"
+msgstr "Загальний потік, сторінка %d"
 
-#: classes/Command.php:216 classes/Command.php:247
-msgid "Error sending direct message."
-msgstr "Помилка при відправці прямого повідомлення."
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr "Загальна хронологія"
 
-#: classes/Command.php:263 classes/Command.php:300
-msgid "Specify the name of the user to subscribe to"
-msgstr "Зазначте ім'я користувача, до якого бажаєте підписатись"
+#: actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Живлення загального потоку"
 
-#: classes/Command.php:270 classes/Command.php:307
-#, php-format
-msgid "Subscribed to %s"
-msgstr "Підписано до %s"
+#: actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Живлення загального потоку"
 
-#: classes/Command.php:288 classes/Command.php:328
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Зазначте ім'я користувача, від якого бажаєте відписатись"
+#: actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Живлення загального потоку"
 
-#: classes/Command.php:295 classes/Command.php:335
+#: actions/public.php:179
 #, php-format
-msgid "Unsubscribed from %s"
-msgstr "Відписано від %s"
-
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
-msgid "Command not yet implemented."
-msgstr "Виконання команди ще не завершено."
-
-#: classes/Command.php:313 classes/Command.php:356
-msgid "Notification off."
-msgstr "Сповіщення вимкнуто."
-
-#: classes/Command.php:315 classes/Command.php:358
-msgid "Can't turn off notification."
-msgstr "Не можна вимкнути сповіщення."
-
-#: classes/Command.php:333 classes/Command.php:379
-msgid "Notification on."
-msgstr "Сповіщення увімкнуто."
-
-#: classes/Command.php:335 classes/Command.php:381
-msgid "Can't turn on notification."
-msgstr "Не можна увімкнути сповіщення."
-
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
-msgstr "Команди:\n"
-
-#: classes/Message.php:53 classes/Message.php:56
-msgid "Could not insert message."
-msgstr "Не можна долучити повідомлення."
-
-#: classes/Message.php:63 classes/Message.php:66
-msgid "Could not update message with new URI."
-msgstr "Не можна оновити повідомлення з новим URI."
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
-msgstr "Користувач без відповідного профілю у системі."
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
 
-#: lib/mail.php:147 lib/mail.php:289
+#: actions/public.php:186
 #, php-format
 msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+"Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
-"Тепер ви маєте нову адресу для надсилання повідомлень на %1$s.\n"
-"\n"
 
-#: lib/mail.php:249 lib/mail.php:508
-#, php-format
-msgid "New private message from %s"
-msgstr "Нове приватне повідомлення від %s"
-
-#: lib/mail.php:253 lib/mail.php:512
+#: actions/public.php:233
 #, php-format
 msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
-"%1$s (%2$s) надіслав(ла) вам приватне повідомлення:\n"
-"\n"
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
+#: actions/public.php:238
+#, fuzzy, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
 msgstr ""
-"Лише користувач має можливість переглядати свою власну поштову скриньку."
+"Цей сайт %%site.name%%, є сервісом [мікроблогів] (http://en.wikipedia.org/"
+"wiki/Micro-blogging) "
 
-#: lib/openid.php:195 lib/openid.php:203
-msgid "This form should automatically submit itself. "
-msgstr "Ця форма має автоматично репрезентувати себе системі. "
-
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-msgid "Favorites"
-msgstr "Обрані"
+#: actions/publictagcloud.php:57
+msgid "Public tag cloud"
+msgstr "Загальна хмарка тегів"
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "%s's favorite notices"
-msgstr "Обрані дописи %s"
-
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-msgid "User"
-msgstr "Користувач"
-
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-msgid "Inbox"
-msgstr "Вхідні"
-
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-msgid "Your incoming messages"
-msgstr "Ваші вхідні повідомлення"
-
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-msgid "Outbox"
-msgstr "Вихідні"
-
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-msgid "Your sent messages"
-msgstr "Надіслані вами повідомлення"
-
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-msgid "Twitter"
-msgstr "Твіттер"
-
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
-msgstr "Опції інтеграції з Твіттером"
-
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-msgid "To"
-msgstr "До"
-
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-msgid "Could not parse message."
-msgstr "Не можна розібрати повідомлення."
+msgid "These are most popular recent tags on %s "
+msgstr "Це найбільш популярні нові теги на %s "
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/publictagcloud.php:69
 #, php-format
-msgid "%s and friends, page %d"
-msgstr "%s з друзями, сторінка %d"
-
-#: actions/avatarsettings.php:76
-msgid "You can upload your personal avatar."
-msgstr "Ви можете завантажити вашу персональну аватару."
-
-#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
-msgid "Avatar settings"
-msgstr "Налаштування аватари"
-
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-msgid "Original"
-msgstr "Оригінал"
-
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-msgid "Preview"
-msgstr "Перегляд"
-
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
-msgid "Crop"
-msgstr "Втяти"
-
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-msgid "There was a problem with your session token. "
-msgstr "Виникли певні проблеми з токеном поточної сесії. "
-
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-msgid "Pick a square area of the image to be your avatar"
-msgstr "Оберіть квадратну ділянку зображення, яка й буде вашою автарою."
-
-#: actions/avatarsettings.php:327 actions/grouplogo.php:384
-msgid "Lost our file data."
-msgstr "Дані вашого файлу десь загубились."
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
+msgstr ""
 
-#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
-msgid "Lost our file."
-msgstr "Файл втрачено."
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
+msgstr ""
 
-#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
-#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
-msgid "Unknown file type"
-msgstr "Тип файлу не підтримується"
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
 
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr "Не визначено жодного профілю."
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
+msgstr "Хмарка тегів"
 
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
-msgstr "Не визначено профілю з таким ID."
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "Ви вже в системі!"
 
-#: actions/block.php:111
-msgid "Block user"
-msgstr "Блокувати користувача."
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "Немає такого коду відновлення."
 
-#: actions/block.php:129
-msgid "Are you sure you want to block this user? "
-msgstr "Ви впевненні, що бажаєте заблокувати цього користувача? "
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "Це не код оновлення."
 
-#: actions/block.php:162
-msgid "You have already blocked this user."
-msgstr "Цього користувача вже заблоковано."
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr "Код відновлення для невідомого користувача."
 
-#: actions/block.php:167
-msgid "Failed to save block information."
-msgstr "Збереження інформації про блокування завершилось невдачею."
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "Помилка з кодом підтвердження."
 
-#: actions/confirmaddress.php:159
-#, php-format
-msgid "The address \"%s\" has been "
-msgstr "Адресу \"%s\" було "
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
+msgstr "Цей код підтвердження застарілий. Будь ласка, розпочніть спочатку."
 
-#: actions/deletenotice.php:73
-msgid "You are about to permanently delete a notice. "
-msgstr "Ви видаляєте повідомлення назавжди. "
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
+msgstr "Не вдалося оновити користувача з підтвердженною електронною адресою."
 
-#: actions/disfavor.php:94
-msgid "Add to favorites"
-msgstr "Додати до обраних"
+#: actions/recoverpassword.php:152
+msgid ""
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
+msgstr ""
 
-#: actions/editgroup.php:54
-#, php-format
-msgid "Edit %s group"
-msgstr "Редагувати групу %s"
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
+msgstr ""
 
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-msgid "Inboxes must be enabled for groups to work"
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
 msgstr ""
-"Поштові скриньки для вхідних повідомлень мають бути дозволені для роботи у "
-"групах"
 
-#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-msgid "You must be logged in to create a group."
-msgstr "Ви маєте спочатку увійти, аби мати змогу створити групу."
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
+msgstr ""
 
-#: actions/editgroup.php:87 actions/grouplogo.php:87
-#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
-msgid "No nickname"
-msgstr "Немає імені"
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
+msgstr ""
+"Ваше ім'я користувача на цьому сервері, або зареєстрована електронна адреса."
 
-#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
-#: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
-msgid "No such group"
-msgstr "Такої групи немає"
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
+msgstr "Відновити"
 
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
-msgid "You must be an admin to edit the group"
-msgstr "Ви маєте бути наділені правами адмінистратора, аби редагувати групу"
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "Скинути пароль"
 
-#: actions/editgroup.php:157
-msgid "Use this form to edit the group."
-msgstr "Скористайтесь цією формою, щоб відредагувати групу."
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr "Відновити пароль"
 
-#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
-msgid "Nickname must have only lowercase letters "
-msgstr "Ім'я користувача повинно складатись з літер нижнього регістру "
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
+msgstr "Запит на відновлення паролю відправлено."
 
-#: actions/editgroup.php:198 actions/newgroup.php:149
-msgid "description is too long (max 140 chars)."
-msgstr "опис надто довгий (140 знаків максимум)"
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
+msgstr "Дія невідома"
 
-#: actions/editgroup.php:218
-msgid "Could not update group."
-msgstr "Не вдалося оновити групу."
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 або більше знаків, і не забудьте їх!"
 
-#: actions/editgroup.php:226
-msgid "Options saved."
-msgstr "Опції збережено."
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Такий само, як і пароль вище"
 
-#: actions/emailsettings.php:107 actions/imsettings.php:108
-#, php-format
-msgid "Awaiting confirmation on this address. "
-msgstr "Очікування підтвердження цієї адреси. "
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "Скинути"
 
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-msgid "Make a new email address for posting to; "
-msgstr "Створити нову електронну адресу для надсилання; "
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "Введіть ім'я або електронну адресу."
 
-#: actions/emailsettings.php:157
-msgid "Send me email when someone "
-msgstr "Надсилати мені листа коли хтось "
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
+msgstr "Користувача з такою електронною адресою або ім'ям немає."
 
-#: actions/emailsettings.php:168
-msgid "Allow friends to nudge me and send me an email."
-msgstr "Дозволити друзям \"розштовхати\" мене, надіславши мені листа."
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr "Для цього користувача немає зареєстрованої електронної адреси."
 
-#: actions/emailsettings.php:321
-msgid "That email address already belongs "
-msgstr "Ця електронна адреса вже належить "
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "Помилка при збереженні підтвердження адреси."
 
-#: actions/emailsettings.php:343
-msgid "A confirmation code was sent to the email address you added. "
+#: actions/recoverpassword.php:325
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
 msgstr ""
-"Код підтвердження був відправлений на електронну адресу, яку ви додали. "
-
-#: actions/facebookhome.php:110
-msgid "Server error - couldn't get user!"
-msgstr "Помилка сервера - неможливо дістатись користувача!"
-
-#: actions/facebookhome.php:196
-#, php-format
-msgid "If you would like the %s app to automatically update "
-msgstr "Якщо ви бажаєте додаток до %s для автоматичного оновлення "
+"Інструкції з відновлення паролю було надіслано на електронну адресу, яку ви "
+"вказали у налаштуваннях вашого профілю."
 
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "Дозволити %s оновлювати мій статус у Facebook"
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
+msgstr "Несподіване скидання паролю."
 
-#: actions/facebookhome.php:218
-msgid "Skip"
-msgstr "Пропустити"
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "Пароль має складатись з 6-ти або більше знаків."
 
-#: actions/facebookhome.php:235
-msgid "No notice content!"
-msgstr "Повідомлення не має змісту!"
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
+msgstr "Пароль та підтвердження не співпадають."
 
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-msgid "Pagination"
-msgstr "Нумерація сторінок"
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
+msgstr "Новий пароль успішно збережено. Тепер ви увійшли."
 
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-msgid "After"
-msgstr "Вперед"
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
+msgstr ""
+"Пробачте, але лише ті, кого було запрошено, мають змогу зареєструватись тут."
 
-#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
-msgid "Before"
-msgstr "Назад"
+#: actions/register.php:92
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "Помилка з кодом підтвердження."
 
-#: actions/facebookinvite.php:70
-#, php-format
-msgid "Thanks for inviting your friends to use %s"
-msgstr "Дякуємо, що запросили своїх друзів до %s"
+#: actions/register.php:112
+msgid "Registration successful"
+msgstr "Реєстрація успішна"
 
-#: actions/facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Запрошення були надіслані наступним користувачам:"
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "Реєстрація"
 
-#: actions/facebookinvite.php:96
-#, php-format
-msgid "You have been invited to %s"
-msgstr "Вас запрошують до %s"
+#: actions/register.php:135
+msgid "Registration not allowed."
+msgstr "Реєстрацію не дозволено."
 
-#: actions/facebookinvite.php:105
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Запросіть своїх друзів до %s"
+#: actions/register.php:198
+msgid "You can't register if you don't agree to the license."
+msgstr "Ви не зможете зареєструватись, якщо не погодитесь з умовами ліцензії."
 
-#: actions/facebookinvite.php:113
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Друзі, які вже користуються %s:"
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "Це недійсна електронна адреса."
 
-#: actions/facebookinvite.php:130
-#, php-format
-msgid "Send invitations"
-msgstr "Надіслати запрошення"
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "Ця адреса вже використовується."
 
-#: actions/facebookremove.php:56
-msgid "Couldn't remove Facebook user."
-msgstr "Не вдалося видалити користувача Facebook."
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "Недійсне ім'я або пароль."
 
-#: actions/facebooksettings.php:65
-msgid "There was a problem saving your sync preferences!"
-msgstr "Виникли певні проблеми при збереженні ваших преференцій синхронізації!"
+#: actions/register.php:342
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
 
-#: actions/facebooksettings.php:67
-msgid "Sync preferences saved."
-msgstr "Преференції синхронізації збережно."
+#: actions/register.php:424
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+"1-64 літери нижнього регістра і цифри, ніякої пунктуації або інтервалів. "
+"Неодмінно."
 
-#: actions/facebooksettings.php:90
-msgid "Automatically update my Facebook status with my notices."
-msgstr "Автоматично оновлювати мій статус у Facebook моїми повідомленнями."
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr "6 або більше знаків. Неодмінно."
 
-#: actions/facebooksettings.php:97
-msgid "Send \"@\" replies to Facebook."
-msgstr "Надсилати \"@\" відповіді до Facebook."
+#: actions/register.php:433
+msgid "Same as password above. Required."
+msgstr "Такий само, як і пароль вище. Неодмінно."
 
-#: actions/facebooksettings.php:106
-msgid "Prefix"
-msgstr "Префікс"
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "Пошта"
 
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
-msgstr "Прив'язка префікса до повідомлень."
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
+msgstr "Використовується лише для оновлень, оголошень та відновлення паролю"
 
-#: actions/facebooksettings.php:124
-#, php-format
-msgid "If you would like %s to automatically update "
-msgstr "Якщо бажаєте %s для автоматичного оновлення "
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
+msgstr "Довше ім'я, переважно ваше \"справжнє\" ім'я"
 
-#: actions/facebooksettings.php:147
-msgid "Sync preferences"
-msgstr "Преференції синхронізації"
+#: actions/register.php:493
+msgid "My text and files are available under "
+msgstr "Мої повідомлення та файли доступні під "
 
-#: actions/favor.php:94 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "Видалити з обраних"
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
 
-#: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
-msgid "Popular notices"
-msgstr "Популярні дописи"
+#: actions/register.php:496
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+" окрім цих приватних даних: пароль, електронна адреса, адреса IM, телефонний "
+"номер."
 
-#: actions/favorited.php:67
+#: actions/register.php:537
 #, php-format
-msgid "Popular notices, page %d"
-msgstr "Популярні дописи, сторінка %d"
-
-#: actions/favorited.php:79
-msgid "The most popular notices on the site right now."
-msgstr "Представлено найбільш популярні дописи на сайті."
-
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
-msgid "Featured users"
-msgstr "Користувачі варті уваги"
+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/featured.php:71
-#, php-format
-msgid "Featured users, page %d"
-msgstr "Користувачі варті уваги, сторінка %d"
+#: actions/register.php:561
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+"(Ви маєте негайно отримати листа електронною поштою, в якому знаходитимуться "
+"інструкції щодо підтвердження вашої електронної адреси.)"
 
-#: actions/featured.php:99
+#: actions/remotesubscribe.php:98
 #, php-format
-msgid "A selection of some of the great users on %s"
-msgstr "Вибірка з деяких видатних користувачів на %s"
-
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
-msgstr "Цей користувач заблокував вашу можливість підписатись."
-
-#: actions/groupbyid.php:79
-msgid "No ID"
-msgstr "Немає ID"
-
-#: actions/grouplogo.php:138 actions/grouplogo.php:191
-msgid "Group logo"
-msgstr "Логотип групи"
-
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
-msgstr "Ви маєте можливість завантажити логотип для вашої группи."
-
-#: actions/grouplogo.php:448
-msgid "Logo updated."
-msgstr "Логотип оновлено."
+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/grouplogo.php:450
-msgid "Failed updating logo."
-msgstr "Оновлення логотипу завершилось невдачею."
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr "Віддалена підписка"
 
-#: actions/groupmembers.php:93 lib/groupnav.php:91
-#, php-format
-msgid "%s group members"
-msgstr "Учасники групи %s"
+#: actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Підписатись до цього користувача"
 
-#: actions/groupmembers.php:96
-#, php-format
-msgid "%s group members, page %d"
-msgstr "Учасники групи %s, сторінка %d"
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "Ім'я користувача"
 
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
-msgstr "Список учасників цієї групи."
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr "Ім'я користувача, за яким ви бажаєте слідувати"
 
-#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
-msgid "Groups"
-msgstr "Групи"
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "URL-адреса профілю"
 
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "Групи, сторінка %d"
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "URL-адреса вашого профілю на іншому сумісному сервісі"
 
-#: actions/groups.php:90
-#, php-format
-msgid "%%%%site.name%%%% groups let you find and talk with "
-msgstr ""
-"Групи на сайті %%%%site.name%%%% надають вам можливість знайти та "
-"спілкуватись з "
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
+msgstr "Підписатись"
 
-#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-msgid "Create a new group"
-msgstr "Створити нову групу"
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr "Недійсна URL-адреса профілю (неправильний формат)"
 
-#: actions/groupsearch.php:57
-#, php-format
+#: actions/remotesubscribe.php:168
+#, fuzzy
 msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-msgstr "Пошук груп на %%site.name%% за їх назвою, локацією або описом. "
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "Це недійсна URL-адреса профілю (немає документа YADIS)."
 
-#: actions/groupsearch.php:63
-msgid "Group search"
-msgstr "Пошук груп"
+#: actions/remotesubscribe.php:176
+#, fuzzy
+msgid "That’s a local profile! Login to subscribe."
+msgstr "Це локальний профіль! Увійдіть аби підписатись."
 
-#: actions/imsettings.php:70
-msgid "You can send and receive notices through "
-msgstr "У вас є можливість надсилати та отримувати повідомлення за допомогою "
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "Не вдалося отримати токен запиту."
 
-#: actions/imsettings.php:120
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
 #, php-format
-msgid "Jabber or GTalk address, "
-msgstr "Jabber або GTalk адреса, "
-
-#: actions/imsettings.php:147
-msgid "Send me replies through Jabber/GTalk "
-msgstr "Надсилати мені відповіді за допомою Jabber/GTalk "
+msgid "Replies to %s"
+msgstr "Відповіді до %s"
 
-#: actions/imsettings.php:321
+#: actions/replies.php:127
 #, php-format
-msgid "A confirmation code was sent "
-msgstr "Код підтвердження було відправлено "
+msgid "Replies to %s, page %d"
+msgstr "Відповіді %s, сторінка %d"
 
-#: actions/joingroup.php:65
-msgid "You must be logged in to join a group."
-msgstr "Ви повинні спочатку увійти на сайт, аби приєднатися до групи."
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Живлення повідомлень для %s"
 
-#: actions/joingroup.php:95
-msgid "You are already a member of that group"
-msgstr "Ви вже є учасником цієї групи"
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Живлення повідомлень для %s"
 
-#: actions/joingroup.php:128
+#: actions/replies.php:158
 #, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Користувачеві %s не вдалось приєднатись до групи %s"
+msgid "Replies feed for %s (Atom)"
+msgstr "Живлення повідомлень для %s"
 
-#: actions/joingroup.php:135
+#: actions/replies.php:198
 #, php-format
-msgid "%s joined group %s"
-msgstr "%s приєднався до групи %s"
-
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
-msgstr "Скриньки вхідних повідомлень мають бути дозволені для роботи у групах."
-
-#: actions/leavegroup.php:65
-msgid "You must be logged in to leave a group."
-msgstr "Ви повинні спочатку увійти на сайт, аби залишити групу."
-
-#: actions/leavegroup.php:88
-msgid "No such group."
-msgstr "Такої групи немає."
-
-#: actions/leavegroup.php:95
-msgid "You are not a member of that group."
-msgstr "Ви не є учасником цієї групи."
-
-#: actions/leavegroup.php:100
-msgid "You may not leave a group while you are its administrator."
-msgstr "Ви не можете залишити групу допоки ви є її адміністратором."
-
-#: actions/leavegroup.php:130
-msgid "Could not find membership record."
-msgstr "Не вдалося знайти запис щодо членства."
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
 
-#: actions/leavegroup.php:138
+#: actions/replies.php:203
 #, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "Не вдалося видалити користувача %s з групи %s"
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
 
-#: actions/leavegroup.php:145
+#: actions/replies.php:205
 #, php-format
-msgid "%s left group %s"
-msgstr "%s залишив групу %s"
-
-#: actions/login.php:225 lib/facebookaction.php:304
-msgid "Login to site"
-msgstr "Вхід на сайт"
-
-#: actions/microsummary.php:69
-msgid "No current status"
-msgstr "Ніякого поточного статусу"
-
-#: actions/newgroup.php:53
-msgid "New group"
-msgstr "Нова група"
-
-#: actions/newgroup.php:115
-msgid "Use this form to create a new group."
-msgstr "Скористайтесь цією формою для створення нової групи."
-
-#: actions/newgroup.php:177
-msgid "Could not create group."
-msgstr "Не вдалося створити нову групу"
-
-#: actions/newgroup.php:191
-msgid "Could not set group membership."
-msgstr "Не вдалося встановити членство."
-
-#: actions/newmessage.php:119 actions/newnotice.php:132
-msgid "That's too long. "
-msgstr "Це надто довго. "
-
-#: actions/newmessage.php:134
-msgid "Don't send a message to yourself; "
-msgstr "Не надсилайте повідомлень самому собі; "
-
-#: actions/newnotice.php:166
-msgid "Notice posted"
-msgstr "Повідомлення відправлено"
-
-#: actions/newnotice.php:200 classes/Channel.php:163
-msgid "Ajax Error"
-msgstr "Помилка в Ajax"
-
-#: actions/nudge.php:85
 msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
-"Цей користувач не дозволив себе \"розштовхувати\", або не підтвердив чи не "
-"налаштував преференції електронної пошти."
-
-#: actions/nudge.php:94
-msgid "Nudge sent"
-msgstr "Спробу \"розштовхати\" зараховано"
-
-#: actions/nudge.php:97
-msgid "Nudge sent!"
-msgstr "Спробу \"розштовхати\" зараховано!"
-
-#: actions/openidlogin.php:97
-msgid "OpenID login"
-msgstr "Вхід OpenID"
-
-#: actions/openidsettings.php:128
-msgid "Removing your only OpenID "
-msgstr "Видалити ваш єдиний OpenID "
-
-#: actions/othersettings.php:60
-msgid "Other Settings"
-msgstr "Інші опції"
-
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Керування деякими іншими опціями"
 
-#: actions/othersettings.php:93
-msgid "URL Auto-shortening"
-msgstr "Автоматичне скорочення URL-адрес"
-
-#: actions/othersettings.php:112
-msgid "Service"
-msgstr "Сервіс"
-
-#: actions/othersettings.php:113
-msgid "Automatic shortening service to use."
-msgstr "Сервіси доступні для використання"
-
-#: actions/othersettings.php:144
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "Сервіс скорочення URL-адрес надто довгий (50 знаків максимум)."
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Повідомлення до %1$s на %2$s"
 
-#: actions/passwordsettings.php:69
-msgid "Change your password."
-msgstr "Змінити пароль."
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "Обрані повідомлення %s, сторінка %d"
 
-#: actions/passwordsettings.php:89
-msgid "Password change"
-msgstr "Пароль замінено"
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
+msgstr "Не можна відновити обрані повідомлення."
 
-#: actions/peopletag.php:35
+#: actions/showfavorites.php:170
 #, php-format
-msgid "Not a valid people tag: %s"
-msgstr "Це недійсний особистий тег: %s"
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Живлення для друзів %s"
 
-#: actions/peopletag.php:47
+#: actions/showfavorites.php:177
 #, php-format
-msgid "Users self-tagged with %s - page %d"
-msgstr "Користувачі з особистим тегом %s - сторінка %d"
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Живлення для друзів %s"
 
-#: actions/peopletag.php:91
+#: actions/showfavorites.php:184
 #, php-format
-msgid "These are users who have tagged themselves \"%s\" "
-msgstr "Тут представлені користувачі, які позначили себе тегом \"%s\" "
-
-#: actions/profilesettings.php:91
-msgid "Profile information"
-msgstr "Інформація профілю"
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Живлення для друзів %s"
 
-#: actions/profilesettings.php:124
+#: actions/showfavorites.php:205
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""
-"Позначте себе тегами (літери, цифри, -, . та _), відокремлюючи кожен комою "
-"або пробілом"
 
-#: actions/profilesettings.php:144
-msgid "Automatically subscribe to whoever "
-msgstr "Автоматична підписка до будь кого, хто "
-
-#: actions/profilesettings.php:229 actions/tagother.php:176
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Недійсний тег: \"%s\""
-
-#: actions/profilesettings.php:311
-msgid "Couldn't save tags."
-msgstr "Не вдалося зберегти теги."
-
-#: actions/public.php:107
-#, php-format
-msgid "Public timeline, page %d"
-msgstr "Загальний потік, сторінка %d"
-
-#: actions/public.php:173
-msgid "Could not retrieve public stream."
-msgstr "Не вдається відновити загальний потік."
-
-#: actions/public.php:220
+#: actions/showfavorites.php:207
 #, php-format
 msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
 msgstr ""
-"Цей сайт %%site.name%%, є сервісом [мікроблогів] "
-"(http://en.wikipedia.org/wiki/Micro-blogging) "
-
-#: actions/publictagcloud.php:57
-msgid "Public tag cloud"
-msgstr "Загальна хмарка тегів"
 
-#: actions/publictagcloud.php:63
+#: actions/showfavorites.php:211
 #, php-format
-msgid "These are most popular recent tags on %s "
-msgstr "Це найбільш популярні нові теги на %s "
-
-#: actions/publictagcloud.php:119
-msgid "Tag cloud"
-msgstr "Хмарка тегів"
-
-#: actions/register.php:139 actions/register.php:349
-msgid "Sorry, only invited people can register."
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
 msgstr ""
-"Пробачте, але лише ті, кого було запрошено, мають змогу зареєструватись тут."
-
-#: actions/register.php:149
-msgid "You can't register if you don't "
-msgstr "Ви не зможете зареєструватись, якщо не "
-
-#: actions/register.php:286
-msgid "With this form you can create "
-msgstr "Скориставшись цією формою, ви можете створити "
-
-#: actions/register.php:368
-msgid "1-64 lowercase letters or numbers, "
-msgstr "1-64 літери нижнього регістра і цифри "
-
-#: actions/register.php:382 actions/register.php:386
-msgid "Used only for updates, announcements, "
-msgstr "Використовується лише для оновлень, оголошень, "
-
-#: actions/register.php:398
-msgid "URL of your homepage, blog, "
-msgstr "URL-адреса вашої веб-сторінки, блогу, "
-
-#: actions/register.php:404
-msgid "Describe yourself and your "
-msgstr "Опишіть себе та свої "
-
-#: actions/register.php:410
-msgid "Where you are, like \"City, "
-msgstr "Де ви живете, на зразок \"Місто, "
-
-#: actions/register.php:432
-msgid " except this private data: password, "
-msgstr " окрім цих приватних даних: пароль, "
-
-#: actions/register.php:471
-#, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
-msgstr "Вітаємо, %s! І ласкаво просимо до %%%%site.name%%%%. "
-
-#: actions/register.php:495
-msgid "(You should receive a message by email "
-msgstr "(Ви маєте отримати листа електронною поштою "
 
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
-msgstr "Це локальний профіль! Увійдіть аби підписатись."
-
-#: actions/replies.php:118
-#, php-format
-msgid "Replies to %s, page %d"
-msgstr "Відповіді %s, сторінка %d"
-
-#: actions/showfavorites.php:79
-#, php-format
-msgid "%s favorite notices, page %d"
-msgstr "Обрані повідомлення %s, сторінка %d"
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:82 lib/groupnav.php:86
 #, php-format
 msgid "%s group"
 msgstr "Група %s"
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr "Група %s, сторінка %d"
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:218
 msgid "Group profile"
 msgstr "Профіль групи"
 
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
 msgid "URL"
 msgstr "URL"
 
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
 msgid "Note"
 msgstr "Зауваження"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:293
 msgid "Group actions"
 msgstr "Діяльність групи"
 
-#: actions/showgroup.php:323
-#, php-format
-msgid "Notice feed for %s group"
+#: actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Живлення повідомлень для групи %s"
+
+#: actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Живлення повідомлень для групи %s"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Живлення повідомлень для групи %s"
+
+#: actions/showgroup.php:345
+#, php-format
+msgid "FOAF for %s group"
+msgstr "Вихідні для %s"
+
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
 msgid "Members"
 msgstr "Учасники"
 
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
 #: lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Пусто)"
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:392
 msgid "All members"
 msgstr "Всі учасники"
 
-#: actions/showgroup.php:378
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "Статистика"
+
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Створити"
+
+#: actions/showgroup.php:448
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+
+#: actions/showgroup.php:454
+#, fuzzy, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
 msgstr ""
 "**%s** це група користувачів на сайті %%%%site.name%%%%, який є сервісом "
 "[мікроблогів] (http://en.wikipedia.org/wiki/Micro-blogging) "
 
+#: actions/showgroup.php:482
+#, fuzzy
+msgid "Admins"
+msgstr "Адмін"
+
+#: actions/showmessage.php:81
+msgid "No such message."
+msgstr "Немає такого повідомлення."
+
 #: actions/showmessage.php:98
-msgid "Only the sender and recipient "
-msgstr "Лише відправник та отримувач "
+msgid "Only the sender and recipient may read this message."
+msgstr "Лише відправник та отримувач мають можливість читати це повідомлення."
+
+#: actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr "Повідомлення до %1$s на %2$s"
+
+#: actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr "Повідомлення від %1$s на %2$s"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Повідомлення відправлено"
 
 #: actions/showstream.php:73
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "Повідомлення позначені з %s"
+
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, сторінка %d"
 
-#: actions/showstream.php:143
-msgid "'s profile"
-msgstr " профіль"
+#: actions/showstream.php:122
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Живлення повідомлень для групи %s"
 
-#: actions/showstream.php:236 actions/tagother.php:77
-msgid "User profile"
-msgstr "Профіль користувача."
+#: actions/showstream.php:129
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Живлення повідомлень для %s"
 
-#: actions/showstream.php:240 actions/tagother.php:81
-msgid "Photo"
-msgstr "Фото"
+#: actions/showstream.php:136
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Живлення повідомлень для %s"
 
-#: actions/showstream.php:317
-msgid "User actions"
-msgstr "Діяльність користувача"
+#: actions/showstream.php:143
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Живлення повідомлень для %s"
 
-#: actions/showstream.php:342
-msgid "Send a direct message to this user"
-msgstr "Надіслати пряме повідомлення цьому користувачеві"
+#: actions/showstream.php:148
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Вихідні для %s"
 
-#: actions/showstream.php:343
-msgid "Message"
-msgstr "Повідомлення"
+#: actions/showstream.php:191
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
 
-#: actions/showstream.php:451
-msgid "All subscribers"
-msgstr "Всі підписчики"
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
 
-#: actions/showstream.php:533
-msgid "All groups"
-msgstr "Всі групи"
+#: actions/showstream.php:198
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
 
-#: actions/showstream.php:542
+#: actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+
+#: actions/showstream.php:239
+#, fuzzy, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
 msgstr ""
 "**%s** є власником рахунку на сайті %%%%site.name%%%% - сервісі "
 "[мікроблогів] (http://en.wikipedia.org/wiki/Micro-blogging) "
 
-#: actions/smssettings.php:128
-msgid "Phone number, no punctuation or spaces, "
-msgstr "Телефонний номер, ніякої пунктуації або інтервалів, "
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "Налаштування СМС"
 
-#: actions/smssettings.php:162
-msgid "Send me notices through SMS; "
-msgstr "Повідомляти мене за допомогою СМС; "
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr "Ви можете отримувати СМС через електронну пошту від %%site.name%%."
 
-#: actions/smssettings.php:335
-msgid "A confirmation code was sent to the phone number you added. "
-msgstr "Код підтвердження було надіслано на телефонний номер, який ви додали. "
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Ця сторінка не доступна в "
+
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Поточний підтверджений телефонний номер."
+
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
+msgstr "Очікування підтвердження телефонного номера."
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:130
+msgid "Confirmation code"
+msgstr "Код підтвердження"
+
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
+msgstr "Введіть код, який ви отримали телефоном."
+
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
+msgstr "Телефонний номер"
+
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "Телефонний номер та регіональний код, ніякої пунктуації чи інтервалів"
+
+#: actions/smssettings.php:174
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+"Повідомляти мене за допомогою СМС; Я розімію, що, можливо, понесу надмірні "
+"витрати від мого мобільного оператора."
+
+#: actions/smssettings.php:306
+msgid "No phone number."
+msgstr "Немає телефонного номера."
+
+#: actions/smssettings.php:311
+msgid "No carrier selected."
+msgstr "Оператора не обрано."
+
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
+msgstr "Це і так вже ваш телефонний номер."
+
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
+msgstr "Цей телефонний номер належить іншому користувачу."
+
+#: actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"Код підтвердження був відправлений на телефонний номер, який ви додали. "
+"Перевірте вхідні повідомлення, там має бути код та подальші інструкції."
+
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
+msgstr "Це помилковий код підтвердження."
+
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
+msgstr "Це не ваш телефонний номер."
+
+#: actions/smssettings.php:465
 msgid "Mobile carrier"
 msgstr "Мобільний оператор"
 
+#: actions/smssettings.php:469
+msgid "Select a carrier"
+msgstr "Оберіть оператора"
+
+#: actions/smssettings.php:476
+#, 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 через електронну пошту, але він тут не вказаний, напишіть нам "
+"і ми внесемо його до списку."
+
+#: actions/smssettings.php:498
+msgid "No code entered"
+msgstr "Код не введено"
+
 #: actions/subedit.php:70
 msgid "You are not subscribed to that profile."
 msgstr "Ви не підписані до цього профілю."
@@ -4291,13 +3044,31 @@ msgid "%s subscribers, page %d"
 msgstr "Підписані до %s, сторінка %d"
 
 #: actions/subscribers.php:63
-msgid "These are the people who listen to "
-msgstr "Тут представлені ті, хто слідкує за "
+msgid "These are the people who listen to your notices."
+msgstr "Тут представлені ті, хто слідкує за вашими повідомленнями."
 
 #: actions/subscribers.php:67
 #, php-format
-msgid "These are the people who "
-msgstr "Тут представлені ті, хто "
+msgid "These are the people who listen to %s's notices."
+msgstr "Тут представлені ті, хто слідкує за повідомленнями від %s."
+
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
+msgstr ""
+
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr ""
+
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
 
 #: actions/subscriptions.php:52
 #, php-format
@@ -4310,27 +3081,36 @@ msgid "%s subscriptions, page %d"
 msgstr "Підписки %s, сторінка %d"
 
 #: actions/subscriptions.php:65
-msgid "These are the people whose notices "
-msgstr "Тут представлені ті, за чиїми повідомленнями "
+msgid "These are the people whose notices you listen to."
+msgstr "Тут представлені ті, за чиїми повідомленнями ви слідкуєте."
 
 #: actions/subscriptions.php:69
 #, php-format
-msgid "These are the people whose "
-msgstr "Тут представлені ті, чиї "
+msgid "These are the people whose notices %s listens to."
+msgstr "Тут представлені ті, за чиїми повідомленнями слідкує %s."
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:121
+#, php-format
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
+msgstr ""
+
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s тепер слідкує за повідомленями "
+
+#: actions/subscriptions.php:194
 msgid "Jabber"
 msgstr "Jabber"
 
-#: actions/tag.php:43
-#, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Повідомлення позначені %s, сторінка %d"
-
-#: actions/tag.php:66
-#, php-format
-msgid "Messages tagged \"%s\", most recent first"
-msgstr "Найновіші повідомлення позначені \"%s\""
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
+msgstr "СМС"
 
 #: actions/tagother.php:33
 msgid "Not logged in"
@@ -4345,11 +3125,19 @@ msgstr "Немає аргументу ID."
 msgid "Tag %s"
 msgstr "Позначити %s"
 
+#: actions/tagother.php:77 lib/userprofile.php:75
+msgid "User profile"
+msgstr "Профіль користувача."
+
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
+msgstr "Фото"
+
 #: actions/tagother.php:141
 msgid "Tag user"
 msgstr "Позначити користувача"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -4357,238 +3145,889 @@ msgstr ""
 "Позначити користувача тегами (літери, цифри, -, . та _), відокремлюючи кожен "
 "комою або пробілом"
 
-#: actions/tagother.php:164
-msgid "There was a problem with your session token."
-msgstr "Виникли певні проблеми з токеном поточної сесії."
-
-#: actions/tagother.php:191
+#: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Ви маєте можливість позначати тегами тих, до кого ви підписані, а також тих, "
 "хто є підписаним до вас."
 
-#: actions/tagother.php:198
+#: actions/tagother.php:200
 msgid "Could not save tags."
 msgstr "Не вдалося зберегти теги."
 
-#: actions/tagother.php:233
+#: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "Скористайтесь цією формою, щоб додати теги підпискам та підписчикам."
 
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Повідомлення позначені %s, сторінка %d"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Живлення повідомлень для %s"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Живлення повідомлень для %s"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Живлення повідомлень для %s"
+
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Такого тегу немає."
 
-#: actions/tagrss.php:66
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
+msgstr "API метод наразі знаходиться у розробці."
+
+#: actions/unsubscribe.php:77
+msgid "No profile id in request."
+msgstr "У запиті відсутній ID профілю."
+
+#: actions/unsubscribe.php:84
+msgid "No profile with that id."
+msgstr "Немає профілю з таким ID."
+
+#: actions/unsubscribe.php:98
+msgid "Unsubscribed"
+msgstr "Відписано"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
 #, php-format
-msgid "Microblog tagged with %s"
-msgstr "Мікроблог позначено тегом %s"
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
 
-#: actions/twitapiblocks.php:47
-msgid "Block user failed."
-msgstr "Спроба заблокувати користувача невдала."
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "Авторизувати підписку"
 
-#: actions/twitapiblocks.php:69
-msgid "Unblock user failed."
-msgstr "Спроба розблокувати користувача невдала."
+#: actions/userauthorization.php:110
+#, fuzzy
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
+msgstr ""
+"Будь ласка, перевірте всі деталі, щоб упевнитись, що ви дійсно бажаєте "
+"підписатись на повідомлення даного користувача. Якщо ви не збирались "
+"підписуватись ні на чиї повідомлення, просто натисніть \"Відмінити\"."
 
-#: actions/twitapiusers.php:48
-msgid "Not found."
-msgstr "Не знайдено."
+#: actions/userauthorization.php:188
+#, fuzzy
+msgid "License"
+msgstr "ліцензія."
 
-#: actions/twittersettings.php:71
-msgid "Add your Twitter account to automatically send "
-msgstr "Додайте свій рахунок на Твіттері, аби автоматично пересилати "
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "Погодитись"
 
-#: actions/twittersettings.php:119
-msgid "Twitter user name"
-msgstr "Ваше ім'я користувача на Твіттері"
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Підписатись до цього користувача"
 
-#: actions/twittersettings.php:126
-msgid "Twitter password"
-msgstr "Пароль на Твіттері"
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "Забраковано"
 
-#: actions/twittersettings.php:228
-msgid "Twitter Friends"
-msgstr "Друзі на Твіттері"
+#: actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "Підписки %s"
 
-#: actions/twittersettings.php:327
-msgid "Username must have only numbers, "
-msgstr "Ім'я користувача має складатись лише з цифр, "
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
+msgstr "Немає запиту на авторизацію!"
 
-#: actions/twittersettings.php:341
-#, php-format
-msgid "Unable to retrieve account information "
-msgstr "Не вдається відновити інформацію рахунку "
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+msgstr "Підписку авторизовано"
 
-#: actions/unblock.php:108
-msgid "Error removing the block."
-msgstr "Помилка при розблокуванні."
+#: actions/userauthorization.php:249
+#, fuzzy
+msgid ""
+"The subscription has been authorized, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to authorize the "
+"subscription. Your subscription token is:"
+msgstr ""
+"Підписку було авторизовано, але URL-адреса у відповідь не передавалася. "
+"Звіртесь з інструкціями на сайті для більш конкретної інформації про те, як "
+"авторизувати підписку. Ваш підписний токен:"
 
-#: actions/unsubscribe.php:50
-msgid "No profile id in request."
-msgstr "У запиті відсутній ID профілю."
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
+msgstr "Підписку скинуто"
 
-#: actions/unsubscribe.php:57
-msgid "No profile with that id."
-msgstr "Немає профілю з таким ID."
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"Підписку було скинуто, але URL-адреса у відповідь не передавалася. Звіртесь "
+"з інструкціями на сайті для більш конкретної інформації про те, як скинути "
+"підписку."
 
-#: actions/unsubscribe.php:71
-msgid "Unsubscribed"
-msgstr "Відписано"
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
 
-#: actions/usergroups.php:63
+#: actions/userauthorization.php:301
 #, php-format
-msgid "%s groups"
-msgstr "Групи %s"
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
 
-#: actions/usergroups.php:65
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Не можна прочитати URL аватари '%s'"
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Неправильний тип зображення для '%s'"
+
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr "Немає ID."
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "Налаштування профілю"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "Групи %s, сторінка %d"
 
-#: classes/Notice.php:104
+#: actions/usergroups.php:130
+#, fuzzy
+msgid "Search for more groups"
+msgstr "Пошук людей або текстів"
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "Ви не є учасником цієї групи."
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Message.php:55
+msgid "Could not insert message."
+msgstr "Не можна долучити повідомлення."
+
+#: classes/Message.php:65
+msgid "Could not update message with new URI."
+msgstr "Не можна оновити повідомлення з новим URI."
+
+#: classes/Notice.php:164
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "Помилка бази даних при додаванні тегу: %s"
+
+#: classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Проблема при збереженні повідомлення."
+
+#: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
 msgstr "Проблема при збереженні повідомлення. Невідомий користувач."
 
-#: classes/Notice.php:109
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Дуже багато повідомлень за короткий термін; відпочиньте трошки і "
 "повертайтесь за кілька хвилин."
 
-#: classes/Notice.php:116
+#: classes/Notice.php:194
+#, fuzzy
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+"Дуже багато повідомлень за короткий термін; відпочиньте трошки і "
+"повертайтесь за кілька хвилин."
+
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr "Вам заборонено надсилати дописи до цього сайту."
 
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
+msgstr "Проблема при збереженні повідомлення."
+
+#: classes/Notice.php:1120
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "Помилка бази даних при додаванні відповіді: %s"
+
+#: classes/User.php:347
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Повідомлення до %1$s на %2$s"
+
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Профіль"
+
 #: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
+msgstr "Змінити налаштування профілю"
+
+#: lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "Завантаження аватари"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr "Змінити ваш пароль"
+
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
+msgstr "Змінити електронну адресу вручну"
+
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:124
+#, fuzzy
+msgid "Design your profile"
+msgstr "Профіль користувача."
+
+#: lib/accountsettingsaction.php:128
 msgid "Other"
 msgstr "Інше"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:128
 msgid "Other options"
 msgstr "Інші опції"
 
-#: lib/action.php:130
+#: lib/action.php:144
 #, php-format
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: lib/action.php:145
+#: lib/action.php:159
 msgid "Untitled page"
 msgstr "Сторінка без заголовку"
 
-#: lib/action.php:316
+#: lib/action.php:424
 msgid "Primary site navigation"
 msgstr "Відправна навігація по сайту"
 
-#: lib/action.php:322
+#: lib/action.php:430
+msgid "Home"
+msgstr "Дім"
+
+#: lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr "Персональний профіль і потік друзів"
 
-#: lib/action.php:325
-msgid "Search for people or text"
-msgstr "Пошук людей або текстів"
-
-#: lib/action.php:328
+#: lib/action.php:432
 msgid "Account"
 msgstr "Рахунок"
 
-#: lib/action.php:328
+#: lib/action.php:432
 msgid "Change your email, avatar, password, profile"
 msgstr "Змінити електронну адресу, аватару, пароль, профіль"
 
-#: lib/action.php:330
-msgid "Connect to IM, SMS, Twitter"
-msgstr "Зв'язок з ІМ, СМС, Твіттер"
+#: lib/action.php:435
+msgid "Connect"
+msgstr "З'єднання"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Невдале перенаправлення на сервер: %s"
+
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
+msgstr "Запросити"
+
+#: lib/action.php:440 lib/subgroupnav.php:106
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr "Запросіть друзів та колег приєднатись до вас на %s"
+
+#: lib/action.php:445
+msgid "Logout"
+msgstr "Вийти"
 
-#: lib/action.php:332
+#: lib/action.php:445
 msgid "Logout from the site"
 msgstr "Вийти з сайту"
 
-#: lib/action.php:335
-msgid "Login to the site"
-msgstr "Увійти на сайт"
-
-#: lib/action.php:338
+#: lib/action.php:450
 msgid "Create an account"
 msgstr "Створити новий рахунок"
 
-#: lib/action.php:341
-msgid "Login with OpenID"
-msgstr "Увійти з OpenID"
+#: lib/action.php:453
+msgid "Login to the site"
+msgstr "Увійти на сайт"
+
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
+msgstr "Допомога"
 
-#: lib/action.php:344
+#: lib/action.php:456
 msgid "Help me!"
 msgstr "Допоможіть!"
 
-#: lib/action.php:362
+#: lib/action.php:459
+msgid "Search"
+msgstr "Пошук"
+
+#: lib/action.php:459
+msgid "Search for people or text"
+msgstr "Пошук людей або текстів"
+
+#: lib/action.php:480
 msgid "Site notice"
 msgstr "Зауваження сайту"
 
-#: lib/action.php:417
+#: lib/action.php:546
 msgid "Local views"
 msgstr "Огляд"
 
-#: lib/action.php:472
+#: lib/action.php:612
 msgid "Page notice"
 msgstr "Зауваження сторінки"
 
-#: lib/action.php:562
+#: lib/action.php:714
 msgid "Secondary site navigation"
 msgstr "Другорядна навігація по сайту"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:721
+msgid "About"
+msgstr "Про"
+
+#: lib/action.php:723
+msgid "FAQ"
+msgstr "ЧаПи"
+
+#: lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/action.php:730
+msgid "Privacy"
+msgstr "Конфіденційність"
+
+#: lib/action.php:732
+msgid "Source"
+msgstr "Джерело"
+
+#: lib/action.php:734
+msgid "Contact"
+msgstr "Контакт"
+
+#: lib/action.php:736
+#, fuzzy
+msgid "Badge"
+msgstr "\"Розштовхати\""
+
+#: lib/action.php:764
 msgid "StatusNet software license"
 msgstr "Ліцензія StatusNet software"
 
-#: lib/action.php:630
+#: lib/action.php:767
+#, 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/action.php:769
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** це сервіс мікроблогів. "
+
+#: lib/action.php:771
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+"Сервіс працює на [StatusNet](http://status.net/) - програмному забезпеченні "
+"для мікроблогів, версія %s, доступному під [GNU Affero General Public "
+"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "Ліцензія StatusNet software"
+
+#: lib/action.php:794
 msgid "All "
 msgstr "Всі "
 
-#: lib/action.php:635
+#: lib/action.php:799
 msgid "license."
 msgstr "ліцензія."
 
-#: lib/blockform.php:123 lib/blockform.php:153
-msgid "Block this user"
-msgstr "Блокувати користувача"
+#: lib/action.php:1052
+msgid "Pagination"
+msgstr "Нумерація сторінок"
 
-#: lib/blockform.php:153
-msgid "Block"
-msgstr "Блок"
+#: lib/action.php:1061
+msgid "After"
+msgstr "Вперед"
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
-msgid "Disfavor this notice"
-msgstr "Видалити з обраних"
+#: lib/action.php:1069
+msgid "Before"
+msgstr "Назад"
+
+#: lib/action.php:1117
+msgid "There was a problem with your session token."
+msgstr "Виникли певні проблеми з токеном поточної сесії."
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "Профіль"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
+msgstr "Результати команди"
+
+#: lib/channel.php:210
+msgid "Command complete"
+msgstr "Команду виконано"
+
+#: lib/channel.php:221
+msgid "Command failed"
+msgstr "Команду не виконано"
+
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr "Даруйте, але виконання команди ще не завершено."
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Не вдалося оновити користувача з підтвердженною електронною адресою."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "Спробу \"розштовхати\" зараховано"
+
+#: lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
+msgstr "Користувач має останнє повідомлення"
 
-#: lib/facebookaction.php:268
+#: lib/command.php:190
+msgid "Notice marked as fave."
+msgstr "Повідомлення позначено як обране."
+
+#: lib/command.php:315
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#: lib/command.php:318
+#, php-format
+msgid "Fullname: %s"
+msgstr "Повне ім'я: %s"
+
+#: lib/command.php:321
+#, php-format
+msgid "Location: %s"
+msgstr "Локація: %s"
+
+#: lib/command.php:324
 #, php-format
-msgid "To use the %s Facebook Application you need to login "
-msgstr "Аби скористатись %s додатком для Facebook, ви маєте увійти "
+msgid "Homepage: %s"
+msgstr "Веб-сторінка: %s"
+
+#: lib/command.php:327
+#, php-format
+msgid "About: %s"
+msgstr "Про мене: %s"
 
-#: lib/facebookaction.php:271
-msgid " a new account."
-msgstr " новий рахунок."
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr "Повідомлення надто довге - максимум 140 знаків, а ви надрукували %d"
 
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-msgid "Published"
-msgstr "Опубліковано"
+#: lib/command.php:377
+msgid "Error sending direct message."
+msgstr "Помилка при відправці прямого повідомлення."
+
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "Повідомлення надто довге - максимум 140 знаків, а ви надрукували %d"
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Відповісти на це повідомлення"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Проблема при збереженні повідомлення."
+
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
+msgstr "Зазначте ім'я користувача, до якого бажаєте підписатись"
+
+#: lib/command.php:502
+#, php-format
+msgid "Subscribed to %s"
+msgstr "Підписано до %s"
+
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
+msgstr "Зазначте ім'я користувача, від якого бажаєте відписатись"
+
+#: lib/command.php:530
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr "Відписано від %s"
+
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
+msgstr "Виконання команди ще не завершено."
+
+#: lib/command.php:551
+msgid "Notification off."
+msgstr "Сповіщення вимкнуто."
+
+#: lib/command.php:553
+msgid "Can't turn off notification."
+msgstr "Не можна вимкнути сповіщення."
+
+#: lib/command.php:574
+msgid "Notification on."
+msgstr "Сповіщення увімкнуто."
+
+#: lib/command.php:576
+msgid "Can't turn on notification."
+msgstr "Не можна увімкнути сповіщення."
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Не вдалося створити форму OpenID: %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Ви не підписані до цього профілю."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Ви не підписані до цього профілю."
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Не вдалося підписати іншого до вас."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Люди підписані до %s"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Ви не є учасником цієї групи."
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "Ви не є учасником цієї групи."
+
+#: lib/command.php:670
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+
+#: lib/common.php:192
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Немає коду підтвердження."
+
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:195
+#, fuzzy
+msgid "Go to the installer."
+msgstr "Увійти на сайт"
+
+#: lib/connectsettingsaction.php:110
+msgid "IM"
+msgstr "ІМ"
+
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Оновлення за допомогою служби миттєвих повідомлень (ІМ)"
+
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
+msgstr "Оновлення через SMS"
+
+#: lib/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Завантажити"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "Змінити ваш пароль"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "З'єднання"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "Пошук"
+
+#: lib/designsettings.php:217
+msgid "Text"
+msgstr "Текст"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "Увійти"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
+msgstr "Видалити з обраних"
 
 #: lib/favorform.php:114 lib/favorform.php:140
 msgid "Favor this notice"
 msgstr "Позначити як обране"
 
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr "Обрати"
+
 #: lib/feedlist.php:64
 msgid "Export data"
 msgstr "Експорт даних"
 
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr ""
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr ""
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr ""
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Фільтр для тегів"
@@ -4597,57 +4036,84 @@ msgstr "Фільтр для тегів"
 msgid "All"
 msgstr "Всі"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Оберіть оператора"
+
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Тег"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "Оберіть тег до звуженого списку"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "Вперед"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "URL-адреса веб-сторінки, блогу групи, або тематичного блогу"
 
-#: lib/groupeditform.php:151
-msgid "Description"
-msgstr "Опис"
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Опишіть групу або тему, вкладаючись у 140 знаків"
 
-#: lib/groupeditform.php:153
-msgid "Describe the group or topic in 140 chars"
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
 msgstr "Опишіть групу або тему, вкладаючись у 140 знаків"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:172
+msgid "Description"
+msgstr "Опис"
+
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr "Локація групи, на зразок \"Місто, область (або регіон), країна\""
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
 msgid "Group"
 msgstr "Група"
 
-#: lib/groupnav.php:100
-msgid "Admin"
-msgstr "Адмін"
-
 #: lib/groupnav.php:101
+#, fuzzy
+msgid "Blocked"
+msgstr "Блок"
+
+#: lib/groupnav.php:102
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Блокувати користувача."
+
+#: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
 msgstr "Редагувати властивості групи %s"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:113
 msgid "Logo"
 msgstr "Лого"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:114
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "Додати або редагувати логотип %s"
 
+#: lib/groupnav.php:120
+#, fuzzy, php-format
+msgid "Add or edit %s design"
+msgstr "Додати або редагувати логотип %s"
+
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Групи з найбільшою кількістю учасників"
@@ -4662,8 +4128,42 @@ msgid "Tags in %s group's notices"
 msgstr "Теги у повідомленнях групи %s"
 
 #: lib/htmloutputter.php:104
-msgid "This page is not available in a "
-msgstr "Ця сторінка не доступна в "
+msgid "This page is not available in a media type you accept"
+msgstr "Ця сторінка не доступна для того типу медіа, з яким ви погодились"
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Ви маєте можливість завантажити логотип для вашої группи."
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr "Часткове завантаження."
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr "Система відповіла помилкою при завантаженні цього файла."
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr "Це не зображення, або файл зіпсовано."
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr "Формат зображення не підтримується."
+
+#: lib/imagefile.php:118
+msgid "Lost our file."
+msgstr "Файл втрачено."
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr "Тип файлу не підтримується"
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr ""
 
 #: lib/joinform.php:114
 msgid "Join"
@@ -4673,43 +4173,88 @@ msgstr "Приєднатись"
 msgid "Leave"
 msgstr "Залишити"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr "Увійти використовуючи ім'я та пароль"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr "Зареєструвати новий рахунок"
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
-msgstr "Увійти або зареєструватись з OpenID"
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+"Лише користувач має можливість переглядати свою власну поштову скриньку."
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr " від "
 
-#: lib/mail.php:175
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "Підтвердження електронної адреси"
+
+#: lib/mail.php:174
 #, php-format
 msgid ""
 "Hey, %s.\n"
 "\n"
-msgstr ""
-"Ей, %s.\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%s\n"
 "\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
+msgstr ""
 
-#: lib/mail.php:236
+#: lib/mail.php:235
 #, php-format
-msgid "%1$s is now listening to "
-msgstr "%1$s тепер слідкує за повідомленями "
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr "%1$s тепер слідкує за вашими повідомленями на %2$s."
+
+#: lib/mail.php:240
+#, fuzzy, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
+"%1$s тепер слідкує за вашими повідомленями на %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Щиро ваші,\n"
+"%4$s.\n"
 
-#: lib/mail.php:254
+#: lib/mail.php:253
 #, php-format
 msgid "Location: %s\n"
 msgstr "Локація: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:255
 #, php-format
 msgid "Homepage: %s\n"
 msgstr "Веб-сторінка: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
@@ -4718,57 +4263,226 @@ msgstr ""
 "Про себе: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:285
+#, php-format
+msgid "New email address for posting to %s"
+msgstr "Нова електронна адреса для надсилання повідомлень на %s"
+
+#: lib/mail.php:288
+#, 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"
+"Щиро ваші,\n"
+"%4$s"
+
+#: lib/mail.php:412
+#, php-format
+msgid "%s status"
+msgstr "%s статус"
+
+#: lib/mail.php:438
+msgid "SMS confirmation"
+msgstr "Підтвердження СМС"
+
+#: lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "Вас спробував \"розштовхати\" %s"
 
-#: lib/mail.php:465
+#: lib/mail.php:466
 #, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
-msgstr "%1$s (%2$s) цікавиться, що у вас нового "
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
+msgstr ""
 
-#: lib/mail.php:555
+#: lib/mail.php:509
 #, php-format
-msgid "%1$s just added your notice from %2$s"
-msgstr "%1$s додав ваше повідомлення від %2$s"
+msgid "New private message from %s"
+msgstr "Нове приватне повідомлення від %s"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
-msgid "From"
-msgstr "Від"
+#: lib/mail.php:513
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%5$s\n"
+msgstr ""
 
-#: lib/messageform.php:110
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s додав(ла) ваше повідомлення до обраних"
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, php-format
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+msgstr ""
+
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+msgid "Could not determine file's mime-type!"
+msgstr "Не вдається відновити загальний потік."
+
+#: lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Надіслати пряме повідомлення"
 
-#: lib/noticeform.php:125
-msgid "Send a notice"
-msgstr "Надіслати повідомлення"
+#: lib/messageform.php:146
+msgid "To"
+msgstr "До"
 
-#: lib/noticeform.php:152
+#: lib/messageform.php:162 lib/noticeform.php:173
 msgid "Available characters"
 msgstr "Лишилось знаків"
 
-#: lib/noticelist.php:426
-msgid "in reply to"
-msgstr "у відповідь на"
+#: lib/noticeform.php:145
+msgid "Send a notice"
+msgstr "Надіслати повідомлення"
+
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
+msgstr "Що нового, %s?"
+
+#: lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "Немає змісту!"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:498
 msgid "Reply to this notice"
 msgstr "Відповісти на це повідомлення"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "Відповісти"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
-msgid "Delete this notice"
-msgstr "Видалити повідомлення"
-
-#: lib/noticelist.php:474
-msgid "Delete"
-msgstr "Видалити"
-
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "\"Розштовхати\" користувача"
@@ -4781,41 +4495,139 @@ msgstr "\"Розштовхати\""
 msgid "Send a nudge to this user"
 msgstr "Спробувати \"розштовхати\" цього користувача"
 
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "Помилка при додаванні нового профілю"
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "Помилка при додаванні аватари"
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "Помилка при додаванні віддаленого профілю"
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Видалити повідомлення"
+
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
+msgstr "Не вдалося додати нову підписку."
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "Особисте"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "Відповіді"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr "Обрані"
+
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr "Користувач"
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr "Вхідні"
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr "Ваші вхідні повідомлення"
+
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr "Вихідні"
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr "Надіслані вами повідомлення"
+
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Теги у повідомленнях %s"
 
-#: lib/profilelist.php:182
-msgid "(none)"
-msgstr "(пусто)"
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "Підписки"
 
-#: lib/publicgroupnav.php:76
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "Всі підписки"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "Підписчики"
+
+#: lib/profileaction.php:157
+msgid "All subscribers"
+msgstr "Всі підписчики"
+
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "Користувач"
+
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "З нами від"
+
+#: lib/profileaction.php:235
+msgid "All groups"
+msgstr "Всі групи"
+
+#: lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Загал"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Групи користувачів"
 
-#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Нові теги"
 
-# ПОСТАТЬ - Видатна особа, визначний представник кого-, чого-небудь.
-# "Featured" перекласти одним словом, так щоб втислося в таб на головній сторінці, важко. На мою думку "Постаті", тобто користувачі, які варті уваги - цілком прийнятний замінник.
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Постаті"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Популярне"
 
+#: lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Пошук"
+
+#: lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Пошук"
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "Люди"
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr "Знайти людей на цьому сайті"
+
 #: lib/searchgroupnav.php:82
 msgid "Notice"
 msgstr "Повідомлення"
 
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr "Знайти за змістом повідомлень"
+
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Знайти групи на цьому сайті"
@@ -4824,33 +4636,63 @@ msgstr "Знайти групи на цьому сайті"
 msgid "Untitled section"
 msgstr "Розділ без заголовку"
 
-#: lib/subgroupnav.php:81
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr "%s підписався до наступних людей"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:91
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Люди підписані до %s"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "%s бере участь в цих групах"
 
-#: lib/subgroupnav.php:104
-#, php-format
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Запросіть друзів та колег приєднатись до вас на %s"
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
 
-#: lib/subs.php:53
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(пусто)"
+
+#: lib/subs.php:48
+msgid "Already subscribed!"
+msgstr ""
+
+#: lib/subs.php:52
 msgid "User has blocked you."
 msgstr "Користувач заблокував вас."
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Підписатись до цього користувача"
+#: lib/subs.php:56
+msgid "Could not subscribe."
+msgstr "Невдала підписка."
+
+#: lib/subs.php:75
+msgid "Could not subscribe other to you."
+msgstr "Не вдалося підписати іншого до вас."
+
+#: lib/subs.php:124
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Не підписано!."
+
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
+msgstr "Не вдалося видалити підписку."
 
 #: lib/tagcloudsection.php:56
 msgid "None"
@@ -4860,51 +4702,107 @@ msgstr "Пусто"
 msgid "Top posters"
 msgstr "Топ дописувачів"
 
-#: lib/unblockform.php:120 lib/unblockform.php:150
-msgid "Unblock this user"
-msgstr "Розблокувати цього користувача"
-
-#: lib/unblockform.php:150
-msgid "Unblock"
-msgstr "Розблокувати"
-
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Відписатись від цього користувача"
 
-#, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "Створити новий рахунок"
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "Відписатись"
 
+#: lib/userprofile.php:116
 #, fuzzy
-#~ msgid "Check if you are sure you want to delete your account."
-#~ msgstr "Ви впевненні, що бажаєте видалити це повідомлення?"
+msgid "Edit Avatar"
+msgstr "Аватара"
+
+#: lib/userprofile.php:236
+msgid "User actions"
+msgstr "Діяльність користувача"
 
+#: lib/userprofile.php:248
 #, fuzzy
-#~ msgid "Showing recently popular notices"
-#~ msgstr "Знайти зміст повідомлення"
+msgid "Edit profile settings"
+msgstr "Налаштування профілю"
+
+#: lib/userprofile.php:249
+msgid "Edit"
+msgstr ""
+
+#: lib/userprofile.php:272
+msgid "Send a direct message to this user"
+msgstr "Надіслати пряме повідомлення цьому користувачеві"
 
-#~ msgid " by "
-#~ msgstr "від"
+#: lib/userprofile.php:273
+msgid "Message"
+msgstr "Повідомлення"
+
+#: lib/util.php:821
+msgid "a few seconds ago"
+msgstr "мить тому"
+
+#: lib/util.php:823
+msgid "about a minute ago"
+msgstr "хвилину тому"
 
-#~ msgid "%1$s Notices recently tagged with %2$s"
-#~ msgstr "%1$s Повідомлення щойно позначені з %2$s"
+#: lib/util.php:825
+#, php-format
+msgid "about %d minutes ago"
+msgstr "близько %d хвилин тому"
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Помилка при додаванні повідомлення"
+#: lib/util.php:827
+msgid "about an hour ago"
+msgstr "годину тому"
 
-#~ 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 ""
-#~ "Якщо ви забули, або загубили свій пароль, ви можете отримати новий на "
-#~ "електронну адресу, яку ви закріпили за своїм рахунком."
+#: lib/util.php:829
+#, php-format
+msgid "about %d hours ago"
+msgstr "близько %d годин тому"
 
-#~ msgid "Last message posted: "
-#~ msgstr "Останнє повідомлення:"
+#: lib/util.php:831
+msgid "about a day ago"
+msgstr "день тому"
 
-#~ msgid "Unsupported type"
-#~ msgstr "Тип не підтримується"
+#: lib/util.php:833
+#, php-format
+msgid "about %d days ago"
+msgstr "близько %d днів тому"
 
-#~ msgid "not a supported data format"
-#~ msgstr "формат даних не підтримується"
+#: lib/util.php:835
+msgid "about a month ago"
+msgstr "місяць тому"
+
+#: lib/util.php:837
+#, php-format
+msgid "about %d months ago"
+msgstr "близько %d місяців тому"
+
+#: lib/util.php:839
+msgid "about a year ago"
+msgstr "рік тому"
+
+#: lib/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "Веб-сторінка має недійсну URL-адресу."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr "Не можна розібрати повідомлення."
+
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr "Це не зареєстрований користувач."
+
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr "Вибачте, але це не є вашою електронною адресою для входної пошти."
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+"Вибачте, але не затверджено жодної електронної адреси для вхідної пошти."
diff --git a/locale/vi/LC_MESSAGES/statusnet.mo b/locale/vi/LC_MESSAGES/statusnet.mo
index b2f4dd370..0480dfd01 100644
--- a/locale/vi/LC_MESSAGES/statusnet.mo
+++ b/locale/vi/LC_MESSAGES/statusnet.mo
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index af34d5210..c0616649e 100644
--- a/locale/vi/LC_MESSAGES/statusnet.po
+++ b/locale/vi/LC_MESSAGES/statusnet.po
@@ -1,4728 +1,4072 @@
+# Translation of StatusNet to Vietnamese
+#
+# --
 msgid ""
 msgstr ""
-"Project-Id-Version: statusnet\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-05-10 05:27+0000\n"
-"Last-Translator: NGUYỄN Mạnh Hùng <loveleeyoungae@yahoo.com>\n"
-"Language-Team: <support@saigonica.com>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:44:26+0000\n"
+"Language-Team: Vietnamese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-Language: English\n"
-"X-Poedit-Country: NEW ZEALAND\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: vi\n"
+"X-Message-Group: out-statusnet\n"
 
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
-#, php-format
-msgid " Search Stream for \"%s\""
-msgstr " Tìm dòng thông tin cho \"%s\""
-
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-#: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
-msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr " ngoại trừ thông tin riêng: mật khẩu, email, địa chỉ IM, số điện thoại"
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr " từ "
-
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr "%1$s / Các cập nhật đang trả lời tới %2$s"
-
-#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
-#, php-format
-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"
-"\n"
-"Nế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"
-"\n"
-"Thân, %2$s\n"
-
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s đang theo dõi lưu ý của bạn trên %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 đ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/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
-#: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr "Trạng thái của %1$s vào %2$s"
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "Không có tin nhắn nào."
 
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
-#, php-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
+msgstr "Không có user nào."
 
-#: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
-#, php-format
-msgid "%s Public Stream"
-msgstr "%s Dòng tin công cộng"
+#: actions/all.php:84
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s và bạn bè"
 
-#: ../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
-#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s và bạn bè"
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/all.php:99
 #, fuzzy, php-format
-msgid "%s public timeline"
-msgstr "Dòng tin công cộng"
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Chọn những người bạn của %s"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: actions/all.php:107
 #, fuzzy, php-format
-msgid "%s status"
-msgstr "Trạng thái của %1$s vào %2$s"
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Chọn những người bạn của %s"
 
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/all.php:115
 #, fuzzy, php-format
-msgid "%s timeline"
-msgstr "Dòng tin nhắn của %s"
+msgid "Feed for friends of %s (Atom)"
+msgstr "Chọn những người bạn của %s"
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/all.php:127
 #, php-format
-msgid "%s updates from everyone!"
-msgstr "%s cập nhật từ tất cả mọi người!"
-
-#: ../actions/register.php:213
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"This is the timeline for %s and friends but no one has posted anything yet."
 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.)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: actions/all.php:132
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
 msgstr ""
-"**%%site.name%%** là dịch vụ gửi tin nhắn được cung cấp từ [%%site.broughtby%"
-"%](%%site.broughtbyurl%%). "
-
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
-#, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** là dịch vụ gửi tin nhắn. "
-
-#: ../lib/util.php:274 lib/util.php:290
-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/finishopenidlogin.php:79 actions/profilesettings.php:76
-#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 chữ cái thường hoặc là chữ số, không có dấu chấm hay "
-
-#: ../actions/register.php:152 actions/register.php:166
-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."
-
-#: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr "Nhiều hơn 6 ký tự"
-
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
-msgid "6 or more characters, and don't forget it!"
-msgstr "Nhiều hơn 6 ký tự, đừng quên nó!"
-
-#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
-msgid "6 or more characters. Required."
-msgstr "Nhiều hơn 6 ký tự. Bắt buộc"
 
-#: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/all.php:134
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
 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."
 
-#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#, php-format
 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."
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
 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."
 
-#: ../actions/smssettings.php:216 actions/smssettings.php:224
+#: actions/all.php:165
 #, 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."
+msgid "You and friends"
+msgstr "%s và bạn bè"
+
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
 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."
 
-#: ../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 actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
-msgid "API method not found!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+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
-#: 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 actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
-msgid "API method under construction."
-msgstr "Phương thức API dưới cấu trúc có sẵn."
-
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
-msgid "About"
-msgstr "Giới thiệu"
-
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
-msgid "Accept"
-msgstr "Chấp nhận"
-
-#: ../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 actions/emailsettings.php:120
-#: actions/imsettings.php:127 actions/openidsettings.php:111
-#: actions/smssettings.php:133 actions/twittersettings.php:163
-msgid "Add"
-msgstr "Thêm"
-
-#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
-msgstr "Thêm OpenID"
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-msgid "Add or remove OpenIDs"
-msgstr "Thêm mới hoặc xóa OpenIDs"
-
-#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39 actions/emailsettings.php:39
-#: actions/imsettings.php:40 actions/smssettings.php:39
-#: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
-msgstr "Địa chỉ"
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
+msgstr "Phương thức này yêu cầu là POST."
 
-#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-msgid "Addresses of friends to invite (one per line)"
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
 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/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
-msgid "All subscriptions"
-msgstr "Tất cả đăng nhận"
 
-#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
-#, php-format
-msgid "All updates for %s"
-msgstr "Tất cả các cập nhật của %s"
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Không thể cập nhật thành viên."
 
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
 #, 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: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
-#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
-msgid "Already logged in."
-msgstr "Đã đăng nhập."
-
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
-msgid "Already subscribed!."
-msgstr "Đã đăng nhận rồi!"
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
-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?"
-
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
-msgid "Authorize subscription"
-msgstr "Đăng nhận cho phép"
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
 
-#: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
-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/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "Không thể lưu thông tin Twitter của bạn!"
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-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/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Không thể cập nhật thành viên."
 
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34 actions/avatarsettings.php:65
-#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
-msgid "Avatar"
-msgstr "Hình đại diện"
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Người dùng không có thông tin."
 
-#: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
-msgid "Avatar updated."
-msgstr "Hình đại diện đã được cập nhật."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Không thể lưu hồ sơ cá nhân."
 
-#: ../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?)"
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
 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/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."
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
 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."
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: actions/apidirectmessagenew.php:126
 #, fuzzy
-msgid "Awaiting confirmation on this phone number."
-msgstr "Đó không phải là số điện thoại của bạn."
+msgid "No message text!"
+msgstr "Không có tin nhắn nào."
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Quá dài. Tối đa là 140 ký tự."
 
-#: ../lib/util.php:1318 lib/util.php:1452
+#: actions/apidirectmessagenew.php:146
 #, fuzzy
-msgid "Before »"
-msgstr "Trước"
+msgid "Recipient user not found."
+msgstr "Không tìm thấy user."
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
-#: actions/profilesettings.php:82 actions/register.php:184
-#: actions/profilesettings.php:112 actions/register.php:402
-msgid "Bio"
-msgstr "Lý lịch"
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+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
-#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
-msgid "Bio is too long (max 140 chars)."
-msgstr "Lý lịch quá dài (không quá 140 ký tự)"
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "Tin nhắn riêng"
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
-msgid "Can't delete this notice."
-msgstr "Không thể xóa tin nhắn này."
+#: actions/apidirectmessage.php:93
+#, fuzzy, php-format
+msgid "All the direct messages sent from %s"
+msgstr "Bạn có tin nhắn riêng từ %s"
+
+#: actions/apidirectmessage.php:101
+#, fuzzy, php-format
+msgid "Direct messages to %s"
+msgstr "Tin nhắn riêng"
 
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/apidirectmessage.php:105
 #, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr "Không thể đọc URL cho hình đại diện '%s'"
+msgid "All the direct messages sent to %s"
+msgstr ""
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404 actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-msgid "Can't save new password."
-msgstr "Không thể lưu mật khẩu mới"
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "Phương thức API không tìm thấy!"
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62 actions/emailsettings.php:58
-#: actions/imsettings.php:59 actions/smssettings.php:62
-#: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
-msgstr "Hủy"
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+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 đó."
 
-#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Không thể thiết lập đối tượng OpenID."
+#: actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status 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/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
-msgstr "Không thể bình thường hóa Jabber ID"
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+msgstr "Không thể tạo favorite."
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
+#: actions/apifavoritedestroy.php:122
 #, fuzzy
-msgid "Cannot normalize that email address"
-msgstr "Không thể bình thường hóa địa chỉ GTalk này"
+msgid "That status is not 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/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
-msgstr "Thay đổi"
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#, fuzzy
+msgid "Could not delete favorite."
+msgstr "Không thể tạo favorite."
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
-msgstr "Đang thực hiện việc thay đổi email"
+#: actions/apifriendshipscreate.php:109
+#, fuzzy
+msgid "Could not follow user: User not found."
+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/password.php:32 actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr "Đổi mật khẩu"
+#: actions/apifriendshipscreate.php:118
+#, 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."
 
-#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
-msgid "Change your password"
-msgstr "Thay đổi mật khẩu của bạn"
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-msgid "Change your profile settings"
-msgstr "Thay đổi các thiết lập trong hồ sơ cá nhân của bạn"
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+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
-#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
-#: actions/register.php:376 actions/smssettings.php:122
-msgid "Confirm"
-msgstr "Xác nhận"
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
+msgstr ""
 
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "Xác nhận địa chỉ"
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "Không thể lấy lại các tin nhắn ưa thích"
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245 actions/emailsettings.php:256
-#: actions/imsettings.php:230 actions/smssettings.php:253
-#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
-msgid "Confirmation cancelled."
-msgstr "Sự xác nhận đã bị hủy bỏ."
+#: actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "Không tìm thấy bất kỳ trạng thái nào."
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 #, fuzzy
-msgid "Confirmation code"
-msgstr "Không có mã số xác nhận."
+msgid "Could not create group."
+msgstr "Không thể tạo favorite."
 
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-msgid "Confirmation code not found."
-msgstr "Không tìm thấy mã xác nhận."
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Không thể tạo favorite."
 
-#: ../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 ""
-"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"
-"\n"
-"Cả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."
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Không thể tạo đăng nhận."
 
-#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
-msgid "Connect"
-msgstr "Kết nối"
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+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:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
-msgid "Connect existing account"
-msgstr "Kết nối đến tài khoản hiện hữu"
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+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."
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
-msgid "Contact"
-msgstr "Liên hệ"
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "Biệt hiệu không hợp lệ."
 
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
-#, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "Không thể tạo OpenID mẫu: %s"
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "Trang chủ không phải là URL"
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "Tên đầy đủ quá dài (tối đa là 255 ký tự)."
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
-#, fuzzy
-msgid "Could not follow user: User not found."
-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/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "Lý lịch quá dài (không quá 140 ký tự)"
+
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "Tên khu vực quá dài (không quá 255 ký tự)."
 
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
 #, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Không thể chuyển đến máy chủ: %s"
+msgid "Too many aliases! Maximum %d."
+msgstr ""
 
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
-msgid "Could not save avatar info"
-msgstr "Không thể lưu hình đại diện"
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Trang chủ '%s'  không hợp lệ"
 
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
-msgid "Could not save new profile info"
-msgstr "Không thể lưu thông tin về hồ sơ cá nhân"
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "Biệt hiệu này đã dùng rồi. Hãy nhập biệt hiệu khác."
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
-#, fuzzy
-msgid "Could not subscribe other to you."
-msgstr "Không thể tạo favorite."
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#: actions/apigroupjoin.php:110
 #, fuzzy
-msgid "Could not subscribe."
-msgstr "Chưa đăng nhận!"
+msgid "You are already a member of that group."
+msgstr "Bạn đã theo những người này:"
 
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-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/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-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/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+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/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
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-msgid "Couldn't delete email confirmation."
-msgstr "Không thể xóa email xác nhận."
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Bạn chưa cập nhật thông tin riêng"
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
-msgid "Couldn't delete subscription."
-msgstr "Không thể xóa đăng nhận."
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+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/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
-msgid "Couldn't find any statuses."
-msgstr "Không tìm thấy bất kỳ trạng thái nào."
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, fuzzy, php-format
+msgid "%s groups"
+msgstr "%s và nhóm"
 
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-msgid "Couldn't get a request token."
-msgstr "Không thể lấy token yêu cầu."
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Mã nhóm"
 
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206 actions/emailsettings.php:223
-#: actions/imsettings.php:195 actions/smssettings.php:214
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
-msgid "Couldn't insert confirmation code."
-msgstr "Không thể  chèn mã xác nhận."
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "%s và nhóm"
 
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
-msgstr "Không thể chèn thêm vào đăng nhận."
+#: actions/apigrouplist.php:103
+#, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "Bạn chưa cập nhật thông tin riêng"
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-msgid "Couldn't save profile."
-msgstr "Không thể lưu hồ sơ cá nhân."
+#: actions/apistatusesdestroy.php:107
+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/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-#, fuzzy
-msgid "Couldn't update user for autosubscribe."
-msgstr "Không thể cập nhật thành viên."
+#: actions/apistatusesdestroy.php:130
+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/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
+#: actions/apistatusesshow.php:138
 #, fuzzy
-msgid "Couldn't update user record."
-msgstr "Không thể cập nhật thành viên."
-
-#: ../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
-#: actions/confirmaddress.php:114 actions/emailsettings.php:280
-#: actions/emailsettings.php:411 actions/imsettings.php:252
-#: actions/imsettings.php:395 actions/othersettings.php:162
-#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
-msgid "Couldn't update user."
-msgstr "Không thể cập nhật thành viên."
-
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
-msgid "Create"
-msgstr "Tạo"
+msgid "Status deleted."
+msgstr "Hình đại diện đã được cập nhật."
 
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
-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/apistatusesshow.php:144
+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/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
-msgid "Create new account"
-msgstr "Tạo tài khoản mới"
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "Quá dài. Tối đa là 140 ký tự."
 
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
-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/apistatusesupdate.php:198
+msgid "Not found"
+msgstr "Không tìm thấy"
 
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "Địa chỉ Jabber/GTalk vừa được xác nhận."
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "SMS xác nhận ngay - đã cho phép gửi qua điện thoại. "
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Không hỗ trợ kiểu file ảnh này."
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-msgid "Current confirmed email address."
-msgstr "Đã xác nhận địa chỉ này."
+#: actions/apitimelinefavorites.php:107
+#, fuzzy, php-format
+msgid "%s / Favorites from %s"
+msgstr "Tìm kiếm các tin nhắn ưa thích của %s"
 
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
-msgstr "Hiện tại"
+#: actions/apitimelinefavorites.php:119
+#, fuzzy, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr "Tất cả các cập nhật của %s"
 
-#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, fuzzy, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s"
+msgid "%s timeline"
+msgstr "Dòng tin nhắn của %s"
 
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s"
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
-msgid "Delete notice"
-msgstr "Xóa tin nhắn"
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
 
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "Nói về bạn và những sở thích của bạn khoảng 140 ký tự"
+#: actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Các cập nhật đang trả lời tới %2$s"
 
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87 actions/register.php:172
-#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
-#: actions/register.php:385 lib/accountsettingsaction.php:113
-msgid "Email"
-msgstr "Email"
+#: actions/apitimelinementions.php:126
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-#, fuzzy
-msgid "Email Address"
-msgstr "Địa chỉ email"
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#, fuzzy, php-format
+msgid "%s public timeline"
+msgstr "Dòng tin công cộng"
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
-msgstr "Thiết lập địa chỉ email"
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#, php-format
+msgid "%s updates from everyone!"
+msgstr "%s cập nhật từ tất cả mọi người!"
 
-#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-msgid "Email address already exists."
-msgstr "Địa chỉ email đã tồn tại."
+#: actions/apitimelinetag.php:101 actions/tag.php:66
+#, php-format
+msgid "Notices tagged with %s"
+msgstr "Thông báo được gắn thẻ %s"
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
-msgid "Email address confirmation"
-msgstr "Xac nhan dia chi email"
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Dòng tin nhắn cho %s"
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
+#: actions/apiusershow.php:96
 #, fuzzy
-msgid "Email address, like \"UserName@example.org\""
-msgstr "Địa chỉ email GTalk, Ví dụ: \"UserName@gmail.com\""
-
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-msgid "Email addresses"
-msgstr "Địa chỉ email"
-
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
-msgid "Enter a nickname or email address."
-msgstr "Nhập biệt hiệu hoặc email."
+msgid "Not found."
+msgstr "Không tìm thấy"
 
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
-msgstr "Nhập mã mà bạn nhận được trên điện thoại của bạn."
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "Không có tài liệu nào."
 
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
-msgid "Error authorizing token"
-msgstr "Lỗi cho phép token"
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+msgstr "Không có biệt hiệu."
 
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
-msgid "Error connecting user to OpenID."
-msgstr "Lỗi xảy ra khi kết nối với OpenId"
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "Không có kích thước."
 
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
-msgstr "Lỗi khi kết nối người dùng."
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "Kích thước không hợp lệ."
 
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
-msgstr "Lỗi xảy ra khi thêm mới hình đại diện"
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "Hình đại diện"
 
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
-msgstr "Lỗi xảy ra khi thêm mới hồ sơ cá nhân"
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+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:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
-msgstr "Lỗi xảy ra khi thêm mới hồ sơ cá nhân"
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+#, fuzzy
+msgid "User without matching profile"
+msgstr "Hồ sơ ở nơi khác không khớp với hồ sơ này của bạn"
 
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
-msgid "Error saving address confirmation."
-msgstr "Lỗi xảy ra khi lưu địa chỉ đã được xác nhận."
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+msgid "Avatar settings"
+msgstr "Thay đổi hình đại diện"
 
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
-msgid "Error saving remote profile"
-msgstr "Lỗi xảy ra khi lưu hồ sơ cá nhân"
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr ""
 
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-msgid "Error saving the profile."
-msgstr "Lỗi xảy ra khi lưu hồ sơ cá nhân."
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr "Xem trước"
 
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-msgid "Error saving the user."
-msgstr "Lỗi xảy ra khi lưu thành viên."
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#, fuzzy
+msgid "Delete"
+msgstr "Xóa tin nhắn"
 
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
-msgid "Error saving user; invalid."
-msgstr "Lỗi xảy ra khi lưu thành viên;  không hợp lệ."
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+msgstr "Tải file"
 
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
-#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
-#: actions/register.php:108 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-msgid "Error setting user."
-msgstr "Lỗi xảy ra khi tạo thành viên."
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#, fuzzy
+msgid "Crop"
+msgstr "Nhóm"
 
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr "Lỗi xảy ra khi cập nhật hồ sơ cá nhân"
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+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/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
-msgstr "Lỗi xảy ra khi cập nhật hồ sơ cá nhân"
+#: actions/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Bất ngờ gửi mẫu thông tin. "
 
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr "Lỗi xảy ra với mã xác nhận."
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
-msgid "Existing nickname"
-msgstr "Biệt hiệu này đã tồn tại"
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
+msgstr ""
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
-msgid "FAQ"
-msgstr "FAQ"
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+msgstr "Hình đại diện đã được cập nhật."
 
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:363
 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:64 actions/all.php:61
-#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
-#, php-format
-msgid "Feed for friends of %s"
-msgstr "Chọn những người bạn của %s"
+#: actions/avatarsettings.php:387
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Hình đại diện đã được cập nhật."
 
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
-#, php-format
-msgid "Feed for replies to %s"
-msgstr "Chọn các phản hồi đến %s"
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+#, fuzzy
+msgid "No nickname"
+msgstr "Không có biệt hiệu."
 
-#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
-#, fuzzy, php-format
-msgid "Feed for tag %s"
-msgstr "Chọn các phản hồi đến %s"
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+#, fuzzy
+msgid "No such group"
+msgstr "Không có user nào."
 
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
-msgstr "Tìm theo nội dung của tin nhắn"
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "Hồ sơ"
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
-msgstr "Tìm kiếm mọi người trên trang web này"
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s và bạn bè"
 
-#: ../actions/login.php:122
-msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
 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."
-
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
-#: actions/profilesettings.php:77 actions/register.php:178
-#: actions/profilesettings.php:103 actions/register.php:391
-#: actions/showgroup.php:235 actions/showstream.php:262
-#: actions/tagother.php:105 lib/groupeditform.php:142
-msgid "Full name"
-msgstr "Tên đầy đủ"
-
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
-#: actions/register.php:86 actions/updateprofile.php:94
-#: actions/editgroup.php:195 actions/newgroup.php:146
-#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
-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:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
-msgid "Help"
-msgstr "Hướng dẫn"
 
-#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
-msgid "Home"
-msgstr "Trang chủ"
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Bỏ chặn người dùng này"
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
-msgid "Homepage"
-msgstr "Trang chủ hoặc Blog"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
+msgstr "Bỏ chặn"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
-msgid "Homepage is not a valid URL."
-msgstr "Trang chủ không phải là URL"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+msgid "Unblock this user"
+msgstr "Bỏ chặn người dùng này"
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
-msgid "I want to post notices by email."
-msgstr "Tôi muốn đưa tin nhắn lên bằng email."
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Chưa đăng nhập."
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
-msgstr "IM"
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
+msgstr ""
 
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
-msgstr "IM"
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+#, fuzzy
+msgid "No profile with that ID."
+msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
 
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
-msgstr "Cấu hình IM"
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#, fuzzy
+msgid "Block user"
+msgstr "Ban user"
 
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/block.php:136
 msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
 msgstr ""
-"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/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
+msgid "No"
+msgstr "Không"
 
-#: ../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 ""
-"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/block.php:149
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Bỏ chặn người dùng này"
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-#: actions/emailsettings.php:127 actions/smssettings.php:140
-msgid "Incoming email"
-msgstr ""
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
+msgstr "Có"
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
 #, fuzzy
-msgid "Incoming email address removed."
-msgstr "Địa chỉ email hoặc mật khẩu không đúng."
+msgid "Block this user"
+msgstr "Ban user"
 
-#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
-msgid "Incorrect old password"
-msgstr "Mật khẩu cũ sai"
+#: actions/block.php:165
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "Bạn đã theo những người này:"
 
-#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
-msgid "Incorrect username or password."
-msgstr "Sai tên đăng nhập hoặc mật khẩu."
+#: actions/block.php:170
+msgid "Failed to save block information."
+msgstr ""
 
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
+#: actions/bookmarklet.php:50
+msgid "Post to "
 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:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "URL cho hình đại diện '%s'  không hợp lệ "
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+msgstr "Không có mã số xác nhận."
 
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
-#, php-format
-msgid "Invalid email address: %s"
-msgstr "Địa chỉ email không đúng:%s"
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "Không tìm thấy mã xác nhận."
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
-#, php-format
-msgid "Invalid homepage '%s'"
-msgstr "Trang chủ '%s'  không hợp lệ"
+#: actions/confirmaddress.php:85
+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/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/confirmaddress.php:90
 #, php-format
-msgid "Invalid license URL '%s'"
-msgstr "URL cấp phép '%s'  không hợp lệ"
+msgid "Unrecognized address type %s"
+msgstr "Không nhận dạng kiểu địa chỉ %s"
 
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
-msgstr "Nội dung tin nhắn không hợp lệ"
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr "Địa chỉ đó đã được xác nhận rồi."
 
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
-msgstr "URI tin nhắn không hợp lệ"
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "Không thể cập nhật thành viên."
 
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
-msgstr "URL tin nhắn không hợp lệ"
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr "Không thể xóa email xác nhận."
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "URL hồ sơ cá nhân của '%s' không hợp lệ"
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "Xác nhận địa chỉ"
 
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
-msgstr "URL hồ sơ cá nhân không đúng định dạng."
+#: actions/confirmaddress.php:159
+#, 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/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
-msgstr "URL hồ sơ cá nhân không hợp lệ."
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "Không có mã số xác nhận."
 
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
-#: actions/avatarbynickname.php:69
-msgid "Invalid size."
-msgstr "Kích thước không hợp lệ."
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
+msgstr "Tin nhắn"
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111 actions/finishopenidlogin.php:241
-#: actions/register.php:103 actions/register.php:121
-#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
-msgid "Invalid username or password."
-msgstr "Tên đăng nhập hoặc mật khẩu không hợp lệ."
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
+msgstr "Không có tin nhắn nào."
 
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-msgid "Invitation(s) sent"
-msgstr "Thư mời đã gửi"
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "Không thể xóa tin nhắn này."
 
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-msgid "Invitation(s) sent to the following people:"
-msgstr "Thư mời đã gửi đến:"
+#: actions/deletenotice.php:103
+#, fuzzy
+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."
 
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
-msgid "Invite"
-msgstr "Thư mời"
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr "Xóa tin nhắn"
 
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-msgid "Invite new users"
-msgstr "Gửi thư mời đến những người chưa có tài khoản"
+#: actions/deletenotice.php:144
+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?"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
-#, fuzzy, php-format
-msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
-msgstr ""
-"Đang dùng [StatusNet](http://status.net/), phiên bản %s phát hành theo bản "
-"quyền [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+#: actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "Không thể xóa tin nhắn này."
 
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
-msgstr "Jabber ID này đã thuộc về người khác rồi."
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+#, fuzzy
+msgid "Delete this notice"
+msgstr "Xóa tin nhắn"
 
-#: ../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 ""
-"Đị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/deletenotice.php:157
+#, fuzzy
+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/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
-msgid "Language"
-msgstr "Ngôn ngữ"
+#: actions/disfavor.php:81
+#, fuzzy
+msgid "This notice is not 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/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
+#: actions/disfavor.php:94
 #, fuzzy
-msgid "Language is too long (max 50 chars)."
-msgstr "Ngôn ngữ quá dài (tối đa là 50 ký tự)."
+msgid "Add to favorites"
+msgstr "Tìm kiếm các tin nhắn ưa thích của %s"
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
-msgid "Location"
-msgstr "Thành phố"
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "Không có tài liệu nào."
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
-#: actions/register.php:92 actions/updateprofile.php:109
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
-msgid "Location is too long (max 255 chars)."
-msgstr "Tên khu vực quá dài (không quá 255 ký tự)."
+#: actions/editgroup.php:56
+#, fuzzy, php-format
+msgid "Edit %s group"
+msgstr "%s và nhóm"
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
-#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
-#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
-#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
-#, php-format
-msgid "Login"
-msgstr "Đăng nhập"
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+#, fuzzy
+msgid "You must be logged in to create a group."
+msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những "
 
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Đăng nhập bằng tài khoản [OpenID](%%doc.openid%%)."
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+#, fuzzy
+msgid "You must be an admin to edit the group"
+msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những "
 
-#: ../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%"
-"%). "
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
 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%%). "
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
-msgid "Logout"
-msgstr "Thoát"
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Lý lịch quá dài (không quá 140 ký tự)"
 
-#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
-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/editgroup.php:253
+#, fuzzy
+msgid "Could not update group."
+msgstr "Không thể cập nhật thành viên."
 
-#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
-msgid "Lost or forgotten password?"
-msgstr "Mất hoặc quên mật khẩu?"
+#: actions/editgroup.php:269
+#, fuzzy
+msgid "Options saved."
+msgstr "Đã lưu các điều chỉnh."
 
-#: ../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 "Tạo một địa chỉ email mới để đưa tin nhắn lên; và xóa "
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "Thiết lập địa chỉ email"
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
 #: actions/emailsettings.php:71
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Bạn nhận email từ %%site.name%% như thế nào."
 
-#: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
-msgid "Member since"
-msgstr "Gia nhập từ"
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "Địa chỉ"
 
-#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
-#, php-format
-msgid "Microblog by %s"
-msgstr "Microblog bởi  %s"
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr "Đã xác nhận địa chỉ này."
 
-#: ../actions/smssettings.php:304
-#, php-format
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "Xóa"
+
+#: actions/emailsettings.php:113
 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."
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
 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."
-
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-msgid "My text and files are available under "
-msgstr "Ghi chú và các file của tôi đã có ở phía dưới"
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#: actions/emailsettings.php:142 actions/smssettings.php:152
-msgid "New"
-msgstr "Mới"
+"Đ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/mail.php:144 lib/mail.php:144 lib/mail.php:286
-#, php-format
-msgid "New email address for posting to %s"
-msgstr "Dia chi email moi de gui tin nhan den %s"
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "Hủy"
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
+#: actions/emailsettings.php:121
 #, fuzzy
-msgid "New incoming email address added."
-msgstr "Đã xác nhận địa chỉ này."
-
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
-msgid "New nickname"
-msgstr "Biệt hiệu mới"
+msgid "Email Address"
+msgstr "Địa chỉ email"
 
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
-msgstr "Thông báo mới"
+#: actions/emailsettings.php:123
+#, fuzzy
+msgid "Email address, like \"UserName@example.org\""
+msgstr "Địa chỉ email GTalk, Ví dụ: \"UserName@example.org\""
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-msgid "New password"
-msgstr "Mật khẩu mới"
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "Thêm"
 
-#: ../actions/recoverpassword.php:314
-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/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+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
-#: actions/login.php:228 actions/profilesettings.php:98
-#: actions/register.php:367 actions/showgroup.php:224
-#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
-msgid "Nickname"
-msgstr "Biệt danh"
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+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/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69 actions/finishopenidlogin.php:181
-#: actions/profilesettings.php:225 actions/register.php:76
-#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
-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/emailsettings.php:145 actions/smssettings.php:162
+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 "
 
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:67 ../actions/updateprofile.php:77
-#: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
-#: actions/register.php:74 actions/updateprofile.php:78
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
-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/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
+msgstr "Mới"
 
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
-msgid "Nickname not allowed."
-msgstr "Biệt hiệu không được cho phép."
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
+msgstr "Tính năng"
 
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-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/emailsettings.php:158
+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."
 
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
-msgid "Nickname or email"
-msgstr "Biệt hiệu hoặc email"
+#: actions/emailsettings.php:163
+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ọ."
 
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
-msgid "No"
-msgstr "Không"
+#: actions/emailsettings.php:169
+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."
 
-#: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
-msgstr "Không có Jabber ID."
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "Gửi email báo cho tôi biết khi có ai đó gửi tin nhắn riêng cho tôi."
 
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
-msgid "No authorization request!"
-msgstr "Không có yêu cầu!"
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
-#, fuzzy
-msgid "No carrier selected."
-msgstr "Bạn chưa chọn hình để đưa lên."
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
+msgstr "Tôi muốn đưa tin nhắn lên bằng email."
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
-msgstr "Không có mã nào được nhập"
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
+msgstr "Xuất bản một MicroID đến địa chỉ email của tôi."
 
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
-#: actions/confirmaddress.php:75
-msgid "No confirmation code."
-msgstr "Không có mã số xác nhận."
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "Lưu"
 
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
-#: actions/newnotice.php:126 classes/Command.php:223
-msgid "No content!"
-msgstr "Không có nội dung!"
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+msgstr "Các tính năng đã được lưu."
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr "Không có địa chỉ email."
 
-#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
-msgid "No id."
-msgstr "Không có id."
+#: actions/emailsettings.php:326
+#, fuzzy
+msgid "Cannot normalize that email address"
+msgstr "Không thể bình thường hóa địa chỉ GTalk này"
 
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
+#: actions/emailsettings.php:330
 #, fuzzy
-msgid "No incoming email address."
+msgid "Not a valid email address"
 msgstr "Địa chỉ email không hợp lệ."
 
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr "Không có biệt hiệu được cung cấp."
+#: actions/emailsettings.php:333
+#, fuzzy
+msgid "That is already your email address."
+msgstr "Bạn đã dùng địa chỉ email này rồi"
 
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
-msgid "No nickname."
-msgstr "Không có biệt hiệu."
+#: actions/emailsettings.php:336
+#, fuzzy
+msgid "That email address already belongs to another user."
+msgstr "Địa chỉ email GTalk này đã có người khác sử dụng rồi."
 
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229 actions/emailsettings.php:240
-#: actions/imsettings.php:214 actions/smssettings.php:237
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
-msgid "No pending confirmation to cancel."
-msgstr "Sự xác nhận chưa được hủy bỏ."
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+msgstr "Không thể  chèn mã xác nhận."
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
-msgstr "Không có số điện thoại."
+#: actions/emailsettings.php:358
+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."
 
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
-msgstr "Không có URL cho hồ sơ để quay về."
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
+msgstr "Sự xác nhận chưa được hủy bỏ."
 
-#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
-msgid "No registered email address for that user."
-msgstr "Thành viên này đã không đăng ký địa chỉ email."
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "Sai IM."
 
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr "Không tìm thấy yêu cầu nào!"
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "Sự xác nhận đã bị hủy bỏ."
 
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
-msgid "No results"
-msgstr "Không có kết quả nào"
+#: actions/emailsettings.php:412
+#, fuzzy
+msgid "That is not your email address."
+msgstr "Xin lỗi, đó không phải là địa chỉ email mà bạn nhập vào."
 
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
-msgstr "Không có kích thước."
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "Đã xóa địa chỉ."
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
-msgid "No status found with that ID."
-msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+#, fuzzy
+msgid "No incoming email address."
+msgstr "Địa chỉ email không hợp lệ."
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
-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/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+#, fuzzy
+msgid "Couldn't update user record."
+msgstr "Không thể cập nhật thành viên."
 
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
-msgstr "Không có OpenID nào."
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+#, fuzzy
+msgid "Incoming email address removed."
+msgstr "Địa chỉ email hoặc mật khẩu không đúng."
 
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
-msgid "No such document."
-msgstr "Không có tài liệu nào."
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+#, fuzzy
+msgid "New incoming email address added."
+msgstr "Đã xác nhận địa chỉ này."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30 actions/shownotice.php:32
-#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
-#: lib/deleteaction.php:51
-msgid "No such notice."
-msgstr "Không có tin nhắn nào."
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+#, fuzzy
+msgid "Popular notices"
+msgstr "Các tin nhắn bị cảnh báo"
 
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr "Không có mã khôi phục nào."
+#: actions/favorited.php:67
+#, fuzzy, php-format
+msgid "Popular notices, page %d"
+msgstr "Các tin nhắn bị cảnh báo"
 
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-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: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 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
-msgid "No such user."
-msgstr "Không có user nào."
+#: actions/favorited.php:79
+#, fuzzy
+msgid "The most popular notices on the site right now."
+msgstr "Các từ khóa phổ biến."
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-msgid "No user with that email address or username."
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
-"Không tìm thấy người dùng nào tương ứng với địa chỉ email hoặc username đó."
 
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
-msgstr "Không có ai!"
-
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr "Mã khôi phục không đúng."
+#: actions/favorited.php:153
+msgid ""
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
+msgstr ""
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
-msgstr "Không có người dùng nào đăng ký"
+#: actions/favorited.php:156
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
+msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
-msgid "Not a supported data format."
-msgstr "Không hỗ trợ định dạng dữ liệu này."
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
+msgstr "Những tin nhắn ưa thích của %s"
 
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
-msgstr "Jabber ID không hợp lệ"
+#: actions/favoritesrss.php:115
+#, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Dòng tin nhắn cho %s"
 
-#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-msgid "Not a valid OpenID."
-msgstr "OpenID không hợp lệ."
+#: actions/favor.php:79
+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/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: actions/favor.php:92 lib/disfavorform.php:140
 #, fuzzy
-msgid "Not a valid email address"
-msgstr "Địa chỉ email không hợp lệ."
+msgid "Disfavor favorite"
+msgstr "Không thích"
 
-#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-msgid "Not a valid email address."
-msgstr "Địa chỉ email không hợp lệ."
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr ""
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-#: actions/editgroup.php:186 actions/newgroup.php:137
-#: actions/profilesettings.php:195 actions/register.php:161
-msgid "Not a valid nickname."
-msgstr "Biệt hiệu không hợp lệ."
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr ""
 
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-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/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
+msgstr ""
 
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-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/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "Thông báo mới"
 
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-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/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "Thông báo mới"
 
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
-msgid "Not an image or corrupt file."
-msgstr "File hỏng hoặc không phải là file ảnh."
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
-msgid "Not authorized."
-msgstr "Chưa được phép."
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Không mong đợi trả lời lại!"
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
-msgid "Not found"
-msgstr "Không tìm thấy"
-
-#: ../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 actions/block.php:59 actions/disfavor.php:61
-#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
-#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
-#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
-#: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "Chưa đăng nhập."
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "Người dùng đang lắng nghe để không thoát khỏi."
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
-msgid "Not subscribed!."
-msgstr "Chưa đăng nhận!"
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+msgstr "Bạn có thể đăng ký tại nơi bạn ở!"
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
-msgstr "Tìm kiếm thông báo"
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
+msgstr ""
 
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
-#, php-format
-msgid "Notice feed for %s"
-msgstr "Dòng tin nhắn cho %s"
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "Chưa được phép."
 
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
-msgstr "Tin nhắn không có hồ sơ cá nhân"
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "Không thể chuyển các token yêu cầu đến token truy cập."
 
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
-msgid "Notices"
-msgstr "Tin nhắn"
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Không biết phiên bản của giao thức OMB."
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
-#, php-format
-msgid "Notices tagged with %s"
-msgstr "Thông báo được gắn thẻ %s"
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "Lỗi xảy ra khi cập nhật hồ sơ cá nhân"
 
-#: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
-msgstr "Mật khẩu cũ"
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+#, fuzzy
+msgid "No such group."
+msgstr "Không có tin nhắn nào."
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
-msgid "OpenID"
-msgstr "OpenID"
-
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
-msgid "OpenID Account Setup"
-msgstr "Tạo tài khoản OpenID"
-
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-msgid "OpenID Auto-Submit"
-msgstr "Tự động nhập OpenID"
-
-#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
-#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-msgid "OpenID Login"
-msgstr "Đăng nhập OpenID"
-
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-#: actions/openidlogin.php:102 actions/openidsettings.php:101
-msgid "OpenID URL"
-msgstr "OpenID URL"
-
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
-msgid "OpenID authentication cancelled."
-msgstr "Xác thực OpenID bị hủy."
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr "Xác thực OpendID bị lỗi: %s"
-
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "OpenID lỗi: %s"
-
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr "OpenID đã xóa."
-
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
-msgstr "Cấu hình OpenID"
-
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-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/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "Không có tin nhắn nào."
 
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
-msgid "Partial upload."
-msgstr "Upload từng phần."
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "Không có tin nhắn nào."
 
-#: ../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 actions/finishopenidlogin.php:118
-#: actions/login.php:231 actions/register.php:372
-#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-msgid "Password"
-msgstr "Mật khẩu"
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
+msgstr ""
 
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
-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/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
 
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
-msgid "Password must be 6 chars or more."
-msgstr "Mật khẩu phải nhiều hơn 6 ký tự."
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "Người dùng không có thông tin."
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-msgid "Password recovery requested"
-msgstr "Yêu cầu khôi phục lại mật khẩu đã được gửi"
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "Bạn chưa cập nhật thông tin riêng"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-msgid "Password saved."
-msgstr "Đã lưu mật khẩu."
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "Ban user"
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-msgid "Passwords don't match."
-msgstr "Mật khẩu không khớp."
+#: actions/groupblock.php:162
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
-msgstr "Tên tài khoản"
+#: actions/groupblock.php:178
+#, fuzzy
+msgid "Do not block this user from this group"
+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/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
+#: actions/groupblock.php:179
 #, fuzzy
-msgid "People Search"
-msgstr "Tìm kiếm nhiều người"
+msgid "Block this user from this group"
+msgstr "Ban user"
 
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
-msgstr "Tìm kiếm nhiều người"
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
+msgstr ""
 
-#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
-msgid "Personal"
-msgstr "Cá nhân"
+#: actions/groupbyid.php:74
+msgid "No ID"
+msgstr ""
 
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-msgid "Personal message"
-msgstr "Tin nhắn cá nhân"
+#: actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những "
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-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ự "
+#: actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "Nhóm"
 
-#: ../actions/userauthorization.php:78
+#: actions/groupdesignsettings.php:152
 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\"."
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
 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:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
-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/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Không thể cập nhật thành viên."
 
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94 actions/emailsettings.php:86
-#: actions/imsettings.php:68 actions/smssettings.php:94
-#: actions/twittersettings.php:70 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
-msgid "Preferences"
-msgstr "Tính năng"
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "Không thể lưu thông tin Twitter của bạn!"
 
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163 actions/emailsettings.php:180
-#: actions/imsettings.php:152 actions/smssettings.php:171
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
-msgid "Preferences saved."
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+#, fuzzy
+msgid "Design preferences saved."
 msgstr "Các tính năng đã được lưu."
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
-msgid "Preferred language"
-msgstr "Ngôn ngữ bạn thích"
-
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
-msgid "Privacy"
-msgstr "Riêng tư"
-
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-msgid "Problem saving notice."
-msgstr "Có lỗi xảy ra khi lưu tin nhắn."
-
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
-msgid "Profile"
-msgstr "Hồ sơ "
-
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
-msgstr "URL của Hồ sơ cá nhân"
-
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
-msgstr "Các thiết lập cho Hồ sơ cá nhân"
-
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-msgid "Profile unknown"
-msgstr "Hồ sơ này không biết"
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+#, fuzzy
+msgid "Group logo"
+msgstr "Mã nhóm"
 
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
-msgid "Public Stream Feed"
-msgstr "Dòng tin công cộng"
+#: actions/grouplogo.php:150
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
 
-#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
-msgid "Public timeline"
-msgstr "Dòng tin công cộng"
+#: actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
+msgstr ""
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Gửi MicroID đến địa chỉ Jabber/GTalk của tôi. "
+#: actions/grouplogo.php:396
+#, fuzzy
+msgid "Logo updated."
+msgstr "Hình đại diện đã được cập nhật."
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
-msgid "Publish a MicroID for my email address."
-msgstr "Xuất bản một MicroID đến địa chỉ email của tôi."
+#: actions/grouplogo.php:398
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "Cập nhật hình đại diện không thành công."
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr "Các từ khóa hiện tại"
+#: actions/groupmembers.php:93 lib/groupnav.php:92
+#, fuzzy, php-format
+msgid "%s group members"
+msgstr "Thành viên"
 
-#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
-msgid "Recover"
-msgstr "Khôi phục"
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
+msgstr ""
 
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
-msgid "Recover password"
-msgstr "Khôi phục mật khẩu"
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr ""
 
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-msgid "Recovery code for unknown user."
-msgstr "Khôi phục lại code cho user không đăng ký."
+#: actions/groupmembers.php:175 lib/groupnav.php:107
+msgid "Admin"
+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
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-msgid "Register"
-msgstr "Đăng ký"
+#: actions/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
+msgstr ""
 
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
+#: actions/groupmembers.php:441
 #, fuzzy
-msgid "Registration not allowed."
-msgstr "Biệt hiệu không được cho phép."
-
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
-msgid "Registration successful"
-msgstr "Đăng ký thành công"
+msgid "Make user an admin of the group"
+msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những "
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
-msgid "Reject"
-msgstr "Từ chối"
+#: actions/groupmembers.php:473
+msgid "Make Admin"
+msgstr ""
 
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
-msgid "Remember me"
-msgstr "Nhớ tôi"
+#: actions/groupmembers.php:473
+#, fuzzy
+msgid "Make this user an admin"
+msgstr "Kênh mà bạn tham gia"
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
-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/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Dòng tin nhắn cho %s"
 
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
-msgstr "Đăng nhận từ xa"
+#: actions/groupsearch.php:52
+#, fuzzy, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"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."
 
-#: ../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 actions/emailsettings.php:101
-#: actions/emailsettings.php:134 actions/imsettings.php:102
-#: actions/openidsettings.php:166 actions/smssettings.php:103
-#: actions/smssettings.php:146 actions/twittersettings.php:115
-msgid "Remove"
-msgstr "Xóa"
+#: actions/groupsearch.php:58
+#, fuzzy
+msgid "Group search"
+msgstr "Tìm kiếm nhiều người"
 
-#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
-msgstr "Xóa OpenID"
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "Không có kết quả nào"
 
-#: ../actions/openidsettings.php:73
+#: actions/groupsearch.php:82
+#, php-format
 msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
 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:55 lib/personal.php:55 lib/personalgroupnav.php:103
-msgid "Replies"
-msgstr "Trả lời"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
-#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
-#: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: actions/groupsearch.php:85
 #, php-format
-msgid "Replies to %s"
-msgstr "Trả lời cho %s"
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
 
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
-msgid "Reset"
-msgstr "Khởi tạo"
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+#, fuzzy
+msgid "Groups"
+msgstr "Nhóm"
 
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
-msgid "Reset password"
-msgstr "Khởi tạo lại mật khẩu"
+#: actions/groups.php:64
+#, fuzzy, php-format
+msgid "Groups, page %d"
+msgstr "Tên nhóm"
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-msgid "SMS"
-msgstr "SMS"
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
-msgid "SMS Phone number"
-msgstr "Số điện thoại để nhắn SMS "
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+#, fuzzy
+msgid "Create a new group"
+msgstr "Tạo nhóm"
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
-msgstr "Thiết lập SMS"
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
-msgid "SMS confirmation"
-msgstr "Xác nhận SMS"
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "Người dùng không có thông tin."
 
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
-msgid "Same as password above"
-msgstr "Cùng mật khẩu ở trên"
+#: actions/groupunblock.php:128 actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Lỗi xảy ra khi lưu thành viên."
 
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
-msgid "Same as password above. Required."
-msgstr "Cùng mật khẩu ở trên. Bắt buộc."
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "Cấu hình IM"
 
-#: ../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 actions/emailsettings.php:182
-#: actions/facebooksettings.php:114 actions/imsettings.php:157
-#: actions/othersettings.php:117 actions/profilesettings.php:150
-#: actions/smssettings.php:169 actions/subscriptions.php:124
-#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
-msgid "Save"
-msgstr "Lưu"
+#: actions/imsettings.php:70
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+"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."
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
-msgid "Search"
-msgstr "Tìm kiếm"
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+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/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
-msgstr "Tìm kiếm dòng thông tin"
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Địa chỉ Jabber/GTalk vừa được xác nhận."
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/imsettings.php:114
 #, php-format
 msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
+"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 ""
-"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."
+"Đ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:124
+msgid "IM Address"
+msgstr "IM"
 
-#: ../actions/peoplesearch.php:28
+#: actions/imsettings.php:126
 #, 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."
+"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 ""
-"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."
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
-msgid "Select a carrier"
-msgstr "Chọn nhà cung cấp Mobile"
-
-#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
-#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
-msgid "Send"
-msgstr "Gửi"
-
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
-msgstr "Gửi email đến địa chỉ này để đưa tin nhắn mới lên."
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-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."
+"Đị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/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Hãy gửi tin nhắn đến tôi qua Jabber hay 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 ""
-"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. "
+#: actions/imsettings.php:148
+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:76 actions/imsettings.php:77
+#: actions/imsettings.php:153
 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."
 
-#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
-msgid "Settings"
-msgstr "Điều chỉnh"
-
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
-msgid "Settings saved."
-msgstr "Đã lưu các điều chỉnh."
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr "Các từ khóa phổ biến."
-
-#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:114
-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
-#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
-msgstr "Vài điều bất thường xảy ra."
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
-msgstr "Xin lỗi, không có địa chỉ email cho phép."
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
-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."
-
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
-msgid "Source"
-msgstr "Nguồn"
-
-#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
-msgid "Statistics"
-msgstr "Số liệu thống kê"
-
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-msgid "Stored OpenID not found."
-msgstr "Không tìm thấy 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
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
-msgid "Subscribe"
-msgstr "Theo bạn này"
-
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
-msgid "Subscribers"
-msgstr "Bạn này theo tôi"
-
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
-msgid "Subscription authorized"
-msgstr "Đăng nhận được phép"
-
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
-msgid "Subscription rejected"
-msgstr "Đăng nhận từ chối"
-
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27 actions/showstream.php:240
-#: actions/showstream.php:322 actions/subscriptions.php:27
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
-msgid "Subscriptions"
-msgstr "Tôi theo bạn này"
-
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
-msgid "System error uploading file."
-msgstr "Hệ thống xảy ra lỗi trong khi tải file."
-
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
-#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
-msgid "Tags"
-msgstr "Từ khóa"
-
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "Chuỗi bất kỳ"
-
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
-msgid "Text search"
-msgstr "Chuỗi cần tìm"
-
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
-msgstr "OpenID này không phải của bạn."
-
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
-msgstr "Địa chỉ đó đã được xác nhận rồi."
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Gửi MicroID đến địa chỉ Jabber/GTalk của tôi. "
 
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-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/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "Không có Jabber ID."
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-#, fuzzy
-msgid "That email address already belongs to another user."
-msgstr "Địa chỉ email GTalk này đã có người khác sử dụng rồi."
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr "Không thể bình thường hóa Jabber ID"
 
-#: ../actions/avatar.php:80 actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
-msgstr "File quá lớn."
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "Jabber ID không hợp lệ"
 
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:299
 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/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
-#, fuzzy
-msgid "That is already your email address."
-msgstr "Bạn đã dùng địa chỉ email này rồi"
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr "Jabber ID này đã thuộc về người khác rồi."
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
-#, fuzzy
-msgid "That is already your phone number."
-msgstr "Đó không phải là số điện thoại của bạn."
+#: actions/imsettings.php:327
+#, 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."
 
-#: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "Đây không phải Jabber ID của bạn."
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
-#, fuzzy
-msgid "That is not your email address."
-msgstr "Xin lỗi, đó không phải là địa chỉ email mà bạn nhập vào."
-
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
-msgstr "Đó không phải là số điện thoại của bạn."
-
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-#: actions/emailsettings.php:367 actions/imsettings.php:349
-msgid "That is the wrong IM address."
-msgstr "Sai IM."
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-#, fuzzy
-msgid "That is the wrong confirmation number."
-msgstr "Đó không phải là số điện thoại của bạn."
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-#, fuzzy
-msgid "That phone number already belongs to another user."
-msgstr "Địa chỉ email Yahoo này đã có người khác sử dụng rồi."
-
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49 actions/twitapistatuses.php:330
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-msgid "That's too long. Max notice size is 140 chars."
-msgstr "Quá dài. Tối đa là 140 ký tự."
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
-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/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr "Hộp thư đến của %s - trang %d"
 
-#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/inbox.php:62
 #, 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."
+msgid "Inbox for %s"
+msgstr "Hộp thư đến của %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
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
-msgid "The address was removed."
-msgstr "Đã xóa địa chỉ."
+#: actions/inbox.php:115
+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/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:"
+#: actions/invite.php:39
+msgid "Invites have been disabled."
 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: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 ""
-"Đă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/invite.php:41
+#, 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/subscribers.php:35 actions/subscribers.php:35
+#: actions/invite.php:72
 #, 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."
+msgid "Invalid email address: %s"
+msgstr "Địa chỉ email không đúng:%s"
 
-#: ../actions/subscribers.php:33 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/invite.php:110
+msgid "Invitation(s) sent"
+msgstr "Thư mời đã gửi"
 
-#: ../actions/subscriptions.php:35 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/invite.php:112
+msgid "Invite new users"
+msgstr "Gửi thư mời đến những người chưa có tài khoản"
 
-#: ../actions/subscriptions.php:33 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/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr "Bạn đã theo những người này:"
+
+#: actions/invite.php:131 actions/invite.php:139
+#, php-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:136
 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/recoverpassword.php:88
-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."
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
+msgstr "Thư mời đã gửi đến:"
 
-#: ../lib/openid.php:195
+#: actions/invite.php:150
 msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 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."
+"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 "
 
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
-#, php-format
+#: actions/invite.php:162
 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."
-
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-msgid "This method requires a POST or DELETE."
-msgstr "Phương thức này yêu cầu là POST hoặc DELETE"
+"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/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
-msgid "This method requires a POST."
-msgstr "Phương thức này yêu cầu là POST."
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "Địa chỉ email"
 
-#: ../lib/util.php:164 lib/util.php:246
-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/invite.php:189
+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/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
-msgid "Timezone"
-msgstr "Khu vực"
+#: actions/invite.php:192
+msgid "Personal message"
+msgstr "Tin nhắn cá nhân"
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
-msgid "Timezone not selected."
-msgstr ""
+#: actions/invite.php:194
+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:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
+msgstr "Gửi"
 
-#: ../actions/remotesubscribe.php:43
+#: actions/invite.php:226
+#, 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:228
 #, 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."
+"%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 ""
-"Để đă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."
+"%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"
+"\n"
+"Nế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"
+"\n"
+"Thân, %2$s\n"
 
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
+#: actions/joingroup.php:60
+#, fuzzy
+msgid "You must be logged in to join a group."
+msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những "
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL về Trang chính, Blog, hoặc hồ sơ cá nhân của bạn trên "
+#: actions/joingroup.php:90 lib/command.php:217
+#, fuzzy
+msgid "You are already a member of that group"
+msgstr "Bạn đã theo những người này:"
 
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-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/joingroup.php:128 lib/command.php:234
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s"
+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/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 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-msgid "Unexpected form submission."
-msgstr "Bất ngờ gửi mẫu thông tin. "
+#: actions/joingroup.php:135 lib/command.php:239
+#, fuzzy, php-format
+msgid "%s joined group %s"
+msgstr "%s và nhóm"
 
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
-msgid "Unexpected password reset."
-msgstr "Bất ngờ reset mật khẩu."
+#: actions/leavegroup.php:60
+#, fuzzy
+msgid "You must be logged in to leave a group."
+msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những "
 
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-msgid "Unknown action"
-msgstr "Không tìm thấy action"
+#: actions/leavegroup.php:90 lib/command.php:268
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "Bạn chưa cập nhật thông tin riêng"
 
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-msgid "Unknown version of OMB protocol."
-msgstr "Không biết phiên bản của giao thức OMB."
+#: actions/leavegroup.php:119 lib/command.php:278
+#, fuzzy
+msgid "Could not find membership record."
+msgstr "Không thể cập nhật thành viên."
 
-#: ../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 ""
-"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/leavegroup.php:127 lib/command.php:284
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+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/confirmaddress.php:48 actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
-#, php-format
-msgid "Unrecognized address type %s"
-msgstr "Không nhận dạng kiểu địa chỉ %s"
+#: actions/leavegroup.php:134 lib/command.php:289
+#, fuzzy, php-format
+msgid "%s left group %s"
+msgstr "%s và nhóm"
 
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
-msgstr "Hết theo"
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "Đã đăng nhập."
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-msgid "Unsupported OMB version"
-msgstr "Không hỗ trợ cho version OMB"
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Nội dung tin nhắn không hợp lệ"
 
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
-msgid "Unsupported image file format."
-msgstr "Không hỗ trợ kiểu file ảnh này."
+#: actions/login.php:143
+msgid "Incorrect username or password."
+msgstr "Sai tên đăng nhập hoặc mật khẩu."
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
-msgstr "Thay đổi bởi SMS"
+#: actions/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
+msgstr "Lỗi xảy ra khi tạo thành viên."
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
-msgstr "Thay đổi bởi tin nhắn nhanh (IM)"
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "Đăng nhập"
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
+#: actions/login.php:243
+msgid "Login to site"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Biệt danh"
 
-#: ../actions/avatar.php:68 actions/profilesettings.php:161
-#: actions/avatarsettings.php:162 actions/grouplogo.php:232
-msgid "Upload"
-msgstr "Tải file"
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Mật khẩu"
 
-#: ../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/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "Nhớ tôi"
+
+#: actions/login.php:253 actions/register.php:479
+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!"
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr "Tải lên một file ảnh mới cho hồ sơ cá nhân"
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "Mất hoặc quên mật khẩu?"
 
-#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/login.php:282
 msgid ""
-"Use this form to invite your friends and colleagues to use this service."
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
 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/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 "Chỉ dùng để cập nhật, thông báo, và hồi phục mật khẩu"
-
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
-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: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
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-msgid "User has no profile."
-msgstr "Người dùng không có thông tin."
-
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
-msgstr "Biệt hiệu của người dùng"
-
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr "Không tìm thấy user."
-
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
-msgid "What timezone are you normally in?"
-msgstr "Khu vực nào bạn thường ở?"
+"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."
 
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: actions/login.php:286
 #, php-format
-msgid "What's up, %s?"
-msgstr "Bạn đang làm gì thế, %s?"
+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, hoặc thử đăng nhập "
+"bằng [OpenID](%%action.openidlogin%%). "
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-#: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Bạn ở đâu, \"Thành phố, Tỉnh thành, Quốc gia\""
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/makeadmin.php:95
 #, php-format
-msgid "Wrong image type for '%s'"
-msgstr "Kiểu file ảnh không phù hợp với  '%s'"
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/makeadmin.php:132
 #, php-format
-msgid "Wrong size image at '%s'"
-msgstr "Kích thước file ảnh không phù hợp đối với  '%s'"
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
-msgid "Yes"
-msgstr "Có"
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
 
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-msgid "You already have this OpenID!"
-msgstr "Bạn đã có được tài khoản OpenID này rồi!"
+#: actions/microsummary.php:69
+msgid "No current status"
+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 "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."
+#: actions/newgroup.php:53
+#, fuzzy
+msgid "New group"
+msgstr "Tạo nhóm"
 
-#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
-msgstr "Bạn đã đăng nhập!"
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
+msgstr ""
 
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-msgid "You are already subscribed to these users:"
-msgstr "Bạn đã theo những người này:"
+#: actions/newmessage.php:71 actions/newmessage.php:231
+#, fuzzy
+msgid "New message"
+msgstr "Tin mới nhất"
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
 #, fuzzy
-msgid "You are not friends with the specified user."
+msgid "You can't send a message to this user."
 msgstr "Bạn đã theo những người này:"
 
-#: ../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:135 actions/register.php:145
-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/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "Bạn có thể nhận tin nhắn SMS qua email từ %%site.name%%."
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+msgstr "Không có nội dung!"
 
-#: ../actions/openidsettings.php:86
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
+#: actions/newmessage.php:158
+msgid "No recipient specified."
 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 actions/imsettings.php:28
-#, php-format
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 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/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "Tin mới nhất"
 
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
-msgstr "Bạn có thể đăng ký tại nơi bạn ở!"
+#: actions/newmessage.php:185 lib/command.php:375
+#, fuzzy, php-format
+msgid "Direct message to %s sent"
+msgstr "Tin nhắn riêng"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
-msgid "You can't register if you don't agree to the license."
-msgstr "Bạn không thể đăng ký nếu không đồng ý các điều khoản."
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+#, fuzzy
+msgid "Ajax Error"
+msgstr "Lỗi"
 
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
-msgid "You did not send us that profile"
-msgstr "Bạn chưa cập nhật thông tin riêng"
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "Thông báo mới"
+
+#: actions/newnotice.php:199
+#, fuzzy
+msgid "Notice posted"
+msgstr "Tin đã gửi"
 
-#: ../lib/mail.php:147
+#: actions/noticesearch.php:68
 #, 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"
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
 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"
-"\n"
-"Chúc sức khỏe,\n"
-"%4$s"
+"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/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
-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/noticesearch.php:78
+msgid "Text search"
+msgstr "Chuỗi cần tìm"
 
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những "
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr " Tìm dòng thông tin cho \"%s\""
 
-#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/noticesearch.php:121
+#, php-format
 msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 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 "
 
-#: ../actions/recoverpassword.php:149
-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/noticesearch.php:124
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
+msgstr ""
 
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
-msgid "Your OpenID URL"
-msgstr "OpenID URL của bạn"
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Dòng tin nhắn cho %s"
 
-#: ../actions/recoverpassword.php:164
-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/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Các thay đổi phù hợp với từ \"%s\""
 
-#: ../actions/openidsettings.php:28
-#, php-format
+#: actions/nudge.php:85
 msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
-"account.  Manage your associated OpenIDs from here."
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 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:943 lib/util.php:992 lib/util.php:945
-msgid "a few seconds ago"
-msgstr "vài giây trước"
+#: actions/nudge.php:94
+#, fuzzy
+msgid "Nudge sent"
+msgstr "Tin đã gửi"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
-#, php-format
-msgid "about %d days ago"
-msgstr "%d ngày trước"
+#: actions/nudge.php:97
+#, fuzzy
+msgid "Nudge sent!"
+msgstr "Tin đã gửi"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
-#, php-format
-msgid "about %d hours ago"
-msgstr "%d giờ trước"
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+msgstr "Tin nhắn không có hồ sơ cá nhân"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: actions/oembed.php:86 actions/shownotice.php:180
 #, php-format
-msgid "about %d minutes ago"
-msgstr "%d phút trước"
+msgid "%1$s's status on %2$s"
+msgstr "Trạng thái của %1$s vào %2$s"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
-#, php-format
-msgid "about %d months ago"
-msgstr "%d tháng trước"
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "Kết nối"
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
-msgid "about a day ago"
-msgstr "1 ngày trước"
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
-msgid "about a minute ago"
-msgstr "1 phút trước"
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
+msgstr "Không hỗ trợ định dạng dữ liệu này."
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
-msgid "about a month ago"
-msgstr "1 tháng trước"
+#: actions/opensearch.php:64
+#, fuzzy
+msgid "People Search"
+msgstr "Tìm kiếm nhiều người"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
-msgid "about a year ago"
-msgstr "1 năm trước"
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "Tìm kiếm thông báo"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
-msgid "about an hour ago"
-msgstr "1 giờ trước"
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "Thiết lập tài khoản Twitter"
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
+#: actions/othersettings.php:71
+msgid "Manage various other options."
 msgstr ""
 
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117 actions/noticesearch.php:136
-#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
-msgid "in reply to..."
-msgstr "còn nữa..."
+#: actions/othersettings.php:108
+msgid " (free service)"
+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 actions/noticesearch.php:194
-msgid "reply"
-msgstr "trả lời"
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
+msgstr ""
 
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-msgid "same as password above"
-msgstr "cùng mật khẩu ở trên"
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
+msgstr ""
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
+#: actions/othersettings.php:122
 #, fuzzy
-msgid "unsupported file type"
-msgstr "Không hỗ trợ kiểu file ảnh này."
+msgid "View profile designs"
+msgstr "Các thiết lập cho Hồ sơ cá nhân"
+
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
 
-#: ../lib/util.php:1309 lib/util.php:1443
+#: actions/othersettings.php:153
 #, fuzzy
-msgid "« After"
-msgstr "Sau"
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "Tên khu vực quá dài (không quá 255 ký tự)."
 
-#: 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
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-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/outbox.php:58
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr "Hộp thư gửi đi của %s - trang %d"
 
-#: actions/disfavor.php:55 actions/disfavor.php:81
-#, fuzzy
-msgid "This notice is not 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/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
+msgstr "Hộp thư đi của %s"
+
+#: actions/outbox.php:116
+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/passwordsettings.php:58
+msgid "Change password"
+msgstr "Đổi mật khẩu"
 
-#: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/passwordsettings.php:69
 #, fuzzy
-msgid "Could not delete favorite."
-msgstr "Không thể tạo favorite."
+msgid "Change your password."
+msgstr "Thay đổi mật khẩu của bạn"
 
-#: actions/disfavor.php:72 lib/favorform.php:140
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
 #, fuzzy
-msgid "Favor"
-msgstr "Ưa thích"
+msgid "Password change"
+msgstr "Đã lưu mật khẩu."
 
-#: actions/emailsettings.php:92
-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ọ."
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "Mật khẩu cũ"
 
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-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."
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "Mật khẩu mới"
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
-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/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "Nhiều hơn 6 ký tự"
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132 actions/favor.php:86
-#: actions/twitapifavorites.php:125 classes/Command.php:152
-msgid "Could not create favorite."
-msgstr "Không thể tạo favorite."
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "Xác nhận"
 
-#: actions/favor.php:70
-msgid "Disfavor"
-msgstr "Không thích"
+#: actions/passwordsettings.php:113
+msgid "same as password above"
+msgstr "cùng mật khẩu ở trên"
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
-#, php-format
-msgid "%s favorite notices"
-msgstr "%s ưa thích các tin nhắn"
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "Thay đổi"
 
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
-#, fuzzy, php-format
-msgid "Feed of favorite notices of %s"
-msgstr "Tìm kiếm các tin nhắn ưa thích của %s"
+#: actions/passwordsettings.php:154 actions/register.php:230
+#, fuzzy
+msgid "Password must be 6 or more characters."
+msgstr "Mật khẩu phải nhiều hơn 6 ký tự."
 
-#: actions/inbox.php:28 actions/inbox.php:59
-#, php-format
-msgid "Inbox for %s - page %d"
-msgstr "Hộp thư đến của %s - trang %d"
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "Mật khẩu không khớp."
 
-#: actions/inbox.php:30 actions/inbox.php:62
-#, php-format
-msgid "Inbox for %s"
-msgstr "Hộp thư đến của %s"
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "Mật khẩu cũ sai"
 
-#: actions/inbox.php:53 actions/inbox.php:115
-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/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "Lỗi xảy ra khi lưu thành viên;  không hợp lệ."
 
-#: actions/invite.php:178 actions/invite.php:213
-#, fuzzy, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-msgstr "%1$s moi ban tham gia vao %2$s (%3$s).\n"
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "Không thể lưu mật khẩu mới"
 
-#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-#, fuzzy
-msgid "Automatically login in the future; "
-msgstr "Sẽ tự động đăng nhập, không dành cho các máy sử dụng chung!"
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "Đã lưu mật khẩu."
 
-#: actions/login.php:122 actions/login.php:264
-#, fuzzy
-msgid "For security reasons, please re-enter your "
+#: actions/peoplesearch.php:52
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+"Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
-"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."
+"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."
 
-#: actions/login.php:126 actions/login.php:268
-#, fuzzy
-msgid "Login with your username and password. "
-msgstr "Sai tên đăng nhập hoặc mật khẩu."
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "Tìm kiếm nhiều người"
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
-#, fuzzy
-msgid "That's too long. Max message size is 140 chars."
-msgstr "Quá dài. Tối đa là 140 ký tự."
+#: actions/peopletag.php:70
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "Địa chỉ email không hợp lệ."
 
-#: actions/newmessage.php:65 actions/newmessage.php:128
-msgid "No recipient specified."
+#: actions/peopletag.php:144
+#, php-format
+msgid "Users self-tagged with %s - page %d"
 msgstr ""
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206 actions/newmessage.php:131
-#: actions/newmessage.php:168 classes/Command.php:237
-#, fuzzy
-msgid "You can't send a message to this user."
-msgstr "Bạn đã theo những người này:"
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "Nội dung tin nhắn không hợp lệ"
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "Các thiết lập cho Hồ sơ cá nhân"
+
+#: actions/profilesettings.php:71
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
+"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/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
+#: actions/profilesettings.php:99
 #, fuzzy
-msgid "No such user"
-msgstr "Không có user nào."
+msgid "Profile information"
+msgstr "Hồ sơ này không biết"
 
-#: actions/newmessage.php:117 actions/newmessage.php:67
-#, fuzzy
-msgid "New message"
-msgstr "Tin mới nhất"
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+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/noticesearch.php:95 actions/noticesearch.php:146
-#, fuzzy
-msgid "Notice without matching profile"
-msgstr "Hồ sơ ở nơi khác không khớp với hồ sơ này của bạn"
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full name"
+msgstr "Tên đầy đủ"
+
+#: actions/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "Trang chủ hoặc Blog"
+
+#: actions/profilesettings.php:117 actions/register.php:454
+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/openidsettings.php:28 actions/openidsettings.php:70
+#: actions/profilesettings.php:122 actions/register.php:460
 #, fuzzy, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-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."
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Nói về bạn và những sở thích của bạn khoảng 140 ký tự"
 
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
+#: actions/profilesettings.php:125 actions/register.php:463
 #, fuzzy
-msgid "If you want to add an OpenID to your account, "
-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\"."
+msgid "Describe yourself and your interests"
+msgstr "Nói về bạn và những sở thích của bạn khoảng 140 ký tự"
 
-#: actions/openidsettings.php:74
-#, fuzzy
-msgid "Removing your only OpenID would make it impossible to log in! "
-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 đã."
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "Lý lịch"
 
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-#, fuzzy
-msgid "You can remove an OpenID from your account "
-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/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "Thành phố"
 
-#: actions/outbox.php:28 actions/outbox.php:58
-#, php-format
-msgid "Outbox for %s - page %d"
-msgstr "Hộp thư gửi đi của %s - trang %d"
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "Bạn ở đâu, \"Thành phố, Tỉnh thành, Quốc gia\""
 
-#: actions/outbox.php:30 actions/outbox.php:61
-#, php-format
-msgid "Outbox for %s"
-msgstr "Hộp thư đi của %s"
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
+msgstr "Từ khóa"
 
-#: actions/outbox.php:53 actions/outbox.php:116
-msgid "This is your outbox, which lists private messages you have sent."
+#: actions/profilesettings.php:140
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 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/peoplesearch.php:28 actions/peoplesearch.php:52
-#, fuzzy, php-format
+#: actions/profilesettings.php:144
+msgid "Language"
+msgstr "Ngôn ngữ"
+
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr "Ngôn ngữ bạn thích"
+
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr "Khu vực"
+
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
+msgstr "Khu vực nào bạn thường ở?"
+
+#: actions/profilesettings.php:160
 msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+"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/profilesettings.php:221 actions/register.php:223
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Lý lịch quá dài (không quá 140 ký tự)"
+
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
 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."
 
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:234
 #, fuzzy
-msgid "You can update your personal profile info here "
-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."
+msgid "Language is too long (max 50 chars)."
+msgstr "Ngôn ngữ quá dài (tối đa là 50 ký tự)."
+
+#: actions/profilesettings.php:246 actions/tagother.php:178
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Trang chủ '%s'  không hợp lệ"
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
+#: actions/profilesettings.php:295
 #, fuzzy
-msgid "User without matching profile"
-msgstr "Hồ sơ ở nơi khác không khớp với hồ sơ này của bạn"
+msgid "Couldn't update user for autosubscribe."
+msgstr "Không thể cập nhật thành viên."
+
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+msgstr "Không thể lưu hồ sơ cá nhân."
 
-#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
+#: actions/profilesettings.php:336
 #, fuzzy
-msgid "This confirmation code is too old. "
-msgstr "Mã xác nhận quá cũ. Hãy thử lại cái khác."
+msgid "Couldn't save tags."
+msgstr "Không thể lưu hồ sơ cá nhân."
+
+#: actions/profilesettings.php:344
+msgid "Settings saved."
+msgstr "Đã lưu các điều chỉnh."
 
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
+#: actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
 msgstr ""
 
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
+#: actions/public.php:92
 #, fuzzy
-msgid "You've been identified. Enter a "
-msgstr "Bạn đã được xác định. Hãy nhập mật khẩu mới ở dưới."
+msgid "Could not retrieve public stream."
+msgstr "Không thể lấy lại các tin nhắn ưa thích"
 
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-#, fuzzy
-msgid "Your nickname on this server, "
-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/public.php:129
+#, fuzzy, php-format
+msgid "Public timeline, page %d"
+msgstr "Dòng tin công cộng"
+
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr "Dòng tin công cộng"
 
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
+#: actions/public.php:151
 #, fuzzy
-msgid "Instructions for recovering your password "
-msgstr "Sai tên đăng nhập hoặc mật khẩu."
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Dòng tin công cộng"
 
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
+#: actions/public.php:155
 #, fuzzy
-msgid "New password successfully saved. "
-msgstr "Mật khẩu mới đã được lưu. Bạn có thể đăng nhập ngay bây giờ."
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Dòng tin công cộng"
 
-#: actions/register.php:95 actions/register.php:180
+#: actions/public.php:159
 #, fuzzy
-msgid "Password must be 6 or more characters."
-msgstr "Mật khẩu phải nhiều hơn 6 ký tự."
+msgid "Public Stream Feed (Atom)"
+msgstr "Dòng tin công cộng"
 
-#: actions/register.php:216
+#: actions/public.php:179
 #, php-format
 msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
 msgstr ""
 
-#: actions/register.php:227
-#, fuzzy
-msgid "(You should receive a message by email momentarily, with "
+#: actions/public.php:182
+msgid "Be the first to post!"
 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.)"
 
-#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
+#: actions/public.php:186
 #, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
-#: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/public.php:233
 #, php-format
-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:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-msgid "Could not retrieve favorite notices."
-msgstr "Không thể lấy lại các tin nhắn ưa thích"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
+msgstr ""
 
-#: actions/showmessage.php:33 actions/showmessage.php:81
-msgid "No such message."
-msgstr "Không có tin nhắn nào."
+#: actions/public.php:238
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
+msgstr ""
 
-#: actions/showmessage.php:42
+#: actions/publictagcloud.php:57
 #, fuzzy
-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 "Public tag cloud"
+msgstr "Dòng tin công cộng"
 
-#: actions/showmessage.php:61 actions/showmessage.php:108
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "Message to %1$s on %2$s"
+msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/showmessage.php:66 actions/showmessage.php:113
+#: actions/publictagcloud.php:69
 #, php-format
-msgid "Message from %1$s on %2$s"
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
 
-#: actions/showstream.php:154
-#, fuzzy
-msgid "Send a message"
-msgstr "Tin nhắn cá nhân"
-
-#: actions/smssettings.php:312 actions/smssettings.php:464
-#, php-format
-msgid "Mobile carrier for your phone. "
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
-#, fuzzy, php-format
-msgid "Direct messages to %s"
-msgstr "Tin nhắn riêng"
-
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/publictagcloud.php:75
 #, php-format
-msgid "All the direct messages sent to %s"
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
 msgstr ""
 
-#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-#, fuzzy
-msgid "Direct Messages You've Sent"
-msgstr "Tin nhắn riêng"
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
+msgstr ""
 
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
-#, fuzzy, php-format
-msgid "All the direct messages sent from %s"
-msgstr "Bạn có tin nhắn riêng từ %s"
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "Bạn đã đăng nhập!"
 
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-#, fuzzy
-msgid "No message text!"
-msgstr "Không có tin nhắn nào."
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "Không có mã khôi phục nào."
 
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-#, fuzzy
-msgid "Recipient user not found."
-msgstr "Không tìm thấy user."
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "Mã khôi phục không đúng."
 
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr "Khôi phục lại code cho user không đăng ký."
 
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
-#, fuzzy, php-format
-msgid "%s / Favorites from %s"
-msgstr "Tìm kiếm các tin nhắn ưa thích của %s"
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "Lỗi xảy ra với mã xác nhận."
 
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
-#, fuzzy, php-format
-msgid "%s updates favorited by %s / %s."
-msgstr "Tất cả các cập nhật của %s"
+#: actions/recoverpassword.php:97
+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."
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
-#, php-format
-msgid "%s added your notice as a favorite"
-msgstr "%s da them tin nhan cua ban vao danh sach tin nhan ua thich"
+#: actions/recoverpassword.php:111
+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/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
-#, fuzzy, php-format
+#: actions/recoverpassword.php:152
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
-msgstr "%s da them tin nhan cua ban vao danh sach tin nhan ua thich\n"
-"\n"
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
+msgstr ""
 
-#: actions/twittersettings.php:27
-#, fuzzy
-msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
 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."
 
-#: actions/twittersettings.php:41 actions/twittersettings.php:60
-msgid "Twitter settings"
-msgstr "Thiết lập tài khoản Twitter"
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
+msgstr ""
 
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-msgid "Twitter Account"
-msgstr "Tài khoản Twitter"
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
+msgstr ""
 
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-msgid "Current verified Twitter account."
-msgstr "Tài khoản Twitter đã được xác nhận."
+#: actions/recoverpassword.php:193
+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/twittersettings.php:63
-msgid "Twitter Username"
-msgstr "Tên tài khoản Twitter"
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
+msgstr "Khôi phục"
 
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-msgid "No spaces, please."
-msgstr "Không nhập ký tự trắng."
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "Khởi tạo lại mật khẩu"
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
-msgstr "Mật khẩu Twitter"
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr "Khôi phục mật khẩu"
 
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-msgid "Automatically send my notices to Twitter."
-msgstr "Tự động gửi tin nhắn của tôi đến Twitter."
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
+msgstr "Yêu cầu khôi phục lại mật khẩu đã được gửi"
 
-#: actions/twittersettings.php:75 actions/twittersettings.php:146
-msgid "Send local \"@\" replies to Twitter."
-msgstr ""
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
+msgstr "Không tìm thấy action"
 
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-msgid "Subscribe to my Twitter friends here."
-msgstr "Đăng ký theo những bạn trên Twitter tại đây."
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "Nhiều hơn 6 ký tự, đừng quên nó!"
 
-#: actions/twittersettings.php:122
-#, fuzzy
-msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
-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 (_)."
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Cùng mật khẩu ở trên"
 
-#: actions/twittersettings.php:128 actions/twittersettings.php:334
-msgid "Could not verify your Twitter credentials!"
-msgstr "Không thể xác nhận tài khoản Twitter của bạn!"
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "Khởi tạo"
 
-#: actions/twittersettings.php:137
-#, fuzzy, php-format
-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."
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "Nhập biệt hiệu hoặc email."
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-msgid "Unable to save your Twitter settings!"
-msgstr "Không thể lưu thông tin Twitter của bạn!"
+#: actions/recoverpassword.php:272
+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 đó."
 
-#: actions/twittersettings.php:174 actions/twittersettings.php:376
-#, fuzzy
-msgid "Twitter settings saved."
-msgstr "Thiết lập tài khoản Twitter"
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr "Thành viên này đã không đăng ký địa chỉ email."
 
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-msgid "That is not your Twitter account."
-msgstr "Không phải là tài khoản Twitter của bạn."
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "Lỗi xảy ra khi lưu địa chỉ đã được xác nhận."
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
-msgid "Couldn't remove Twitter user."
-msgstr "Không thể xóa tài khoản Twitter."
+#: actions/recoverpassword.php:325
+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/twittersettings.php:212 actions/twittersettings.php:407
-msgid "Twitter account removed."
-msgstr "Tài khoản Twitter đã xóa."
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
+msgstr "Bất ngờ reset mật khẩu."
+
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "Mật khẩu phải nhiều hơn 6 ký tự."
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
-msgid "Couldn't save Twitter preferences."
-msgstr "Không thể lưu các yêu cầu cho tài khoản Twitter. "
+#: actions/recoverpassword.php:356
+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/twittersettings.php:245 actions/twittersettings.php:461
-msgid "Twitter preferences saved."
-msgstr "Các yêu cầu cho tài khoản Twitter đã lưu"
+#: actions/recoverpassword.php:382
+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/userauthorization.php:84 actions/userauthorization.php:86
-msgid "Please check these details to make sure "
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
+#: actions/register.php:92
 #, fuzzy
-msgid "The subscription has been authorized, but no "
-msgstr "Đăng nhận được phép"
+msgid "Sorry, invalid invitation code."
+msgstr "Lỗi xảy ra với mã xác nhận."
 
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-#, fuzzy
-msgid "The subscription has been rejected, but no "
-msgstr "Đăng nhận từ chối"
+#: actions/register.php:112
+msgid "Registration successful"
+msgstr "Đăng ký thành công"
+
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "Đăng ký"
 
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#: actions/register.php:135
 #, fuzzy
-msgid "Command results"
-msgstr "Không có kết quả nào"
+msgid "Registration not allowed."
+msgstr "Biệt hiệu không được cho phép."
 
-#: classes/Channel.php:148 classes/Channel.php:204
-msgid "Command complete"
-msgstr ""
+#: actions/register.php:198
+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."
 
-#: classes/Channel.php:158 classes/Channel.php:215
-#, fuzzy
-msgid "Command failed"
-msgstr " và bạn bè"
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "Địa chỉ email không hợp lệ."
 
-#: classes/Command.php:39 classes/Command.php:44
-msgid "Sorry, this command is not yet implemented."
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "Địa chỉ email đã tồn tại."
+
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "Tên đăng nhập hoặc mật khẩu không hợp lệ."
+
+#: actions/register.php:342
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
 msgstr ""
 
-#: classes/Command.php:96 classes/Command.php:113
-#, fuzzy, php-format
-msgid "Subscriptions: %1$s\n"
-msgstr "Tôi theo: %1$s\n"
+#: actions/register.php:424
+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."
 
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
-#, fuzzy
-msgid "User has no last notice"
-msgstr "Người dùng không có thông tin."
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr "Nhiều hơn 6 ký tự. Bắt buộc"
 
-#: classes/Command.php:146 classes/Command.php:166
-#, fuzzy
-msgid "Notice marked as fave."
-msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
+#: actions/register.php:433
+msgid "Same as password above. Required."
+msgstr "Cùng mật khẩu ở trên. Bắt buộc."
 
-#: classes/Command.php:166 classes/Command.php:189
-#, fuzzy, php-format
-msgid "%1$s (%2$s)"
-msgstr "%s (%s)"
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "Email"
 
-#: classes/Command.php:169 classes/Command.php:192
-#, fuzzy, php-format
-msgid "Fullname: %s"
-msgstr "Tên đầy đủ"
+#: actions/register.php:438 actions/register.php:442
+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"
 
-#: classes/Command.php:172 classes/Command.php:195
-#, fuzzy, php-format
-msgid "Location: %s"
-msgstr "Thành phố: %s"
+#: actions/register.php:449
+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."
 
-#: classes/Command.php:175 classes/Command.php:198
-#, fuzzy, php-format
-msgid "Homepage: %s"
-msgstr "Trang chủ hoặc Blog: %s"
+#: actions/register.php:493
+msgid "My text and files are available under "
+msgstr "Ghi chú và các file của tôi đã có ở phía dưới"
 
-#: classes/Command.php:178 classes/Command.php:201
-#, fuzzy, php-format
-msgid "About: %s"
-msgstr "Giới thiệu"
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
 
-#: classes/Command.php:200 classes/Command.php:228
+#: actions/register.php:496
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and 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/register.php:537
 #, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
+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"
+"\n"
+"Cả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."
 
-#: classes/Command.php:214 classes/Command.php:245
-#, fuzzy, php-format
-msgid "Direct message to %s sent"
-msgstr "Tin nhắn riêng"
-
-#: classes/Command.php:216 classes/Command.php:247
-#, fuzzy
-msgid "Error sending direct message."
-msgstr "Thư bạn đã gửi"
+#: actions/register.php:561
+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.)"
 
-#: classes/Command.php:263 classes/Command.php:300
-msgid "Specify the name of the user to subscribe to"
+#: actions/remotesubscribe.php:98
+#, php-format
+msgid ""
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
+"Để đă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."
 
-#: classes/Command.php:270 classes/Command.php:307
-#, fuzzy, php-format
-msgid "Subscribed to %s"
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr "Đăng nhận từ xa"
+
+#: actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
 msgstr "Theo nhóm này"
 
-#: classes/Command.php:288 classes/Command.php:328
-msgid "Specify the name of the user to unsubscribe from"
-msgstr ""
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "Biệt hiệu của người dùng"
 
-#: classes/Command.php:295 classes/Command.php:335
-#, fuzzy, php-format
-msgid "Unsubscribed from %s"
-msgstr "Hết theo"
+#: actions/remotesubscribe.php:130
+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"
 
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
-msgid "Command not yet implemented."
-msgstr ""
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "URL của Hồ sơ cá nhân"
+
+#: actions/remotesubscribe.php:134
+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/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
+msgstr "Theo bạn này"
+
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr "URL hồ sơ cá nhân không đúng định dạng."
 
-#: classes/Command.php:313 classes/Command.php:356
+#: actions/remotesubscribe.php:168
 #, fuzzy
-msgid "Notification off."
-msgstr "Không có mã số xác nhận."
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "Không phải là URL về hồ sơ cá nhân hợp lệ (không phải là "
 
-#: classes/Command.php:315 classes/Command.php:358
-msgid "Can't turn off notification."
+#: actions/remotesubscribe.php:176
+msgid "That’s a local profile! Login to subscribe."
 msgstr ""
 
-#: classes/Command.php:333 classes/Command.php:379
+#: actions/remotesubscribe.php:183
 #, fuzzy
-msgid "Notification on."
-msgstr "Không có mã số xác nhận."
+msgid "Couldn’t get a request token."
+msgstr "Không thể lấy token yêu cầu."
 
-#: classes/Command.php:335 classes/Command.php:381
-msgid "Can't turn on notification."
-msgstr ""
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
+#, php-format
+msgid "Replies to %s"
+msgstr "Trả lời cho %s"
 
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
-msgstr ""
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %s, page %d"
+msgstr "Trả lời cho %s"
 
-#: classes/Message.php:53 classes/Message.php:56
-#, fuzzy
-msgid "Could not insert message."
-msgstr "Không thể chèn thêm vào đăng nhận."
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Dòng tin nhắn cho %s"
 
-#: classes/Message.php:63 classes/Message.php:66
-#, fuzzy
-msgid "Could not update message with new URI."
-msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận."
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Dòng tin nhắn cho %s"
 
-#: lib/gallery.php:46
-#, fuzzy
-msgid "User without matching profile in system."
-msgstr "Hồ sơ ở nơi khác không khớp với hồ sơ này của bạn"
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Dòng tin nhắn cho %s"
 
-#: lib/mail.php:147 lib/mail.php:289
+#: actions/replies.php:198
 #, php-format
 msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
 msgstr ""
 
-#: lib/mail.php:249 lib/mail.php:508
-#, php-format
-msgid "New private message from %s"
-msgstr "Bạn có tin nhắn riêng từ %s"
-
-#: lib/mail.php:253 lib/mail.php:512
+#: actions/replies.php:203
 #, php-format
 msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
-msgstr ""
-
-#: lib/mailbox.php:43 lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
 msgstr ""
 
-#: lib/openid.php:195 lib/openid.php:203
-msgid "This form should automatically submit itself. "
+#: actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-msgid "Favorites"
-msgstr "Ưa thích"
-
-#: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/repliesrss.php:72
 #, php-format
-msgid "%s's favorite notices"
-msgstr "Những tin nhắn ưa thích của %s"
+msgid "Replies to %1$s on %2$s!"
+msgstr "%s chào mừng bạn "
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-msgid "User"
-msgstr ""
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "%s ưa thích các tin nhắn"
 
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-msgid "Inbox"
-msgstr "Hộp thư đến"
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
+msgstr "Không thể lấy lại các tin nhắn ưa thích"
 
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-msgid "Your incoming messages"
-msgstr "Thư đến của bạn"
+#: actions/showfavorites.php:170
+#, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Chọn những người bạn của %s"
 
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-msgid "Outbox"
-msgstr "Hộp thư đi"
+#: actions/showfavorites.php:177
+#, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Chọn những người bạn của %s"
 
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-msgid "Your sent messages"
-msgstr "Thư bạn đã gửi"
+#: actions/showfavorites.php:184
+#, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Chọn những người bạn của %s"
 
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-#, fuzzy
-msgid "Twitter"
-msgstr "Tài khoản Twitter"
+#: actions/showfavorites.php:205
+msgid ""
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
+msgstr ""
 
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
-msgstr "Các lựa chọn để tích hợp với Twitter "
+#: actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
 
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-msgid "To"
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
 msgstr ""
 
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-#, fuzzy
-msgid "Could not parse message."
-msgstr "Không thể cập nhật thành viên."
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/showgroup.php:82 lib/groupnav.php:86
 #, fuzzy, php-format
-msgid "%s and friends, page %d"
-msgstr "%s và bạn bè"
+msgid "%s group"
+msgstr "%s và nhóm"
 
-#: actions/avatarsettings.php:76
-#, fuzzy
-msgid "You can upload your personal avatar."
+#: actions/showgroup.php:84
+#, php-format
+msgid "%s group, page %d"
 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/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
-msgid "Avatar settings"
-msgstr "Thay đổi hình đại diện"
+#: actions/showgroup.php:218
+#, fuzzy
+msgid "Group profile"
+msgstr "Thông tin nhóm"
 
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-msgid "Original"
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
+msgid "URL"
 msgstr ""
 
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-msgid "Preview"
-msgstr "Xem trước"
-
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
 #, fuzzy
-msgid "Crop"
-msgstr "Nhóm"
-
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-#, fuzzy
-msgid "There was a problem with your session token. "
-msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
-
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-msgid "Pick a square area of the image to be your avatar"
-msgstr ""
+msgid "Note"
+msgstr "Tin nhắn"
 
-#: actions/avatarsettings.php:327 actions/grouplogo.php:384
-msgid "Lost our file data."
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
 msgstr ""
 
-#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
-#, fuzzy
-msgid "Lost our file."
-msgstr "Không có tin nhắn nào."
-
-#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
-#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
+#: actions/showgroup.php:293
 #, fuzzy
-msgid "Unknown file type"
-msgstr "Không hỗ trợ kiểu file ảnh này."
+msgid "Group actions"
+msgstr "Mã nhóm"
 
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
-msgstr ""
+#: actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Dòng tin nhắn cho %s"
 
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-#, fuzzy
-msgid "No profile with that ID."
-msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
+#: actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Dòng tin nhắn cho %s"
 
-#: actions/block.php:111
-#, fuzzy
-msgid "Block user"
-msgstr "Ban user"
+#: actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Dòng tin nhắn cho %s"
 
-#: actions/block.php:129
-#, fuzzy
-msgid "Are you sure you want to block this user? "
-msgstr "Bạn có chắc chắn là muốn xóa tin nhắn này không?"
+#: actions/showgroup.php:345
+#, php-format
+msgid "FOAF for %s group"
+msgstr "Hộp thư đi của %s"
 
-#: actions/block.php:162
-#, fuzzy
-msgid "You have already blocked this user."
-msgstr "Bạn đã theo những người này:"
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
+msgid "Members"
+msgstr "Thành viên"
 
-#: actions/block.php:167
-msgid "Failed to save block information."
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/tagcloudsection.php:71
+msgid "(None)"
 msgstr ""
 
-#: actions/confirmaddress.php:159
-#, fuzzy, php-format
-msgid "The address \"%s\" has been "
-msgstr "Đã xóa địa chỉ."
-
-#: actions/deletenotice.php:73
+#: actions/showgroup.php:392
 #, fuzzy
-msgid "You are about to permanently delete a notice. "
-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 "All members"
+msgstr "Thành viên"
 
-#: actions/disfavor.php:94
-#, fuzzy
-msgid "Add to favorites"
-msgstr "Tìm kiếm các tin nhắn ưa thích của %s"
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "Số liệu thống kê"
 
-#: actions/editgroup.php:54
-#, fuzzy, php-format
-msgid "Edit %s group"
-msgstr "%s và nhóm"
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "Tạo"
 
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-msgid "Inboxes must be enabled for groups to work"
+#: actions/showgroup.php:448
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-#, fuzzy
-msgid "You must be logged in to create a group."
-msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những "
+#: actions/showgroup.php:454
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
+msgstr ""
 
-#: actions/editgroup.php:87 actions/grouplogo.php:87
-#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
-#, fuzzy
-msgid "No nickname"
-msgstr "Không có biệt hiệu."
+#: actions/showgroup.php:482
+msgid "Admins"
+msgstr ""
 
-#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
-#: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
-#, fuzzy
-msgid "No such group"
-msgstr "Không có user nào."
+#: actions/showmessage.php:81
+msgid "No such message."
+msgstr "Không có tin nhắn nào."
 
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
+#: actions/showmessage.php:98
 #, fuzzy
-msgid "You must be an admin to edit the group"
-msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những "
+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"
 
-#: actions/editgroup.php:157
-msgid "Use this form to edit the group."
+#: actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
-#, fuzzy
-msgid "Nickname must have only lowercase letters "
-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/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr ""
 
-#: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/shownotice.php:90
 #, fuzzy
-msgid "description is too long (max 140 chars)."
-msgstr "Lý lịch quá dài (không quá 140 ký tự)"
+msgid "Notice deleted."
+msgstr "Tin đã gửi"
 
-#: actions/editgroup.php:218
-#, fuzzy
-msgid "Could not update group."
-msgstr "Không thể cập nhật thành viên."
+#: actions/showstream.php:73
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "Thông báo được gắn thẻ %s"
 
-#: actions/editgroup.php:226
-#, fuzzy
-msgid "Options saved."
-msgstr "Đã lưu các điều chỉnh."
+#: actions/showstream.php:79
+#, fuzzy, php-format
+msgid "%s, page %d"
+msgstr "Hộp thư đến của %s - trang %d"
 
-#: actions/emailsettings.php:107 actions/imsettings.php:108
+#: actions/showstream.php:122
 #, fuzzy, php-format
-msgid "Awaiting confirmation on this address. "
-msgstr "Đó không phải là số điện thoại của bạn."
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "Dòng tin nhắn cho %s"
 
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-#, fuzzy
-msgid "Make a new email address for posting to; "
-msgstr "Dia chi email moi de gui tin nhan den %s"
+#: actions/showstream.php:129
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Dòng tin nhắn cho %s"
 
-#: actions/emailsettings.php:157
-#, fuzzy
-msgid "Send me email when someone "
-msgstr "Gửi email báo cho tôi biết khi có ai đó gửi tin nhắn riêng cho tôi."
+#: actions/showstream.php:136
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Dòng tin nhắn cho %s"
 
-#: actions/emailsettings.php:168
-msgid "Allow friends to nudge me and send me an email."
-msgstr ""
+#: actions/showstream.php:143
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Dòng tin nhắn cho %s"
 
-#: actions/emailsettings.php:321
-#, fuzzy
-msgid "That email address already belongs "
-msgstr "Địa chỉ email GTalk này đã có người khác sử dụng rồi."
+#: actions/showstream.php:148
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Hộp thư đi của %s"
 
-#: actions/emailsettings.php:343
-#, fuzzy
-msgid "A confirmation code was sent to the email address you added. "
+#: actions/showstream.php:191
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
 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."
 
-#: actions/facebookhome.php:110
-msgid "Server error - couldn't get user!"
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
 msgstr ""
 
-#: actions/facebookhome.php:196
+#: actions/showstream.php:198
 #, php-format
-msgid "If you would like the %s app to automatically update "
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#: actions/showstream.php:234
 #, php-format
-msgid "Allow %s to update my Facebook status"
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/facebookhome.php:218
-msgid "Skip"
+#: actions/showstream.php:239
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
 msgstr ""
 
-#: actions/facebookhome.php:235
-#, fuzzy
-msgid "No notice content!"
-msgstr "Không có nội dung!"
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "Thiết lập SMS"
 
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-msgid "Pagination"
-msgstr ""
+#: actions/smssettings.php:69
+#, php-format
+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%%."
 
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/smssettings.php:91
 #, fuzzy
-msgid "After"
-msgstr "Sau"
+msgid "SMS is not available."
+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/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
-#, fuzzy
-msgid "Before"
-msgstr "Trước"
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "SMS xác nhận ngay - đã cho phép gửi qua điện thoại. "
 
-#: actions/facebookinvite.php:70
-#, php-format
-msgid "Thanks for inviting your friends to use %s"
-msgstr ""
+#: actions/smssettings.php:123
+#, fuzzy
+msgid "Awaiting confirmation on this phone number."
+msgstr "Đó không phải là số điện thoại của bạn."
 
-#: actions/facebookinvite.php:72
+#: actions/smssettings.php:130
 #, fuzzy
-msgid "Invitations have been sent to the following users:"
-msgstr "Thư mời đã gửi đến:"
+msgid "Confirmation code"
+msgstr "Không có mã số xác nhận."
 
-#: actions/facebookinvite.php:96
-#, fuzzy, php-format
-msgid "You have been invited to %s"
-msgstr "Bạn đã được xác định. Hãy nhập mật khẩu mới ở dưới."
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
+msgstr "Nhập mã mà bạn nhận được trên điện thoại của bạn."
 
-#: actions/facebookinvite.php:105
-#, fuzzy, php-format
-msgid "Invite your friends to use %s"
-msgstr "Mời bạn bè"
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
+msgstr "Số điện thoại để nhắn SMS "
 
-#: actions/facebookinvite.php:113
-#, php-format
-msgid "Friends already using %s:"
-msgstr ""
+#: actions/smssettings.php:140
+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ự "
 
-#: actions/facebookinvite.php:130
-#, php-format
-msgid "Send invitations"
+#: actions/smssettings.php:174
+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. "
 
-#: actions/facebookremove.php:56
+#: actions/smssettings.php:306
+msgid "No phone number."
+msgstr "Không có số điện thoại."
+
+#: actions/smssettings.php:311
 #, fuzzy
-msgid "Couldn't remove Facebook user."
-msgstr "Không thể xóa tài khoản Twitter."
+msgid "No carrier selected."
+msgstr "Bạn chưa chọn hình để đưa lên."
 
-#: actions/facebooksettings.php:65
+#: actions/smssettings.php:318
 #, fuzzy
-msgid "There was a problem saving your sync preferences!"
-msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
+msgid "That is already your phone number."
+msgstr "Đó không phải là số điện thoại của bạn."
 
-#: actions/facebooksettings.php:67
+#: actions/smssettings.php:321
 #, fuzzy
-msgid "Sync preferences saved."
-msgstr "Các tính năng đã được lưu."
+msgid "That phone number already belongs to another user."
+msgstr "Địa chỉ email Yahoo này đã có người khác sử dụng rồi."
 
-#: actions/facebooksettings.php:90
+#: actions/smssettings.php:347
 #, fuzzy
-msgid "Automatically update my Facebook status with my notices."
-msgstr "Tự động gửi tin nhắn của tôi đến Twitter."
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"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."
 
-#: actions/facebooksettings.php:97
+#: actions/smssettings.php:374
 #, fuzzy
-msgid "Send \"@\" replies to Facebook."
-msgstr "Hãy gửi tin nhắn đến tôi qua Jabber/GTalk."
+msgid "That is the wrong confirmation number."
+msgstr "Đó không phải là số điện thoại của bạn."
+
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
+msgstr "Đó không phải là số điện thoại của bạn."
 
-#: actions/facebooksettings.php:106
+#: actions/smssettings.php:465
 #, fuzzy
-msgid "Prefix"
-msgstr "Hồ sơ "
+msgid "Mobile carrier"
+msgstr "Chọn nhà cung cấp Mobile"
 
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
-msgstr ""
+#: actions/smssettings.php:469
+msgid "Select a carrier"
+msgstr "Chọn nhà cung cấp Mobile"
 
-#: actions/facebooksettings.php:124
+#: actions/smssettings.php:476
 #, php-format
-msgid "If you would like %s to automatically update "
+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."
+
+#: actions/smssettings.php:498
+msgid "No code entered"
+msgstr "Không có mã nào được nhập"
 
-#: actions/facebooksettings.php:147
+#: actions/subedit.php:70
 #, fuzzy
-msgid "Sync preferences"
-msgstr "Tính năng"
+msgid "You are not subscribed to that profile."
+msgstr "Bạn chưa cập nhật thông tin riêng"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/subedit.php:83
 #, fuzzy
-msgid "Disfavor favorite"
-msgstr "Không thích"
+msgid "Could not save subscription."
+msgstr "Không thể tạo đăng nhận."
 
-#: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
+#: actions/subscribe.php:55
 #, fuzzy
-msgid "Popular notices"
-msgstr "Các tin nhắn bị cảnh báo"
+msgid "Not a local user."
+msgstr "Không có user nào."
 
-#: actions/favorited.php:67
+#: actions/subscribe.php:69
+#, fuzzy
+msgid "Subscribed"
+msgstr "Theo bạn này"
+
+#: actions/subscribers.php:50
 #, fuzzy, php-format
-msgid "Popular notices, page %d"
-msgstr "Các tin nhắn bị cảnh báo"
+msgid "%s subscribers"
+msgstr "Bạn này theo tôi"
 
-#: actions/favorited.php:79
-#, fuzzy
-msgid "The most popular notices on the site right now."
-msgstr "Các từ khóa phổ biến."
+#: actions/subscribers.php:52
+#, fuzzy, php-format
+msgid "%s subscribers, page %d"
+msgstr "Theo tôi"
 
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
-msgid "Featured users"
-msgstr ""
+#: actions/subscribers.php:63
+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/featured.php:71
+#: actions/subscribers.php:67
 #, php-format
-msgid "Featured users, page %d"
+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:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
 msgstr ""
 
-#: actions/featured.php:99
+#: actions/subscribers.php:110
 #, php-format
-msgid "A selection of some of the great users on %s"
+msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
 
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
 msgstr ""
 
-#: actions/groupbyid.php:79
-msgid "No ID"
+#: actions/subscriptions.php:52
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "Tất cả đăng nhận"
+
+#: actions/subscriptions.php:54
+#, fuzzy, php-format
+msgid "%s subscriptions, page %d"
+msgstr "Tất cả đăng nhận"
+
+#: actions/subscriptions.php:65
+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/subscriptions.php:69
+#, 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:121
+#, php-format
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
 msgstr ""
 
-#: actions/grouplogo.php:138 actions/grouplogo.php:191
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s dang theo doi tin nhan cua ban tren %2$s."
+
+#: actions/subscriptions.php:194
 #, fuzzy
-msgid "Group logo"
-msgstr "Mã nhóm"
+msgid "Jabber"
+msgstr "Không có Jabber ID."
 
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
-msgstr ""
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
+msgstr "SMS"
 
-#: actions/grouplogo.php:448
+#: actions/tagother.php:33
 #, fuzzy
-msgid "Logo updated."
-msgstr "Hình đại diện đã được cập nhật."
+msgid "Not logged in"
+msgstr "Chưa đăng nhập."
 
-#: actions/grouplogo.php:450
+#: actions/tagother.php:39
 #, fuzzy
-msgid "Failed updating logo."
-msgstr "Cập nhật hình đại diện không thành công."
+msgid "No id argument."
+msgstr "Không có tài liệu nào."
 
-#: actions/groupmembers.php:93 lib/groupnav.php:91
+#: actions/tagother.php:65
 #, fuzzy, php-format
-msgid "%s group members"
-msgstr "Thành viên"
+msgid "Tag %s"
+msgstr "Từ khóa"
 
-#: actions/groupmembers.php:96
-#, php-format
-msgid "%s group members, page %d"
-msgstr ""
+#: actions/tagother.php:77 lib/userprofile.php:75
+#, fuzzy
+msgid "User profile"
+msgstr "Hồ sơ"
 
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
 msgstr ""
 
-#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
+#: actions/tagother.php:141
 #, fuzzy
-msgid "Groups"
-msgstr "Nhóm"
-
-#: actions/groups.php:64
-#, fuzzy, php-format
-msgid "Groups, page %d"
-msgstr "Tên nhóm"
+msgid "Tag user"
+msgstr "Từ khóa"
 
-#: actions/groups.php:90
-#, php-format
-msgid "%%%%site.name%%%% groups let you find and talk with "
+#: actions/tagother.php:151
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
 msgstr ""
 
-#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-#, fuzzy
-msgid "Create a new group"
-msgstr "Tạo nhóm"
-
-#: actions/groupsearch.php:57
-#, fuzzy, php-format
+#: actions/tagother.php:193
 msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
+"You can only tag people you are subscribed to or who are subscribed to you."
 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."
 
-#: actions/groupsearch.php:63
+#: actions/tagother.php:200
 #, fuzzy
-msgid "Group search"
-msgstr "Tìm kiếm nhiều người"
+msgid "Could not save tags."
+msgstr "Không thể lưu hồ sơ cá nhân."
 
-#: actions/imsettings.php:70
-#, fuzzy
-msgid "You can send and receive notices through "
-msgstr "Bạn đã theo những người này:"
+#: actions/tagother.php:236
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
 
-#: actions/imsettings.php:120
+#: actions/tag.php:68
 #, fuzzy, php-format
-msgid "Jabber or GTalk address, "
-msgstr "Chưa nhập địa chỉ email GTalk"
-
-#: actions/imsettings.php:147
-#, fuzzy
-msgid "Send me replies through Jabber/GTalk "
-msgstr "Hãy gửi tin nhắn đến tôi qua Jabber/GTalk."
+msgid "Notices tagged with %s, page %d"
+msgstr "Dòng tin nhắn cho %s"
 
-#: actions/imsettings.php:321
+#: actions/tag.php:86
 #, fuzzy, php-format
-msgid "A confirmation code was sent "
-msgstr "Không có mã số xác nhận."
-
-#: actions/joingroup.php:65
-#, fuzzy
-msgid "You must be logged in to join a group."
-msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những "
-
-#: actions/joingroup.php:95
-#, fuzzy
-msgid "You are already a member of that group"
-msgstr "Bạn đã theo những người này:"
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Dòng tin nhắn cho %s"
 
-#: actions/joingroup.php:128
+#: actions/tag.php:92
 #, fuzzy, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Dòng tin nhắn cho %s"
 
-#: actions/joingroup.php:135
+#: actions/tag.php:98
 #, fuzzy, php-format
-msgid "%s joined group %s"
-msgstr "%s và nhóm"
-
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
-msgstr ""
-
-#: actions/leavegroup.php:65
-#, fuzzy
-msgid "You must be logged in to leave a group."
-msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những "
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Dòng tin nhắn cho %s"
 
-#: actions/leavegroup.php:88
+#: actions/tagrss.php:35
 #, fuzzy
-msgid "No such group."
+msgid "No such tag."
 msgstr "Không có tin nhắn nào."
 
-#: actions/leavegroup.php:95
-#, fuzzy
-msgid "You are not a member of that group."
-msgstr "Bạn chưa cập nhật thông tin riêng"
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
+msgstr "Phương thức API dưới cấu trúc có sẵn."
 
-#: actions/leavegroup.php:100
+#: actions/unsubscribe.php:77
 #, fuzzy
-msgid "You may not leave a group while you are its administrator."
-msgstr "Bạn đã không xóa trạng thái của những người khác."
+msgid "No profile id in request."
+msgstr "Không có URL cho hồ sơ để quay về."
 
-#: actions/leavegroup.php:130
+#: actions/unsubscribe.php:84
 #, fuzzy
-msgid "Could not find membership record."
-msgstr "Không thể cập nhật thành viên."
-
-#: actions/leavegroup.php:138
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
+msgid "No profile with that id."
+msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
 
-#: actions/leavegroup.php:145
-#, fuzzy, php-format
-msgid "%s left group %s"
-msgstr "%s và nhóm"
+#: actions/unsubscribe.php:98
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Hết theo"
 
-#: actions/login.php:225 lib/facebookaction.php:304
-msgid "Login to site"
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
-#: actions/microsummary.php:69
-msgid "No current status"
-msgstr ""
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "Đăng nhận cho phép"
 
-#: actions/newgroup.php:53
+#: actions/userauthorization.php:110
 #, fuzzy
-msgid "New group"
-msgstr "Tạo nhóm"
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
+msgstr ""
+"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/newgroup.php:115
-msgid "Use this form to create a new group."
+#: actions/userauthorization.php:188
+msgid "License"
 msgstr ""
 
-#: actions/newgroup.php:177
-#, fuzzy
-msgid "Could not create group."
-msgstr "Không thể tạo favorite."
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "Chấp nhận"
 
-#: actions/newgroup.php:191
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
 #, fuzzy
-msgid "Could not set group membership."
-msgstr "Không thể tạo đăng nhận."
+msgid "Subscribe to this user"
+msgstr "Theo nhóm này"
 
-#: actions/newmessage.php:119 actions/newnotice.php:132
-#, fuzzy
-msgid "That's too long. "
-msgstr "File quá lớn."
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "Từ chối"
 
-#: actions/newmessage.php:134
+#: actions/userauthorization.php:212
 #, fuzzy
-msgid "Don't send a message to yourself; "
-msgstr "Bạn đã theo những người này:"
+msgid "Reject this subscription"
+msgstr "Tất cả đăng nhận"
 
-#: actions/newnotice.php:166
-#, fuzzy
-msgid "Notice posted"
-msgstr "Tin đã gửi"
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
+msgstr "Không có yêu cầu!"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
-#, fuzzy
-msgid "Ajax Error"
-msgstr "Lỗi"
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+msgstr "Đăng nhận được phép"
 
-#: actions/nudge.php:85
+#: actions/userauthorization.php:249
+#, fuzzy
 msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+"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/nudge.php:94
-#, fuzzy
-msgid "Nudge sent"
-msgstr "Tin đã gửi"
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
+msgstr "Đăng nhận từ chối"
 
-#: actions/nudge.php:97
+#: actions/userauthorization.php:261
 #, fuzzy
-msgid "Nudge sent!"
-msgstr "Tin đã gửi"
+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/openidlogin.php:97
-#, fuzzy
-msgid "OpenID login"
-msgstr "Đăng nhập OpenID"
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
 
-#: actions/openidsettings.php:128
-#, fuzzy
-msgid "Removing your only OpenID "
-msgstr "Xóa OpenID"
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
 
-#: actions/othersettings.php:60
-#, fuzzy
-msgid "Other Settings"
-msgstr "Thiết lập tài khoản Twitter"
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
 
-#: actions/othersettings.php:71
-msgid "Manage various other options."
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr ""
 
-#: actions/othersettings.php:93
-msgid "URL Auto-shortening"
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr ""
 
-#: actions/othersettings.php:112
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Không thể đọc URL cho hình đại diện '%s'"
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Kiểu file ảnh không phù hợp với  '%s'"
+
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr "Không có id."
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
 #, fuzzy
-msgid "Service"
-msgstr "Tìm kiếm"
+msgid "Profile design"
+msgstr "Các thiết lập cho Hồ sơ cá nhân"
 
-#: actions/othersettings.php:113
-msgid "Automatic shortening service to use."
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
 msgstr ""
 
-#: actions/othersettings.php:144
-#, fuzzy
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "Tên khu vực quá dài (không quá 255 ký tự)."
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
 
-#: actions/passwordsettings.php:69
-#, fuzzy
-msgid "Change your password."
-msgstr "Thay đổi mật khẩu của bạn"
+#: actions/usergroups.php:64
+#, php-format
+msgid "%s groups, page %d"
+msgstr ""
 
-#: actions/passwordsettings.php:89
-#, fuzzy
-msgid "Password change"
-msgstr "Đã lưu mật khẩu."
+#: actions/usergroups.php:130
+msgid "Search for more groups"
+msgstr ""
 
-#: actions/peopletag.php:35
+#: actions/usergroups.php:153
 #, fuzzy, php-format
-msgid "Not a valid people tag: %s"
-msgstr "Địa chỉ email không hợp lệ."
+msgid "%s is not a member of any group."
+msgstr "Bạn chưa cập nhật thông tin riêng"
 
-#: actions/peopletag.php:47
+#: actions/usergroups.php:158
 #, php-format
-msgid "Users self-tagged with %s - page %d"
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
 
-#: actions/peopletag.php:91
+#: classes/File.php:137
 #, php-format
-msgid "These are users who have tagged themselves \"%s\" "
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
 msgstr ""
 
-#: actions/profilesettings.php:91
-#, fuzzy
-msgid "Profile information"
-msgstr "Hồ sơ này không biết"
+#: classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
 
-#: actions/profilesettings.php:124
-msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+#: classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
-#: actions/profilesettings.php:144
+#: classes/Message.php:55
 #, fuzzy
-msgid "Automatically subscribe to whoever "
-msgstr "Tự động theo những người nào đăng ký theo tôi"
-
-#: actions/profilesettings.php:229 actions/tagother.php:176
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Trang chủ '%s'  không hợp lệ"
+msgid "Could not insert message."
+msgstr "Không thể chèn thêm vào đăng nhận."
 
-#: actions/profilesettings.php:311
+#: classes/Message.php:65
 #, fuzzy
-msgid "Couldn't save tags."
-msgstr "Không thể lưu hồ sơ cá nhân."
+msgid "Could not update message with new URI."
+msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận."
 
-#: actions/public.php:107
+#: classes/Notice.php:164
 #, fuzzy, php-format
-msgid "Public timeline, page %d"
-msgstr "Dòng tin công cộng"
+msgid "DB error inserting hashtag: %s"
+msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s"
 
-#: actions/public.php:173
+#: classes/Notice.php:179
 #, fuzzy
-msgid "Could not retrieve public stream."
-msgstr "Không thể lấy lại các tin nhắn ưa thích"
-
-#: actions/public.php:220
-#, php-format
-msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
-msgstr ""
+msgid "Problem saving notice. Too long."
+msgstr "Có lỗi xảy ra khi lưu tin nhắn."
 
-#: actions/publictagcloud.php:57
+#: classes/Notice.php:183
 #, fuzzy
-msgid "Public tag cloud"
-msgstr "Dòng tin công cộng"
+msgid "Problem saving notice. Unknown user."
+msgstr "Có lỗi xảy ra khi lưu tin nhắn."
 
-#: actions/publictagcloud.php:63
-#, php-format
-msgid "These are most popular recent tags on %s "
+#: classes/Notice.php:188
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: actions/publictagcloud.php:119
-msgid "Tag cloud"
+#: classes/Notice.php:194
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
 msgstr ""
 
-#: actions/register.php:139 actions/register.php:349
-msgid "Sorry, only invited people can register."
+#: classes/Notice.php:202
+msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: actions/register.php:149
-#, fuzzy
-msgid "You can't register if you don't "
-msgstr "Bạn không thể đăng ký nếu không đồng ý các điều khoản."
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
+msgstr "Có lỗi xảy ra khi lưu tin nhắn."
 
-#: actions/register.php:286
-msgid "With this form you can create "
-msgstr ""
+#: classes/Notice.php:1120
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s"
 
-#: actions/register.php:368
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, "
-msgstr "1-64 chữ cái thường hoặc là chữ số, không có dấu chấm hay "
+#: classes/User.php:347
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "%s chào mừng bạn "
 
-#: actions/register.php:382 actions/register.php:386
-#, fuzzy
-msgid "Used only for updates, announcements, "
-msgstr "Chỉ dùng để cập nhật, thông báo, và hồi phục mật khẩu"
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Hồ sơ "
 
-#: actions/register.php:398
-#, fuzzy
-msgid "URL of your homepage, blog, "
-msgstr "URL về Trang chính, Blog, hoặc hồ sơ cá nhân của bạn trên "
+#: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
+msgstr "Thay đổi các thiết lập trong hồ sơ cá nhân của bạn"
 
-#: actions/register.php:404
+#: lib/accountsettingsaction.php:112
 #, fuzzy
-msgid "Describe yourself and your "
-msgstr "Nói về bạn và những sở thích của bạn khoảng 140 ký tự"
+msgid "Upload an avatar"
+msgstr "Cập nhật hình đại diện không thành công."
 
-#: actions/register.php:410
-#, fuzzy
-msgid "Where you are, like \"City, "
-msgstr "Bạn ở đâu, \"Thành phố, Tỉnh thành, Quốc gia\""
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr "Thay đổi mật khẩu của bạn"
 
-#: actions/register.php:432
-#, fuzzy
-msgid " except this private data: password, "
-msgstr " ngoại trừ thông tin riêng: mật khẩu, email, địa chỉ IM, số điện thoại"
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
+msgstr "Đang thực hiện việc thay đổi email"
 
-#: actions/register.php:471
-#, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
 msgstr ""
 
-#: actions/register.php:495
+#: lib/accountsettingsaction.php:124
 #, fuzzy
-msgid "(You should receive a message by email "
-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 "Design your profile"
+msgstr "Hồ sơ"
 
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
-msgstr ""
+#: lib/accountsettingsaction.php:128
+#, fuzzy
+msgid "Other"
+msgstr "Sau"
 
-#: actions/replies.php:118
-#, fuzzy, php-format
-msgid "Replies to %s, page %d"
-msgstr "Trả lời cho %s"
+#: lib/accountsettingsaction.php:128
+msgid "Other options"
+msgstr ""
 
-#: actions/showfavorites.php:79
+#: lib/action.php:144
 #, fuzzy, php-format
-msgid "%s favorite notices, page %d"
-msgstr "%s ưa thích các tin nhắn"
+msgid "%s - %s"
+msgstr "%s (%s)"
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
-#, fuzzy, php-format
-msgid "%s group"
-msgstr "%s và nhóm"
+#: lib/action.php:159
+msgid "Untitled page"
+msgstr ""
 
-#: actions/showgroup.php:79
-#, php-format
-msgid "%s group, page %d"
+#: lib/action.php:424
+msgid "Primary site navigation"
 msgstr ""
 
-#: actions/showgroup.php:206
-#, fuzzy
-msgid "Group profile"
-msgstr "Thông tin nhóm"
+#: lib/action.php:430
+msgid "Home"
+msgstr "Trang chủ"
 
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
-msgid "URL"
+#: lib/action.php:430
+msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: lib/action.php:432
 #, fuzzy
-msgid "Note"
-msgstr "Tin nhắn"
+msgid "Account"
+msgstr "Giới thiệu"
 
-#: actions/showgroup.php:270
+#: lib/action.php:432
 #, fuzzy
-msgid "Group actions"
-msgstr "Mã nhóm"
+msgid "Change your email, avatar, password, profile"
+msgstr "Thay đổi mật khẩu của bạn"
+
+#: lib/action.php:435
+msgid "Connect"
+msgstr "Kết nối"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "Không thể chuyển đến máy chủ: %s"
 
-#: actions/showgroup.php:323
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
+msgstr "Thư mời"
+
+#: lib/action.php:440 lib/subgroupnav.php:106
 #, fuzzy, php-format
-msgid "Notice feed for %s group"
-msgstr "Dòng tin nhắn cho %s"
+msgid "Invite friends and colleagues to join you on %s"
+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/showgroup.php:357 lib/groupnav.php:90
-msgid "Members"
-msgstr "Thành viên"
+#: lib/action.php:445
+msgid "Logout"
+msgstr "Thoát"
 
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
-msgid "(None)"
+#: lib/action.php:445
+msgid "Logout from the site"
 msgstr ""
 
-#: actions/showgroup.php:370
+#: lib/action.php:450
 #, fuzzy
-msgid "All members"
-msgstr "Thành viên"
+msgid "Create an account"
+msgstr "Tạo tài khoản mới"
 
-#: actions/showgroup.php:378
-#, php-format
-msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+#: lib/action.php:453
+msgid "Login to the site"
 msgstr ""
 
-#: actions/showmessage.php:98
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
+msgstr "Hướng dẫn"
+
+#: lib/action.php:456
 #, fuzzy
-msgid "Only the sender and recipient "
-msgstr "Chỉ có người gửi hoặc người nhận mới có thể xem tin nhắn này"
+msgid "Help me!"
+msgstr "Hướng dẫn"
 
-#: actions/showstream.php:73
-#, fuzzy, php-format
-msgid "%s, page %d"
-msgstr "Hộp thư đến của %s - trang %d"
+#: lib/action.php:459
+msgid "Search"
+msgstr "Tìm kiếm"
 
-#: actions/showstream.php:143
-#, fuzzy
-msgid "'s profile"
-msgstr "Hồ sơ"
+#: lib/action.php:459
+msgid "Search for people or text"
+msgstr ""
 
-#: actions/showstream.php:236 actions/tagother.php:77
+#: lib/action.php:480
 #, fuzzy
-msgid "User profile"
-msgstr "Hồ sơ"
+msgid "Site notice"
+msgstr "Thông báo mới"
 
-#: actions/showstream.php:240 actions/tagother.php:81
-msgid "Photo"
+#: lib/action.php:546
+msgid "Local views"
 msgstr ""
 
-#: actions/showstream.php:317
+#: lib/action.php:612
 #, fuzzy
-msgid "User actions"
-msgstr "Không tìm thấy action"
+msgid "Page notice"
+msgstr "Thông báo mới"
 
-#: actions/showstream.php:342
+#: lib/action.php:714
 #, fuzzy
-msgid "Send a direct message to this user"
-msgstr "Bạn đã theo những người này:"
+msgid "Secondary site navigation"
+msgstr "Tôi theo"
 
-#: actions/showstream.php:343
-#, fuzzy
-msgid "Message"
-msgstr "Tin mới nhất"
+#: lib/action.php:721
+msgid "About"
+msgstr "Giới thiệu"
 
-#: actions/showstream.php:451
-#, fuzzy
-msgid "All subscribers"
-msgstr "Bạn này theo tôi"
+#: lib/action.php:723
+msgid "FAQ"
+msgstr "FAQ"
+
+#: lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/action.php:730
+msgid "Privacy"
+msgstr "Riêng tư"
 
-#: actions/showstream.php:533
+#: lib/action.php:732
+msgid "Source"
+msgstr "Nguồn"
+
+#: lib/action.php:734
+msgid "Contact"
+msgstr "Liên hệ"
+
+#: lib/action.php:736
 #, fuzzy
-msgid "All groups"
-msgstr "Nhóm"
+msgid "Badge"
+msgstr "Tin đã gửi"
+
+#: lib/action.php:764
+msgid "StatusNet software license"
+msgstr ""
 
-#: actions/showstream.php:542
+#: lib/action.php:767
 #, php-format
 msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"**%%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%%). "
 
-#: actions/smssettings.php:128
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, "
-msgstr "Số điện thoại, không cho phép nhập dấu chấm và ký tự "
+#: lib/action.php:769
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** là dịch vụ gửi tin nhắn. "
 
-#: actions/smssettings.php:162
-#, fuzzy
-msgid "Send me notices through SMS; "
-msgstr "Hãy gửi tin nhắn đến tôi qua Jabber hay GTalk"
+#: lib/action.php:771
+#, fuzzy, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+"Đang dùng [StatusNet](http://status.net/), phiên bản %s phát hành theo bản "
+"quyền [GNU Affero General Public License](http://www.fsf.org/licensing/"
+"licenses/agpl-3.0.html)."
 
-#: actions/smssettings.php:335
+#: lib/action.php:785
 #, fuzzy
-msgid "A confirmation code was sent to the phone number you added. "
-msgstr "Đó không phải là số điện thoại của bạn."
+msgid "Site content license"
+msgstr "Tìm theo nội dung của tin nhắn"
 
-#: actions/smssettings.php:453
-#, fuzzy
-msgid "Mobile carrier"
-msgstr "Chọn nhà cung cấp Mobile"
+#: lib/action.php:794
+msgid "All "
+msgstr ""
 
-#: actions/subedit.php:70
-#, fuzzy
-msgid "You are not subscribed to that profile."
-msgstr "Bạn chưa cập nhật thông tin riêng"
+#: lib/action.php:799
+msgid "license."
+msgstr ""
 
-#: actions/subedit.php:83
+#: lib/action.php:1052
+msgid "Pagination"
+msgstr ""
+
+#: lib/action.php:1061
 #, fuzzy
-msgid "Could not save subscription."
-msgstr "Không thể tạo đăng nhận."
+msgid "After"
+msgstr "Sau"
 
-#: actions/subscribe.php:55
+#: lib/action.php:1069
 #, fuzzy
-msgid "Not a local user."
-msgstr "Không có user nào."
+msgid "Before"
+msgstr "Trước"
 
-#: actions/subscribe.php:69
+#: lib/action.php:1117
 #, fuzzy
-msgid "Subscribed"
-msgstr "Theo bạn này"
+msgid "There was a problem with your session token."
+msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
 
-#: actions/subscribers.php:50
-#, fuzzy, php-format
-msgid "%s subscribers"
-msgstr "Bạn này theo tôi"
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
 
-#: actions/subscribers.php:52
-#, fuzzy, php-format
-msgid "%s subscribers, page %d"
-msgstr "Theo tôi"
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
 
-#: actions/subscribers.php:63
+#: lib/attachmentlist.php:278
 #, fuzzy
-msgid "These are the people who listen to "
-msgstr "Có nhiều người nghe theo lời nhắn của %s."
+msgid "Provider"
+msgstr "Hồ sơ "
 
-#: actions/subscribers.php:67
-#, fuzzy, php-format
-msgid "These are the people who "
-msgstr "Có nhiều người nghe theo lời nhắn của %s."
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
 
-#: actions/subscriptions.php:52
-#, fuzzy, php-format
-msgid "%s subscriptions"
-msgstr "Tất cả đăng nhận"
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
 
-#: actions/subscriptions.php:54
-#, fuzzy, php-format
-msgid "%s subscriptions, page %d"
-msgstr "Tất cả đăng nhận"
+#: lib/channel.php:138 lib/channel.php:158
+#, fuzzy
+msgid "Command results"
+msgstr "Không có kết quả nào"
 
-#: actions/subscriptions.php:65
+#: lib/channel.php:210
+msgid "Command complete"
+msgstr ""
+
+#: lib/channel.php:221
 #, fuzzy
-msgid "These are the people whose notices "
-msgstr "Có nhiều người gửi lời nhắn để  %s nghe theo."
+msgid "Command failed"
+msgstr " và bạn bè"
 
-#: actions/subscriptions.php:69
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: lib/command.php:88
 #, fuzzy, php-format
-msgid "These are the people whose "
-msgstr "Có nhiều người nghe theo lời nhắn của %s."
+msgid "Could not find a user with nickname %s"
+msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận."
 
-#: actions/subscriptions.php:122
-#, fuzzy
-msgid "Jabber"
-msgstr "Không có Jabber ID."
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
 
-#: actions/tag.php:43
+#: lib/command.php:99
 #, fuzzy, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Dòng tin nhắn cho %s"
+msgid "Nudge sent to %s"
+msgstr "Tin đã gửi"
 
-#: actions/tag.php:66
+#: lib/command.php:126
 #, php-format
-msgid "Messages tagged \"%s\", most recent first"
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
 msgstr ""
 
-#: actions/tagother.php:33
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
 #, fuzzy
-msgid "Not logged in"
-msgstr "Chưa đăng nhập."
+msgid "User has no last notice"
+msgstr "Người dùng không có thông tin."
 
-#: actions/tagother.php:39
+#: lib/command.php:190
 #, fuzzy
-msgid "No id argument."
-msgstr "Không có tài liệu nào."
+msgid "Notice marked as fave."
+msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
 
-#: actions/tagother.php:65
+#: lib/command.php:315
 #, fuzzy, php-format
-msgid "Tag %s"
-msgstr "Từ khóa"
+msgid "%1$s (%2$s)"
+msgstr "%s (%s)"
 
-#: actions/tagother.php:141
-#, fuzzy
-msgid "Tag user"
-msgstr "Từ khóa"
+#: lib/command.php:318
+#, fuzzy, php-format
+msgid "Fullname: %s"
+msgstr "Tên đầy đủ"
 
-#: actions/tagother.php:149
-msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
-msgstr ""
+#: lib/command.php:321
+#, fuzzy, php-format
+msgid "Location: %s"
+msgstr "Thành phố: %s"
 
-#: actions/tagother.php:164
-#, fuzzy
-msgid "There was a problem with your session token."
-msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
+#: lib/command.php:324
+#, fuzzy, php-format
+msgid "Homepage: %s"
+msgstr "Trang chủ hoặc Blog: %s"
 
-#: actions/tagother.php:191
-msgid ""
-"You can only tag people you are subscribed to or who are subscribed to you."
+#: lib/command.php:327
+#, fuzzy, php-format
+msgid "About: %s"
+msgstr "Giới thiệu"
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: actions/tagother.php:198
+#: lib/command.php:377
 #, fuzzy
-msgid "Could not save tags."
-msgstr "Không thể lưu hồ sơ cá nhân."
+msgid "Error sending direct message."
+msgstr "Thư bạn đã gửi"
 
-#: actions/tagother.php:233
-msgid "Use this form to add tags to your subscribers or subscriptions."
+#: lib/command.php:431
+#, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: actions/tagrss.php:35
-#, fuzzy
-msgid "No such tag."
-msgstr "Không có tin nhắn nào."
-
-#: actions/tagrss.php:66
+#: lib/command.php:439
 #, fuzzy, php-format
-msgid "Microblog tagged with %s"
-msgstr "Microblog bởi  %s"
+msgid "Reply to %s sent"
+msgstr "Trả lời tin nhắn này"
 
-#: actions/twitapiblocks.php:47
-msgid "Block user failed."
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Có lỗi xảy ra khi lưu tin nhắn."
+
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: actions/twitapiblocks.php:69
-msgid "Unblock user failed."
+#: lib/command.php:502
+#, fuzzy, php-format
+msgid "Subscribed to %s"
+msgstr "Theo nhóm này"
+
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: actions/twitapiusers.php:48
-#, fuzzy
-msgid "Not found."
-msgstr "Không tìm thấy"
+#: lib/command.php:530
+#, fuzzy, php-format
+msgid "Unsubscribed from %s"
+msgstr "Hết theo"
 
-#: actions/twittersettings.php:71
-#, fuzzy
-msgid "Add your Twitter account to automatically send "
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
 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."
 
-#: actions/twittersettings.php:119
+#: lib/command.php:551
 #, fuzzy
-msgid "Twitter user name"
-msgstr "Tên tài khoản Twitter"
+msgid "Notification off."
+msgstr "Không có mã số xác nhận."
 
-#: actions/twittersettings.php:126
-#, fuzzy
-msgid "Twitter password"
-msgstr "Mật khẩu Twitter"
+#: lib/command.php:553
+msgid "Can't turn off notification."
+msgstr ""
 
-#: actions/twittersettings.php:228
+#: lib/command.php:574
 #, fuzzy
-msgid "Twitter Friends"
-msgstr "Thiết lập tài khoản Twitter"
+msgid "Notification on."
+msgstr "Không có mã số xác nhận."
 
-#: actions/twittersettings.php:327
-msgid "Username must have only numbers, "
+#: lib/command.php:576
+msgid "Can't turn on notification."
 msgstr ""
 
-#: actions/twittersettings.php:341
+#: lib/command.php:597
 #, fuzzy, php-format
-msgid "Unable to retrieve account information "
-msgstr "Không thể lấy thông tin tài khoản của '%s' từ Twitter."
+msgid "Could not create login token for %s"
+msgstr "Không thể tạo OpenID mẫu: %s"
 
-#: actions/unblock.php:108
-#, fuzzy
-msgid "Error removing the block."
-msgstr "Lỗi xảy ra khi lưu thành viên."
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
 
-#: actions/unsubscribe.php:50
+#: lib/command.php:618
 #, fuzzy
-msgid "No profile id in request."
-msgstr "Không có URL cho hồ sơ để quay về."
+msgid "You are not subscribed to anyone."
+msgstr "Bạn chưa cập nhật thông tin riêng"
 
-#: actions/unsubscribe.php:57
+#: lib/command.php:620
 #, fuzzy
-msgid "No profile with that id."
-msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
+msgid "You are subscribed to these people: "
+msgstr "Bạn chưa cập nhật thông tin riêng"
 
-#: actions/unsubscribe.php:71
+#: lib/command.php:637
 #, fuzzy
-msgid "Unsubscribed"
-msgstr "Hết theo"
+msgid "No one is subscribed to you."
+msgstr "Không thể tạo favorite."
 
-#: actions/usergroups.php:63
-#, fuzzy, php-format
-msgid "%s groups"
-msgstr "%s và nhóm"
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Theo nhóm này"
 
-#: actions/usergroups.php:65
-#, php-format
-msgid "%s groups, page %d"
-msgstr ""
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Bạn chưa cập nhật thông tin riêng"
 
-#: classes/Notice.php:104
+#: lib/command.php:658
 #, fuzzy
-msgid "Problem saving notice. Unknown user."
-msgstr "Có lỗi xảy ra khi lưu tin nhắn."
+msgid "You are a member of these groups: "
+msgstr "Bạn chưa cập nhật thông tin riêng"
 
-#: classes/Notice.php:109
+#: lib/command.php:670
 msgid ""
-"Too many notices too fast; take a breather and post again in a few minutes."
-msgstr ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+
+#: lib/common.php:192
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Không có mã số xác nhận."
 
-#: classes/Notice.php:116
-msgid "You are banned from posting notices on this site."
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/accountsettingsaction.php:108
-#, fuzzy
-msgid "Upload an avatar"
-msgstr "Cập nhật hình đại diện không thành công."
-
-#: lib/accountsettingsaction.php:119
-#, fuzzy
-msgid "Other"
-msgstr "Sau"
-
-#: lib/accountsettingsaction.php:120
-msgid "Other options"
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/action.php:130
-#, fuzzy, php-format
-msgid "%s - %s"
-msgstr "%s (%s)"
-
-#: lib/action.php:145
-msgid "Untitled page"
+#: lib/common.php:195
+msgid "Go to the installer."
 msgstr ""
 
-#: lib/action.php:316
-msgid "Primary site navigation"
-msgstr ""
+#: lib/connectsettingsaction.php:110
+msgid "IM"
+msgstr "IM"
 
-#: lib/action.php:322
-msgid "Personal profile and friends timeline"
-msgstr ""
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Thay đổi bởi tin nhắn nhanh (IM)"
 
-#: lib/action.php:325
-msgid "Search for people or text"
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
+msgstr "Thay đổi bởi SMS"
+
+#: lib/dberroraction.php:60
+msgid "Database error"
 msgstr ""
 
-#: lib/action.php:328
+#: lib/designsettings.php:101
 #, fuzzy
-msgid "Account"
-msgstr "Giới thiệu"
+msgid "Change background image"
+msgstr "Background Theme:"
 
-#: lib/action.php:328
+#: lib/designsettings.php:105
 #, fuzzy
-msgid "Change your email, avatar, password, profile"
-msgstr "Thay đổi mật khẩu của bạn"
+msgid "Upload file"
+msgstr "Tải file"
 
-#: lib/action.php:330
-msgid "Connect to IM, SMS, Twitter"
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 
-#: lib/action.php:332
-msgid "Logout from the site"
+#: lib/designsettings.php:139
+msgid "On"
 msgstr ""
 
-#: lib/action.php:335
-msgid "Login to the site"
+#: lib/designsettings.php:155
+msgid "Off"
 msgstr ""
 
-#: lib/action.php:338
-#, fuzzy
-msgid "Create an account"
-msgstr "Tạo tài khoản mới"
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
 
-#: lib/action.php:341
+#: lib/designsettings.php:161
 #, fuzzy
-msgid "Login with OpenID"
-msgstr "Không có OpenID nào."
+msgid "Tile background image"
+msgstr "Background Theme:"
 
-#: lib/action.php:344
+#: lib/designsettings.php:170
 #, fuzzy
-msgid "Help me!"
-msgstr "Hướng dẫn"
+msgid "Change colours"
+msgstr "Thay đổi mật khẩu của bạn"
 
-#: lib/action.php:362
+#: lib/designsettings.php:178
 #, fuzzy
-msgid "Site notice"
-msgstr "Thông báo mới"
+msgid "Background"
+msgstr "Background Theme:"
 
-#: lib/action.php:417
-msgid "Local views"
-msgstr ""
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "Kết nối"
 
-#: lib/action.php:472
+#: lib/designsettings.php:204
 #, fuzzy
-msgid "Page notice"
-msgstr "Thông báo mới"
+msgid "Sidebar"
+msgstr "Tìm kiếm"
 
-#: lib/action.php:562
+#: lib/designsettings.php:217
+msgid "Text"
+msgstr "Chuỗi bất kỳ"
+
+#: lib/designsettings.php:230
 #, fuzzy
-msgid "Secondary site navigation"
-msgstr "Tôi theo"
+msgid "Links"
+msgstr "Đăng nhập"
 
-#: lib/action.php:602 lib/action.php:623
-msgid "StatusNet software license"
+#: lib/designsettings.php:247
+msgid "Use defaults"
 msgstr ""
 
-#: lib/action.php:630
-msgid "All "
+#: lib/designsettings.php:248
+msgid "Restore default designs"
 msgstr ""
 
-#: lib/action.php:635
-msgid "license."
+#: lib/designsettings.php:254
+msgid "Reset back to default"
 msgstr ""
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/designsettings.php:257
 #, fuzzy
-msgid "Block this user"
-msgstr "Ban user"
+msgid "Save design"
+msgstr "Lưu"
 
-#: lib/blockform.php:153
-msgid "Block"
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
 msgstr ""
 
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
@@ -4730,30 +4074,36 @@ msgstr ""
 msgid "Disfavor this notice"
 msgstr "cảnh báo tin nhắn"
 
-#: lib/facebookaction.php:268
-#, php-format
-msgid "To use the %s Facebook Application you need to login "
-msgstr ""
-
-#: lib/facebookaction.php:271
-#, fuzzy
-msgid " a new account."
-msgstr "Tạo tài khoản mới"
-
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-#, fuzzy
-msgid "Published"
-msgstr "Công cộng"
-
 #: lib/favorform.php:114 lib/favorform.php:140
 #, fuzzy
 msgid "Favor this notice"
 msgstr "Bạn muốn cảnh báo tin nhắn này?"
 
+#: lib/favorform.php:140
+#, fuzzy
+msgid "Favor"
+msgstr "Ưa thích"
+
 #: lib/feedlist.php:64
 msgid "Export data"
 msgstr ""
 
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr ""
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr ""
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr ""
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr ""
@@ -4762,62 +4112,88 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Chọn nhà cung cấp Mobile"
+
+#: lib/galleryaction.php:140
 #, fuzzy
 msgid "Tag"
 msgstr "Từ khóa"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr ""
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:163
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "URL về Trang chính, Blog, hoặc hồ sơ cá nhân của bạn trên "
 
-#: lib/groupeditform.php:151
-msgid "Description"
-msgstr "Mô tả"
-
-#: lib/groupeditform.php:153
+#: lib/groupeditform.php:168
 #, fuzzy
-msgid "Describe the group or topic in 140 chars"
+msgid "Describe the group or topic"
+msgstr "Nói về những sở thích của nhóm trong vòng 140 ký tự"
+
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
 msgstr "Nói về những sở thích của nhóm trong vòng 140 ký tự"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:172
+msgid "Description"
+msgstr "Mô tả"
+
+#: lib/groupeditform.php:179
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr "Bạn ở đâu, \"Thành phố, Tỉnh thành, Quốc gia\""
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
 msgid "Group"
 msgstr "Nhóm"
 
-#: lib/groupnav.php:100
-msgid "Admin"
-msgstr ""
-
 #: lib/groupnav.php:101
+#, fuzzy
+msgid "Blocked"
+msgstr "Ban user"
+
+#: lib/groupnav.php:102
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "Ban user"
+
+#: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
 msgstr ""
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:113
 #, fuzzy
 msgid "Logo"
 msgstr "Thoát"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:114
 #, php-format
 msgid "Add or edit %s logo"
 msgstr ""
 
+#: lib/groupnav.php:120
+#, php-format
+msgid "Add or edit %s design"
+msgstr ""
+
 #: lib/groupsbymemberssection.php:71
 #, fuzzy
 msgid "Groups with most members"
@@ -4833,10 +4209,47 @@ msgid "Tags in %s group's notices"
 msgstr ""
 
 #: lib/htmloutputter.php:104
-#, fuzzy
-msgid "This page is not available in a "
+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."
 
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+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."
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr "Upload từng phần."
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr "Hệ thống xảy ra lỗi trong khi tải file."
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr "File hỏng hoặc không phải là file ảnh."
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr "Không hỗ trợ kiểu file ảnh này."
+
+#: lib/imagefile.php:118
+#, fuzzy
+msgid "Lost our file."
+msgstr "Không có tin nhắn nào."
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+#, fuzzy
+msgid "Unknown file type"
+msgstr "Không hỗ trợ kiểu file ảnh này."
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr ""
+
 #: lib/joinform.php:114
 #, fuzzy
 msgid "Join"
@@ -4847,108 +4260,361 @@ msgstr "Đăng nhập"
 msgid "Leave"
 msgstr "Lưu"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:80
 #, fuzzy
 msgid "Login with a username and password"
 msgstr "Sai tên đăng nhập hoặc mật khẩu."
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:86
 #, fuzzy
 msgid "Sign up for a new account"
 msgstr "Tạo tài khoản mới"
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
 msgstr ""
 
-#: lib/mail.php:175
-#, php-format
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr " từ "
+
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "Xac nhan dia chi email"
+
+#: lib/mail.php:174
+#, fuzzy, php-format
 msgid ""
 "Hey, %s.\n"
 "\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%s\n"
+"\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
 msgstr ""
+"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"
+"\n"
+"Cảm ơn bạn đã bỏ thời gian để đọc thư,\n"
+"\n"
+"%4$s\n"
+"\n"
+
+#: lib/mail.php:235
+#, php-format
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr "%1$s đang theo dõi lưu ý của bạn trên %2$s."
 
-#: lib/mail.php:236
+#: lib/mail.php:240
 #, fuzzy, php-format
-msgid "%1$s is now listening to "
-msgstr "%1$s dang theo doi tin nhan cua ban tren %2$s."
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
+"%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"
 
-#: lib/mail.php:254
+#: lib/mail.php:253
 #, fuzzy, php-format
 msgid "Location: %s\n"
 msgstr "Thành phố: %s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:255
 #, fuzzy, php-format
 msgid "Homepage: %s\n"
 msgstr "Trang chủ hoặc Blog: %s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:461
+#: lib/mail.php:285
+#, php-format
+msgid "New email address for posting to %s"
+msgstr "Dia chi email moi de gui tin nhan den %s"
+
+#: lib/mail.php:288
+#, 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 ""
+"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"
+"\n"
+"Chúc sức khỏe,\n"
+"%4$s"
+
+#: lib/mail.php:412
+#, fuzzy, php-format
+msgid "%s status"
+msgstr "Trạng thái của %1$s vào %2$s"
+
+#: lib/mail.php:438
+msgid "SMS confirmation"
+msgstr "Xác nhận SMS"
+
+#: lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr ""
 
-#: lib/mail.php:465
+#: lib/mail.php:466
 #, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
 msgstr ""
 
-#: lib/mail.php:555
+#: lib/mail.php:509
+#, php-format
+msgid "New private message from %s"
+msgstr "Bạn có tin nhắn riêng từ %s"
+
+#: lib/mail.php:513
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%5$s\n"
+msgstr ""
+"%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"
+"\n"
+"Chúc sức khỏe,\n"
+"%5$s\n"
+
+#: lib/mail.php:554
 #, fuzzy, php-format
-msgid "%1$s just added your notice from %2$s"
+msgid "%s (@%s) added your notice as a favorite"
 msgstr "%s da them tin nhan cua ban vao danh sach tin nhan ua thich"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
-#, fuzzy
-msgid "From"
-msgstr " từ"
+#: lib/mail.php:556
+#, fuzzy, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
+"%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"
+"\n"
+"Chúc sức khỏe,\n"
+"%5$s\n"
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, php-format
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+msgstr ""
+
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+msgid "Could not determine file's mime-type!"
+msgstr "Không thể lấy lại các tin nhắn ưa thích"
+
+#: lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
 
-#: lib/messageform.php:110
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: lib/messageform.php:120
 #, fuzzy
 msgid "Send a direct notice"
 msgstr "Xóa tin nhắn"
 
-#: lib/noticeform.php:125
-#, fuzzy
-msgid "Send a notice"
-msgstr "Thông báo mới"
+#: lib/messageform.php:146
+msgid "To"
+msgstr ""
 
-#: lib/noticeform.php:152
+#: lib/messageform.php:162 lib/noticeform.php:173
 #, fuzzy
 msgid "Available characters"
 msgstr "Nhiều hơn 6 ký tự"
 
-#: lib/noticelist.php:426
+#: lib/noticeform.php:145
+#, fuzzy
+msgid "Send a notice"
+msgstr "Thông báo mới"
+
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
+msgstr "Bạn đang làm gì thế, %s?"
+
+#: lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:478
 #, fuzzy
-msgid "in reply to"
-msgstr "còn nữa..."
+msgid "in context"
+msgstr "Không có nội dung!"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:498
 #, fuzzy
 msgid "Reply to this notice"
 msgstr "Trả lời tin nhắn này"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:499
 msgid "Reply"
 msgstr "Trả lời"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
-#, fuzzy
-msgid "Delete this notice"
-msgstr "Xóa tin nhắn"
-
-#: lib/noticelist.php:474
-#, fuzzy
-msgid "Delete"
-msgstr "Xóa tin nhắn"
-
 #: lib/nudgeform.php:116
 #, fuzzy
 msgid "Nudge this user"
@@ -4964,43 +4630,144 @@ msgstr "Tin đã gửi"
 msgid "Send a nudge to this user"
 msgstr "Bạn đã theo những người này:"
 
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "Lỗi xảy ra khi thêm mới hồ sơ cá nhân"
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "Lỗi xảy ra khi thêm mới hình đại diện"
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "Lỗi xảy ra khi thêm mới hồ sơ cá nhân"
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Xóa tin nhắn"
+
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
+msgstr "Không thể chèn thêm vào đăng nhận."
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "Cá nhân"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "Trả lời"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr "Ưa thích"
+
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr ""
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr "Hộp thư đến"
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr "Thư đến của bạn"
+
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr "Hộp thư đi"
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr "Thư bạn đã gửi"
+
 #: lib/personaltagcloudsection.php:56
 #, fuzzy, php-format
 msgid "Tags in %s's notices"
 msgstr "cảnh báo tin nhắn"
 
-#: lib/profilelist.php:182
-msgid "(none)"
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "Tôi theo bạn này"
+
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "Tất cả đăng nhận"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "Bạn này theo tôi"
+
+#: lib/profileaction.php:157
+#, fuzzy
+msgid "All subscribers"
+msgstr "Bạn này theo tôi"
+
+#: lib/profileaction.php:177
+msgid "User ID"
 msgstr ""
 
-#: lib/publicgroupnav.php:76
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "Gia nhập từ"
+
+#: lib/profileaction.php:235
+#, fuzzy
+msgid "All groups"
+msgstr "Nhóm"
+
+#: lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Công cộng"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:82
 #, fuzzy
 msgid "User groups"
 msgstr "Hồ sơ"
 
-#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 #, fuzzy
 msgid "Recent tags"
 msgstr "Các từ khóa hiện tại"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr ""
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:92
 #, fuzzy
 msgid "Popular"
 msgstr "Tên tài khoản"
 
+#: lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Tìm kiếm"
+
+#: lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "Tìm kiếm"
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "Tên tài khoản"
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr "Tìm kiếm mọi người trên trang web này"
+
 #: lib/searchgroupnav.php:82
 #, fuzzy
 msgid "Notice"
 msgstr "Tin nhắn"
 
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr "Tìm theo nội dung của tin nhắn"
+
 #: lib/searchgroupnav.php:85
 #, fuzzy
 msgid "Find groups on this site"
@@ -5010,37 +4777,66 @@ msgstr "Tìm kiếm mọi người trên trang web này"
 msgid "Untitled section"
 msgstr ""
 
-#: lib/subgroupnav.php:81
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: lib/subgroupnav.php:83
 #, fuzzy, php-format
 msgid "People %s subscribes to"
 msgstr "Đăng nhận từ xa"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:91
 #, fuzzy, php-format
 msgid "People subscribed to %s"
 msgstr "Theo nhóm này"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:104
-#, fuzzy, php-format
-msgid "Invite friends and colleagues to join you on %s"
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr ""
+
+#: lib/subs.php:48
+msgid "Already subscribed!"
 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."
 
-#: lib/subs.php:53
+#: lib/subs.php:52
 #, fuzzy
 msgid "User has blocked you."
 msgstr "Người dùng không có thông tin."
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: lib/subs.php:56
 #, fuzzy
-msgid "Subscribe to this user"
-msgstr "Theo nhóm này"
+msgid "Could not subscribe."
+msgstr "Chưa đăng nhận!"
+
+#: lib/subs.php:75
+#, fuzzy
+msgid "Could not subscribe other to you."
+msgstr "Không thể tạo favorite."
+
+#: lib/subs.php:124
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Chưa đăng nhận!"
+
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
+msgstr "Không thể xóa đăng nhận."
 
 #: lib/tagcloudsection.php:56
 #, fuzzy
@@ -5052,734 +4848,110 @@ msgstr "Không"
 msgid "Top posters"
 msgstr "Top posters"
 
-#: lib/unblockform.php:120 lib/unblockform.php:150
-msgid "Unblock this user"
-msgstr "Bỏ chặn người dùng này"
-
-#: lib/unblockform.php:150
-msgid "Unblock"
-msgstr "Bỏ chặn"
-
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Ngừng đăng ký từ người dùng này"
 
-#, fuzzy
-#~ msgid "Code not yet ready."
-#~ msgstr "Không thể tạo favorite."
-
-#, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "Tạo tài khoản mới"
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "Hết theo"
 
+#: lib/userprofile.php:116
 #, fuzzy
-#~ msgid "Delete my account confirmation"
-#~ msgstr "Không thể xóa email xác nhận."
+msgid "Edit Avatar"
+msgstr "Hình đại diện"
 
+#: lib/userprofile.php:236
 #, fuzzy
-#~ msgid "Check if you are sure you want to delete your account."
-#~ msgstr "Bạn có chắc chắn là muốn xóa tin nhắn này không?"
+msgid "User actions"
+msgstr "Không tìm thấy action"
 
+#: lib/userprofile.php:248
 #, fuzzy
-#~ msgid "Showing recently popular notices"
-#~ msgstr "Tìm theo nội dung của tin nhắn"
-
-#~ msgid " Required."
-#~ msgstr " Bắt buộc."
-
-#~ msgid "Couldn't confirm email."
-#~ msgstr "Không thể xác nhận địa chỉ email."
-
-#~ msgid "Error inserting notice"
-#~ msgstr "Lỗi xảy ra khi thêm mới tin nhắn"
-
-#~ msgid "FAQ "
-#~ msgstr "FAQ - Hỏi đáp"
-
-#~ msgid ""
-#~ "It runs the [StatusNet](http://status.net/) microblogging software, version "
-#~ "%s, available under the [GNU Affero General Public License] (http://www."
-#~ "fsf.org/licensing/licenses/agpl-3.0.html)."
-#~ msgstr ""
-#~ "Microblogging [StatusNet](http://status.net/), version %s đã có ở [GNU "
-#~ "Affero General Public License] (http://www.fsf.org/licensing/licenses/"
-#~ "agpl-3.0.html)."
-
-#~ 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."
-
-#~ msgid "Password recovery requested "
-#~ msgstr "Yeu cau khoi phuc lai mat khau da duoc gui"
-
-#~ msgid "%s, Tell the world what's on your mind?"
-#~ msgstr "%s, bạn đang làm gì?"
-
-#~ msgid "City, State/Region, Country"
-#~ msgstr "Thành phố, Tỉnh thành, Quốc gia"
-
-#~ msgid "Register for a free account!"
-#~ msgstr "Đăng ký tài khoản miễn phí!"
-
-#~ msgid "Everyone"
-#~ msgstr "Tất cả mọi người"
-
-#~ msgid "Welcome to %s"
-#~ msgstr "%s chào mừng bạn "
-
-#~ msgid "Blog + Chat = Fun"
-#~ msgstr "Vừa Blog vừa Chat = Vui Lắm"
-
-#~ 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."
-
-#~ 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? "
-
-#~ msgid "Register now!"
-#~ msgstr "Hãy đăng ký ngay!"
-
-#~ msgid "What's the latest?"
-#~ msgstr "Mọi người đang nói gì?"
-
-#~ msgid "What Everyone Is Talking About"
-#~ msgstr "Mọi người đang nói gì?"
-
-#~ 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 "
-
-#~ 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."
-
-#~ msgid "Choose a theme"
-#~ msgstr "Chọn theme"
-
-#~ msgid "Theme Error"
-#~ msgstr "Lỗi Theme"
-
-#~ 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."
-
-#~ msgid "Background Theme:"
-#~ msgstr "Background Theme:"
-
-#~ msgid "Customize your theme"
-#~ msgstr "Tùy chỉnh theme "
-
-#~ msgid "Timeline Theme:"
-#~ msgstr "Timeline Theme:"
-
-#~ msgid "Dashboard Theme:"
-#~ msgstr "Dashboard Theme:"
-
-#~ msgid "Theme"
-#~ msgstr "Theme"
-
-#~ msgid "Activity"
-#~ msgstr "Các hoạt động"
-
-#~ msgid "Me & My Friends"
-#~ msgstr "Tôi & bạn"
-
-#~ msgid "User & Friends"
-#~ msgstr "Nhóm bạn"
-
-#~ msgid "My Profile"
-#~ msgstr "Cá nhân"
-
-#~ msgid "Customize your page even more with CSS"
-#~ msgstr "Tùy chỉnh trang của bạn bằng CSS"
-
-#~ msgid "Save Changes"
-#~ msgstr "Lưu"
-
-#~ msgid "Change css code"
-#~ msgstr "Thay đổi code css"
-
-#~ msgid "You can change your css code here."
-#~ msgstr "Bạn có thể thay đổi code css"
-
-#~ msgid "New css code saved."
-#~ msgstr "CSS đã được lưu."
-
-#~ msgid "Upload from your computer"
-#~ msgstr "Tải từ máy tính cá nhân  "
-
-#~ msgid "Get from library"
-#~ msgstr "Lấy từ tập ảnh có sẵn"
-
-#~ msgid "Male"
-#~ msgstr "Nam"
-
-#~ msgid "Female"
-#~ msgstr "Nữ"
-
-#~ msgid "No reply yet"
-#~ msgstr "chưa có trả lời"
-
-#~ msgid "replies"
-#~ msgstr "trả lời"
-
-#~ 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"
-#~ "\n"
-#~ "Chúc sức khỏe,\n"
-#~ "%5$s\n"
-
-#~ msgid "Flag a notice"
-#~ msgstr "Cảnh báo tin nhắn"
-
-#~ 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."
-
-#~ msgid ""
-#~ "To use this [Saigonica version](%%doc.source%%), you must write the "
-#~ "license is of StatusNet 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."
-
-#~ 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"
-#~ "\n"
-#~ "Cảm ơn bạn đã bỏ thời gian để đọc thư,\n"
-#~ "\n"
-#~ "%4$s\n"
-#~ "\n"
-
-#~ 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 ""
-#~ "%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"
-#~ "\n"
-#~ "Chú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 "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 "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"
-#~ "\n"
-#~ "Xin 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 ""
-#~ "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"
-#~ "\n"
-#~ "Cảm ơn bạn đã bỏ thời gian để đọc thư, \n"
-#~ "%1$s\n"
-
-#~ 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 "Timeline"
-#~ msgstr "Dòng tin"
-
-#~ msgid "Share a thought? Vas-y, ton tour..."
-#~ msgstr "Muốn chia sẽ ý nghĩ của bạn?"
-
-#~ 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 "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 "Short description of the group"
-#~ msgstr "Mô tả ngắn gọn về 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 "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 "Chat vs T8M"
-#~ msgstr "Chat và T8M"
-
-#~ msgid "Prev"
-#~ msgstr "Trước"
-
-#~ msgid "Next"
-#~ msgstr "Kế"
-
-#~ msgid "Group View"
-#~ msgstr "Xem theo nhóm"
-
-#~ msgid "Linear View"
-#~ msgstr "Xem tuần tự"
-
-#~ 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 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 "Edit profile settings"
+msgstr "Các thiết lập cho Hồ sơ cá nhân"
 
-#~ 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ư."
+#: lib/userprofile.php:249
+msgid "Edit"
+msgstr ""
 
-#~ msgid "says"
-#~ msgstr "nói"
+#: lib/userprofile.php:272
+#, fuzzy
+msgid "Send a direct message to this user"
+msgstr "Bạn đã theo những người này:"
 
-#~ msgid "Your message is posted successful."
-#~ msgstr "Tin nhắn đã gửi đi"
+#: lib/userprofile.php:273
+#, fuzzy
+msgid "Message"
+msgstr "Tin mới nhất"
 
-#~ 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"
+#: lib/util.php:821
+msgid "a few seconds ago"
+msgstr "vài giây trước"
 
-#~ 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"
+#: lib/util.php:823
+msgid "about a minute ago"
+msgstr "1 phút trước"
 
-#~ msgid "GTalk Settings"
-#~ msgstr "Thiết lập địa chỉ GTalk"
+#: lib/util.php:825
+#, php-format
+msgid "about %d minutes ago"
+msgstr "%d phút trước"
 
-#~ 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."
+#: lib/util.php:827
+msgid "about an hour ago"
+msgstr "1 giờ trước"
 
-#~ 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. "
+#: lib/util.php:829
+#, php-format
+msgid "about %d hours ago"
+msgstr "%d giờ trước"
 
-#~ msgid "GTalk Address"
-#~ msgstr "Địa chỉ email GTalk"
+#: lib/util.php:831
+msgid "about a day ago"
+msgstr "1 ngày trước"
 
-#~ 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ư."
+#: lib/util.php:833
+#, php-format
+msgid "about %d days ago"
+msgstr "%d ngày trước"
 
-#~ msgid "Check virus"
-#~ msgstr "Kiểm tra virus"
+#: lib/util.php:835
+msgid "about a month ago"
+msgstr "1 tháng trước"
 
-#~ msgid "Avatar "
-#~ msgstr "Hình"
+#: lib/util.php:837
+#, php-format
+msgid "about %d months ago"
+msgstr "%d tháng trước"
 
-#~ msgid "Change your avatar"
-#~ msgstr "Thay đổi hình đại diện của bạn"
+#: lib/util.php:839
+msgid "about a year ago"
+msgstr "1 năm trước"
 
-#~ msgid "Updates by Yahoo Messenger (YM)"
-#~ msgstr "Cập nhật địa chỉ Yahoo để gửi tin qua Yahoo Mesenger(YM)"
+#: lib/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "Trang chủ không phải là URL"
 
-#~ msgid "Ban from network"
-#~ msgstr "Ban user ra khỏi mạng"
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
 
-#~ msgid "Ban users violate rules of saigonica"
-#~ msgstr "Ban user vi phạm nội quy của saigonica"
+#: scripts/maildaemon.php:48
+#, fuzzy
+msgid "Could not parse message."
+msgstr "Không thể cập nhật thành viên."
 
-#~ msgid "Are you sure to ban this user?"
-#~ msgstr "Bạn có chắc muốn ban người này không?"
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr "Không có người dùng nào đăng ký"
 
-#~ msgid "Your account was banned."
-#~ msgstr "Tài khoản của bạn đã bị ban."
+#: scripts/maildaemon.php:57
+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."
 
-#~ msgid "User has been baned."
-#~ msgstr "User đã bị ban."
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr "Xin lỗi, không có địa chỉ email cho phép."
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.mo b/locale/zh_CN/LC_MESSAGES/statusnet.mo
index 7984ab714..4fd7cd1dc 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.mo
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.mo
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 5c2eced4e..722af7d34 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -1,3 +1,6 @@
+# Translation of StatusNet to Simplified Chinese
+#
+# --
 # Messages of identi.ca
 # Copyright (C) 2008 Gouki <gouki@goukihq.org>
 # This file is distributed under the same license as the identi.ca package.
@@ -5,2574 +8,1419 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: identi.ca\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-07-28 14:03+0000\n"
-"Last-Translator: offacer <offacer@gmail.com>\n"
-"Language-Team: i18n-zh <i18n-zh@googlegroups.com>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:44:29+0000\n"
+"Language-Team: Simplified Chinese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
-
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
-#, 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
-#: actions/finishopenidlogin.php:110
-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
-#: actions/twitapistatuses.php:347
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr "%1$s / 回复 %2$s 的消息"
-
-#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s 邀请您加入 %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"
-"%1$s 说:\n"
-"\n"
-"%4$s\n"
-"\n"
-"你可以在这里查阅 %1$s's 的资料 %2$s :\n"
-"\n"
-"%5$s\n"
-"\n"
-"如果你想使用这个服务，请点击一下链接接受邀请。\n"
-"%6$s\n"
-"\n"
-"如果你不愿意，请跳过这条信息。感谢您的耐心和时间。\n"
-"\n"
-"诚挚的感谢, %2$s\n"
-
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s 开始关注您的 %2$s 信息。"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: zh-hans\n"
+"X-Message-Group: out-statusnet\n"
 
-#: ../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
-#: actions/twitapistatuses.php:350
-#, 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
-#: actions/shownotice.php:161
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr "%1$s 的 %2$s 状态"
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "未找到此消息。"
 
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
-#, php-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
+msgstr "没有这个用户。"
 
-#: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
-#, php-format
-msgid "%s Public Stream"
-msgstr "%s 公开聚合"
+#: actions/all.php:84
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+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
-#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s 及好友"
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
-#, php-format
-msgid "%s public timeline"
-msgstr "%s 公众时间表"
+#: actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "%s 好友的聚合"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
-#, php-format
-msgid "%s status"
-msgstr "%s 状态"
+#: actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "%s 好友的聚合"
 
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
-#, php-format
-msgid "%s timeline"
-msgstr "%s 时间表"
+#: actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "%s 好友的聚合"
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/all.php:127
 #, 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 "(您将收到一封邮件，包含了如何确认邮件地址的说明。)"
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: actions/all.php:132
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
 msgstr ""
-"**%%site.name%%** 是一个微博客服务，提供者为 [%%site.broughtby%%](%%site."
-"broughtbyurl%%)。"
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
-#, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** 是一个微博客服务。"
-
-#: ../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
-#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1 到 64 个小写字母或数字，不包含标点及空白"
-
-#: ../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
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr "6 个或更多字符"
-
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
-msgid "6 or more characters, and don't forget it!"
-msgstr "6 个或更多字符，不能忘记！"
-
-#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
-msgid "6 or more characters. Required."
-msgstr "6 个或更多字符。此项必填。"
-
-#: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/all.php:134
 #, 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."
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
-"验证码已被发送到您新增的电子邮件。请检查收件箱(和垃圾箱)，找到验证码并按要求"
-"使用它。"
 
-#: ../actions/smssettings.php:216 actions/smssettings.php:224
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#, php-format
 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."
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
 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 actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
-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 actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
-msgid "API method under construction."
-msgstr "API 方法尚未实现。"
-
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
-msgid "About"
-msgstr "关于"
-
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
-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 actions/emailsettings.php:120
-#: actions/imsettings.php:127 actions/openidsettings.php:111
-#: actions/smssettings.php:133 actions/twittersettings.php:163
-msgid "Add"
-msgstr "添加"
-
-#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
-msgstr "添加 OpenID"
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-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
-#: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
-msgstr "地址"
-
-#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-msgid "Addresses of friends to invite (one per line)"
-msgstr "要邀请的好友地址(每行一个)"
-
-#: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
-msgid "All subscriptions"
-msgstr "所有订阅"
 
-#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
-#, php-format
-msgid "All updates for %s"
-msgstr "所有 %s 消息"
+#: actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s 及好友"
 
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
 #, 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
-#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
-msgid "Already logged in."
-msgstr "已登录。"
-
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
-msgid "Already subscribed!."
-msgstr "已订阅！"
-
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
-msgid "Are you sure you want to delete this notice?"
-msgstr "确定要删除这条消息吗？"
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr "%2$s 上 %1$s 和好友的更新！"
 
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
-msgid "Authorize subscription"
-msgstr "确认订阅"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
+msgstr "API 方法未实现！"
 
-#: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
-msgid "Automatically login in the future; not for shared computers!"
-msgstr "保持这台机器上的登录状态。不要在共用的机器上保持登录！"
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
+msgstr "此方法接受POST请求。"
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/apiaccountupdatedeliverydevice.php:105
 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 actions/avatarsettings.php:65
-#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
-msgid "Avatar"
-msgstr "头像"
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
 
-#: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
-msgid "Avatar updated."
-msgstr "头像已更新。"
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "无法更新用户。"
 
-#: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
 #, 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."
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
 msgstr ""
-"等待确认此地址。请查看您的收件箱(和垃圾箱)是否收到了邮件，其中包含了进一步的"
-"指示。"
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
-msgid "Awaiting confirmation on this phone number."
-msgstr "等待确认此电话号码。"
-
-#: ../lib/util.php:1318 lib/util.php:1452
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
 #, fuzzy
-msgid "Before »"
-msgstr "下一页 »"
-
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
-#: actions/profilesettings.php:82 actions/register.php:184
-#: actions/profilesettings.php:112 actions/register.php:402
-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
-#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
-msgid "Bio is too long (max 140 chars)."
-msgstr "自述过长(不能超过140字符)。"
-
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
-msgid "Can't delete this notice."
-msgstr "无法删除通告。"
-
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
-#, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr "无法访问头像URL '%s'"
+msgid "Unable to save your design settings."
+msgstr "无法保存 Twitter 设置！"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404 actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-msgid "Can't save new password."
-msgstr "无法保存新密码。"
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+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
-#: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
-msgstr "取消"
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "用户没有个人信息。"
 
-#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "无法创建 OpenID 用户对象。"
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "无法保存个人信息。"
 
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
-msgstr "无法识别此Jabber ID"
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
+msgstr "阻止用户失败。"
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
-msgid "Cannot normalize that email address"
-msgstr "无法识别此电子邮件"
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
+msgstr "取消阻止用户失败。"
 
-#: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
-msgstr "修改"
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "消息没有正文！"
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
-msgstr "修改电子邮件"
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "超出长度限制。不能超过 140 个字符。"
 
-#: ../actions/password.php:32 actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr "修改密码"
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "未找到收件人。"
 
-#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
-msgid "Change your password"
-msgstr "修改密码"
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr "无法向并非好友的用户发送直接消息。"
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-msgid "Change your profile settings"
-msgstr "修改您的个人信息"
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "发给 %s 的直接消息"
 
-#: ../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
-#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
-#: actions/register.php:376 actions/smssettings.php:122
-msgid "Confirm"
-msgstr "确认"
+#: actions/apidirectmessage.php:93
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr "%s 发送的直接消息"
 
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "确认地址"
+#: actions/apidirectmessage.php:101
+#, php-format
+msgid "Direct messages to %s"
+msgstr "发给 %s 的直接消息"
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245 actions/emailsettings.php:256
-#: actions/imsettings.php:230 actions/smssettings.php:253
-#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
-msgid "Confirmation cancelled."
-msgstr "已取消确认。"
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr "发给 %s 的直接消息"
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
-msgid "Confirmation code"
-msgstr "确认码"
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "API 方法未实现！"
 
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-msgid "Confirmation code not found."
-msgstr "未找到确认码。"
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
+msgstr "没有找到此ID的信息。"
 
-#: ../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"
-"* 查看你的资料Go to [your profile](%s) 发布你的第一条消息.\n"
-"* 填加 [Jabber/GTalk address](%%%%action.imsettings%%%%) 然后你可以通过即时消息平台发布信息。\n"
-"* [Search for people](%%%%action.peoplesearch%%%%) 你认识的或和你有共同兴趣的朋友。 \n"
-"* 更新你的 [profile settings](%%%%action.profilesettings%%%%) 告诉大家更多关于你的情况。 \n"
-"* 请阅读 [online docs](%%%%doc.help%%%%) 有的功能也许你还不熟悉。\n"
-"\n"
-"感谢您的注册，希望您喜欢这个服务。"
+#: actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+msgstr "已收藏此通告！"
 
-#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
-msgid "Connect"
-msgstr "连接"
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+msgstr "无法创建收藏。"
 
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
-msgid "Connect existing account"
-msgstr "连接现有帐号"
+#: actions/apifavoritedestroy.php:122
+#, fuzzy
+msgid "That status is not a favorite!"
+msgstr "此通告未被收藏！"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
-msgid "Contact"
-msgstr "联系人"
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr "无法删除收藏。"
 
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
-#, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "无法创建 OpenID 表单：%s"
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
+msgstr "无法订阅用户：未找到。"
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "无法订阅用户：%s 已在订阅列表中。"
 
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
-msgid "Could not follow user: User not found."
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
 msgstr "无法订阅用户：未找到。"
 
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr "无法重定向到服务器：%s"
-
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
-msgid "Could not save avatar info"
-msgstr "无法保存头像"
-
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
-msgid "Could not save new profile info"
-msgstr "无法保存个人信息"
-
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
-msgid "Could not subscribe other to you."
-msgstr "无法订阅他人更新。"
-
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
-msgid "Could not subscribe."
-msgstr "无法订阅。"
-
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
-msgstr "无法更新已确认的电子邮件。"
-
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-msgid "Couldn't convert request tokens to access tokens."
-msgstr "无法将请求标记转换为访问令牌。"
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+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
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-msgid "Couldn't delete email confirmation."
-msgstr "无法删除电子邮件确认。"
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
+msgstr "必须提供两个用户帐号或昵称。"
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
-msgid "Couldn't delete subscription."
-msgstr "无法删除订阅。"
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "无法获取收藏的通告。"
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
-msgid "Couldn't find any statuses."
+#: actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
 msgstr "找不到任何信息。"
 
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-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
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
-msgid "Couldn't insert confirmation code."
-msgstr "无法插入验证码。"
-
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
-msgstr "无法添加新的订阅。"
-
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-msgid "Couldn't save profile."
-msgstr "无法保存个人信息。"
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
-msgstr "无法更新用户的自动订阅选项。"
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
-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
-#: actions/confirmaddress.php:114 actions/emailsettings.php:280
-#: actions/emailsettings.php:411 actions/imsettings.php:252
-#: actions/imsettings.php:395 actions/othersettings.php:162
-#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
-msgid "Couldn't update user."
-msgstr "无法更新用户。"
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
+msgid "Could not create group."
+msgstr "无法创建组。"
 
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
-msgid "Create"
-msgstr "创建"
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "无法创建收藏。"
 
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
-msgid "Create a new user with this nickname."
-msgstr "创建使用此昵称的新用户。"
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "无法删除订阅。"
 
-#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
-msgid "Create new account"
-msgstr "创建新帐号"
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "昵称只能使用小写字母和数字，不包含空格。"
 
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
-msgid "Creating new account for OpenID that already has a user."
-msgstr "为 OpenID 用户产生新的帐号。"
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr "昵称已被使用，换一个吧。"
 
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "已确认的Jabber/GTalk帐号。"
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "不是有效的昵称。"
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "已确认的可以发送SMS短消息的电话号码。"
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "主页的URL不正确。"
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-msgid "Current confirmed email address."
-msgstr "已确认的电子邮件。"
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "全名过长(不能超过 255 个字符)。"
 
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
-msgstr "目前"
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "描述过长(不能超过140字符)。"
 
-#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "添加标签时数据库出错：%s"
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "位置过长(不能超过255个字符)。"
 
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
 #, php-format
-msgid "DB error inserting reply: %s"
-msgstr "添加回复时数据库出错：%s"
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
-msgid "Delete notice"
-msgstr "删除通告"
-
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "用不超过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 actions/register.php:381
-#: actions/register.php:385 lib/accountsettingsaction.php:113
-msgid "Email"
-msgstr "电子邮件"
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-msgid "Email Address"
-msgstr "电子邮件地址"
-
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
-msgstr "电子邮件设置"
-
-#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-msgid "Email address already exists."
-msgstr "电子邮件地址已存在。"
-
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
-msgid "Email address confirmation"
-msgstr "电子邮件地址确认"
-
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
-msgstr "电子邮件，类似 \"UserName@example.org\""
-
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-msgid "Email addresses"
-msgstr "电子邮件地址"
+msgid "Too many aliases! Maximum %d."
+msgstr ""
 
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
-msgid "Enter a nickname or email address."
-msgstr "输入昵称或电子邮件。"
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "主页'%s'不正确"
 
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
-msgstr "输入手机收到的验证码。"
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "昵称已被使用，换一个吧。"
 
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
-msgid "Error authorizing token"
-msgstr "无法认证令牌"
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
-msgid "Error connecting user to OpenID."
-msgstr "无法将用户与 OpenID 连接。"
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "您已经是该组成员"
 
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
-msgstr "无法连接用户。"
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
-msgstr "添加头像出错"
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "无法把 %s 用户添加到 %s 组"
 
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
-msgstr "添加个人信息出错"
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "您未告知此个人信息"
 
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
-msgstr "添加远程的个人信息出错"
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "无法订阅用户：未找到。"
 
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
-msgid "Error saving address confirmation."
-msgstr "保存地址确认时出错。"
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "%s 群组"
 
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
-msgid "Error saving remote profile"
-msgstr "保存远程的个人信息时出错"
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "组动作"
 
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-msgid "Error saving the profile."
-msgstr "保存个人信息时出错。"
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "%s 群组"
 
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-msgid "Error saving the user."
-msgstr "保存用户时出错。"
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "%s 组是成员组成了"
 
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
-msgid "Error saving user; invalid."
-msgstr "保存用户时出错；不正确。"
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
+msgstr "此方法接受POST或DELETE请求。"
 
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
-#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
-#: actions/register.php:108 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-msgid "Error setting user."
-msgstr "保存用户设置时出错。"
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
+msgstr "您不能删除其他用户的状态。"
 
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr "更新个人信息时出错"
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "头像已更新。"
 
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
-msgstr "更新远程的个人信息时出错"
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
+msgstr "没有找到此ID的信息。"
 
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr "验证码出错。"
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "超出长度限制。不能超过 140 个字符。"
 
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
-msgid "Existing nickname"
-msgstr "昵称已被使用"
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
+msgstr "未找到"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
-msgid "FAQ"
-msgstr "常见问题FAQ"
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
 
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
-msgid "Failed updating avatar."
-msgstr "更新头像失败。"
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "不支持这种图像格式。"
 
-#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/apitimelinefavorites.php:107
 #, php-format
-msgid "Feed for friends of %s"
-msgstr "%s 好友的聚合"
+msgid "%s / Favorites from %s"
+msgstr "%s 的收藏 / %s"
 
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
+#: actions/apitimelinefavorites.php:119
 #, php-format
-msgid "Feed for replies to %s"
-msgstr "%s 回复的聚合"
+msgid "%s updates favorited by %s / %s."
+msgstr "%s 收藏了 %s 的 %s 通告。"
 
-#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
-msgid "Feed for tag %s"
-msgstr "%s 标签的聚合"
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
-msgstr "搜索通告内容"
-
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-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
-#: actions/profilesettings.php:103 actions/register.php:391
-#: actions/showgroup.php:235 actions/showstream.php:262
-#: actions/tagother.php:105 lib/groupeditform.php:142
-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
-#: actions/editgroup.php:195 actions/newgroup.php:146
-#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
-msgid "Full name is too long (max 255 chars)."
-msgstr "全名过长(不能超过 255 个字符)。"
-
-#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
-msgid "Help"
-msgstr "帮助"
-
-#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
-msgid "Home"
-msgstr "主页"
-
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
-msgid "Homepage"
-msgstr "主页"
-
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
-msgid "Homepage is not a valid URL."
-msgstr "主页的URL不正确。"
-
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
-msgid "I want to post notices by email."
-msgstr "我希望通过邮件发布信息。"
-
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
-msgstr "即时通讯IM"
-
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
-msgstr "IM 帐号"
-
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
-msgstr "IM 设置"
-
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
-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
-#: actions/emailsettings.php:127 actions/smssettings.php:140
-msgid "Incoming email"
-msgstr "发布用的电子邮件"
-
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
-msgid "Incoming email address removed."
-msgstr "发布用的电子邮件被移除。"
-
-#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
-msgid "Incorrect old password"
-msgstr "旧密码不正确"
+msgid "%s timeline"
+msgstr "%s 时间表"
 
-#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
-msgid "Incorrect username or password."
-msgstr "用户名或密码不正确。"
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "%2$s 上 %1$s 的更新！"
 
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
-msgstr "恢复密码的指示已被发送到您的注册邮箱。"
+#: actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / 回复 %2$s 的消息"
 
-#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/apitimelinementions.php:126
 #, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "头像URL '%s'不正确"
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr "回复 %2$s / %3$s 的 %1$s 更新。"
 
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
 #, php-format
-msgid "Invalid email address: %s"
-msgstr "电子邮件地址 %s 不正确"
+msgid "%s public timeline"
+msgstr "%s 公众时间表"
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
 #, php-format
-msgid "Invalid homepage '%s'"
-msgstr "主页'%s'不正确"
+msgid "%s updates from everyone!"
+msgstr "来自所有人的 %s 消息！"
 
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/apitimelinetag.php:101 actions/tag.php:66
 #, php-format
-msgid "Invalid license URL '%s'"
-msgstr "授权方式URL '%s'不正确"
-
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
-msgstr "通告内容不正确"
+msgid "Notices tagged with %s"
+msgstr "带 %s 标签的通告"
 
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
-msgstr "通告URI不正确"
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "%2$s 上 %1$s 的更新！"
 
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
-msgstr "通告URL不正确"
+#: actions/apiusershow.php:96
+#, fuzzy
+msgid "Not found."
+msgstr "未找到"
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "个人信息URL '%s'不正确。"
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "没有这份文档。"
 
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
-msgstr "个人信息URL不正确(格式错误)"
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+msgstr "没有昵称。"
 
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
-msgstr "服务器返回的个人信息URL不正确。"
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "没有大小。"
 
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 #: actions/avatarbynickname.php:69
 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
-#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
-msgid "Invalid username or password."
-msgstr "用户名或密码不正确。"
-
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-msgid "Invitation(s) sent"
-msgstr "已发送邀请"
-
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-msgid "Invitation(s) sent to the following people:"
-msgstr "已发送邀请给这些人："
-
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
-msgid "Invite"
-msgstr "邀请"
-
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-msgid "Invite new users"
-msgstr "邀请新用户"
-
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
-#, php-format
-msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
-msgstr ""
-"它运行[StatusNet](http://status.net/)微博客服务，版本 %s，采用[GNU Affero "
-"General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)"
-"授权。"
-
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-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
-#: actions/profilesettings.php:128
-msgid "Language"
-msgstr "语言"
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "头像"
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
-msgid "Language is too long (max 50 chars)."
-msgstr "语言过长(不能超过50个字符)。"
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "您可以在这里上传个人头像。"
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
-msgid "Location"
-msgstr "位置"
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
+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
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
-msgid "Location is too long (max 255 chars)."
-msgstr "位置过长(不能超过255个字符)。"
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+msgid "Avatar settings"
+msgstr "头像设置"
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
-#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
-#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
-#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
-#, php-format
-msgid "Login"
-msgstr "登录"
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr "原来的"
 
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "使用[OpenID](%%doc.openid%%)帐号登录。"
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+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 ""
-"请使用你的帐号和密码登入。没有帐号？[注册](%%action.register%%) 一个新帐号, 或使用 "
-"[OpenID](%%action.openidlogin%%). "
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+#, fuzzy
+msgid "Delete"
+msgstr "删除"
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
-msgid "Logout"
-msgstr "登出"
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+msgstr "上传"
 
-#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
-msgid "Longer name, preferably your \"real\" name"
-msgstr "长名字，最好是“实名”"
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
+msgstr "剪裁"
 
-#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
-msgid "Lost or forgotten password?"
-msgstr "忘记了密码？"
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+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/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "未预料的表单提交。"
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#: actions/emailsettings.php:71
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr "设置 %%site.name%% 发送的邮件。"
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
+msgstr "请选择一块方形区域作为你的头像"
 
-#: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
-msgid "Member since"
-msgstr "用户始于"
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
+msgstr "文件数据丢失"
 
-#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
-#, php-format
-msgid "Microblog by %s"
-msgstr "%s 的微博客服务"
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+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 ""
-"电话的服务商。如果您的服务商支持通过电子邮件发送SMS短信，而这里尚未列出，请联"
-"系 %s 以告知。"
+#: actions/avatarsettings.php:363
+msgid "Failed updating avatar."
+msgstr "更新头像失败。"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-msgid "My text and files are available under "
-msgstr "我的文字和文件采用的授权方式为"
+#: actions/avatarsettings.php:387
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "头像已更新。"
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#: actions/emailsettings.php:142 actions/smssettings.php:152
-msgid "New"
-msgstr "新建"
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+#, fuzzy
+msgid "No nickname"
+msgstr "没有昵称。"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
-#, php-format
-msgid "New email address for posting to %s"
-msgstr "新的电子邮件地址，用于发布 %s 信息"
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
+msgstr "没有这个组"
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
-msgid "New incoming email address added."
-msgstr "已添加新的发布用的电子邮件地址。"
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "用户没有个人信息。"
 
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
-msgid "New nickname"
-msgstr "新昵称"
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s 及好友"
 
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
-msgstr "新通告"
+#: actions/blockedfromgroup.php:108
+#, fuzzy
+msgid "A list of the users blocked from joining this group."
+msgstr "该组成员列表。"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-msgid "New password"
-msgstr "新密码"
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "取消阻止用户失败。"
 
-#: ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
-msgstr "新密码已保存，您现在已登录。"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
+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
-#: actions/login.php:228 actions/profilesettings.php:98
-#: actions/register.php:367 actions/showgroup.php:224
-#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
-msgid "Nickname"
-msgstr "昵称"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+#, fuzzy
+msgid "Unblock this user"
+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
-#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
-msgid "Nickname already in use. Try another one."
-msgstr "昵称已被使用，换一个吧。"
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+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
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "昵称只能使用小写字母和数字，不包含空格。"
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+#, fuzzy
+msgid "No profile specified."
+msgstr "没有收件人。"
 
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
-msgid "Nickname not allowed."
-msgstr "不允许的昵称。"
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+#, fuzzy
+msgid "No profile with that ID."
+msgstr "没有找到此ID的信息。"
 
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
-msgstr "希望订阅的用户的昵称"
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#, fuzzy
+msgid "Block user"
+msgstr "阻止用户"
 
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
-msgid "Nickname or email"
-msgstr "昵称或电子邮件"
+#: actions/block.php:136
+msgid ""
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
+msgstr ""
 
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
+#: actions/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
 msgid "No"
 msgstr "否"
 
-#: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
-msgstr "没有 Jabber ID。"
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user"
+msgstr "取消阻止次用户"
 
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
-msgid "No authorization request!"
-msgstr "未收到认证请求！"
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
+msgstr "是"
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
-msgid "No carrier selected."
-msgstr "未选择运营商。"
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "阻止该用户"
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
-msgstr "没有输入验证码"
+#: actions/block.php:165
+msgid "You have already blocked this user."
+msgstr "您已成功阻止该用户："
+
+#: actions/block.php:170
+msgid "Failed to save block information."
+msgstr "保存阻止信息失败。"
+
+#: actions/bookmarklet.php:50
+#, fuzzy
+msgid "Post to "
+msgstr "相片"
 
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 #: actions/confirmaddress.php:75
 msgid "No confirmation code."
 msgstr "没有验证码"
 
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
-#: actions/newnotice.php:126 classes/Command.php:223
-msgid "No content!"
-msgstr "没有内容！"
-
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
-msgid "No email address."
-msgstr "没有电子邮件地址。"
-
-#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
-msgid "No id."
-msgstr "没有 id。"
-
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
-msgid "No incoming email address."
-msgstr "没有发布用的电子邮件地址。"
-
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr "远程服务器没有昵称。"
-
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
-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
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
-msgid "No pending confirmation to cancel."
-msgstr "没有可以取消的确认。"
-
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
-msgstr "没有电话号码。"
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "未找到确认码。"
 
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
-msgstr "服务器没有返回个人信息URL。"
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "此确认码不适用！"
 
-#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
-msgid "No registered email address for that user."
-msgstr "用户没有注册电子邮件。"
+#: actions/confirmaddress.php:90
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr "不可识别的地址类型 %s"
 
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr "没有找到请求！"
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr "此地址已被确认。"
 
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
-msgid "No results"
-msgstr "没有结果"
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "无法更新用户。"
 
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
-msgstr "没有大小。"
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr "无法删除电子邮件确认。"
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
-msgid "No status found with that ID."
-msgstr "没有找到此ID的信息。"
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "确认地址"
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
-msgid "No status with that ID found."
-msgstr "没有找到此ID的信息。"
+#: actions/confirmaddress.php:159
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "地址 \"%s\" 已确认。"
 
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
-msgstr "没有这个 OpenID。"
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "确认码"
 
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
-msgid "No such document."
-msgstr "没有这份文档。"
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
+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 actions/shownotice.php:87
-#: lib/deleteaction.php:51
+#: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "没有这份通告。"
 
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr "没有这个恢复码。"
-
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-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 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
-msgid "No such user."
-msgstr "没有这个用户。"
-
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-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
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr "不是恢复码。"
-
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
-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 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
-msgid "Not a supported data format."
-msgstr "不支持的数据格式。"
-
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
-msgstr "不是有效的 Jabber ID"
-
-#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-msgid "Not a valid OpenID."
-msgstr "不是有效的 OpenID。"
-
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
-msgid "Not a valid email address"
-msgstr "不是有效的电子邮件"
-
-#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-msgid "Not a valid email address."
-msgstr "不是有效的电子邮件。"
-
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-#: actions/editgroup.php:186 actions/newgroup.php:137
-#: actions/profilesettings.php:195 actions/register.php:161
-msgid "Not a valid nickname."
-msgstr "不是有效的昵称。"
-
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
-msgstr "不是有效的个人信息URL(不正确的服务)。"
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "无法删除通告。"
 
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr "不是有效的个人信息URL(未定义XRDS)。"
+#: actions/deletenotice.php:103
+#, fuzzy
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr "您选择了永久删除通告。这样做是无法恢复的。"
 
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr "不是有效的个人信息URL(没有YADIS数据)。"
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr "删除通告"
 
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
-msgid "Not an image or corrupt file."
-msgstr "不是图片文件或文件已损坏。"
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr "确定要删除这条消息吗？"
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
-msgid "Not authorized."
-msgstr "未认证。"
+#: actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "无法删除通告。"
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
-msgid "Not expecting this response!"
-msgstr "未预料的响应！"
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+#, fuzzy
+msgid "Delete this notice"
+msgstr "删除通告"
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
-msgid "Not found"
-msgstr "未找到"
+#: actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
+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 actions/block.php:59 actions/disfavor.php:61
-#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
-#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
-#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
-#: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "未登录。"
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr "此通告未被收藏！"
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
-msgid "Not subscribed!."
-msgstr "未订阅！"
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "加入收藏"
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
-msgstr "搜索通告"
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "没有这份文档。"
 
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
+#: actions/editgroup.php:56
 #, php-format
-msgid "Notice feed for %s"
-msgstr "%s 的通告聚合"
+msgid "Edit %s group"
+msgstr "编辑 %s 组"
 
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
-msgstr "通告没有关联个人信息"
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
+msgstr "您必须登录才能创建小组。"
 
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
-msgid "Notices"
-msgstr "通告"
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+msgid "You must be an admin to edit the group"
+msgstr "只有admin才能编辑这个组"
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
-#, php-format
-msgid "Notices tagged with %s"
-msgstr "带 %s 标签的通告"
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
+msgstr "使用这个表单来编辑组"
 
-#: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
-msgstr "旧密码"
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "描述过长(不能超过140字符)。"
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
-msgid "OpenID"
-msgstr "OpenID"
-
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
-msgid "OpenID Account Setup"
-msgstr "OpenID 帐号设置"
-
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-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
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-msgid "OpenID Login"
-msgstr "OpenID 登录"
-
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-#: actions/openidlogin.php:102 actions/openidsettings.php:101
-msgid "OpenID URL"
-msgstr "OpenID URL"
-
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
-msgid "OpenID authentication cancelled."
-msgstr "OpenID 认证已取消。"
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr "OpenID 认证失败：%s"
-
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "OpenID 失败：%s"
-
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr "OpenID 已移除。"
-
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
-msgstr "OpenID 设置"
-
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-msgid "Optionally add a personal message to the invitation."
-msgstr "在邀请中加几句话(可选)。"
+#: actions/editgroup.php:253
+msgid "Could not update group."
+msgstr "无法更新组"
 
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
-msgid "Partial upload."
-msgstr "部分上传。"
+#: actions/editgroup.php:269
+msgid "Options saved."
+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 actions/finishopenidlogin.php:118
-#: actions/login.php:231 actions/register.php:372
-#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-msgid "Password"
-msgstr "密码"
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "电子邮件设置"
 
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
-msgid "Password and confirmation do not match."
-msgstr "密码和确认不匹配。"
+#: actions/emailsettings.php:71
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr "设置 %%site.name%% 发送的邮件。"
 
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
-msgid "Password must be 6 chars or more."
-msgstr "密码必须是 6 个字符或更多。"
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "地址"
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-msgid "Password recovery requested"
-msgstr "请求恢复密码"
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr "已确认的电子邮件。"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-msgid "Password saved."
-msgstr "密码已保存。"
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "移除"
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-msgid "Passwords don't match."
-msgstr "密码不匹配。"
+#: actions/emailsettings.php:113
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
+"等待确认此地址。请查看您的收件箱(和垃圾箱)是否收到了邮件，其中包含了进一步的"
+"指示。"
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
-msgstr "用户"
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "取消"
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
-msgstr "搜索用户"
+#: actions/emailsettings.php:121
+msgid "Email Address"
+msgstr "电子邮件地址"
 
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
-msgstr "搜索用户"
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr "电子邮件，类似 \"UserName@example.org\""
 
-#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
-msgid "Personal"
-msgstr "个人"
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "添加"
 
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-msgid "Personal message"
-msgstr "个人消息"
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+msgstr "发布用的电子邮件"
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "电话号码，不带标点或空格，包含地区代码"
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
+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/emailsettings.php:145 actions/smssettings.php:162
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr "生成新的电子邮件地址用于发布信息；取消旧的。"
 
-#: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "当我的Jabber/GTalk状态改变时自动发布通告。"
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
+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 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 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
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
-msgid "Preferences saved."
-msgstr "首选项已保存。"
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
-msgid "Preferred language"
-msgstr "首选语言"
-
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
-msgid "Privacy"
-msgstr "隐私"
-
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-msgid "Problem saving notice."
-msgstr "保存通告时出错。"
-
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
-msgid "Profile"
-msgstr "个人信息"
-
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
-msgstr "个人信息URL"
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
+msgstr "如果有新订阅，通过电子邮件告诉我。"
 
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
-msgstr "个人设置"
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr "如果有人收藏我的通告，发邮件通知我。"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-msgid "Profile unknown"
-msgstr "未知的帐号"
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
+msgstr "如果收到私人信息，发邮件通知我。"
 
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
-msgid "Public Stream Feed"
-msgstr "公开的聚合"
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "如果收到私人信息，发邮件通知我。"
 
-#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
-msgid "Public timeline"
-msgstr "公开的时间表"
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
+msgstr "允许朋友们呼叫并给我发送邮件。"
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "公开Jabber/GTalk帐号的 MicroID。"
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
+msgstr "我希望通过邮件发布信息。"
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:191
 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
-#: actions/recoverpassword.php:190
-msgid "Recover"
-msgstr "恢复"
-
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
-msgid "Recover password"
-msgstr "恢复密码"
-
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-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
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-msgid "Register"
-msgstr "注册"
-
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
-msgid "Registration not allowed."
-msgstr "不允许注册。"
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "保存"
 
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
-msgid "Registration successful"
-msgstr "注册成功。"
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+msgstr "首选项已保存。"
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
-msgid "Reject"
-msgstr "拒绝"
+#: actions/emailsettings.php:319
+msgid "No email address."
+msgstr "没有电子邮件地址。"
 
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
-msgid "Remember me"
-msgstr "记住登录状态"
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
+msgstr "无法识别此电子邮件"
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
-msgid "Remote profile with no matching profile"
-msgstr "没有匹配的远程个人信息"
+#: actions/emailsettings.php:330
+msgid "Not a valid email address"
+msgstr "不是有效的电子邮件"
 
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
-msgstr "远程订阅"
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
+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 actions/emailsettings.php:101
-#: actions/emailsettings.php:134 actions/imsettings.php:102
-#: actions/openidsettings.php:166 actions/smssettings.php:103
-#: actions/smssettings.php:146 actions/twittersettings.php:115
-msgid "Remove"
-msgstr "移除"
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another user."
+msgstr "此电子邮件属于其他用户。"
 
-#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
-msgstr "移除OpenID"
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+msgstr "无法插入验证码。"
 
-#: ../actions/openidsettings.php:73
+#: actions/emailsettings.php:358
 msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
-msgstr "移除唯一的OpenID可能使您无法登陆！如果需要移除它，请先添加一个新的。"
+"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 ""
+"验证码已被发送到您新增的电子邮件。请检查收件箱(和垃圾箱)，找到验证码并按要求"
+"使用它。"
 
-#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
-msgid "Replies"
-msgstr "回复"
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
+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
-#: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
-#, php-format
-msgid "Replies to %s"
-msgstr "%s 的回复"
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "即时通讯帐号错误。"
 
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
-msgid "Reset"
-msgstr "重置"
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "已取消确认。"
 
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
-msgid "Reset password"
-msgstr "重置密码"
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
+msgstr "这是他人的电子邮件。"
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-msgid "SMS"
-msgstr "SMS短信"
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "地址被移除。"
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
-msgid "SMS Phone number"
-msgstr "SMS短信电话号码"
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
+msgstr "没有发布用的电子邮件地址。"
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
-msgstr "SMS短信设置"
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
+msgstr "无法更新用户记录。"
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
-msgid "SMS confirmation"
-msgstr "SMS短信确认"
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
+msgstr "发布用的电子邮件被移除。"
 
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
-msgid "Same as password above"
-msgstr "相同的密码"
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
+msgstr "已添加新的发布用的电子邮件地址。"
 
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
-msgid "Same as password above. Required."
-msgstr "相同的密码。此项必填。"
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+#, fuzzy
+msgid "Popular notices"
+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 actions/emailsettings.php:182
-#: actions/facebooksettings.php:114 actions/imsettings.php:157
-#: actions/othersettings.php:117 actions/profilesettings.php:150
-#: actions/smssettings.php:169 actions/subscriptions.php:124
-#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
-msgid "Save"
-msgstr "保存"
+#: actions/favorited.php:67
+#, fuzzy, php-format
+msgid "Popular notices, page %d"
+msgstr "没有这份通告。"
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
-msgid "Search"
-msgstr "搜索"
+#: actions/favorited.php:79
+#, fuzzy
+msgid "The most popular notices on the site right now."
+msgstr "显示上周以来最流行的标签"
 
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
-msgstr "搜索聚合"
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
-#, php-format
+#: actions/favorited.php:153
 msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
 msgstr ""
-"在 %%site.name%% 的通告内容中搜索。搜索条件至少包含 3 个字符，多个搜索条件用"
-"空格分隔。"
 
-#: ../actions/peoplesearch.php:28
+#: actions/favorited.php:156
 #, 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."
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
 msgstr ""
-"在 %%site.name%% 的用户信息中搜索，可以搜索姓名、未知和爱好。搜索条件至少包"
-"含 3 个字符，多个搜索条件用空格分隔。"
-
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
-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 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
-msgid "Send"
-msgstr "发送"
-
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
-msgstr "向这个电子邮件发信以发布新的通告。"
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
-msgstr "如果有新订阅，通过电子邮件告诉我。"
-
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
-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 lib/facebookaction.php:215
-msgid "Settings"
-msgstr "设置"
-
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
-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
-#: actions/finishaddopenid.php:114
-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
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
-msgstr "发生了奇怪的错误……"
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
-msgstr "对不起，发布用的电子邮件无法使用。"
-
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
-msgstr "对不起，这个发布用的电子邮件属于其他用户。"
-
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
-msgid "Source"
-msgstr "来源"
-
-#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
-msgid "Statistics"
-msgstr "统计"
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
+msgstr "%s 收藏的通告"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-msgid "Stored OpenID not found."
-msgstr "未找到已有的OpenID。"
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "%2$s 上 %1$s 的更新！"
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
-#: actions/showstream.php:197 actions/showstream.php:206
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
-msgid "Subscribe"
-msgstr "订阅"
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "已收藏此通告！"
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
-msgid "Subscribers"
-msgstr "订阅者"
+#: actions/favor.php:92 lib/disfavorform.php:140
+#, fuzzy
+msgid "Disfavor favorite"
+msgstr "取消收藏"
 
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
-msgid "Subscription authorized"
-msgstr "订阅已确认"
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr "推荐用户"
 
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
-msgid "Subscription rejected"
-msgstr "订阅被拒绝"
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr "推荐用户，第 %d 页"
 
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27 actions/showstream.php:240
-#: actions/showstream.php:322 actions/subscriptions.php:27
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
-msgid "Subscriptions"
-msgstr "订阅"
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
+msgstr "%s 优秀用户摘选"
 
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
-msgid "System error uploading file."
-msgstr "上传文件时出错。"
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "新通告"
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
-#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
-msgid "Tags"
-msgstr "标签"
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "新通告"
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "文本"
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
 
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
-msgid "Text search"
-msgstr "搜索文本"
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
 
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
-msgstr "此OpenID属于他人。"
+#: actions/finishremotesubscribe.php:69
+msgid "Not expecting this response!"
+msgstr "未预料的响应！"
 
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
-msgstr "此地址已被确认。"
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "要查看的用户不存在。"
 
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
-msgstr "此确认码不适用！"
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+msgstr "您可以在这里订阅！"
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr "此电子邮件属于其他用户。"
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
+msgstr "那个用户阻止了你的订阅。"
 
-#: ../actions/avatar.php:80 actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
-msgstr "文件超出大小限制。"
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "未认证。"
 
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
-msgid "That is already your Jabber ID."
-msgstr "您已登记此Jabber帐号。"
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "无法将请求标记转换为访问令牌。"
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
-msgid "That is already your email address."
-msgstr "您已登记此电子邮件。"
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "此OMB协议版本无效。"
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
-msgid "That is already your phone number."
-msgstr "您已登记此电话号码。"
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "更新远程的个人信息时出错"
 
-#: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
-msgid "That is not your Jabber ID."
-msgstr "这不是您的Jabber帐号。"
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+msgid "No such group."
+msgstr "没有这个组。"
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
-msgid "That is not your email address."
-msgstr "这是他人的电子邮件。"
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "没有这份通告。"
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
-msgstr "这是他人的电话号码。"
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "没有这份通告。"
 
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-#: actions/emailsettings.php:367 actions/imsettings.php:349
-msgid "That is the wrong IM address."
-msgstr "即时通讯帐号错误。"
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "没有收件人。"
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
-msgstr "确认码错误。"
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-msgid "That phone number already belongs to another user."
-msgstr "这个电话号码属于另一个用户。"
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "用户没有个人信息。"
 
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49 actions/twitapistatuses.php:330
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-msgid "That's too long. Max notice size is 140 chars."
-msgstr "超出长度限制。不能超过 140 个字符。"
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "您未告知此个人信息"
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "超出长度限制。不能超过 255 个字符。"
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "阻止用户"
 
-#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/groupblock.php:162
 #, 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
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
-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:"
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
 msgstr ""
-"订阅已确认，但是没有回传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/groupblock.php:178
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "该组成员列表。"
 
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
-#, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr "这是 %s 订阅的用户。"
+#: actions/groupblock.php:179
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "该组成员列表。"
 
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr "这是您订阅的用户。"
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
+msgstr ""
 
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
-msgid ""
-"These people are already users and you were automatically subscribed to them:"
-msgstr "这些好友已注册，您已自动订阅这些用户。"
+#: actions/groupbyid.php:74
+msgid "No ID"
+msgstr "没有ID"
 
-#: ../actions/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
-msgstr "验证码超时，请重来。"
+#: actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+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/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "组"
 
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
-#, php-format
+#: actions/groupdesignsettings.php:152
 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."
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
 msgstr ""
-"这是您第一次登陆 %s，我们需要将 OpenID 连接到这里的帐号。您可以创建新帐号，或"
-"者连接到已有的帐号。"
-
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-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 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
-msgid "This method requires a POST."
-msgstr "此方法接受POST请求。"
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "无法更新用户。"
 
-#: ../lib/util.php:164 lib/util.php:246
-msgid "This page is not available in a media type you accept"
-msgstr "这个页面不提供您想要的媒体类型"
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "无法保存 Twitter 设置！"
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
-msgid "Timezone"
-msgstr "时区"
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "同步选项已保存。"
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
-msgid "Timezone not selected."
-msgstr "未选择时区。"
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
+msgstr "组logo"
 
-#: ../actions/remotesubscribe.php:43
-#, php-format
+#: actions/grouplogo.php:150
+#, fuzzy, 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 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
-msgid "Two user ids or screen_names must be supplied."
-msgstr "必须提供两个用户帐号或昵称。"
-
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "您的主页、博客或在其他站点的URL"
-
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-msgid "URL of your profile on another compatible microblogging service"
-msgstr "您在其他兼容的微博客服务的个人信息URL"
-
-#: ../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 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-msgid "Unexpected form submission."
-msgstr "未预料的表单提交。"
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr "你可以给你的组上载一个logo图。"
 
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
-msgid "Unexpected password reset."
-msgstr "未预料的密码重置。"
+#: actions/grouplogo.php:362
+#, fuzzy
+msgid "Pick a square area of the image to be the logo."
+msgstr "请选择一块方形区域作为你的头像"
 
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-msgid "Unknown action"
-msgstr "未知动作"
+#: actions/grouplogo.php:396
+msgid "Logo updated."
+msgstr "logo已更新。"
 
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-msgid "Unknown version of OMB protocol."
-msgstr "此OMB协议版本无效。"
+#: actions/grouplogo.php:398
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "更新logo失败。"
 
-#: ../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/groupmembers.php:93 lib/groupnav.php:92
+#, php-format
+msgid "%s group members"
+msgstr "%s 组成员"
 
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
+#: actions/groupmembers.php:96
 #, php-format
-msgid "Unrecognized address type %s"
-msgstr "不可识别的地址类型 %s"
+msgid "%s group members, page %d"
+msgstr "%s 组成员, 第 %d 页"
 
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
-msgstr "退订"
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr "该组成员列表。"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-msgid "Unsupported OMB version"
-msgstr "不支持此OMB版本"
+#: actions/groupmembers.php:175 lib/groupnav.php:107
+msgid "Admin"
+msgstr "admin管理员"
 
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
-msgid "Unsupported image file format."
-msgstr "不支持这种图像格式。"
+#: actions/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
+msgstr "阻止"
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
-msgstr "使用SMS短信更新"
+#: actions/groupmembers.php:441
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "只有admin才能编辑这个组"
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
-msgstr "使用即时通讯工具(IM)更新"
+#: actions/groupmembers.php:473
+#, fuzzy
+msgid "Make Admin"
+msgstr "admin管理员"
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr "%2$s 上 %1$s 和好友的更新！"
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
-#, php-format
-msgid "Updates from %1$s on %2$s!"
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
 msgstr "%2$s 上 %1$s 的更新！"
 
-#: ../actions/avatar.php:68 actions/profilesettings.php:161
-#: actions/avatarsettings.php:162 actions/grouplogo.php:232
-msgid "Upload"
-msgstr "上传"
-
-#: ../actions/avatar.php:27
+#: actions/groupsearch.php:52
+#, fuzzy, php-format
 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."
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
-"在这里上传新的头像。上传后无法修改，请尽量使用正方形图片。图片必须使用与站点"
-"相同的授权。请使用您希望分享的属于您的图片。"
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr "上传个人信息头像"
-
-#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
-msgstr "使用这个表单来邀请好友和同事加入。"
-
-#: ../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 actions/finishremotesubscribe.php:94
-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
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-msgid "User has no profile."
-msgstr "用户没有个人信息。"
+"在 %%site.name%% 的用户信息中搜索，可以搜索姓名、未知和爱好。搜索条件至少包"
+"含 3 个字符，多个搜索条件用空格分隔。"
 
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
-msgstr "昵称"
+#: actions/groupsearch.php:58
+msgid "Group search"
+msgstr "组检索"
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr "未找到用户。"
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "没有结果"
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
-msgid "What timezone are you normally in?"
-msgstr "您一般处于哪个时区？"
+#: actions/groupsearch.php:82
+#, php-format
+msgid ""
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
+msgstr ""
 
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: actions/groupsearch.php:85
 #, php-format
-msgid "What's up, %s?"
-msgstr "怎么样，%s？"
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-#: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "你的位置，格式类似\"城市，省份，国家\""
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "组"
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/groups.php:64
 #, php-format
-msgid "Wrong image type for '%s'"
-msgstr "'%s' 图像格式错误"
+msgid "Groups, page %d"
+msgstr "组，第 %d 页"
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/groups.php:90
 #, 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
-#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
-msgid "Yes"
-msgstr "是"
-
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-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
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
-msgstr "已登录！"
-
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-msgid "You are already subscribed to these users:"
-msgstr "您已订阅这些用户："
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
-msgid "You are not friends with the specified user."
-msgstr "您与此用户并非好友。"
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+#, fuzzy
+msgid "Create a new group"
+msgstr "创建新组"
 
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr "在这里修改密码。选择一个好密码！"
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
 
-#: ../actions/register.php:135 actions/register.php:145
-msgid "You can create a new account to start posting notices."
-msgstr "请创建新帐号，开始发布通告。"
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "用户没有个人信息。"
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "您可以通过 %%site.name%% 的电子邮件接收SMS短信。"
+#: actions/groupunblock.php:128 actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+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:59
+msgid "IM Settings"
+msgstr "IM 设置"
 
-#: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2581,1644 +1429,1565 @@ 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
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
-msgstr "您可以在这里订阅！"
-
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
-msgid "You can't register if you don't agree to the license."
-msgstr "您必须同意此授权方可注册。"
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "这个页面不提供您想要的媒体类型"
 
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
-msgid "You did not send us that profile"
-msgstr "您未告知此个人信息"
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "已确认的Jabber/GTalk帐号。"
 
-#: ../lib/mail.php:147
+#: actions/imsettings.php:114
 #, 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"
+"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 ""
-"您的 %1$s 发布用地址已更新。\n"
-"\n"
-"发送邮件到 %2$s 来发布新消息。\n"
-"\n"
-"更多电子邮件的帮助请见 %3$s。\n"
-"\n"
-"为您效力的 %4$s"
+"正在等待这个地址的确认。请查阅你Jabber/GTalk的帐户看有没有收到进一步的指示。"
+"（你是否已经添加 %s为你的好友？）"
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
-msgid "You may not delete another user's status."
-msgstr "您不能删除其他用户的状态。"
-
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr "您必须登录才能邀请其他人使用 %s"
-
-#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr "如果其他人接受邀请并注册，您将得到通知。谢谢您推动了社区发展壮大！"
-
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr "您已得到确认。请输入新密码。"
-
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
-msgid "Your OpenID URL"
-msgstr "您的OpenID URL"
-
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
-msgstr "您在此服务器的昵称，或注册邮箱。"
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "IM 帐号"
 
-#: ../actions/openidsettings.php:28
+#: actions/imsettings.php:126
 #, php-format
 msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
-"account.  Manage your associated OpenIDs from here."
+"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 ""
-"[OpenID](%%doc.openid%%)允许您使用相同的帐号登录许多不同的站点。在这里管理已"
-"关联的 OpenID。"
-
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
-msgid "a few seconds ago"
-msgstr "几秒前"
-
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
-#, php-format
-msgid "about %d days ago"
-msgstr "%d 天前"
-
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
-#, php-format
-msgid "about %d hours ago"
-msgstr "%d 小时前"
-
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
-#, php-format
-msgid "about %d minutes ago"
-msgstr "%d 分钟前"
-
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
-#, php-format
-msgid "about %d months ago"
-msgstr "%d 个月前"
-
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
-msgid "about a day ago"
-msgstr "一天前"
-
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
-msgid "about a minute ago"
-msgstr "一分钟前"
-
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
-msgid "about a month ago"
-msgstr "一个月前"
-
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
-msgid "about a year ago"
-msgstr "一年前"
-
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
-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 actions/noticesearch.php:187
-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 actions/noticesearch.php:194
-msgid "reply"
-msgstr "回复"
-
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-msgid "same as password above"
-msgstr "相同的密码"
-
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
-msgid "unsupported file type"
-msgstr "不支持这种类型的文件"
-
-#: ../lib/util.php:1309 lib/util.php:1443
-#, fuzzy
-msgid "« After"
-msgstr "« 之后"
+"Jabber 或 GTalk 帐号，类似\"UserName@example.org\"。首先，必须在即时聊天工具"
+"或GTalk中将 %s 加为好友。"
 
-#: 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
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-msgid "There was a problem with your session token. Try again, please."
-msgstr "会话标识有问题，请重试。"
+#: actions/imsettings.php:143
+msgid "Send me notices through Jabber/GTalk."
+msgstr "通过Jabber/GTalk发送通告。"
 
-#: actions/disfavor.php:55 actions/disfavor.php:81
-msgid "This notice is not a favorite!"
-msgstr "此通告未被收藏！"
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr "当我的Jabber/GTalk状态改变时自动发布通告。"
 
-#: actions/disfavor.php:63 actions/disfavor.php:87
-msgid "Could not delete favorite."
-msgstr "无法删除收藏。"
+#: actions/imsettings.php:153
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr "如果我尚未订阅的用户回我消息，使用Jabber/GTalk通知我。"
 
-#: actions/disfavor.php:72 lib/favorform.php:140
-msgid "Favor"
-msgstr "收藏"
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "公开Jabber/GTalk帐号的 MicroID。"
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
-msgstr "如果有人收藏我的通告，发邮件通知我。"
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "没有 Jabber ID。"
 
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-msgid "Send me email when someone sends me a private message."
-msgstr "如果收到私人信息，发邮件通知我。"
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr "无法识别此Jabber ID"
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
-msgid "This notice is already a favorite!"
-msgstr "已收藏此通告！"
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "不是有效的 Jabber ID"
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132 actions/favor.php:86
-#: actions/twitapifavorites.php:125 classes/Command.php:152
-msgid "Could not create favorite."
-msgstr "无法创建收藏。"
+#: actions/imsettings.php:299
+msgid "That is already your Jabber ID."
+msgstr "您已登记此Jabber帐号。"
 
-#: actions/favor.php:70
-msgid "Disfavor"
-msgstr "取消收藏"
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr "Jabber ID 属于另一用户。"
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/imsettings.php:327
 #, php-format
-msgid "%s favorite notices"
-msgstr "%s 收藏的通告"
+msgid ""
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr "验证码已被发送到您新增的即时通讯帐号。您必须允许 %s 向您发送信息。"
 
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
-#, php-format
-msgid "Feed of favorite notices of %s"
-msgstr "%s 的收藏的聚合"
+#: actions/imsettings.php:387
+msgid "That is not your Jabber ID."
+msgstr "这不是您的Jabber帐号。"
 
-#: actions/inbox.php:28 actions/inbox.php:59
+#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %s - page %d"
 msgstr "%s 的收件箱 - 第 %d 页"
 
-#: actions/inbox.php:30 actions/inbox.php:62
+#: actions/inbox.php:62
 #, php-format
 msgid "Inbox for %s"
 msgstr "%s 的收件箱"
 
-#: actions/inbox.php:53 actions/inbox.php:115
+#: actions/inbox.php:115
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr "这是您的收件箱，包含发给您的私人消息。"
 
-#: actions/invite.php:178 actions/invite.php:213
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+#: actions/invite.php:39
+msgid "Invites have been disabled."
 msgstr ""
-"%1$s 邀请您加入 %2$s (%3$s)。\n"
-"\n"
 
-#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-msgid "Automatically login in the future; "
-msgstr "保持登录状态；"
+#: actions/invite.php:41
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr "您必须登录才能邀请其他人使用 %s"
 
-#: actions/login.php:122 actions/login.php:264
-msgid "For security reasons, please re-enter your "
-msgstr "由于安全原因，请重新输入"
+#: actions/invite.php:72
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "电子邮件地址 %s 不正确"
 
-#: actions/login.php:126 actions/login.php:268
-msgid "Login with your username and password. "
-msgstr "输入用户名和密码以登录。"
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
+msgstr "已发送邀请"
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
-msgid "That's too long. Max message size is 140 chars."
-msgstr "超出长度限制。不能超过 140 个字符。"
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr "邀请新用户"
 
-#: actions/newmessage.php:65 actions/newmessage.php:128
-msgid "No recipient specified."
-msgstr "没有收件人。"
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr "您已订阅这些用户："
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206 actions/newmessage.php:131
-#: actions/newmessage.php:168 classes/Command.php:237
-msgid "You can't send a message to this user."
-msgstr "无法向此用户发送消息。"
+#: actions/invite.php:131 actions/invite.php:139
+#, php-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: actions/invite.php:136
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "不要向自己发送消息；跟自己悄悄说就得了。"
+"These people are already users and you were automatically subscribed to them:"
+msgstr "这些好友已注册，您已自动订阅这些用户。"
 
-#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
-msgid "No such user"
-msgstr "未找到用户"
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
+msgstr "已发送邀请给这些人："
 
-#: actions/newmessage.php:117 actions/newmessage.php:67
-msgid "New message"
-msgstr "新消息"
+#: actions/invite.php:150
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr "如果其他人接受邀请并注册，您将得到通知。谢谢您推动了社区发展壮大！"
 
-#: actions/noticesearch.php:95 actions/noticesearch.php:146
-msgid "Notice without matching profile"
-msgstr "找不到匹配的通告"
+#: actions/invite.php:162
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
+msgstr "使用这个表单来邀请好友和同事加入。"
 
-#: actions/openidsettings.php:28 actions/openidsettings.php:70
-#, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr "[OpenID](%%doc.openid%%)允许您登录许多不同的站点"
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "电子邮件地址"
 
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
-msgstr "如果您希望添加OpenID，"
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr "要邀请的好友地址(每行一个)"
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr "移除仅有的OpenID可能使您无法登陆！"
+#: actions/invite.php:192
+msgid "Personal message"
+msgstr "个人消息"
 
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-msgid "You can remove an OpenID from your account "
-msgstr "您可以移除一个OpenID"
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
+msgstr "在邀请中加几句话(可选)。"
 
-#: actions/outbox.php:28 actions/outbox.php:58
-#, php-format
-msgid "Outbox for %s - page %d"
-msgstr "%s 的发件箱 - 第 %d 页"
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
+msgstr "发送"
 
-#: actions/outbox.php:30 actions/outbox.php:61
+#: actions/invite.php:226
 #, php-format
-msgid "Outbox for %s"
-msgstr "%s 的发件箱"
-
-#: actions/outbox.php:53 actions/outbox.php:116
-msgid "This is your outbox, which lists private messages you have sent."
-msgstr "这是您的发件箱，包含您发送的私人消息。"
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s 邀请您加入 %2$s"
 
-#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
+#: actions/invite.php:228
 #, php-format
 msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
-msgstr "在 %%site.name%% 的用户信息中搜索，可以搜索姓名、未知和爱好。"
-
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
-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
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
-msgid "User without matching profile"
-msgstr "找不到匹配的用户。"
-
-#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
-msgstr "验证码超时。"
-
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
-msgstr "如果您忘记或丢失了您的"
+"%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"
+"%1$s 说:\n"
+"\n"
+"%4$s\n"
+"\n"
+"你可以在这里查阅 %1$s's 的资料 %2$s :\n"
+"\n"
+"%5$s\n"
+"\n"
+"如果你想使用这个服务，请点击一下链接接受邀请。\n"
+"%6$s\n"
+"\n"
+"如果你不愿意，请跳过这条信息。感谢您的耐心和时间。\n"
+"\n"
+"诚挚的感谢, %2$s\n"
 
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a "
-msgstr "您已得到确认。输入"
+#: actions/joingroup.php:60
+#, fuzzy
+msgid "You must be logged in to join a group."
+msgstr "您必须登录才能加入组。"
 
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-msgid "Your nickname on this server, "
-msgstr "您在服务器上的昵称，"
+#: actions/joingroup.php:90 lib/command.php:217
+msgid "You are already a member of that group"
+msgstr "您已经是该组成员"
 
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-msgid "Instructions for recovering your password "
-msgstr "恢复密码的步骤"
+#: actions/joingroup.php:128 lib/command.php:234
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s"
+msgstr "无法把 %s 用户添加到 %s 组"
 
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
-msgid "New password successfully saved. "
-msgstr "新密码已保存。"
+#: actions/joingroup.php:135 lib/command.php:239
+#, fuzzy, php-format
+msgid "%s joined group %s"
+msgstr "%s 加入 %s 组"
 
-#: actions/register.php:95 actions/register.php:180
-msgid "Password must be 6 or more characters."
-msgstr "密码必须包含 6 个或更多字符。"
+#: actions/leavegroup.php:60
+#, fuzzy
+msgid "You must be logged in to leave a group."
+msgstr "您必须登录才能邀请其他人使用 %s"
 
-#: 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/leavegroup.php:90 lib/command.php:268
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "您未告知此个人信息"
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
-msgstr "(您将立即收到一封电子邮件，含有"
+#: actions/leavegroup.php:119 lib/command.php:278
+#, fuzzy
+msgid "Could not find membership record."
+msgstr "无法更新用户记录。"
 
-#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
-#, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr "要订阅，请先[登录](%%action.login%%)，"
+#: actions/leavegroup.php:127 lib/command.php:284
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "无法订阅用户：未找到。"
 
-#: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
-msgid "Feed for favorites of %s"
-msgstr "%s 的收藏的聚合"
-
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-msgid "Could not retrieve favorite notices."
-msgstr "无法获取收藏的通告。"
+msgid "%s left group %s"
+msgstr "%s 离开群 %s"
 
-#: actions/showmessage.php:33 actions/showmessage.php:81
-msgid "No such message."
-msgstr "未找到此消息。"
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "已登录。"
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
-msgstr "只有发送和接受双方可以阅读此消息。"
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "通告内容不正确"
 
-#: actions/showmessage.php:61 actions/showmessage.php:108
-#, php-format
-msgid "Message to %1$s on %2$s"
-msgstr "发送给 %1$s 的 %2$s 消息"
+#: actions/login.php:143
+msgid "Incorrect username or password."
+msgstr "用户名或密码不正确。"
 
-#: actions/showmessage.php:66 actions/showmessage.php:113
-#, php-format
-msgid "Message from %1$s on %2$s"
-msgstr "来自 %1$s 的 %2$s 消息"
+#: actions/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
+msgstr "保存用户设置时出错。"
 
-#: actions/showstream.php:154
-msgid "Send a message"
-msgstr "发送消息"
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "登录"
 
-#: actions/smssettings.php:312 actions/smssettings.php:464
-#, php-format
-msgid "Mobile carrier for your phone. "
-msgstr "手机的运营商。"
+#: actions/login.php:243
+msgid "Login to site"
+msgstr "登录"
 
-#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
-#, php-format
-msgid "Direct messages to %s"
-msgstr "发给 %s 的直接消息"
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "昵称"
 
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
-#, php-format
-msgid "All the direct messages sent to %s"
-msgstr "发给 %s 的直接消息"
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "密码"
 
-#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-msgid "Direct Messages You've Sent"
-msgstr "您已发送的直接消息"
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "记住登录状态"
 
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
-#, php-format
-msgid "All the direct messages sent from %s"
-msgstr "%s 发送的直接消息"
+#: actions/login.php:253 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
+msgstr "保持这台机器上的登录状态。不要在共用的机器上保持登录！"
 
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-msgid "No message text!"
-msgstr "消息没有正文！"
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "忘记了密码？"
 
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-msgid "Recipient user not found."
-msgstr "未找到收件人。"
+#: actions/login.php:282
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr "由于安全原因，修改设置前需要输入用户名和密码。"
 
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr "无法向并非好友的用户发送直接消息。"
+#: actions/login.php:286
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"请使用你的帐号和密码登入。没有帐号？[注册](%%action.register%%) 一个新帐号, "
+"或使用 [OpenID](%%action.openidlogin%%). "
 
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
-#, php-format
-msgid "%s / Favorites from %s"
-msgstr "%s 的收藏 / %s"
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
 
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/makeadmin.php:95
 #, php-format
-msgid "%s updates favorited by %s / %s."
-msgstr "%s 收藏了 %s 的 %s 通告。"
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
+#: actions/makeadmin.php:132
 #, php-format
-msgid "%s added your notice as a favorite"
-msgstr "%s 收藏了您的通告"
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
+#: actions/makeadmin.php:145
 #, php-format
-msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+msgid "Can't make %s an admin for group %s"
 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 actions/twittersettings.php:60
-msgid "Twitter settings"
-msgstr "Twitter 设置"
-
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-msgid "Twitter Account"
-msgstr "Twitter 帐号"
-
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-msgid "Current verified Twitter account."
-msgstr "已验证的 Twitter 帐号。"
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr "没有当前状态"
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr "Twitter 用户名"
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr "新组"
 
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-msgid "No spaces, please."
-msgstr "请不要包含空格。"
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
+msgstr "使用此表格创建组。"
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
-msgstr "Twitter 密码"
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr "新消息"
 
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-msgid "Automatically send my notices to Twitter."
-msgstr "自动将我的通告转发到 Twitter。"
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
+msgstr "无法向此用户发送消息。"
 
-#: actions/twittersettings.php:75 actions/twittersettings.php:146
-msgid "Send local \"@\" replies to Twitter."
-msgstr "将这里的 \"@\" 回复发送到 Twitter。"
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+msgstr "没有内容！"
 
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-msgid "Subscribe to my Twitter friends here."
-msgstr "在这里订阅 Twitter 好友。"
+#: actions/newmessage.php:158
+msgid "No recipient specified."
+msgstr "没有收件人。"
 
-#: actions/twittersettings.php:122
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
-msgstr "用户名只能包含数字，大写和小写字母和下划线。不能超过 15 个字符。"
+"Don't send a message to yourself; just say it to yourself quietly instead."
+msgstr "不要向自己发送消息；跟自己悄悄说就得了。"
 
-#: actions/twittersettings.php:128 actions/twittersettings.php:334
-msgid "Could not verify your Twitter credentials!"
-msgstr "不能验证 Twitter 帐号！"
+#: actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "新消息"
 
-#: actions/twittersettings.php:137
+#: actions/newmessage.php:185 lib/command.php:375
 #, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr "无法从 Twitter 获取\"%s\"的帐号信息。"
-
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-msgid "Unable to save your Twitter settings!"
-msgstr "无法保存 Twitter 设置！"
-
-#: actions/twittersettings.php:174 actions/twittersettings.php:376
-msgid "Twitter settings saved."
-msgstr "Twitter 设置已保存。"
-
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-msgid "That is not your Twitter account."
-msgstr "此 Twitter 帐号属于他人。"
-
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
-msgid "Couldn't remove Twitter user."
-msgstr "无法移除 Twitter 用户。"
-
-#: actions/twittersettings.php:212 actions/twittersettings.php:407
-msgid "Twitter account removed."
-msgstr "Twitter 帐号已移除。"
-
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
-msgid "Couldn't save Twitter preferences."
-msgstr "无法保存 Twitter 首选项。"
-
-#: actions/twittersettings.php:245 actions/twittersettings.php:461
-msgid "Twitter preferences saved."
-msgstr "Twitter 首选项已保存。"
-
-#: actions/userauthorization.php:84 actions/userauthorization.php:86
-msgid "Please check these details to make sure "
-msgstr "请检查详细信息"
-
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
-msgid "The subscription has been authorized, but no "
-msgstr "订阅已确认，但是"
-
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-msgid "The subscription has been rejected, but no "
-msgstr "订阅已拒绝，但是"
-
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-msgid "Command results"
-msgstr "执行结果"
+msgid "Direct message to %s sent"
+msgstr "已向 %s 发送消息"
 
-#: classes/Channel.php:148 classes/Channel.php:204
-msgid "Command complete"
-msgstr "执行完毕"
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
+msgstr "Ajax错误"
 
-#: classes/Channel.php:158 classes/Channel.php:215
-msgid "Command failed"
-msgstr "执行失败"
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "新通告"
 
-#: classes/Command.php:39 classes/Command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "对不起，这个命令还没有实现。"
+#: actions/newnotice.php:199
+msgid "Notice posted"
+msgstr "消息已发布。"
 
-#: classes/Command.php:96 classes/Command.php:113
+#: actions/noticesearch.php:68
 #, php-format
-msgid "Subscriptions: %1$s\n"
-msgstr "订阅：%1$s\n"
-
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
-msgid "User has no last notice"
-msgstr "用户没有通告。"
+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 个字符，多个搜索条件用"
+"空格分隔。"
 
-#: classes/Command.php:146 classes/Command.php:166
-msgid "Notice marked as fave."
-msgstr "通告被标记为收藏。"
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "搜索文本"
 
-#: classes/Command.php:166 classes/Command.php:189
-#, php-format
-msgid "%1$s (%2$s)"
-msgstr "%1$s (%2$s)"
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "搜索有关\"%s\"的消息"
 
-#: classes/Command.php:169 classes/Command.php:192
+#: actions/noticesearch.php:121
 #, php-format
-msgid "Fullname: %s"
-msgstr "全名：%s"
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
 
-#: classes/Command.php:172 classes/Command.php:195
+#: actions/noticesearch.php:124
 #, php-format
-msgid "Location: %s"
-msgstr "位置：%s"
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
+msgstr ""
 
-#: classes/Command.php:175 classes/Command.php:198
-#, php-format
-msgid "Homepage: %s"
-msgstr "主页：%s"
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "%2$s 上 %1$s 的更新！"
 
-#: classes/Command.php:178 classes/Command.php:201
-#, php-format
-msgid "About: %s"
-msgstr "关于：%s"
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "所有匹配搜索条件\"%s\"的消息"
 
-#: classes/Command.php:200 classes/Command.php:228
-#, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
-msgstr "您的消息包含 %d 个字符，超出长度限制 - 不能超过 140 个字符。"
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr "此用户不允许振铃呼叫或者还没有确认或设置TA的电子邮件。"
 
-#: classes/Command.php:214 classes/Command.php:245
-#, php-format
-msgid "Direct message to %s sent"
-msgstr "已向 %s 发送消息"
+#: actions/nudge.php:94
+msgid "Nudge sent"
+msgstr "振铃呼叫发出。"
 
-#: classes/Command.php:216 classes/Command.php:247
-msgid "Error sending direct message."
-msgstr "发送消息出错。"
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr "振铃呼叫已经发出！"
 
-#: classes/Command.php:263 classes/Command.php:300
-msgid "Specify the name of the user to subscribe to"
-msgstr "指定要订阅的用户名"
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+msgstr "通告没有关联个人信息"
 
-#: classes/Command.php:270 classes/Command.php:307
+#: actions/oembed.php:86 actions/shownotice.php:180
 #, php-format
-msgid "Subscribed to %s"
-msgstr "订阅 %s"
+msgid "%1$s's status on %2$s"
+msgstr "%1$s 的 %2$s 状态"
 
-#: classes/Command.php:288 classes/Command.php:328
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "指定要取消订阅的用户名"
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "连接"
 
-#: classes/Command.php:295 classes/Command.php:335
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "取消订阅 %s"
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
-msgid "Command not yet implemented."
-msgstr "命令尚未实现。"
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
+msgstr "不支持的数据格式。"
 
-#: classes/Command.php:313 classes/Command.php:356
-msgid "Notification off."
-msgstr "通告关闭。"
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "搜索用户"
 
-#: classes/Command.php:315 classes/Command.php:358
-msgid "Can't turn off notification."
-msgstr "无法关闭通告。"
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "搜索通告"
 
-#: classes/Command.php:333 classes/Command.php:379
-msgid "Notification on."
-msgstr "通告开启。"
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "Twitter 设置"
 
-#: classes/Command.php:335 classes/Command.php:381
-msgid "Can't turn on notification."
-msgstr "无法开启通告。"
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr "管理其他选项。"
 
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
-msgstr "命令：\n"
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
 
-#: classes/Message.php:53 classes/Message.php:56
-msgid "Could not insert message."
-msgstr "无法添加信息。"
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
+msgstr ""
 
-#: classes/Message.php:63 classes/Message.php:66
-msgid "Could not update message with new URI."
-msgstr "无法添加新URI的信息。"
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
+msgstr "要使用的自动缩短服务。"
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
-msgstr "系统中没有相应用户的信息。"
+#: actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "个人设置"
 
-#: lib/mail.php:147 lib/mail.php:289
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
 msgstr ""
-"您的新的发布用的地址是 %1$s。\n"
-"\n"
 
-#: lib/mail.php:249 lib/mail.php:508
-#, php-format
-msgid "New private message from %s"
-msgstr "%s 发送了新的私人信息"
+#: actions/othersettings.php:153
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "URL缩短服务超长(最多50个字符)。"
 
-#: lib/mail.php:253 lib/mail.php:512
+#: actions/outbox.php:58
 #, php-format
-msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
-msgstr ""
-"%1$s (%2$s) 发送了新的私人信息：\n"
-"\n"
+msgid "Outbox for %s - page %d"
+msgstr "%s 的发件箱 - 第 %d 页"
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "只有用户自己可以访问邮箱。"
+#: actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
+msgstr "%s 的发件箱"
 
-#: lib/openid.php:195 lib/openid.php:203
-msgid "This form should automatically submit itself. "
-msgstr "此表单会自动提交。"
+#: actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr "这是您的发件箱，包含您发送的私人消息。"
 
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-msgid "Favorites"
-msgstr "收藏夹"
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "修改密码"
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-#, php-format
-msgid "%s's favorite notices"
-msgstr "%s 收藏的通告"
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "修改密码"
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-msgid "User"
-msgstr "用户"
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#, fuzzy
+msgid "Password change"
+msgstr "密码已保存。"
 
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-msgid "Inbox"
-msgstr "收件箱"
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "旧密码"
 
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-msgid "Your incoming messages"
-msgstr "您接收的消息"
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "新密码"
 
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-msgid "Outbox"
-msgstr "发件箱"
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6 个或更多字符"
 
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-msgid "Your sent messages"
-msgstr "您发送的消息"
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "确认"
 
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-msgid "Twitter"
-msgstr "Twitter"
+#: actions/passwordsettings.php:113
+msgid "same as password above"
+msgstr "相同的密码"
 
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
-msgstr "Twitter 整合选项"
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "修改"
 
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-msgid "To"
-msgstr "到"
+#: actions/passwordsettings.php:154 actions/register.php:230
+msgid "Password must be 6 or more characters."
+msgstr "密码必须包含 6 个或更多字符。"
 
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-msgid "Could not parse message."
-msgstr "无法解析消息。"
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "密码不匹配。"
 
-#: actions/all.php:63 actions/facebookhome.php:162
-#, fuzzy, php-format
-msgid "%s and friends, page %d"
-msgstr "%s 及好友"
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "旧密码不正确"
 
-#: actions/avatarsettings.php:76
-msgid "You can upload your personal avatar."
-msgstr "您可以在这里上传个人头像。"
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "保存用户时出错；不正确。"
 
-#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
-msgid "Avatar settings"
-msgstr "头像设置"
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "无法保存新密码。"
 
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-msgid "Original"
-msgstr "原来的"
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "密码已保存。"
 
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-msgid "Preview"
-msgstr "预览"
+#: actions/peoplesearch.php:52
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"在 %%site.name%% 的用户信息中搜索，可以搜索姓名、未知和爱好。搜索条件至少包"
+"含 3 个字符，多个搜索条件用空格分隔。"
 
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
-msgid "Crop"
-msgstr "剪裁"
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "搜索用户"
 
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-#, fuzzy
-msgid "There was a problem with your session token. "
-msgstr "会话标识有问题，请重试。"
+#: actions/peopletag.php:70
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "不是有效的电子邮件"
 
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-msgid "Pick a square area of the image to be your avatar"
-msgstr "请选择一块方形区域作为你的头像"
+#: actions/peopletag.php:144
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr "用户自加标签 %s - 第 %d 页"
 
-#: actions/avatarsettings.php:327 actions/grouplogo.php:384
-msgid "Lost our file data."
-msgstr "文件数据丢失"
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "通告内容不正确"
 
-#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
-#, fuzzy
-msgid "Lost our file."
-msgstr "没有这份通告。"
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
 
-#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
-#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
-msgid "Unknown file type"
-msgstr "未知文件类型"
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "个人设置"
 
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-#, fuzzy
-msgid "No profile specified."
-msgstr "没有收件人。"
+#: actions/profilesettings.php:71
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr "在这里更新个人信息，让大家对您了解得更多。"
 
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/profilesettings.php:99
 #, fuzzy
-msgid "No profile with that ID."
-msgstr "没有找到此ID的信息。"
+msgid "Profile information"
+msgstr "未知的帐号"
 
-#: actions/block.php:111
-#, fuzzy
-msgid "Block user"
-msgstr "阻止用户"
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1 到 64 个小写字母或数字，不包含标点及空白"
 
-#: actions/block.php:129
-#, fuzzy
-msgid "Are you sure you want to block this user? "
-msgstr "确定要阻止该用户吗？"
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full name"
+msgstr "全名"
 
-#: actions/block.php:162
-msgid "You have already blocked this user."
-msgstr "您已成功阻止该用户："
+#: actions/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "主页"
 
-#: actions/block.php:167
-msgid "Failed to save block information."
-msgstr "保存阻止信息失败。"
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "您的主页、博客或在其他站点的URL"
 
-#: actions/confirmaddress.php:159
-#, php-format
-msgid "The address \"%s\" has been "
-msgstr "该地址 \"%s\" 已被"
+#: actions/profilesettings.php:122 actions/register.php:460
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "用不超过140个字符描述您自己和您的爱好"
 
-#: actions/deletenotice.php:73
+#: actions/profilesettings.php:125 actions/register.php:463
 #, fuzzy
-msgid "You are about to permanently delete a notice. "
-msgstr "您将要永久删除这条通告。"
-
-#: actions/disfavor.php:94
-msgid "Add to favorites"
-msgstr "加入收藏"
+msgid "Describe yourself and your interests"
+msgstr "用不超过140个字符描述您自己和您的爱好"
 
-#: actions/editgroup.php:54
-#, php-format
-msgid "Edit %s group"
-msgstr "编辑 %s 组"
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "自述"
 
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-#, fuzzy
-msgid "Inboxes must be enabled for groups to work"
-msgstr "使用组功能前必须使能邮箱"
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "位置"
 
-# before login, the user don't even see any Chinese translation. Anyway. This may be good for the future.
-#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-msgid "You must be logged in to create a group."
-msgstr "您必须登录才能创建小组。"
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "你的位置，格式类似\"城市，省份，国家\""
 
-#: actions/editgroup.php:87 actions/grouplogo.php:87
-#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
-#, fuzzy
-msgid "No nickname"
-msgstr "没有昵称。"
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
+msgstr "标签"
 
-#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
-#: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
-msgid "No such group"
-msgstr "没有这个组"
+#: actions/profilesettings.php:140
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr "你的标签 (字母letters, 数字numbers, -, ., 和 _), 以逗号或空格分隔"
 
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
-msgid "You must be an admin to edit the group"
-msgstr "只有admin才能编辑这个组"
+#: actions/profilesettings.php:144
+msgid "Language"
+msgstr "语言"
 
-#: actions/editgroup.php:157
-msgid "Use this form to edit the group."
-msgstr "使用这个表单来编辑组"
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr "首选语言"
 
-#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
-#, fuzzy
-msgid "Nickname must have only lowercase letters "
-msgstr "昵称只能使用小写字母"
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr "时区"
 
-#: actions/editgroup.php:198 actions/newgroup.php:149
-msgid "description is too long (max 140 chars)."
-msgstr "描述过长(不能超过140字符)。"
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
+msgstr "您一般处于哪个时区？"
 
-#: actions/editgroup.php:218
-msgid "Could not update group."
-msgstr "无法更新组"
+#: actions/profilesettings.php:160
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr "自动订阅任何订阅我的更新的人(这个选项最适合机器人)"
 
-#: actions/editgroup.php:226
-msgid "Options saved."
-msgstr "选项已保存。"
+#: actions/profilesettings.php:221 actions/register.php:223
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "自述过长(不能超过140字符)。"
 
-#: actions/emailsettings.php:107 actions/imsettings.php:108
-#, php-format
-msgid "Awaiting confirmation on this address. "
-msgstr "正在等待这个地址的确认。"
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
+msgstr "未选择时区。"
 
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-#, fuzzy
-msgid "Make a new email address for posting to; "
-msgstr "新的电子邮件地址，用于发布 %s 信息"
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr "语言过长(不能超过50个字符)。"
 
-#: actions/emailsettings.php:157
-#, fuzzy
-msgid "Send me email when someone "
-msgstr "如果收到私人信息，发邮件通知我。"
+#: actions/profilesettings.php:246 actions/tagother.php:178
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "主页'%s'不正确"
 
-#: actions/emailsettings.php:168
-msgid "Allow friends to nudge me and send me an email."
-msgstr "允许朋友们呼叫并给我发送邮件。"
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
+msgstr "无法更新用户的自动订阅选项。"
 
-#: actions/emailsettings.php:321
-#, fuzzy
-msgid "That email address already belongs "
-msgstr "此电子邮件属于其他用户。"
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+msgstr "无法保存个人信息。"
 
-#: actions/emailsettings.php:343
+#: actions/profilesettings.php:336
 #, fuzzy
-msgid "A confirmation code was sent to the email address you added. "
-msgstr "验证码已被发送到您新增的即时通讯帐号。您必须允许 %s 向您发送信息。"
-
-#: actions/facebookhome.php:110
-msgid "Server error - couldn't get user!"
-msgstr "服务器报错 -- 无法找到该用户。"
+msgid "Couldn't save tags."
+msgstr "无法保存个人信息。"
 
-#: actions/facebookhome.php:196
-#, php-format
-msgid "If you would like the %s app to automatically update "
-msgstr "如果你想使用 %s 程序自动更新"
+#: actions/profilesettings.php:344
+msgid "Settings saved."
+msgstr "设置已保存。"
 
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#: actions/public.php:83
 #, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "允许 %s 更新我Facebook 的状态"
-
-#: actions/facebookhome.php:218
-msgid "Skip"
-msgstr "跳过"
+msgid "Beyond the page limit (%s)"
+msgstr ""
 
-#: actions/facebookhome.php:235
+#: actions/public.php:92
 #, fuzzy
-msgid "No notice content!"
-msgstr "没有内容！"
+msgid "Could not retrieve public stream."
+msgstr "无法获取收藏的通告。"
 
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-msgid "Pagination"
-msgstr "分页"
+#: actions/public.php:129
+#, fuzzy, php-format
+msgid "Public timeline, page %d"
+msgstr "公开的时间表"
 
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-#, fuzzy
-msgid "After"
-msgstr "« 之后"
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr "公开的时间表"
 
-#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/public.php:151
 #, fuzzy
-msgid "Before"
-msgstr "之前 »"
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "公开的聚合"
 
-#: actions/facebookinvite.php:70
-#, php-format
-msgid "Thanks for inviting your friends to use %s"
-msgstr "感谢您邀请朋友使用 %s"
+#: actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "公开的聚合"
 
-#: actions/facebookinvite.php:72
+#: actions/public.php:159
 #, fuzzy
-msgid "Invitations have been sent to the following users:"
-msgstr "已发送邀请给这些人："
+msgid "Public Stream Feed (Atom)"
+msgstr "公开的聚合"
 
-#: actions/facebookinvite.php:96
-#, fuzzy, php-format
-msgid "You have been invited to %s"
-msgstr "您已被邀请到 %s"
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
 
-#: actions/facebookinvite.php:105
-#, fuzzy, php-format
-msgid "Invite your friends to use %s"
-msgstr "%s 好友的聚合"
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
 
-#: actions/facebookinvite.php:113
+#: actions/public.php:186
 #, php-format
-msgid "Friends already using %s:"
-msgstr "已经正在使用 %s 的朋友："
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
 
-#: actions/facebookinvite.php:130
+#: actions/public.php:233
 #, php-format
-msgid "Send invitations"
-msgstr "发出邀请"
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
+msgstr ""
 
-#: actions/facebookremove.php:56
-#, fuzzy
-msgid "Couldn't remove Facebook user."
-msgstr "无法移除 facebook用户。"
+#: actions/public.php:238
+#, fuzzy, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
+msgstr ""
+"这里是 %%site.name%%,一个微博客 [micro-blogging](http://en.wikipedia.org/"
+"wiki/Micro-blogging) 服务"
 
-#: actions/facebooksettings.php:65
+#: actions/publictagcloud.php:57
 #, fuzzy
-msgid "There was a problem saving your sync preferences!"
-msgstr "会话标识有问题，请重试。"
+msgid "Public tag cloud"
+msgstr "公开的聚合"
 
-#: actions/facebooksettings.php:67
-msgid "Sync preferences saved."
-msgstr "同步选项已保存。"
+#: actions/publictagcloud.php:63
+#, php-format
+msgid "These are most popular recent tags on %s "
+msgstr "这些是最近的 %s 流行标签 "
 
-#: actions/facebooksettings.php:90
-#, fuzzy
-msgid "Automatically update my Facebook status with my notices."
-msgstr "自动将我的通告转发到 Twitter。"
+#: actions/publictagcloud.php:69
+#, php-format
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
+msgstr ""
 
-#: actions/facebooksettings.php:97
-#, fuzzy
-msgid "Send \"@\" replies to Facebook."
-msgstr "将这里的 \"@\" 回复发送到 Twitter。"
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
+msgstr ""
 
-#: actions/facebooksettings.php:106
-#, fuzzy
-msgid "Prefix"
-msgstr "个人信息"
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
 
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
-msgstr "消息以一字符串为前缀。"
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
+msgstr "标签云聚集"
 
-#: actions/facebooksettings.php:124
-#, php-format
-msgid "If you would like %s to automatically update "
-msgstr "如果你希望 %s 自动更新。"
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "已登录！"
 
-#: actions/facebooksettings.php:147
-msgid "Sync preferences"
-msgstr "同步设置"
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "没有这个恢复码。"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
-#, fuzzy
-msgid "Disfavor favorite"
-msgstr "取消收藏"
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "不是恢复码。"
 
-#: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
-#, fuzzy
-msgid "Popular notices"
-msgstr "没有这份通告。"
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr "恢复码未知"
 
-#: actions/favorited.php:67
-#, fuzzy, php-format
-msgid "Popular notices, page %d"
-msgstr "没有这份通告。"
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "验证码出错。"
 
-#: actions/favorited.php:79
-#, fuzzy
-msgid "The most popular notices on the site right now."
-msgstr "显示上周以来最流行的标签"
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
+msgstr "验证码超时，请重来。"
 
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
-msgid "Featured users"
-msgstr "推荐用户"
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
+msgstr "无法更新已确认的电子邮件。"
 
-#: actions/featured.php:71
-#, php-format
-msgid "Featured users, page %d"
-msgstr "推荐用户，第 %d 页"
+#: actions/recoverpassword.php:152
+msgid ""
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
+msgstr ""
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some of the great users on %s"
-msgstr "%s 优秀用户摘选"
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
+msgstr ""
 
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
-msgstr "那个用户阻止了你的订阅。"
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
+msgstr ""
 
-#: actions/groupbyid.php:79
-msgid "No ID"
-msgstr "没有ID"
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
+msgstr ""
 
-#: actions/grouplogo.php:138 actions/grouplogo.php:191
-msgid "Group logo"
-msgstr "组logo"
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
+msgstr "您在此服务器的昵称，或注册邮箱。"
 
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
-msgstr "你可以给你的组上载一个logo图。"
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
+msgstr "恢复"
 
-#: actions/grouplogo.php:448
-msgid "Logo updated."
-msgstr "logo已更新。"
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "重置密码"
 
-#: actions/grouplogo.php:450
-#, fuzzy
-msgid "Failed updating logo."
-msgstr "更新logo失败。"
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr "恢复密码"
 
-#: actions/groupmembers.php:93 lib/groupnav.php:91
-#, php-format
-msgid "%s group members"
-msgstr "%s 组成员"
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
+msgstr "请求恢复密码"
 
-#: actions/groupmembers.php:96
-#, php-format
-msgid "%s group members, page %d"
-msgstr "%s 组成员, 第 %d 页"
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
+msgstr "未知动作"
 
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
-msgstr "该组成员列表。"
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 个或更多字符，不能忘记！"
 
-#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
-msgid "Groups"
-msgstr "组"
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "相同的密码"
 
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "组，第 %d 页"
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "重置"
 
-#: actions/groups.php:90
-#, php-format
-#, fuzzy
-msgid "%%%%site.name%%%% groups let you find and talk with "
-msgstr "%%%%site.name%%%% 组你可以查找并联络"
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "输入昵称或电子邮件。"
 
-#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-#, fuzzy
-msgid "Create a new group"
-msgstr "创建新组"
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
+msgstr "没有拥有这个用户名或电子邮件的用户。"
 
-#: actions/groupsearch.php:57
-#, fuzzy, php-format
-msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-msgstr "在 %%site.name%% 的用户信息中搜索，可以搜索姓名、未知和爱好。"
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr "用户没有注册电子邮件。"
 
-#: actions/groupsearch.php:63
-msgid "Group search"
-msgstr "组检索"
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "保存地址确认时出错。"
 
-#: actions/imsettings.php:70
-#, fuzzy
-msgid "You can send and receive notices through "
-msgstr "收发可以通过"
+#: actions/recoverpassword.php:325
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr "恢复密码的指示已被发送到您的注册邮箱。"
 
-#: actions/imsettings.php:120
-#, php-format
-msgid "Jabber or GTalk address, "
-msgstr "Jabber 或者 GTalk 地址, "
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
+msgstr "未预料的密码重置。"
 
-#: actions/imsettings.php:147
-#, fuzzy
-msgid "Send me replies through Jabber/GTalk "
-msgstr "通过Jabber/GTalk发送通告。"
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "密码必须是 6 个字符或更多。"
 
-#: actions/imsettings.php:321
-#, php-format
-msgid "A confirmation code was sent "
-msgstr "确认消息已经发送"
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
+msgstr "密码和确认不匹配。"
 
-#: actions/joingroup.php:65
-#, fuzzy
-msgid "You must be logged in to join a group."
-msgstr "您必须登录才能加入组。"
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
+msgstr "新密码已保存，您现在已登录。"
 
-#: actions/joingroup.php:95
-msgid "You are already a member of that group"
-msgstr "您已经是该组成员"
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
+msgstr "对不起，请邀请那些能注册的人。"
 
-#: actions/joingroup.php:128
-#, fuzzy, php-format
-msgid "Could not join user %s to group %s"
-msgstr "无法把 %s 用户添加到 %s 组"
+#: actions/register.php:92
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "验证码出错。"
 
-#: actions/joingroup.php:135
-#, fuzzy, php-format
-msgid "%s joined group %s"
-msgstr "%s 加入 %s 组"
+#: actions/register.php:112
+msgid "Registration successful"
+msgstr "注册成功。"
 
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
-msgstr "邮箱必须使能组才能工作。"
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "注册"
 
-#: actions/leavegroup.php:65
-#, fuzzy
-msgid "You must be logged in to leave a group."
-msgstr "您必须登录才能邀请其他人使用 %s"
+#: actions/register.php:135
+msgid "Registration not allowed."
+msgstr "不允许注册。"
 
-#: actions/leavegroup.php:88
-msgid "No such group."
-msgstr "没有这个组。"
+#: actions/register.php:198
+msgid "You can't register if you don't agree to the license."
+msgstr "您必须同意此授权方可注册。"
 
-#: actions/leavegroup.php:95
-#, fuzzy
-msgid "You are not a member of that group."
-msgstr "您未告知此个人信息"
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "不是有效的电子邮件。"
 
-#: actions/leavegroup.php:100
-#, fuzzy
-msgid "You may not leave a group while you are its administrator."
-msgstr "您不能删除其他用户的状态。"
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "电子邮件地址已存在。"
 
-#: actions/leavegroup.php:130
-#, fuzzy
-msgid "Could not find membership record."
-msgstr "无法更新用户记录。"
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "用户名或密码不正确。"
 
-#: actions/leavegroup.php:138
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "无法订阅用户：未找到。"
+#: actions/register.php:342
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
 
-#: actions/leavegroup.php:145
-#, php-format
-msgid "%s left group %s"
-msgstr "%s 离开群 %s"
+#: actions/register.php:424
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr "1 到 64 个小写字母或数字，不包含标点及空白。此项必填。"
 
-#: actions/login.php:225 lib/facebookaction.php:304
-msgid "Login to site"
-msgstr "登录"
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr "6 个或更多字符。此项必填。"
 
-#: actions/microsummary.php:69
-msgid "No current status"
-msgstr "没有当前状态"
+#: actions/register.php:433
+msgid "Same as password above. Required."
+msgstr "相同的密码。此项必填。"
 
-#: actions/newgroup.php:53
-msgid "New group"
-msgstr "新组"
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "电子邮件"
 
-#: actions/newgroup.php:115
-msgid "Use this form to create a new group."
-msgstr "使用此表格创建组。"
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
+msgstr "只用于更新、通告或密码恢复"
 
-#: actions/newgroup.php:177
-msgid "Could not create group."
-msgstr "无法创建组。"
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
+msgstr "长名字，最好是“实名”"
 
-#: actions/newgroup.php:191
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "无法删除订阅。"
+#: actions/register.php:493
+msgid "My text and files are available under "
+msgstr "我的文字和文件采用的授权方式为"
 
-#: actions/newmessage.php:119 actions/newnotice.php:132
-#, fuzzy
-msgid "That's too long. "
-msgstr "文件超出大小限制。"
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
 
-#: actions/newmessage.php:134
+#: actions/register.php:496
 #, fuzzy
-msgid "Don't send a message to yourself; "
-msgstr "无法向此用户发送消息。"
-
-#: actions/newnotice.php:166
-msgid "Notice posted"
-msgstr "消息已发布。"
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr "除了隐私内容：密码，电子邮件，即时通讯帐号，电话号码。"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
-msgid "Ajax Error"
-msgstr "Ajax错误"
+#: actions/register.php:537
+#, 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"
+"* 查看你的资料Go to [your profile](%s) 发布你的第一条消息.\n"
+"* 填加 [Jabber/GTalk address](%%%%action.imsettings%%%%) 然后你可以通过即时消"
+"息平台发布信息。\n"
+"* [Search for people](%%%%action.peoplesearch%%%%) 你认识的或和你有共同兴趣的"
+"朋友。 \n"
+"* 更新你的 [profile settings](%%%%action.profilesettings%%%%) 告诉大家更多关"
+"于你的情况。 \n"
+"* 请阅读 [online docs](%%%%doc.help%%%%) 有的功能也许你还不熟悉。\n"
+"\n"
+"感谢您的注册，希望您喜欢这个服务。"
 
-#: actions/nudge.php:85
+#: actions/register.php:561
 msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
-msgstr "此用户不允许振铃呼叫或者还没有确认或设置TA的电子邮件。"
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr "(您将收到一封邮件，包含了如何确认邮件地址的说明。)"
 
-#: actions/nudge.php:94
-msgid "Nudge sent"
-msgstr "振铃呼叫发出。"
+#: actions/remotesubscribe.php:98
+#, php-format
+msgid ""
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
+msgstr ""
+"要订阅，你可以登录 (%%action.login%%), 或注册(%%action.register%%) 一个新帐"
+"号。如果你已经有在另一个兼容的微博客的帐号(%%doc.openmublog%%),  请填入你资料"
+"的互联网地址URL."
 
-#: actions/nudge.php:97
-msgid "Nudge sent!"
-msgstr "振铃呼叫已经发出！"
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr "远程订阅"
 
-#: actions/openidlogin.php:97
+#: actions/remotesubscribe.php:124
 #, fuzzy
-msgid "OpenID login"
-msgstr "OpenID 登录"
+msgid "Subscribe to a remote user"
+msgstr "订阅 %s"
 
-#: actions/openidsettings.php:128
-#, fuzzy
-msgid "Removing your only OpenID "
-msgstr "移除OpenID"
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "昵称"
 
-#: actions/othersettings.php:60
-#, fuzzy
-msgid "Other Settings"
-msgstr "Twitter 设置"
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr "希望订阅的用户的昵称"
 
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "管理其他选项。"
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "个人信息URL"
 
-#: actions/othersettings.php:93
-msgid "URL Auto-shortening"
-msgstr "URL自动缩短"
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "您在其他兼容的微博客服务的个人信息URL"
 
-#: actions/othersettings.php:112
-msgid "Service"
-msgstr "服务"
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
+msgstr "订阅"
 
-#: actions/othersettings.php:113
-msgid "Automatic shortening service to use."
-msgstr "要使用的自动缩短服务。"
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr "个人信息URL不正确(格式错误)"
 
-#: actions/othersettings.php:144
+#: actions/remotesubscribe.php:168
 #, fuzzy
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "URL缩短服务超长(最多50个字符)。"
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "不是有效的个人信息URL(没有YADIS数据)。"
 
-#: actions/passwordsettings.php:69
+#: actions/remotesubscribe.php:176
 #, fuzzy
-msgid "Change your password."
-msgstr "修改密码"
+msgid "That’s a local profile! Login to subscribe."
+msgstr "那是一个本地资料！需要登录才能订阅。"
 
-#: actions/passwordsettings.php:89
+#: actions/remotesubscribe.php:183
 #, fuzzy
-msgid "Password change"
-msgstr "密码已保存。"
-
-#: actions/peopletag.php:35
-#, fuzzy, php-format
-msgid "Not a valid people tag: %s"
-msgstr "不是有效的电子邮件"
-
-#: actions/peopletag.php:47
-#, php-format
-msgid "Users self-tagged with %s - page %d"
-msgstr "用户自加标签 %s - 第 %d 页"
+msgid "Couldn’t get a request token."
+msgstr "无法获得一份请求标记。"
 
-#: actions/peopletag.php:91
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
 #, php-format
-msgid "These are users who have tagged themselves \"%s\" "
-msgstr "这些是自我标识为 \"%s\"  的用户"
-
-#: actions/profilesettings.php:91
-#, fuzzy
-msgid "Profile information"
-msgstr "未知的帐号"
-
-#: actions/profilesettings.php:124
-msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
-msgstr "你的标签 (字母letters, 数字numbers, -, ., 和 _), 以逗号或空格分隔"
-
-#: actions/profilesettings.php:144
-#, fuzzy
-msgid "Automatically subscribe to whoever "
-msgstr "自动订阅任何订阅我的更新的人(这个选项最适合机器人)"
+msgid "Replies to %s"
+msgstr "%s 的回复"
 
-#: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/replies.php:127
 #, fuzzy, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "主页'%s'不正确"
+msgid "Replies to %s, page %d"
+msgstr "%s 的回复，第 % 页"
 
-#: actions/profilesettings.php:311
-#, fuzzy
-msgid "Couldn't save tags."
-msgstr "无法保存个人信息。"
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "%s 的通告聚合"
 
-#: actions/public.php:107
+#: actions/replies.php:151
 #, fuzzy, php-format
-msgid "Public timeline, page %d"
-msgstr "公开的时间表"
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "%s 的通告聚合"
 
-#: actions/public.php:173
-#, fuzzy
-msgid "Could not retrieve public stream."
-msgstr "无法获取收藏的通告。"
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "%s 的通告聚合"
 
-#: actions/public.php:220
+#: actions/replies.php:198
 #, php-format
 msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
 msgstr ""
-"这里是 %%site.name%%,一个微博客 [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) 服务"
 
-#: actions/publictagcloud.php:57
-#, fuzzy
-msgid "Public tag cloud"
-msgstr "公开的聚合"
-
-#: actions/publictagcloud.php:63
+#: actions/replies.php:203
 #, php-format
-msgid "These are most popular recent tags on %s "
-msgstr "这些是最近的 %s 流行标签 "
-
-#: actions/publictagcloud.php:119
-msgid "Tag cloud"
-msgstr "标签云聚集"
-
-#: actions/register.php:139 actions/register.php:349
-msgid "Sorry, only invited people can register."
-msgstr "对不起，请邀请那些能注册的人。"
-
-#: actions/register.php:149
-#, fuzzy
-msgid "You can't register if you don't "
-msgstr "您必须同意此授权方可注册。"
-
-#: actions/register.php:286
-msgid "With this form you can create "
-msgstr "使用这个表格你可以创建"
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
 
-#: actions/register.php:368
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, "
-msgstr "1 到 64 个小写字母或数字，不包含标点及空白"
+#: actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
 
-#: actions/register.php:382 actions/register.php:386
-#, fuzzy
-msgid "Used only for updates, announcements, "
-msgstr "只用于更新、通告或密码恢复"
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "发送给 %1$s 的 %2$s 消息"
 
-#: actions/register.php:398
-#, fuzzy
-msgid "URL of your homepage, blog, "
-msgstr "您的主页、博客或在其他站点的URL"
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "%s 收藏的通告"
 
-#: actions/register.php:404
-#, fuzzy
-msgid "Describe yourself and your "
-msgstr "用不超过140个字符描述您自己和您的爱好"
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
+msgstr "无法获取收藏的通告。"
 
-#: actions/register.php:410
-#, fuzzy
-msgid "Where you are, like \"City, "
-msgstr "你的位置，格式类似\"城市，省份，国家\""
+#: actions/showfavorites.php:170
+#, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "%s 好友的聚合"
 
-#: actions/register.php:432
-#, fuzzy
-msgid " except this private data: password, "
-msgstr "除了隐私内容：密码，电子邮件，即时通讯帐号，电话号码。"
+#: actions/showfavorites.php:177
+#, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "%s 好友的聚合"
 
-#: actions/register.php:471
-#, fuzzy, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
-msgstr "祝贺你，%s！欢迎来到 %%%%site.name%%%%。在这里，您可以……"
+#: actions/showfavorites.php:184
+#, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "%s 好友的聚合"
 
-#: actions/register.php:495
-#, fuzzy
-msgid "(You should receive a message by email "
-msgstr "(您将立即收到一封电子邮件，含有"
+#: actions/showfavorites.php:205
+msgid ""
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
+msgstr ""
 
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
-msgstr "那是一个本地资料！需要登录才能订阅。"
+#: actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
 
-#: actions/replies.php:118
-#, fuzzy, php-format
-msgid "Replies to %s, page %d"
-msgstr "%s 的回复，第 % 页"
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
 
-#: actions/showfavorites.php:79
-#, fuzzy, php-format
-msgid "%s favorite notices, page %d"
-msgstr "%s 收藏的通告"
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:82 lib/groupnav.php:86
 #, php-format
 msgid "%s group"
 msgstr "%s 组"
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr "%s 组, 第 %d 页"
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:218
 #, fuzzy
 msgid "Group profile"
 msgstr "组资料"
 
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
 msgid "URL"
 msgstr "URL 互联网地址"
 
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
 #, fuzzy
 msgid "Note"
 msgstr "通告"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:293
 msgid "Group actions"
 msgstr "组动作"
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "%s 的通告聚合"
+
+#: actions/showgroup.php:334
 #, fuzzy, php-format
-msgid "Notice feed for %s group"
+msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "%s 的通告聚合"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "%s 的通告聚合"
+
+#: actions/showgroup.php:345
+#, php-format
+msgid "FOAF for %s group"
+msgstr "%s 的发件箱"
+
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
 #, fuzzy
 msgid "Members"
 msgstr "注册于"
 
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
 #: lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "（没有）"
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:392
 msgid "All members"
 msgstr "所有成员"
 
-#: actions/showgroup.php:378
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "统计"
+
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "创建"
+
+#: actions/showgroup.php:448
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
-"**%s** 是一个 %%%%site.name%%%% 的用户组,一个微博客服务 [micro-"
-"blogging](http://en.wikipedia.org/wiki/Micro-blogging)"
 
-#: actions/showmessage.php:98
+#: actions/showgroup.php:454
+#, fuzzy, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
+msgstr ""
+"**%s** 是一个 %%%%site.name%%%% 的用户组,一个微博客服务 [micro-blogging]"
+"(http://en.wikipedia.org/wiki/Micro-blogging)"
+
+#: actions/showgroup.php:482
 #, fuzzy
-msgid "Only the sender and recipient "
+msgid "Admins"
+msgstr "admin管理员"
+
+#: actions/showmessage.php:81
+msgid "No such message."
+msgstr "未找到此消息。"
+
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient may read this message."
 msgstr "只有发送和接受双方可以阅读此消息。"
 
+#: actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr "发送给 %1$s 的 %2$s 消息"
+
+#: actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr "来自 %1$s 的 %2$s 消息"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "消息已发布。"
+
 #: actions/showstream.php:73
 #, fuzzy, php-format
+msgid " tagged %s"
+msgstr "带 %s 标签的通告"
+
+#: actions/showstream.php:79
+#, fuzzy, php-format
 msgid "%s, page %d"
 msgstr "%s 的收件箱 - 第 %d 页"
 
-#: actions/showstream.php:143
-#, fuzzy
-msgid "'s profile"
-msgstr "个人信息"
+#: actions/showstream.php:122
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "%s 的通告聚合"
 
-#: actions/showstream.php:236 actions/tagother.php:77
-#, fuzzy
-msgid "User profile"
-msgstr "用户没有个人信息。"
+#: actions/showstream.php:129
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "%s 的通告聚合"
 
-#: actions/showstream.php:240 actions/tagother.php:81
-msgid "Photo"
-msgstr "相片"
+#: actions/showstream.php:136
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "%s 的通告聚合"
 
-#: actions/showstream.php:317
-#, fuzzy
-msgid "User actions"
-msgstr "未知动作"
+#: actions/showstream.php:143
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "%s 的通告聚合"
 
-#: actions/showstream.php:342
-#, fuzzy
-msgid "Send a direct message to this user"
-msgstr "无法向此用户发送消息。"
+#: actions/showstream.php:148
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "%s 的发件箱"
 
-#: actions/showstream.php:343
-#, fuzzy
-msgid "Message"
-msgstr "新消息"
+#: actions/showstream.php:191
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
 
-#: actions/showstream.php:451
-#, fuzzy
-msgid "All subscribers"
-msgstr "订阅者"
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
 
-#: actions/showstream.php:533
-msgid "All groups"
-msgstr "所有组"
+#: actions/showstream.php:198
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
 
-#: actions/showstream.php:542
+#: actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
-"**%s** 有一个帐号在 %%%%site.name%%%%, 一个微博客服务 [micro-"
-"blogging](http://en.wikipedia.org/wiki/Micro-blogging)"
 
-#: actions/smssettings.php:128
+#: actions/showstream.php:239
+#, fuzzy, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
+msgstr ""
+"**%s** 有一个帐号在 %%%%site.name%%%%, 一个微博客服务 [micro-blogging]"
+"(http://en.wikipedia.org/wiki/Micro-blogging)"
+
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "SMS短信设置"
+
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr "您可以通过 %%site.name%% 的电子邮件接收SMS短信。"
+
+#: actions/smssettings.php:91
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, "
+msgid "SMS is not available."
+msgstr "这个页面不提供您想要的媒体类型"
+
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "已确认的可以发送SMS短消息的电话号码。"
+
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
+msgstr "等待确认此电话号码。"
+
+#: actions/smssettings.php:130
+msgid "Confirmation code"
+msgstr "确认码"
+
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
+msgstr "输入手机收到的验证码。"
+
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
+msgstr "SMS短信电话号码"
+
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "电话号码，不带标点或空格，包含地区代码"
 
-#: actions/smssettings.php:162
-#, fuzzy
-msgid "Send me notices through SMS; "
-msgstr "通过Jabber/GTalk发送通告。"
+#: actions/smssettings.php:174
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr "通过SMS短信将通告发给我；我了解这样也许会给我带来不菲的开支。"
 
-#: actions/smssettings.php:335
+#: actions/smssettings.php:306
+msgid "No phone number."
+msgstr "没有电话号码。"
+
+#: actions/smssettings.php:311
+msgid "No carrier selected."
+msgstr "未选择运营商。"
+
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
+msgstr "您已登记此电话号码。"
+
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
+msgstr "这个电话号码属于另一个用户。"
+
+#: actions/smssettings.php:347
 #, fuzzy
-msgid "A confirmation code was sent to the phone number you added. "
-msgstr "等待确认此电话号码。"
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"验证码已被发送到您新增的电话号码。请检查收件箱(和垃圾箱)，找到验证码并按要求"
+"使用它。"
+
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
+msgstr "确认码错误。"
+
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
+msgstr "这是他人的电话号码。"
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:465
 #, fuzzy
 msgid "Mobile carrier"
 msgstr "选择运营商"
 
+#: actions/smssettings.php:469
+msgid "Select a carrier"
+msgstr "选择运营商"
+
+#: actions/smssettings.php:476
+#, 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/smssettings.php:498
+msgid "No code entered"
+msgstr "没有输入验证码"
+
 #: actions/subedit.php:70
 #, fuzzy
 msgid "You are not subscribed to that profile."
@@ -4250,15 +3019,32 @@ msgid "%s subscribers, page %d"
 msgstr "%s 订阅者, 第 %d 页"
 
 #: actions/subscribers.php:63
-#, fuzzy
-msgid "These are the people who listen to "
-msgstr "这些用户订阅了 %s 的通告。"
+msgid "These are the people who listen to your notices."
+msgstr "这些用户订阅了您的通告。"
 
 #: actions/subscribers.php:67
-#, fuzzy, php-format
-msgid "These are the people who "
+#, php-format
+msgid "These are the people who listen to %s's notices."
 msgstr "这些用户订阅了 %s 的通告。"
 
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
+msgstr ""
+
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr ""
+
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
 #: actions/subscriptions.php:52
 #, fuzzy, php-format
 msgid "%s subscriptions"
@@ -4270,29 +3056,37 @@ msgid "%s subscriptions, page %d"
 msgstr "所有订阅"
 
 #: actions/subscriptions.php:65
-#, fuzzy
-msgid "These are the people whose notices "
-msgstr "这是 %s 订阅的用户。"
+msgid "These are the people whose notices you listen to."
+msgstr "这是您订阅的用户。"
 
 #: actions/subscriptions.php:69
+#, php-format
+msgid "These are the people whose notices %s listens to."
+msgstr "这是 %s 订阅的用户。"
+
+#: actions/subscriptions.php:121
+#, php-format
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
+msgstr ""
+
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
 #, fuzzy, php-format
-msgid "These are the people whose "
-msgstr "这些用户订阅了 %s 的通告。"
+msgid "%s is not listening to anyone."
+msgstr "%1$s 开始关注您的 %2$s 信息。"
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:194
 #, fuzzy
 msgid "Jabber"
 msgstr "没有 Jabber ID。"
 
-#: actions/tag.php:43
-#, fuzzy, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "带 %s 标签的通告"
-
-#: actions/tag.php:66
-#, php-format
-msgid "Messages tagged \"%s\", most recent first"
-msgstr "有 \"%s\" 标签的消息，最近的排序在前"
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
+msgstr "SMS短信"
 
 #: actions/tagother.php:33
 #, fuzzy
@@ -4309,269 +3103,916 @@ msgstr "没有这份文档。"
 msgid "Tag %s"
 msgstr "标签"
 
+#: actions/tagother.php:77 lib/userprofile.php:75
+#, fuzzy
+msgid "User profile"
+msgstr "用户没有个人信息。"
+
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
+msgstr "相片"
+
 #: actions/tagother.php:141
 #, fuzzy
 msgid "Tag user"
 msgstr "标签"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
-msgstr "给这个用户加注标签 (字母letters, 数字numbers, -, ., and _), 逗号或空格分隔"
-
-#: actions/tagother.php:164
-#, fuzzy
-msgid "There was a problem with your session token."
-msgstr "会话标识有问题，请重试。"
+msgstr ""
+"给这个用户加注标签 (字母letters, 数字numbers, -, ., and _), 逗号或空格分隔"
 
-#: actions/tagother.php:191
+#: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr "你只能给你订阅的人或订阅你的人加标签。"
 
-#: actions/tagother.php:198
+#: actions/tagother.php:200
 #, fuzzy
 msgid "Could not save tags."
 msgstr "无法保存头像"
 
-#: actions/tagother.php:233
+#: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "使用这个表格给你的关注者或你的订阅加注标签。"
 
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "带 %s 标签的通告"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "%s 的通告聚合"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "%s 的通告聚合"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "%s 的通告聚合"
+
 #: actions/tagrss.php:35
 #, fuzzy
 msgid "No such tag."
 msgstr "未找到此消息。"
 
-#: actions/tagrss.php:66
-#, fuzzy, php-format
-msgid "Microblog tagged with %s"
-msgstr "带 %s 标签的通告"
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
+msgstr "API 方法尚未实现。"
 
-#: actions/twitapiblocks.php:47
-msgid "Block user failed."
-msgstr "阻止用户失败。"
+#: actions/unsubscribe.php:77
+#, fuzzy
+msgid "No profile id in request."
+msgstr "服务器没有返回个人信息URL。"
 
-#: actions/twitapiblocks.php:69
-msgid "Unblock user failed."
-msgstr "取消阻止用户失败。"
+#: actions/unsubscribe.php:84
+#, fuzzy
+msgid "No profile with that id."
+msgstr "没有找到此ID的信息。"
 
-#: actions/twitapiusers.php:48
+#: actions/unsubscribe.php:98
 #, fuzzy
-msgid "Not found."
-msgstr "未找到"
+msgid "Unsubscribed"
+msgstr "退订"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "确认订阅"
 
-#: actions/twittersettings.php:71
+#: actions/userauthorization.php:110
 #, fuzzy
-msgid "Add your Twitter account to automatically send "
-msgstr "添加 Twitter 帐号，自动向 Twitter 发送更新。"
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
+msgstr ""
+"请检查详细信息，确认希望订阅此用户的通告。如果您刚才没有要求订阅任何人的通"
+"告，请点击\"取消\"。"
 
-#: actions/twittersettings.php:119
+#: actions/userauthorization.php:188
 #, fuzzy
-msgid "Twitter user name"
-msgstr "Twitter 用户名"
+msgid "License"
+msgstr "注册证"
 
-#: actions/twittersettings.php:126
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "接受"
+
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
 #, fuzzy
-msgid "Twitter password"
-msgstr "Twitter 密码"
+msgid "Subscribe to this user"
+msgstr "订阅 %s"
+
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "拒绝"
 
-#: actions/twittersettings.php:228
+#: actions/userauthorization.php:212
 #, fuzzy
-msgid "Twitter Friends"
-msgstr "Twitter 设置"
+msgid "Reject this subscription"
+msgstr "所有订阅"
 
-#: actions/twittersettings.php:327
-msgid "Username must have only numbers, "
-msgstr "用户名只能有数字，"
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
+msgstr "未收到认证请求！"
 
-#: actions/twittersettings.php:341
-#, fuzzy, php-format
-msgid "Unable to retrieve account information "
-msgstr "无法从 Twitter 获取\"%s\"的帐号信息。"
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+msgstr "订阅已确认"
 
-#: actions/unblock.php:108
+#: actions/userauthorization.php:249
 #, fuzzy
-msgid "Error removing the block."
-msgstr "保存用户时出错。"
+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/unsubscribe.php:50
-#, fuzzy
-msgid "No profile id in request."
-msgstr "服务器没有返回个人信息URL。"
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
+msgstr "订阅被拒绝"
 
-#: actions/unsubscribe.php:57
+#: actions/userauthorization.php:261
 #, fuzzy
-msgid "No profile with that id."
-msgstr "没有找到此ID的信息。"
+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/unsubscribe.php:71
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "退订"
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
 
-#: actions/usergroups.php:63
+#: actions/userauthorization.php:301
 #, php-format
-msgid "%s groups"
-msgstr "%s 群组"
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "无法访问头像URL '%s'"
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "'%s' 图像格式错误"
+
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr "没有 id。"
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "个人设置"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "%s 群组, 第 %d 页"
 
-#: classes/Notice.php:104
+#: actions/usergroups.php:130
+#, fuzzy
+msgid "Search for more groups"
+msgstr "检索人或文字"
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "您未告知此个人信息"
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Message.php:55
+msgid "Could not insert message."
+msgstr "无法添加信息。"
+
+#: classes/Message.php:65
+msgid "Could not update message with new URI."
+msgstr "无法添加新URI的信息。"
+
+#: classes/Notice.php:164
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "添加标签时数据库出错：%s"
+
+#: classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "保存通告时出错。"
+
+#: classes/Notice.php:183
 #, fuzzy
 msgid "Problem saving notice. Unknown user."
 msgstr "保存通告时出错。"
 
-#: classes/Notice.php:109
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr "你在短时间里发布了过多的消息，请深呼吸，过几分钟再发消息。"
 
-#: classes/Notice.php:116
+#: classes/Notice.php:194
+#, fuzzy
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr "你在短时间里发布了过多的消息，请深呼吸，过几分钟再发消息。"
+
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr "在这个网站你被禁止发布消息。"
 
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
+msgstr "保存通告时出错。"
+
+#: classes/Notice.php:1120
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "添加回复时数据库出错：%s"
+
+#: classes/User.php:347
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "发送给 %1$s 的 %2$s 消息"
+
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "个人信息"
+
 #: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
+msgstr "修改您的个人信息"
+
+#: lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "上载一个头像。"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr "修改密码"
+
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
+msgstr "修改电子邮件"
+
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:124
+#, fuzzy
+msgid "Design your profile"
+msgstr "用户没有个人信息。"
+
+#: lib/accountsettingsaction.php:128
 msgid "Other"
 msgstr "其他"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:128
 msgid "Other options"
 msgstr "其他选项"
 
-#: lib/action.php:130
+#: lib/action.php:144
 #, fuzzy, php-format
 msgid "%s - %s"
 msgstr "%s (%s)"
 
-#: lib/action.php:145
+#: lib/action.php:159
 msgid "Untitled page"
 msgstr "无标题页"
 
-#: lib/action.php:316
+#: lib/action.php:424
 msgid "Primary site navigation"
 msgstr "主站导航"
 
-#: lib/action.php:322
+#: lib/action.php:430
+msgid "Home"
+msgstr "主页"
+
+#: lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr "个人资料及朋友年表"
 
-#: lib/action.php:325
-msgid "Search for people or text"
-msgstr "检索人或文字"
-
-#: lib/action.php:328
+#: lib/action.php:432
 msgid "Account"
 msgstr "帐号"
 
-#: lib/action.php:328
+#: lib/action.php:432
 #, fuzzy
 msgid "Change your email, avatar, password, profile"
 msgstr "修改资料"
 
-#: lib/action.php:330
-msgid "Connect to IM, SMS, Twitter"
-msgstr "与IM，手机短信，Twitter的连接"
+#: lib/action.php:435
+msgid "Connect"
+msgstr "连接"
 
-#: lib/action.php:332
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "无法重定向到服务器：%s"
+
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
+msgstr "邀请"
+
+#: lib/action.php:440 lib/subgroupnav.php:106
+#, fuzzy, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr "使用这个表单来邀请好友和同事加入。"
+
+#: lib/action.php:445
+msgid "Logout"
+msgstr "登出"
+
+#: lib/action.php:445
 msgid "Logout from the site"
 msgstr "登出本站"
 
-#: lib/action.php:335
-msgid "Login to the site"
-msgstr "登入本站"
-
-#: lib/action.php:338
+#: lib/action.php:450
 #, fuzzy
 msgid "Create an account"
 msgstr "创建新帐号"
 
-#: lib/action.php:341
-#, fuzzy
-msgid "Login with OpenID"
-msgstr "没有这个 OpenID。"
+#: lib/action.php:453
+msgid "Login to the site"
+msgstr "登入本站"
+
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
+msgstr "帮助"
 
-#: lib/action.php:344
+#: lib/action.php:456
 #, fuzzy
 msgid "Help me!"
 msgstr "帮助"
 
-#: lib/action.php:362
+#: lib/action.php:459
+msgid "Search"
+msgstr "搜索"
+
+#: lib/action.php:459
+msgid "Search for people or text"
+msgstr "检索人或文字"
+
+#: lib/action.php:480
 #, fuzzy
 msgid "Site notice"
 msgstr "新通告"
 
-#: lib/action.php:417
+#: lib/action.php:546
 msgid "Local views"
 msgstr "本地显示"
 
-#: lib/action.php:472
+#: lib/action.php:612
 #, fuzzy
 msgid "Page notice"
 msgstr "新通告"
 
-#: lib/action.php:562
+#: lib/action.php:714
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "次项站导航"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:721
+msgid "About"
+msgstr "关于"
+
+#: lib/action.php:723
+msgid "FAQ"
+msgstr "常见问题FAQ"
+
+#: lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/action.php:730
+msgid "Privacy"
+msgstr "隐私"
+
+#: lib/action.php:732
+msgid "Source"
+msgstr "来源"
+
+#: lib/action.php:734
+msgid "Contact"
+msgstr "联系人"
+
+#: lib/action.php:736
+#, fuzzy
+msgid "Badge"
+msgstr "呼叫"
+
+#: lib/action.php:764
 msgid "StatusNet software license"
 msgstr "StatusNet软件注册证"
 
-#: lib/action.php:630
+#: lib/action.php:767
+#, 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/action.php:769
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** 是一个微博客服务。"
+
+#: lib/action.php:771
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+"它运行[StatusNet](http://status.net/)微博客服务，版本 %s，采用[GNU Affero "
+"General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)"
+"授权。"
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "StatusNet软件注册证"
+
+#: lib/action.php:794
 msgid "All "
 msgstr "全部"
 
-#: lib/action.php:635
+#: lib/action.php:799
 msgid "license."
 msgstr "注册证"
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/action.php:1052
+msgid "Pagination"
+msgstr "分页"
+
+#: lib/action.php:1061
 #, fuzzy
-msgid "Block this user"
-msgstr "阻止该用户"
+msgid "After"
+msgstr "« 之后"
 
-#: lib/blockform.php:153
-msgid "Block"
-msgstr "阻止"
+#: lib/action.php:1069
+#, fuzzy
+msgid "Before"
+msgstr "之前 »"
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
+#: lib/action.php:1117
 #, fuzzy
-msgid "Disfavor this notice"
-msgstr "%s 收藏的通告"
+msgid "There was a problem with your session token."
+msgstr "会话标识有问题，请重试。"
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "个人信息"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
 
-#: lib/facebookaction.php:268
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
+msgstr "执行结果"
+
+#: lib/channel.php:210
+msgid "Command complete"
+msgstr "执行完毕"
+
+#: lib/channel.php:221
+msgid "Command failed"
+msgstr "执行失败"
+
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr "对不起，这个命令还没有实现。"
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "无法更新已确认的电子邮件。"
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "振铃呼叫发出。"
+
+#: lib/command.php:126
 #, php-format
-msgid "To use the %s Facebook Application you need to login "
-msgstr "你需要登录方能使用%sFacebook程序"
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
+msgstr "用户没有通告。"
 
-#: lib/facebookaction.php:271
+#: lib/command.php:190
+msgid "Notice marked as fave."
+msgstr "通告被标记为收藏。"
+
+#: lib/command.php:315
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#: lib/command.php:318
+#, php-format
+msgid "Fullname: %s"
+msgstr "全名：%s"
+
+#: lib/command.php:321
+#, php-format
+msgid "Location: %s"
+msgstr "位置：%s"
+
+#: lib/command.php:324
+#, php-format
+msgid "Homepage: %s"
+msgstr "主页：%s"
+
+#: lib/command.php:327
+#, php-format
+msgid "About: %s"
+msgstr "关于：%s"
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr "您的消息包含 %d 个字符，超出长度限制 - 不能超过 140 个字符。"
+
+#: lib/command.php:377
+msgid "Error sending direct message."
+msgstr "发送消息出错。"
+
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "您的消息包含 %d 个字符，超出长度限制 - 不能超过 140 个字符。"
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "无法删除通告。"
+
+#: lib/command.php:441
 #, fuzzy
-msgid " a new account."
-msgstr "一个新帐号"
+msgid "Error saving notice."
+msgstr "保存通告时出错。"
 
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-msgid "Published"
-msgstr "已发布"
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
+msgstr "指定要订阅的用户名"
+
+#: lib/command.php:502
+#, php-format
+msgid "Subscribed to %s"
+msgstr "订阅 %s"
+
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
+msgstr "指定要取消订阅的用户名"
+
+#: lib/command.php:530
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr "取消订阅 %s"
+
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
+msgstr "命令尚未实现。"
+
+#: lib/command.php:551
+msgid "Notification off."
+msgstr "通告关闭。"
+
+#: lib/command.php:553
+msgid "Can't turn off notification."
+msgstr "无法关闭通告。"
+
+#: lib/command.php:574
+msgid "Notification on."
+msgstr "通告开启。"
+
+#: lib/command.php:576
+msgid "Can't turn on notification."
+msgstr "无法开启通告。"
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "无法创建 OpenID 表单：%s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "您未告知此个人信息"
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "您未告知此个人信息"
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "无法订阅他人更新。"
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "订阅 %s"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "您未告知此个人信息"
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "您未告知此个人信息"
+
+#: lib/command.php:670
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+
+#: lib/common.php:192
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "没有验证码"
+
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:195
+#, fuzzy
+msgid "Go to the installer."
+msgstr "登入本站"
+
+#: lib/connectsettingsaction.php:110
+msgid "IM"
+msgstr "即时通讯IM"
+
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "使用即时通讯工具(IM)更新"
+
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
+msgstr "使用SMS短信更新"
+
+#: lib/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "上传"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "修改密码"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "连接"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "搜索"
+
+#: lib/designsettings.php:217
+msgid "Text"
+msgstr "文本"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "登录"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+#, fuzzy
+msgid "Disfavor this notice"
+msgstr "%s 收藏的通告"
 
 #: lib/favorform.php:114 lib/favorform.php:140
 #, fuzzy
 msgid "Favor this notice"
 msgstr "%s 收藏的通告"
 
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr "收藏"
+
 #: lib/feedlist.php:64
 msgid "Export data"
 msgstr "导出数据"
 
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr ""
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr ""
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr ""
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr ""
+
 #: lib/galleryaction.php:121
 #, fuzzy
 msgid "Filter tags"
@@ -4581,63 +4022,89 @@ msgstr "%s 标签的聚合"
 msgid "All"
 msgstr "全部"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "选择运营商"
+
+#: lib/galleryaction.php:140
 #, fuzzy
 msgid "Tag"
 msgstr "标签"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "选择标签缩小清单"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "执行"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:163
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "您的主页、博客或在其他站点的URL"
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:168
 #, fuzzy
-msgid "Description"
-msgstr "描述"
+msgid "Describe the group or topic"
+msgstr "用不超过140个字符描述您自己和您的爱好"
 
-#: lib/groupeditform.php:153
-#, fuzzy
-msgid "Describe the group or topic in 140 chars"
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
 msgstr "用不超过140个字符描述您自己和您的爱好"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:172
+#, fuzzy
+msgid "Description"
+msgstr "描述"
+
+#: lib/groupeditform.php:179
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr "你的位置，格式类似\"城市，省份，国家\""
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
 msgid "Group"
 msgstr "组"
 
-#: lib/groupnav.php:100
-msgid "Admin"
-msgstr "admin管理员"
-
 #: lib/groupnav.php:101
+#, fuzzy
+msgid "Blocked"
+msgstr "阻止"
+
+#: lib/groupnav.php:102
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "阻止用户"
+
+#: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
 msgstr "编辑 %s群选项"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:113
 #, fuzzy
 msgid "Logo"
 msgstr "Logo图标"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:114
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "添加或编辑 %s 图标"
 
+#: lib/groupnav.php:120
+#, fuzzy, php-format
+msgid "Add or edit %s design"
+msgstr "添加或编辑 %s 图标"
+
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "人气最旺的群"
@@ -4652,10 +4119,44 @@ msgid "Tags in %s group's notices"
 msgstr "这个组所发布的消息的标签"
 
 #: lib/htmloutputter.php:104
-#, fuzzy
-msgid "This page is not available in a "
+msgid "This page is not available in a media type you accept"
 msgstr "这个页面不提供您想要的媒体类型"
 
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "你可以给你的组上载一个logo图。"
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr "部分上传。"
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr "上传文件时出错。"
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr "不是图片文件或文件已损坏。"
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr "不支持这种图像格式。"
+
+#: lib/imagefile.php:118
+#, fuzzy
+msgid "Lost our file."
+msgstr "没有这份通告。"
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr "未知文件类型"
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr ""
+
 #: lib/joinform.php:114
 #, fuzzy
 msgid "Join"
@@ -4666,45 +4167,88 @@ msgstr "加入"
 msgid "Leave"
 msgstr "保存"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:80
 #, fuzzy
 msgid "Login with a username and password"
 msgstr "输入用户名和密码以登录。"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:86
 #, fuzzy
 msgid "Sign up for a new account"
 msgstr "创建新帐号"
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
-msgstr "使用openID登录或注册"
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "只有用户自己可以访问邮箱。"
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
 
-#: lib/mail.php:175
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr " 从 "
+
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "电子邮件地址确认"
+
+#: lib/mail.php:174
 #, php-format
 msgid ""
 "Hey, %s.\n"
 "\n"
-msgstr ""
-"你好，%s.\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%s\n"
 "\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
+msgstr ""
 
-#: lib/mail.php:236
-#, fuzzy, php-format
-msgid "%1$s is now listening to "
+#: lib/mail.php:235
+#, php-format
+msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s 开始关注您的 %2$s 信息。"
 
-#: lib/mail.php:254
+#: lib/mail.php:240
+#, fuzzy, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
+"%1$s 开始关注您的 %2$s 信息。\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"为您效力的 %4$s\n"
+
+#: lib/mail.php:253
 #, fuzzy, php-format
 msgid "Location: %s\n"
 msgstr "位置：%s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:255
 #, fuzzy, php-format
 msgid "Homepage: %s\n"
 msgstr "主页：%s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
@@ -4713,66 +4257,230 @@ msgstr ""
 "自传Bio: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:285
+#, php-format
+msgid "New email address for posting to %s"
+msgstr "新的电子邮件地址，用于发布 %s 信息"
+
+#: lib/mail.php:288
+#, 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"
+
+#: lib/mail.php:412
+#, php-format
+msgid "%s status"
+msgstr "%s 状态"
+
+#: lib/mail.php:438
+msgid "SMS confirmation"
+msgstr "SMS短信确认"
+
+#: lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "%s 振铃呼叫你"
 
-#: lib/mail.php:465
-#, fuzzy, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
-msgstr "%1$s (%2$s) 发送了新的私人信息："
+#: lib/mail.php:466
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
+msgstr ""
+
+#: lib/mail.php:509
+#, php-format
+msgid "New private message from %s"
+msgstr "%s 发送了新的私人信息"
+
+#: lib/mail.php:513
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%5$s\n"
+msgstr ""
 
-#: lib/mail.php:555
+#: lib/mail.php:554
 #, fuzzy, php-format
-msgid "%1$s just added your notice from %2$s"
-msgstr "%1$s 收藏了您的 %2$s 通告"
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s 收藏了您的通告"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
-#, fuzzy
-msgid "From"
-msgstr "从 "
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, php-format
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+msgstr ""
+
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+msgid "Could not determine file's mime-type!"
+msgstr "无法获取收藏的通告。"
+
+#: lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
 
-#: lib/messageform.php:110
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: lib/messageform.php:120
 #, fuzzy
 msgid "Send a direct notice"
 msgstr "删除通告"
 
-#: lib/noticeform.php:125
-#, fuzzy
-msgid "Send a notice"
-msgstr "发送消息"
+#: lib/messageform.php:146
+msgid "To"
+msgstr "到"
 
-#: lib/noticeform.php:152
+#: lib/messageform.php:162 lib/noticeform.php:173
 #, fuzzy
 msgid "Available characters"
 msgstr "6 个或更多字符"
 
-#: lib/noticelist.php:426
+#: lib/noticeform.php:145
+#, fuzzy
+msgid "Send a notice"
+msgstr "发送消息"
+
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
+msgstr "怎么样，%s？"
+
+#: lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:478
 #, fuzzy
-msgid "in reply to"
-msgstr "先前……"
+msgid "in context"
+msgstr "没有内容！"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:498
 #, fuzzy
 msgid "Reply to this notice"
 msgstr "无法删除通告。"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:499
 #, fuzzy
 msgid "Reply"
 msgstr "回复"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
-#, fuzzy
-msgid "Delete this notice"
-msgstr "删除通告"
-
-#: lib/noticelist.php:474
-#, fuzzy
-msgid "Delete"
-msgstr "删除"
-
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "呼叫这个用户"
@@ -4786,42 +4494,143 @@ msgstr "呼叫"
 msgid "Send a nudge to this user"
 msgstr "呼叫这个用户"
 
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "添加个人信息出错"
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "添加头像出错"
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "添加远程的个人信息出错"
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "删除通告"
+
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
+msgstr "无法添加新的订阅。"
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "个人"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "回复"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr "收藏夹"
+
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr "用户"
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr "收件箱"
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr "您接收的消息"
+
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr "发件箱"
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr "您发送的消息"
+
 #: lib/personaltagcloudsection.php:56
 #, fuzzy, php-format
 msgid "Tags in %s's notices"
 msgstr "%s's 的消息的标签"
 
-#: lib/profilelist.php:182
-msgid "(none)"
-msgstr "(none 没有)"
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "订阅"
+
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "所有订阅"
 
-#: lib/publicgroupnav.php:76
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "订阅者"
+
+#: lib/profileaction.php:157
+#, fuzzy
+msgid "All subscribers"
+msgstr "订阅者"
+
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "用户"
+
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "用户始于"
+
+#: lib/profileaction.php:235
+msgid "All groups"
+msgstr "所有组"
+
+#: lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "公告"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "用户组"
 
-#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 #, fuzzy
 msgid "Recent tags"
 msgstr "最近的标签"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "特征"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:92
 #, fuzzy
 msgid "Popular"
 msgstr "用户"
 
+#: lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "搜索"
+
+#: lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "搜索"
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "用户"
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr "搜索用户信息"
+
 #: lib/searchgroupnav.php:82
 #, fuzzy
 msgid "Notice"
 msgstr "通告"
 
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr "搜索通告内容"
+
 #: lib/searchgroupnav.php:85
 #, fuzzy
 msgid "Find groups on this site"
@@ -4831,35 +4640,64 @@ msgstr "搜索用户信息"
 msgid "Untitled section"
 msgstr "无标题章节"
 
-#: lib/subgroupnav.php:81
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: lib/subgroupnav.php:83
 #, fuzzy, php-format
 msgid "People %s subscribes to"
 msgstr "%s 订阅的人"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:91
 #, fuzzy, php-format
 msgid "People subscribed to %s"
 msgstr "订阅 %s"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "%s 组是成员组成了"
 
-#: lib/subgroupnav.php:104
-#, fuzzy, php-format
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "使用这个表单来邀请好友和同事加入。"
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
 
-#: lib/subs.php:53
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(none 没有)"
+
+#: lib/subs.php:48
+msgid "Already subscribed!"
+msgstr ""
+
+#: lib/subs.php:52
 #, fuzzy
 msgid "User has blocked you."
 msgstr "用户没有个人信息。"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: lib/subs.php:56
+msgid "Could not subscribe."
+msgstr "无法订阅。"
+
+#: lib/subs.php:75
+msgid "Could not subscribe other to you."
+msgstr "无法订阅他人更新。"
+
+#: lib/subs.php:124
 #, fuzzy
-msgid "Subscribe to this user"
-msgstr "订阅 %s"
+msgid "Not subscribed!"
+msgstr "未订阅！"
+
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
+msgstr "无法删除订阅。"
 
 #: lib/tagcloudsection.php:56
 #, fuzzy
@@ -4871,36 +4709,110 @@ msgstr "否"
 msgid "Top posters"
 msgstr "灌水精英"
 
-#: lib/unblockform.php:120 lib/unblockform.php:150
-#, fuzzy
-msgid "Unblock this user"
-msgstr "取消阻止次用户"
-
-#: lib/unblockform.php:150
-msgid "Unblock"
-msgstr "取消阻止"
-
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 #, fuzzy
 msgid "Unsubscribe from this user"
 msgstr "取消订阅 %s"
 
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "退订"
+
+#: lib/userprofile.php:116
 #, fuzzy
-#~ msgid "Code not yet ready."
-#~ msgstr "命令尚未实现。"
+msgid "Edit Avatar"
+msgstr "头像"
 
+#: lib/userprofile.php:236
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "创建新帐号"
+msgid "User actions"
+msgstr "未知动作"
 
+#: lib/userprofile.php:248
 #, fuzzy
-#~ msgid "Delete my account confirmation"
-#~ msgstr "无法删除电子邮件确认。"
+msgid "Edit profile settings"
+msgstr "个人设置"
 
+#: lib/userprofile.php:249
+msgid "Edit"
+msgstr ""
+
+#: lib/userprofile.php:272
 #, fuzzy
-#~ msgid "Check if you are sure you want to delete your account."
-#~ msgstr "确定要删除这条通告吗？"
+msgid "Send a direct message to this user"
+msgstr "无法向此用户发送消息。"
 
+#: lib/userprofile.php:273
 #, fuzzy
-#~ msgid "Showing recently popular notices"
-#~ msgstr "搜索通告内容"
+msgid "Message"
+msgstr "新消息"
+
+#: lib/util.php:821
+msgid "a few seconds ago"
+msgstr "几秒前"
+
+#: lib/util.php:823
+msgid "about a minute ago"
+msgstr "一分钟前"
+
+#: lib/util.php:825
+#, php-format
+msgid "about %d minutes ago"
+msgstr "%d 分钟前"
+
+#: lib/util.php:827
+msgid "about an hour ago"
+msgstr "一小时前"
+
+#: lib/util.php:829
+#, php-format
+msgid "about %d hours ago"
+msgstr "%d 小时前"
+
+#: lib/util.php:831
+msgid "about a day ago"
+msgstr "一天前"
+
+#: lib/util.php:833
+#, php-format
+msgid "about %d days ago"
+msgstr "%d 天前"
+
+#: lib/util.php:835
+msgid "about a month ago"
+msgstr "一个月前"
+
+#: lib/util.php:837
+#, php-format
+msgid "about %d months ago"
+msgstr "%d 个月前"
+
+#: lib/util.php:839
+msgid "about a year ago"
+msgstr "一年前"
+
+#: lib/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "主页的URL不正确。"
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr "无法解析消息。"
+
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr "不是已注册用户。"
+
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr "对不起，这个发布用的电子邮件属于其他用户。"
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr "对不起，发布用的电子邮件无法使用。"
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.mo b/locale/zh_TW/LC_MESSAGES/statusnet.mo
index 9bdfbaf9f..0db278848 100644
--- a/locale/zh_TW/LC_MESSAGES/statusnet.mo
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.mo
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po
index 4f1168601..d251d4aa4 100644
--- a/locale/zh_TW/LC_MESSAGES/statusnet.po
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.po
@@ -1,3 +1,6 @@
+# Translation of StatusNet to Traditional Chinese
+#
+# --
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -5,4446 +8,3881 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-03-12 16:21+0000\n"
-"Last-Translator: Evan Prodromou <evan@status.net>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:44:31+0000\n"
+"Language-Team: Traditional Chinese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: zh-hant\n"
+"X-Message-Group: out-statusnet\n"
 
-#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
-#, php-format
-msgid " Search Stream for \"%s\""
-msgstr "搜尋 \"%s\"相關資料"
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "無此通知"
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-#: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
-msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr "不包含這些個人資料：密碼、電子信箱、線上即時通信箱、電話號碼"
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:112
+msgid "No such user."
+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/all.php:84
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s與好友"
 
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
+msgid "%s and friends"
+msgstr "%s與好友"
 
-#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
+#: actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "發送給%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 ""
+#: actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "發送給%s好友的訂閱"
 
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "現在%1$s在%2$s成為你的粉絲囉"
+#: actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "發送給%s好友的訂閱"
 
-#: ../lib/mail.php:126
+#: actions/all.php:127
 #, 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"
+"This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
-"現在%1$s在%2$s成為你的粉絲囉。\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"\n"
-"%4$s.\n"
-"敬上。\n"
 
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/all.php:132
 #, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
 msgstr ""
 
-#: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr "%1$s的狀態是%2$s"
-
-#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/all.php:134
 #, php-format
-msgid "%s (%s)"
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
 #, php-format
-msgid "%s Public Stream"
-msgstr "%s的公開內容"
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+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
-#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
-#, php-format
-msgid "%s and friends"
+#: actions/all.php:165
+#, fuzzy
+msgid "You and friends"
 msgstr "%s與好友"
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
 #, php-format
-msgid "%s public timeline"
-msgstr ""
-
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
-#, php-format
-msgid "%s status"
+msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
-#, php-format
-msgid "%s timeline"
-msgstr ""
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
+msgstr "確認碼遺失"
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
-#, php-format
-msgid "%s updates from everyone!"
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
+#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
+msgid "This method requires a POST."
 msgstr ""
 
-#: ../actions/register.php:213
+#: actions/apiaccountupdatedeliverydevice.php:105
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
 msgstr ""
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "無法更新使用者"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/newnotice.php:94 lib/designsettings.php:283
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
 msgstr ""
-"**%%site.name%%**是由[%%site.broughtby%%](%%site.broughtbyurl%%)所提供的微型"
-"部落格服務"
-
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
-#, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%**是個微型部落格"
-
-#: ../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
-#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64個小寫英文字母或數字，勿加標點符號或空格"
 
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
 msgstr ""
 
-#: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr "6個以上字元"
-
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
-msgid "6 or more characters, and don't forget it!"
-msgstr "6個或6個以上字元，別忘了自己密碼喔"
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "無法更新使用者"
 
-#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
-msgid "6 or more characters. Required."
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
 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 "確認信已寄到你的線上即時通信箱。%s送給你得訊息要先經過你的認可。"
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+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."
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
 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 actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
-msgid "API method not found!"
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
 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 actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
-msgid "API method under construction."
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
 msgstr ""
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
-msgid "About"
-msgstr "關於"
-
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
-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 actions/emailsettings.php:120
-#: actions/imsettings.php:127 actions/openidsettings.php:111
-#: actions/smssettings.php:133 actions/twittersettings.php:163
-msgid "Add"
-msgstr "新增"
-
-#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
-msgstr "新增OpenID"
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-msgid "Add or remove OpenIDs"
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
 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
-#: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
-msgstr "信箱"
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr ""
 
-#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-msgid "Addresses of friends to invite (one per line)"
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
-msgid "All subscriptions"
-msgstr "所有訂閱"
+#: actions/apidirectmessage.php:89
+#, php-format
+msgid "Direct messages from %s"
+msgstr ""
 
-#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/apidirectmessage.php:93
 #, php-format
-msgid "All updates for %s"
-msgstr "%s的所有新增內容"
+msgid "All the direct messages sent from %s"
+msgstr ""
 
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/apidirectmessage.php:101
 #, php-format
-msgid "All updates matching search term \"%s\""
-msgstr "所有符合 \"%s\"的更新"
+msgid "Direct messages to %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
-#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
-msgid "Already logged in."
-msgstr "已登入"
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
-msgid "Already subscribed!."
-msgstr "此帳號已註冊"
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr ""
 
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
-msgid "Are you sure you want to delete this notice?"
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
 msgstr ""
 
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
-msgid "Authorize subscription"
-msgstr "註冊確認"
+#: actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
+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/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+msgstr ""
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+#: actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
 msgstr ""
 
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34 actions/avatarsettings.php:65
-#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
-msgid "Avatar"
-msgstr "個人圖像"
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr ""
 
-#: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
-msgid "Avatar updated."
-msgstr "更新個人圖像"
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
+msgstr ""
 
-#: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/apifriendshipscreate.php:118
 #, 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?)"
+msgid "Could not follow user: %s is already on your 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."
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "無法連結到伺服器:%s"
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
 msgstr ""
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
-msgid "Awaiting confirmation on this phone number."
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
-#: ../lib/util.php:1318 lib/util.php:1452
+#: actions/apifriendshipsshow.php:135
 #, fuzzy
-msgid "Before »"
-msgstr "之前的內容»"
-
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
-#: actions/profilesettings.php:82 actions/register.php:184
-#: actions/profilesettings.php:112 actions/register.php:402
-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
-#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
-msgid "Bio is too long (max 140 chars)."
-msgstr "自我介紹過長(共140個字元)"
+msgid "Could not determine source user."
+msgstr "無法更新使用者"
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
-msgid "Can't delete this notice."
-msgstr ""
+#: actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "無法更新使用者"
 
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
-#, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr "無法讀取此%sURL的圖像"
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
+#, fuzzy
+msgid "Could not create group."
+msgstr "無法存取個人圖像資料"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404 actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-msgid "Can't save new password."
-msgstr "無法存取新密碼"
+#: actions/apigroupcreate.php:147 actions/editgroup.php:259
+#: actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+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
-#: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
-msgstr "取消"
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "註冊失敗"
 
-#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "無法初始化OpenID用戶對象(consumer object)"
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "暱稱請用小寫字母或數字，勿加空格。"
 
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
-msgstr "此JabberID錯誤"
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr "此暱稱已有人使用。再試試看別的吧。"
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
-msgid "Cannot normalize that email address"
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
 msgstr ""
 
-#: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
-msgstr "更改"
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "個人首頁位址錯誤"
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
-msgstr ""
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "全名過長（最多255字元）"
 
-#: ../actions/password.php:32 actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr "更改密碼"
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "自我介紹過長(共140個字元)"
 
-#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
-msgid "Change your password"
-msgstr ""
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "地點過長（共255個字）"
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-msgid "Change your profile settings"
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
 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
-#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
-#: actions/register.php:376 actions/smssettings.php:122
-msgid "Confirm"
-msgstr "確認"
-
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "確認信箱"
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "個人首頁連結%s無效"
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245 actions/emailsettings.php:256
-#: actions/imsettings.php:230 actions/smssettings.php:253
-#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
-msgid "Confirmation cancelled."
-msgstr "確認取消"
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "此暱稱已有人使用。再試試看別的吧。"
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
-msgid "Confirmation code"
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
 msgstr ""
 
-#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-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."
+#: actions/apigroupjoin.php:110
+msgid "You are already a member of that group."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
-msgid "Connect"
-msgstr "連結"
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
-msgid "Connect existing account"
-msgstr "與現有帳號連結"
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "無法連結到伺服器:%s"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
-msgid "Contact"
-msgstr "好友名單"
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "無法連結到伺服器:%s"
 
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
-#, php-format
-msgid "Could not create OpenID form: %s"
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
 msgstr "無法從 %s 建立OpenID"
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
-#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
 #, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
-msgid "Could not follow user: User not found."
+msgid "%s groups"
 msgstr ""
 
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: actions/apigrouplistall.php:94
 #, php-format
-msgid "Could not redirect to server: %s"
-msgstr "無法連結到伺服器:%s"
-
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
-msgid "Could not save avatar info"
-msgstr "無法存取個人圖像資料"
+msgid "groups on %s"
+msgstr ""
 
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
-msgid "Could not save new profile info"
-msgstr "無法存取新的個人資料"
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "無此通知"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
-msgid "Could not subscribe other to you."
+#: actions/apigrouplist.php:103
+#, php-format
+msgid "Groups %s is a member of on %s."
 msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
-msgid "Could not subscribe."
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
 msgstr ""
 
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-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
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-msgid "Couldn't delete email confirmation."
-msgstr "無法取消信箱確認"
-
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
-msgid "Couldn't delete subscription."
-msgstr "無法刪除帳號"
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "更新個人圖像"
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
-msgid "Couldn't find any statuses."
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-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
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
-msgid "Couldn't insert confirmation code."
-msgstr "無法輸入確認碼"
-
-#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
-msgstr "無法新增訂閱"
-
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-msgid "Couldn't save profile."
-msgstr "無法儲存個人資料"
-
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, php-format
+msgid "That's too long. Max notice size is %d chars."
 msgstr ""
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
-msgid "Couldn't update user record."
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
 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
-#: actions/confirmaddress.php:114 actions/emailsettings.php:280
-#: actions/emailsettings.php:411 actions/imsettings.php:252
-#: actions/imsettings.php:395 actions/othersettings.php:162
-#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
-msgid "Couldn't update user."
-msgstr "無法更新使用者"
-
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
-msgid "Create"
-msgstr "新增"
-
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
-msgid "Create a new user with this nickname."
-msgstr "以此暱稱新增使用者"
-
-#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
-msgid "Create new account"
-msgstr "新增帳號"
-
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
-msgid "Creating new account for OpenID that already has a user."
-msgstr "該OpenID已經注冊"
-
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "目前已確認的Jabber/Gtalk地址"
-
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-msgid "Current confirmed email address."
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+msgid "Unsupported format."
 msgstr ""
 
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
-msgstr "目前"
-
-#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: actions/apitimelinefavorites.php:107
 #, php-format
-msgid "DB error inserting hashtag: %s"
+msgid "%s / Favorites from %s"
 msgstr ""
 
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: actions/apitimelinefavorites.php:119
 #, php-format
-msgid "DB error inserting reply: %s"
-msgstr "增加回覆時,資料庫發生錯誤: %s"
-
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
-msgid "Delete notice"
+msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "請在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 actions/register.php:381
-#: actions/register.php:385 lib/accountsettingsaction.php:113
-msgid "Email"
-msgstr "電子信箱"
-
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-msgid "Email Address"
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
+#, php-format
+msgid "%s timeline"
 msgstr ""
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
+#, php-format
+msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
-#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-msgid "Email address already exists."
-msgstr "此電子信箱已註冊過了"
-
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
-msgid "Email address confirmation"
-msgstr "確認信箱"
+#: actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s的狀態是%2$s"
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
+#: actions/apitimelinementions.php:126
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-msgid "Email addresses"
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#, php-format
+msgid "%s public timeline"
 msgstr ""
 
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
-msgid "Enter a nickname or email address."
-msgstr "請輸入暱稱或電子信箱"
-
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#, php-format
+msgid "%s updates from everyone!"
 msgstr ""
 
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
-msgid "Error authorizing token"
-msgstr "授權錯誤(Error authorizing token)"
-
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
-msgid "Error connecting user to OpenID."
-msgstr "連接OpenID時發生錯誤"
-
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
-msgstr "連接用戶時發生錯誤(Error connecting user.)"
-
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
-msgstr "個人圖像插入錯誤"
-
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
-msgstr "新的更人資料輸入錯誤"
+#: actions/apitimelinetag.php:101 actions/tag.php:66
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
-msgstr "新增外部個人資料發生錯誤(Error inserting remote profile)"
+#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "&s的微型部落格"
 
-#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
-msgid "Error saving address confirmation."
-msgstr "儲存信箱確認發生錯誤"
+#: actions/apiusershow.php:96
+#, fuzzy
+msgid "Not found."
+msgstr "目前無請求"
 
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
-msgid "Error saving remote profile"
-msgstr "儲存遠端個人資料發生錯誤"
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "無此文件"
 
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-msgid "Error saving the profile."
-msgstr "儲存個人資料發生錯誤"
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+msgstr "無暱稱"
 
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-msgid "Error saving the user."
-msgstr "儲存使用者發生錯誤"
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "無尺寸"
 
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
-msgid "Error saving user; invalid."
-msgstr "儲存使用者發生錯誤;使用者名稱無效"
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+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 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-msgid "Error setting user."
-msgstr "使用者設定發生錯誤"
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "個人圖像"
 
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr "更新個人資料發生錯誤"
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr ""
 
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
-msgstr "更新遠端個人資料發生錯誤"
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
+msgstr ""
 
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr "確認碼發生錯誤"
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+#, fuzzy
+msgid "Avatar settings"
+msgstr "線上即時通設定"
 
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
-msgid "Existing nickname"
-msgstr "這個暱稱已有人用了喔"
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr ""
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
-msgid "FAQ"
-msgstr "常見問題"
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr ""
 
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
-msgid "Failed updating avatar."
-msgstr "無法上傳個人圖像"
+#: actions/avatarsettings.php:148 lib/noticelist.php:522
+msgid "Delete"
+msgstr ""
 
-#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
-#, php-format
-msgid "Feed for friends of %s"
-msgstr "發送給%s好友的訂閱"
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+msgstr ""
 
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
-#, php-format
-msgid "Feed for replies to %s"
-msgstr "回應給%s的訂閱"
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
+msgstr ""
 
-#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
-#, php-format
-msgid "Feed for tag %s"
+#: actions/avatarsettings.php:265 actions/block.php:64 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unblock.php:65 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
+#: actions/avatarsettings.php:277 actions/emailsettings.php:255
+#: actions/grouplogo.php:319 actions/imsettings.php:220
+#: actions/recoverpassword.php:44 actions/smssettings.php:248
+#: lib/designsettings.php:304
+msgid "Unexpected form submission."
 msgstr ""
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: ../actions/login.php:122
-msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
-msgstr "為安全起見，請先重新輸入你的使用者名稱與密碼再更改設定。"
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
+msgstr ""
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
-#: actions/profilesettings.php:77 actions/register.php:178
-#: actions/profilesettings.php:103 actions/register.php:391
-#: actions/showgroup.php:235 actions/showstream.php:262
-#: actions/tagother.php:105 lib/groupeditform.php:142
-msgid "Full name"
-msgstr "全名"
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+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
-#: actions/editgroup.php:195 actions/newgroup.php:146
-#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
-msgid "Full name is too long (max 255 chars)."
-msgstr "全名過長（最多255字元）"
+#: actions/avatarsettings.php:363
+msgid "Failed updating avatar."
+msgstr "無法上傳個人圖像"
 
-#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
-msgid "Help"
-msgstr "求救"
+#: actions/avatarsettings.php:387
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "更新個人圖像"
 
-#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
-msgid "Home"
-msgstr "主頁"
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+#, fuzzy
+msgid "No nickname"
+msgstr "無暱稱"
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
-msgid "Homepage"
-msgstr "個人首頁"
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+#, fuzzy
+msgid "No such group"
+msgstr "無此通知"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
-msgid "Homepage is not a valid URL."
-msgstr "個人首頁位址錯誤"
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "無此通知"
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
-msgid "I want to post notices by email."
-msgstr ""
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s與好友"
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
 msgstr ""
 
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
-msgstr "線上即時通信箱"
-
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
-msgstr "線上即時通設定"
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "無此使用者"
 
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
-msgstr "若已經註冊過了，請輸入使用者名稱與密碼連結到你的OpenID。"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
+msgid "Unblock"
+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 "若想新增OpenID到你的帳號，請在下方空格輸入並勾選『新增』"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:120
+#: lib/unblockform.php:150
+#, fuzzy
+msgid "Unblock this user"
+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."
+#: actions/block.php:59 actions/deletenotice.php:67 actions/disfavor.php:61
+#: actions/favor.php:62 actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/logout.php:69 actions/makeadmin.php:61 actions/newmessage.php:87
+#: actions/newnotice.php:89 actions/nudge.php:63 actions/subedit.php:31
+#: actions/subscribe.php:30 actions/unblock.php:60 actions/unsubscribe.php:52
+#: lib/settingsaction.php:72
+msgid "Not logged in."
 msgstr ""
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-#: actions/emailsettings.php:127 actions/smssettings.php:140
-msgid "Incoming email"
+#: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
+msgid "No profile specified."
 msgstr ""
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
-msgid "Incoming email address removed."
+#: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+msgid "No profile with that ID."
 msgstr ""
 
-#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
-msgid "Incorrect old password"
-msgstr "舊密碼錯誤"
-
-#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
-msgid "Incorrect username or password."
-msgstr "使用者名稱或密碼錯誤"
+#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160
+#, fuzzy
+msgid "Block user"
+msgstr "無此使用者"
 
-#: ../actions/recoverpassword.php:265
+#: actions/block.php:136
 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
-#: actions/updateprofile.php:118
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "個人圖像連結%s無效"
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
+msgstr ""
 
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
-#, php-format
-msgid "Invalid email address: %s"
+#: actions/block.php:149 actions/deletenotice.php:145
+#: actions/groupblock.php:178
+msgid "No"
 msgstr ""
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
-#, php-format
-msgid "Invalid homepage '%s'"
-msgstr "個人首頁連結%s無效"
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user"
+msgstr "無此使用者"
 
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
-#, php-format
-msgid "Invalid license URL '%s'"
+#: actions/block.php:150 actions/deletenotice.php:146
+#: actions/groupblock.php:179
+msgid "Yes"
 msgstr ""
 
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
-msgstr ""
+#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
+#: lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "無此使用者"
 
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
+#: actions/block.php:165
+msgid "You have already blocked this user."
 msgstr ""
 
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
+#: actions/block.php:170
+msgid "Failed to save block information."
 msgstr ""
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "個人資料連結%s無效"
-
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
-msgstr "個人資料連結無效(格式錯誤)"
-
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
+#: actions/bookmarklet.php:50
+msgid "Post to "
 msgstr ""
 
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
-#: actions/avatarbynickname.php:69
-msgid "Invalid size."
-msgstr "尺寸錯誤"
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+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
-#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
-msgid "Invalid username or password."
-msgstr "使用者名稱或密碼無效"
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "確認碼遺失"
 
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-msgid "Invitation(s) sent"
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
 msgstr ""
 
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-msgid "Invitation(s) sent to the following people:"
+#: actions/confirmaddress.php:90
+#, php-format
+msgid "Unrecognized address type %s"
 msgstr ""
 
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
-msgid "Invite"
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
 msgstr ""
 
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-msgid "Invite new users"
-msgstr ""
+#: actions/confirmaddress.php:114 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "無法更新使用者"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
-#, php-format
-msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
-msgstr ""
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr "無法取消信箱確認"
 
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
-msgstr "此Jabber ID已有人使用"
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "確認信箱"
 
-#: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/confirmaddress.php:159
 #, 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
-#: actions/profilesettings.php:128
-msgid "Language"
-msgstr ""
-
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
-msgid "Language is too long (max 50 chars)."
+msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
-msgid "Location"
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
 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
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
-msgid "Location is too long (max 255 chars)."
-msgstr "地點過長（共255個字）"
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
+msgstr ""
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
-#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
-#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
-#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
-#, php-format
-msgid "Login"
-msgstr "登入"
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
+msgstr "無此通知"
 
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "用OpenID(%%doc.openid%%)帳號登入"
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr ""
 
-#: ../actions/login.php:126
-#, php-format
+#: actions/deletenotice.php:103
 msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
-"%). "
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
 msgstr ""
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
-msgid "Logout"
-msgstr "登出"
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr ""
 
-#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
-msgid "Longer name, preferably your \"real\" name"
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
 msgstr ""
 
-#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
-msgid "Lost or forgotten password?"
-msgstr "遺失或忘記密碼了嗎？"
+#: actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+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."
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+msgid "Delete this notice"
 msgstr ""
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#: actions/emailsettings.php:71
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
+#: actions/deletenotice.php:157
+msgid "There was a problem with your session token.  Try again, please."
 msgstr ""
 
-#: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
-msgid "Member since"
-msgstr "何時加入會員的呢？"
-
-#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
-#, 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."
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-msgid "My text and files are available under "
+#: actions/disfavor.php:94
+msgid "Add to favorites"
 msgstr ""
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#: actions/emailsettings.php:142 actions/smssettings.php:152
-msgid "New"
-msgstr ""
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "無此文件"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: actions/editgroup.php:56
 #, php-format
-msgid "New email address for posting to %s"
+msgid "Edit %s group"
 msgstr ""
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
-msgid "New incoming email address added."
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
-msgid "New nickname"
-msgstr "新暱稱"
-
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
-msgstr "新訊息"
+#: actions/editgroup.php:103 actions/editgroup.php:168
+#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+msgid "You must be an admin to edit the group"
+msgstr ""
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-msgid "New password"
-msgstr "新密碼"
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
+msgstr ""
 
-#: ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
-msgstr "新密碼已儲存成功。你已登入。"
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "自我介紹過長(共140個字元)"
 
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151 actions/login.php:101
-#: actions/profilesettings.php:74 actions/register.php:165
-#: actions/login.php:228 actions/profilesettings.php:98
-#: actions/register.php:367 actions/showgroup.php:224
-#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
-msgid "Nickname"
-msgstr "暱稱"
+#: actions/editgroup.php:253
+#, fuzzy
+msgid "Could not update group."
+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
-#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
-msgid "Nickname already in use. Try another one."
-msgstr "此暱稱已有人使用。再試試看別的吧。"
+#: actions/editgroup.php:269
+msgid "Options saved."
+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
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "暱稱請用小寫字母或數字，勿加空格。"
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
-msgid "Nickname not allowed."
-msgstr "此暱稱無法使用"
+#: actions/emailsettings.php:71
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
 
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
-msgstr "你想成為誰的粉絲呢？請輸入他/她的暱稱。"
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "信箱"
 
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
-msgid "Nickname or email"
-msgstr "暱稱或信箱"
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr ""
 
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
-msgid "No"
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
 msgstr ""
 
-#: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
-msgstr "查無此Jabber ID"
+#: actions/emailsettings.php:113
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
 
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
-msgid "No authorization request!"
-msgstr "無確認請求"
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "取消"
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
-msgid "No carrier selected."
+#: actions/emailsettings.php:121
+msgid "Email Address"
 msgstr ""
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
-#: actions/confirmaddress.php:75
-msgid "No confirmation code."
-msgstr "無確認碼"
-
-#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
-#: actions/newnotice.php:126 classes/Command.php:223
-msgid "No content!"
-msgstr "無內容"
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "新增"
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
-msgid "No email address."
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
 msgstr ""
 
-#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
-msgid "No id."
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
 msgstr ""
 
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
-msgid "No incoming email address."
+#: actions/emailsettings.php:145 actions/smssettings.php:162
+msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr "無遠端伺服器提供的暱稱"
-
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
-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
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
-msgid "No pending confirmation to cancel."
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
 msgstr ""
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
-#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
-msgid "No registered email address for that user."
-msgstr "查無此使用者所註冊的信箱"
-
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr "目前無請求"
-
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
-msgid "No results"
-msgstr "無結果"
-
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
-msgstr "無尺寸"
-
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
-msgid "No status found with that ID."
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
-msgid "No status with that ID found."
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
-msgstr "無此OpenID"
-
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
-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 actions/shownotice.php:87
-#: lib/deleteaction.php:51
-msgid "No such notice."
-msgstr "無此通知"
-
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr "無此恢復碼"
-
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-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 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
-msgid "No such user."
-msgstr "無此使用者"
+#: actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr ""
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-msgid "No user with that email address or username."
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
 msgstr ""
 
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr "此恢復碼錯誤"
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
+msgstr ""
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
+#: actions/emailsettings.php:195 actions/imsettings.php:163
+#: actions/othersettings.php:126 actions/profilesettings.php:167
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
 msgstr ""
 
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
-msgid "Not a supported data format."
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
 msgstr ""
 
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
-msgstr "此JabberID無效"
+#: actions/emailsettings.php:319
+msgid "No email address."
+msgstr ""
 
-#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-msgid "Not a valid OpenID."
-msgstr "此OpenID無效"
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
+msgstr ""
 
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr ""
 
-#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-msgid "Not a valid email address."
-msgstr "此信箱無效"
-
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-#: actions/editgroup.php:186 actions/newgroup.php:137
-#: actions/profilesettings.php:195 actions/register.php:161
-msgid "Not a valid nickname."
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another user."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr ""
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+msgstr "無法輸入確認碼"
 
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
+#: actions/emailsettings.php:358
+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/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
-msgid "Not an image or corrupt file."
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
-msgid "Not authorized."
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
-msgid "Not expecting this response!"
-msgstr ""
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "確認取消"
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
-msgid "Not found"
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
 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 actions/block.php:59 actions/disfavor.php:61
-#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
-#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
-#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
-#: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
-msgid "Not logged in."
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
 msgstr ""
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
-msgid "Not subscribed!."
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
 msgstr ""
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
 msgstr ""
 
-#: ../actions/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
-#, php-format
-msgid "Notice feed for %s"
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
 msgstr ""
 
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
 msgstr ""
 
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
-msgid "Notices"
-msgstr ""
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+#, fuzzy
+msgid "Popular notices"
+msgstr "無此通知"
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
-#, php-format
-msgid "Notices tagged with %s"
+#: actions/favorited.php:67
+#, fuzzy, php-format
+msgid "Popular notices, page %d"
+msgstr "無此通知"
+
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
 msgstr ""
 
-#: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
-msgid "OpenID"
+#: actions/favorited.php:153
+msgid ""
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
-msgid "OpenID Account Setup"
+#: actions/favorited.php:156
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
 msgstr ""
 
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-msgid "OpenID Auto-Submit"
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
 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
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-msgid "OpenID Login"
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "&s的微型部落格"
+
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
 msgstr ""
 
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-#: actions/openidlogin.php:102 actions/openidsettings.php:101
-msgid "OpenID URL"
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
 msgstr ""
 
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
-msgid "OpenID authentication cancelled."
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
 msgstr ""
 
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/featured.php:71
 #, php-format
-msgid "OpenID authentication failed: %s"
+msgid "Featured users, page %d"
 msgstr ""
 
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: actions/featured.php:99
 #, php-format
-msgid "OpenID failure: %s"
+msgid "A selection of some of the great users on %s"
 msgstr ""
 
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr ""
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "新訊息"
 
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
-msgstr ""
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "新訊息"
 
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-msgid "Optionally add a personal message to the invitation."
+#: actions/file.php:42
+msgid "No attachments"
 msgstr ""
 
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
-msgid "Partial upload."
+#: actions/file.php:51
+msgid "No uploaded attachments"
 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 actions/finishopenidlogin.php:118
-#: actions/login.php:231 actions/register.php:372
-#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-msgid "Password"
+#: actions/finishremotesubscribe.php:69
+msgid "Not expecting this response!"
 msgstr ""
 
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
-msgid "Password and confirmation do not match."
+#: actions/finishremotesubscribe.php:80
+msgid "User being listened to does not exist."
 msgstr ""
 
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
-msgid "Password must be 6 chars or more."
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
 msgstr ""
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-msgid "Password recovery requested"
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-msgid "Password saved."
+#: actions/finishremotesubscribe.php:106
+msgid "You are not authorized."
 msgstr ""
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-msgid "Passwords don't match."
-msgstr ""
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "無法轉換請求標記以致無法存取標記"
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
+#: actions/finishremotesubscribe.php:114
+msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
-msgstr ""
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "更新遠端個人資料發生錯誤"
 
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
-msgstr ""
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+#, fuzzy
+msgid "No such group."
+msgstr "無此通知"
 
-#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
-msgid "Personal"
-msgstr ""
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "無此通知"
 
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-msgid "Personal message"
-msgstr ""
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "無此通知"
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
 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\"."
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
 msgstr ""
 
-#: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
-msgid "Post a notice when my Jabber/GTalk status changes."
+#: actions/groupblock.php:95
+msgid "User is already blocked from group."
 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 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
-msgid "Preferences"
+#: actions/groupblock.php:100
+msgid "User is not a member of group."
 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
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
-msgid "Preferences saved."
-msgstr ""
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "無此使用者"
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
-msgid "Preferred language"
+#: actions/groupblock.php:162
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
 msgstr ""
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
-msgid "Privacy"
-msgstr ""
+#: actions/groupblock.php:178
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "無法連結到伺服器:%s"
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-msgid "Problem saving notice."
-msgstr ""
+#: actions/groupblock.php:179
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "無此使用者"
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
-msgid "Profile"
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
+#: actions/groupbyid.php:74
+msgid "No ID"
 msgstr ""
 
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
+#: actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
 msgstr ""
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-msgid "Profile unknown"
+#: actions/groupdesignsettings.php:141
+msgid "Group design"
 msgstr ""
 
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
-msgid "Public Stream Feed"
+#: actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
 msgstr ""
 
-#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
-msgid "Public timeline"
-msgstr ""
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "無法更新使用者"
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+msgid "Unable to save your design settings!"
 msgstr ""
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
-msgid "Publish a MicroID for my email address."
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+msgid "Design preferences saved."
 msgstr ""
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
 msgstr ""
 
-#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
-msgid "Recover"
+#: actions/grouplogo.php:150
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
 msgstr ""
 
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
-msgid "Recover password"
+#: actions/grouplogo.php:362
+msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-msgid "Recovery code for unknown user."
-msgstr ""
+#: actions/grouplogo.php:396
+#, fuzzy
+msgid "Logo updated."
+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
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-msgid "Register"
-msgstr ""
+#: actions/grouplogo.php:398
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "無法上傳個人圖像"
 
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
-msgid "Registration not allowed."
+#: actions/groupmembers.php:93 lib/groupnav.php:92
+#, php-format
+msgid "%s group members"
 msgstr ""
 
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
-msgid "Registration successful"
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
 msgstr ""
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
-msgid "Reject"
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
 msgstr ""
 
-#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
-msgid "Remember me"
+#: actions/groupmembers.php:175 lib/groupnav.php:107
+msgid "Admin"
 msgstr ""
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
-msgid "Remote profile with no matching profile"
+#: actions/groupmembers.php:346 lib/blockform.php:153
+msgid "Block"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
+#: actions/groupmembers.php:441
+msgid "Make user an admin of the group"
 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 actions/emailsettings.php:101
-#: actions/emailsettings.php:134 actions/imsettings.php:102
-#: actions/openidsettings.php:166 actions/smssettings.php:103
-#: actions/smssettings.php:146 actions/twittersettings.php:115
-msgid "Remove"
+#: actions/groupmembers.php:473
+msgid "Make Admin"
 msgstr ""
 
-#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
 msgstr ""
 
-#: ../actions/openidsettings.php:73
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "&s的微型部落格"
+
+#: actions/groupsearch.php:52
+#, php-format
 msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 
-#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
-msgid "Replies"
+#: actions/groupsearch.php:58
+msgid "Group search"
 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
-#: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "無結果"
+
+#: actions/groupsearch.php:82
 #, php-format
-msgid "Replies to %s"
+msgid ""
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
 msgstr ""
 
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
-msgid "Reset"
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
 msgstr ""
 
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
-msgid "Reset password"
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
 msgstr ""
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-msgid "SMS"
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
 msgstr ""
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
-msgid "SMS Phone number"
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
 msgstr ""
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
-msgstr ""
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+#, fuzzy
+msgid "Create a new group"
+msgstr "新增帳號"
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
-msgid "SMS confirmation"
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
 msgstr ""
 
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
-msgid "Same as password above"
+#: actions/groupunblock.php:95
+msgid "User is not blocked from group."
 msgstr ""
 
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
-msgid "Same as password above. Required."
-msgstr ""
+#: actions/groupunblock.php:128 actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+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 actions/emailsettings.php:182
-#: actions/facebooksettings.php:114 actions/imsettings.php:157
-#: actions/othersettings.php:117 actions/profilesettings.php:150
-#: actions/smssettings.php:169 actions/subscriptions.php:124
-#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
-msgid "Save"
-msgstr ""
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "線上即時通設定"
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
-msgid "Search"
+#: actions/imsettings.php:70
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
 msgstr ""
 
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
-msgstr ""
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "個人首頁位址錯誤"
+
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "目前已確認的Jabber/Gtalk地址"
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/imsettings.php:114
 #, php-format
 msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
+"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/imsettings.php:124
+msgid "IM Address"
+msgstr "線上即時通信箱"
 
-#: ../actions/peoplesearch.php:28
+#: actions/imsettings.php:126
 #, 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."
+"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/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
-msgid "Select a carrier"
+#: actions/imsettings.php:143
+msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
-#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
-#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
-msgid "Send"
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
+#: actions/imsettings.php:153
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
-msgid "Send me notices through Jabber/GTalk."
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "查無此Jabber ID"
+
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr "此JabberID錯誤"
+
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "此JabberID無效"
+
+#: actions/imsettings.php:299
+msgid "That is already your Jabber ID."
 msgstr ""
 
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr "此Jabber ID已有人使用"
+
+#: actions/imsettings.php:327
+#, php-format
 msgid ""
-"Send me notices through SMS; I understand I may incur exorbitant charges "
-"from my carrier."
-msgstr ""
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr "確認信已寄到你的線上即時通信箱。%s送給你得訊息要先經過你的認可。"
 
-#: ../actions/imsettings.php:76 actions/imsettings.php:77
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#: actions/imsettings.php:387
+msgid "That is not your Jabber ID."
 msgstr ""
 
-#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
-msgid "Settings"
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
 msgstr ""
 
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
-msgid "Settings saved."
+#: actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
 msgstr ""
 
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 
-#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:114
-msgid "Someone else already has this OpenID."
+#: actions/invite.php:39
+msgid "Invites have been disabled."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
+#: actions/invite.php:41
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
 msgstr ""
 
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
+#: actions/invite.php:72
+#, php-format
+msgid "Invalid email address: %s"
 msgstr ""
 
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
 msgstr ""
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
-msgid "Source"
+#: actions/invite.php:112
+msgid "Invite new users"
 msgstr ""
 
-#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
-msgid "Statistics"
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-msgid "Stored OpenID not found."
+#: actions/invite.php:131 actions/invite.php:139
+#, php-format
+msgid "%s (%s)"
 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
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
-msgid "Subscribe"
+#: actions/invite.php:136
+msgid ""
+"These people are already users and you were automatically subscribed to them:"
 msgstr ""
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
-msgid "Subscribers"
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
 msgstr ""
 
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
-msgid "Subscription authorized"
+#: actions/invite.php:150
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 msgstr ""
 
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
-msgid "Subscription rejected"
+#: actions/invite.php:162
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
 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
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
-msgid "Subscriptions"
+#: actions/invite.php:187
+msgid "Email addresses"
 msgstr ""
 
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
-msgid "System error uploading file."
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
 msgstr ""
 
-#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
-#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164
-msgid "Tags"
+#: actions/invite.php:192
+msgid "Personal message"
 msgstr ""
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
-msgid "Text search"
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
 msgstr ""
 
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
+#: actions/invite.php:226
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
 
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
+#: actions/invite.php:228
+#, 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/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
 msgstr ""
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
+#: actions/joingroup.php:90 lib/command.php:217
+msgid "You are already a member of that group"
 msgstr ""
 
-#: ../actions/avatar.php:80 actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
-msgstr ""
+#: actions/joingroup.php:128 lib/command.php:234
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s"
+msgstr "無法連結到伺服器:%s"
 
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
-msgid "That is already your Jabber ID."
+#: actions/joingroup.php:135 lib/command.php:239
+#, php-format
+msgid "%s joined group %s"
 msgstr ""
 
-#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
-msgid "That is already your email address."
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
-msgid "That is already your phone number."
+#: actions/leavegroup.php:90 lib/command.php:268
+msgid "You are not a member of that group."
 msgstr ""
 
-#: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
-msgid "That is not your Jabber ID."
+#: actions/leavegroup.php:119 lib/command.php:278
+msgid "Could not find membership record."
 msgstr ""
 
-#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
-msgid "That is not your email address."
-msgstr ""
+#: actions/leavegroup.php:127 lib/command.php:284
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "無法從 %s 建立OpenID"
 
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
+#: actions/leavegroup.php:134 lib/command.php:289
+#, php-format
+msgid "%s left group %s"
 msgstr ""
 
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-#: actions/emailsettings.php:367 actions/imsettings.php:349
-msgid "That is the wrong IM address."
-msgstr ""
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "已登入"
 
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
+#: actions/login.php:110 actions/login.php:120
+msgid "Invalid or expired token."
 msgstr ""
 
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-msgid "That phone number already belongs to another user."
-msgstr ""
+#: actions/login.php:143
+msgid "Incorrect username or password."
+msgstr "使用者名稱或密碼錯誤"
 
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49 actions/twitapistatuses.php:330
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-msgid "That's too long. Max notice size is 140 chars."
-msgstr ""
+#: actions/login.php:149 actions/recoverpassword.php:375
+#: actions/register.php:248
+msgid "Error setting user."
+msgstr "使用者設定發生錯誤"
 
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
-msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
+#: actions/login.php:204 actions/login.php:257 lib/action.php:453
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "登入"
 
-#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
-#, php-format
-msgid "The address \"%s\" has been confirmed for your account."
+#: actions/login.php:243
+msgid "Login to site"
 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
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
-msgid "The address was removed."
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "暱稱"
+
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
 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:"
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
 msgstr ""
 
-#: ../actions/userauthorization.php:322
+#: actions/login.php:253 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
+msgstr "未來在同一部電腦自動登入"
+
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "遺失或忘記密碼了嗎？"
+
+#: actions/login.php:282
 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 ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr "為安全起見，請先重新輸入你的使用者名稱與密碼再更改設定。"
 
-#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/login.php:286
 #, php-format
-msgid "These are the people who listen to %s's notices."
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
 msgstr ""
 
-#: ../actions/subscribers.php:33 actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
 msgstr ""
 
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/makeadmin.php:95
 #, 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."
+msgid "%s is already an admin for group \"%s\"."
 msgstr ""
 
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
-msgid ""
-"These people are already users and you were automatically subscribed to them:"
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
 msgstr ""
 
-#: ../actions/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
 msgstr ""
 
-#: ../lib/openid.php:195
-msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
+#: actions/microsummary.php:69
+msgid "No current status"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
-#, 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."
+#: actions/newgroup.php:53
+msgid "New group"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-msgid "This method requires a POST or DELETE."
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
 msgstr ""
 
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
-msgid "This method requires a POST."
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
 msgstr ""
 
-#: ../lib/util.php:164 lib/util.php:246
-msgid "This page is not available in a media type you accept"
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367
+msgid "You can't send a message to this user."
 msgstr ""
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
-msgid "Timezone"
-msgstr ""
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+msgstr "無內容"
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
-msgid "Timezone not selected."
+#: actions/newmessage.php:158
+msgid "No recipient specified."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:43
-#, php-format
+#: actions/newmessage.php:164 lib/command.php:370
 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."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
-msgid "Two user ids or screen_names must be supplied."
+#: actions/newmessage.php:181
+msgid "Message sent"
 msgstr ""
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
-msgid "URL of your homepage, blog, or profile on another site"
+#: actions/newmessage.php:185 lib/command.php:375
+#, php-format
+msgid "Direct message to %s sent"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-msgid "URL of your profile on another compatible microblogging service"
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
 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 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-msgid "Unexpected form submission."
-msgstr ""
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "新訊息"
 
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
-msgid "Unexpected password reset."
+#: actions/newnotice.php:199
+msgid "Notice posted"
 msgstr ""
 
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-msgid "Unknown action"
+#: actions/noticesearch.php:68
+#, php-format
+msgid ""
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-msgid "Unknown version of OMB protocol."
+#: actions/noticesearch.php:78
+msgid "Text search"
 msgstr ""
 
-#: ../lib/util.php:269 lib/util.php:285
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "搜尋 \"%s\"相關資料"
+
+#: actions/noticesearch.php:121
+#, php-format
 msgid ""
-"Unless otherwise specified, contents of this site are copyright by the "
-"contributors and available under the "
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 msgstr ""
 
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
+#: actions/noticesearch.php:124
 #, php-format
-msgid "Unrecognized address type %s"
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
-msgstr ""
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "&s的微型部落格"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-msgid "Unsupported OMB version"
-msgstr ""
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "所有符合 \"%s\"的更新"
 
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
-msgid "Unsupported image file format."
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
+#: actions/nudge.php:94
+msgid "Nudge sent"
 msgstr ""
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
+#: actions/nudge.php:97
+msgid "Nudge sent!"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
+#: actions/oembed.php:86 actions/shownotice.php:180
 #, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
+msgid "%1$s's status on %2$s"
+msgstr "%1$s的狀態是%2$s"
 
-#: ../actions/avatar.php:68 actions/profilesettings.php:161
-#: actions/avatarsettings.php:162 actions/grouplogo.php:232
-msgid "Upload"
-msgstr ""
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+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."
+#: actions/oembed.php:160
+msgid "Only "
 msgstr ""
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
 msgstr ""
 
-#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
+#: actions/opensearch.php:64
+msgid "People Search"
 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"
+#: actions/opensearch.php:67
+msgid "Notice Search"
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
-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
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-msgid "User has no profile."
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "線上即時通設定"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
+#: actions/othersettings.php:108
+msgid " (free service)"
 msgstr ""
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
 msgstr ""
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
-msgid "What timezone are you normally in?"
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
 msgstr ""
 
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
-#, php-format
-msgid "What's up, %s?"
+#: actions/othersettings.php:122
+msgid "View profile designs"
 msgstr ""
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-#: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
-msgid "Where you are, like \"City, State (or Region), Country\""
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
 msgstr ""
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/othersettings.php:153
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "地點過長（共255個字）"
+
+#: actions/outbox.php:58
 #, php-format
-msgid "Wrong image type for '%s'"
+msgid "Outbox for %s - page %d"
 msgstr ""
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/outbox.php:61
 #, php-format
-msgid "Wrong size image at '%s'"
+msgid "Outbox for %s"
 msgstr ""
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
-msgid "Yes"
+#: actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-msgid "You already have this OpenID!"
-msgstr ""
+#: actions/passwordsettings.php:58
+msgid "Change password"
+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/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "更改密碼"
 
-#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+msgid "Password change"
 msgstr ""
 
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-msgid "You are already subscribed to these users:"
+#: actions/passwordsettings.php:104
+msgid "Old password"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
-msgid "You are not friends with the specified user."
-msgstr ""
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "新密碼"
 
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr ""
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6個以上字元"
 
-#: ../actions/register.php:135 actions/register.php:145
-msgid "You can create a new account to start posting notices."
-msgstr ""
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "確認"
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
+#: actions/passwordsettings.php:113
+msgid "same as password above"
 msgstr ""
 
-#: ../actions/openidsettings.php:86
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr ""
+#: actions/passwordsettings.php:117
+msgid "Change"
+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."
+#: actions/passwordsettings.php:154 actions/register.php:230
+msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: ../actions/profilesettings.php:27
-msgid ""
-"You can update your personal profile info here so people know more about you."
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
 msgstr ""
 
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
-msgstr ""
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "舊密碼錯誤"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
-msgid "You can't register if you don't agree to the license."
-msgstr ""
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "儲存使用者發生錯誤;使用者名稱無效"
 
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
-msgid "You did not send us that profile"
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "無法存取新密碼"
+
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
 msgstr ""
 
-#: ../lib/mail.php:147
+#: actions/peoplesearch.php:52
 #, 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"
+"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/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
-msgid "You may not delete another user's status."
+#: actions/peoplesearch.php:58
+msgid "People search"
 msgstr ""
 
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr ""
+#: actions/peopletag.php:70
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "此信箱無效"
 
-#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
+#: actions/peopletag.php:144
+#, php-format
+msgid "Users self-tagged with %s - page %d"
 msgstr ""
 
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
 msgstr ""
 
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
-msgid "Your OpenID URL"
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
+#: actions/profilesettings.php:60
+msgid "Profile settings"
 msgstr ""
 
-#: ../actions/openidsettings.php:28
-#, php-format
+#: actions/profilesettings.php:71
 msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
-"account.  Manage your associated OpenIDs from here."
+"You can update your personal profile info here so people know more about you."
 msgstr ""
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
-msgid "a few seconds ago"
+#: actions/profilesettings.php:99
+msgid "Profile information"
 msgstr ""
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
-#, php-format
-msgid "about %d days ago"
-msgstr ""
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64個小寫英文字母或數字，勿加標點符號或空格"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
-#, php-format
-msgid "about %d hours ago"
-msgstr ""
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full name"
+msgstr "全名"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
-#, php-format
-msgid "about %d minutes ago"
-msgstr ""
+#: actions/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "個人首頁"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
-#, php-format
-msgid "about %d months ago"
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
-msgid "about a day ago"
-msgstr ""
+#: actions/profilesettings.php:122 actions/register.php:460
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "請在140個字以內描述你自己與你的興趣"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
-msgid "about a minute ago"
-msgstr ""
+#: actions/profilesettings.php:125 actions/register.php:463
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "請在140個字以內描述你自己與你的興趣"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
-msgid "about a month ago"
-msgstr ""
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "自我介紹"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
-msgid "about a year ago"
-msgstr ""
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "地點"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
-msgid "about an hour ago"
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
 msgstr ""
 
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117 actions/noticesearch.php:136
-#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
-msgid "in reply to..."
+#: actions/profilesettings.php:140
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 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 actions/noticesearch.php:194
-msgid "reply"
+#: actions/profilesettings.php:144
+msgid "Language"
 msgstr ""
 
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-msgid "same as password above"
+#: actions/profilesettings.php:145
+msgid "Preferred language"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
-msgid "unsupported file type"
+#: actions/profilesettings.php:154
+msgid "Timezone"
 msgstr ""
 
-#: ../lib/util.php:1309 lib/util.php:1443
-msgid "« After"
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
 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
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-msgid "There was a problem with your session token. Try again, please."
+#: actions/profilesettings.php:160
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 
-#: actions/disfavor.php:55 actions/disfavor.php:81
-msgid "This notice is not a favorite!"
-msgstr ""
+#: actions/profilesettings.php:221 actions/register.php:223
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "自我介紹過長(共140個字元)"
 
-#: actions/disfavor.php:63 actions/disfavor.php:87
-msgid "Could not delete favorite."
+#: actions/profilesettings.php:228
+msgid "Timezone not selected."
 msgstr ""
 
-#: actions/disfavor.php:72 lib/favorform.php:140
-msgid "Favor"
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
 msgstr ""
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
-msgstr ""
+#: actions/profilesettings.php:246 actions/tagother.php:178
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "個人首頁連結%s無效"
 
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-msgid "Send me email when someone sends me a private message."
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
 msgstr ""
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
-msgid "This notice is already a favorite!"
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+msgstr "無法儲存個人資料"
+
+#: actions/profilesettings.php:336
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "無法儲存個人資料"
+
+#: actions/profilesettings.php:344
+msgid "Settings saved."
 msgstr ""
 
-#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132 actions/favor.php:86
-#: actions/twitapifavorites.php:125 classes/Command.php:152
-msgid "Could not create favorite."
+#: actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
 msgstr ""
 
-#: actions/favor.php:70
-msgid "Disfavor"
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
 msgstr ""
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/public.php:129
 #, php-format
-msgid "%s favorite notices"
+msgid "Public timeline, page %d"
 msgstr ""
 
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
-#, php-format
-msgid "Feed of favorite notices of %s"
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
 msgstr ""
 
-#: actions/inbox.php:28 actions/inbox.php:59
-#, php-format
-msgid "Inbox for %s - page %d"
+#: actions/public.php:151
+msgid "Public Stream Feed (RSS 1.0)"
 msgstr ""
 
-#: actions/inbox.php:30 actions/inbox.php:62
+#: actions/public.php:155
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr ""
+
+#: actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "%s的公開內容"
+
+#: actions/public.php:179
 #, php-format
-msgid "Inbox for %s"
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
 msgstr ""
 
-#: actions/inbox.php:53 actions/inbox.php:115
-msgid "This is your inbox, which lists your incoming private messages."
+#: actions/public.php:182
+msgid "Be the first to post!"
 msgstr ""
 
-#: actions/invite.php:178 actions/invite.php:213
+#: actions/public.php:186
 #, php-format
 msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+"Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
-#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-msgid "Automatically login in the future; "
+#: actions/public.php:233
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 
-#: actions/login.php:122 actions/login.php:264
-msgid "For security reasons, please re-enter your "
+#: actions/public.php:238
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
 msgstr ""
 
-#: actions/login.php:126 actions/login.php:268
-msgid "Login with your username and password. "
+#: actions/publictagcloud.php:57
+msgid "Public tag cloud"
 msgstr ""
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
-msgid "That's too long. Max message size is 140 chars."
+#: actions/publictagcloud.php:63
+#, php-format
+msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/newmessage.php:65 actions/newmessage.php:128
-msgid "No recipient specified."
+#: actions/publictagcloud.php:69
+#, php-format
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
 
-#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206 actions/newmessage.php:131
-#: actions/newmessage.php:168 classes/Command.php:237
-msgid "You can't send a message to this user."
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
 msgstr ""
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: actions/publictagcloud.php:75
+#, php-format
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
 msgstr ""
 
-#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
-msgid "No such user"
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
 msgstr ""
 
-#: actions/newmessage.php:117 actions/newmessage.php:67
-msgid "New message"
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
 msgstr ""
 
-#: actions/noticesearch.php:95 actions/noticesearch.php:146
-msgid "Notice without matching profile"
-msgstr ""
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "無此恢復碼"
 
-#: actions/openidsettings.php:28 actions/openidsettings.php:70
-#, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr ""
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "此恢復碼錯誤"
 
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
 msgstr ""
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "確認碼發生錯誤"
+
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
 msgstr ""
 
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-msgid "You can remove an OpenID from your account "
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
 msgstr ""
 
-#: actions/outbox.php:28 actions/outbox.php:58
-#, php-format
-msgid "Outbox for %s - page %d"
+#: actions/recoverpassword.php:152
+msgid ""
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
 msgstr ""
 
-#: actions/outbox.php:30 actions/outbox.php:61
-#, php-format
-msgid "Outbox for %s"
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
-#: actions/outbox.php:53 actions/outbox.php:116
-msgid "This is your outbox, which lists private messages you have sent."
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
 msgstr ""
 
-#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
-#, php-format
-msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
 msgstr ""
 
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
-msgid "You can update your personal profile info here "
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
-msgid "User without matching profile"
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
 msgstr ""
 
-#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
+#: actions/recoverpassword.php:208
+msgid "Reset password"
 msgstr ""
 
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
+#: actions/recoverpassword.php:209
+msgid "Recover password"
 msgstr ""
 
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a "
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
 msgstr ""
 
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-msgid "Your nickname on this server, "
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
 msgstr ""
 
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-msgid "Instructions for recovering your password "
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "6個或6個以上字元，別忘了自己密碼喔"
+
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
 msgstr ""
 
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
-msgid "New password successfully saved. "
+#: actions/recoverpassword.php:243
+msgid "Reset"
 msgstr ""
 
-#: actions/register.php:95 actions/register.php:180
-msgid "Password must be 6 or more characters."
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "請輸入暱稱或電子信箱"
+
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
 msgstr ""
 
-#: actions/register.php:216
-#, php-format
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr "查無此使用者所註冊的信箱"
+
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "儲存信箱確認發生錯誤"
+
+#: actions/recoverpassword.php:325
 msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
-msgstr ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr "我們已寄出一封信到你帳號中的信箱，告訴你如何取回你的密碼。"
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
 msgstr ""
 
-#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
-#, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
 msgstr ""
 
-#: actions/showfavorites.php:61 actions/showfavorites.php:145
-#, php-format
-msgid "Feed for favorites of %s"
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
 msgstr ""
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-msgid "Could not retrieve favorite notices."
-msgstr ""
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
+msgstr "新密碼已儲存成功。你已登入。"
 
-#: actions/showmessage.php:33 actions/showmessage.php:81
-msgid "No such message."
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
-msgstr ""
+#: actions/register.php:92
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "確認碼發生錯誤"
 
-#: actions/showmessage.php:61 actions/showmessage.php:108
-#, php-format
-msgid "Message to %1$s on %2$s"
+#: actions/register.php:112
+msgid "Registration successful"
 msgstr ""
 
-#: actions/showmessage.php:66 actions/showmessage.php:113
-#, php-format
-msgid "Message from %1$s on %2$s"
+#: actions/register.php:114 actions/register.php:502 lib/action.php:450
+#: lib/logingroupnav.php:85
+msgid "Register"
 msgstr ""
 
-#: actions/showstream.php:154
-msgid "Send a message"
+#: actions/register.php:135
+msgid "Registration not allowed."
 msgstr ""
 
-#: actions/smssettings.php:312 actions/smssettings.php:464
-#, php-format
-msgid "Mobile carrier for your phone. "
+#: actions/register.php:198
+msgid "You can't register if you don't agree to the license."
 msgstr ""
 
-#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
-#, php-format
-msgid "Direct messages to %s"
-msgstr ""
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "此信箱無效"
 
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
-#, php-format
-msgid "All the direct messages sent to %s"
-msgstr ""
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "此電子信箱已註冊過了"
+
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "使用者名稱或密碼無效"
 
-#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-msgid "Direct Messages You've Sent"
+#: actions/register.php:342
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
 msgstr ""
 
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
-#, php-format
-msgid "All the direct messages sent from %s"
+#: actions/register.php:424
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-msgid "No message text!"
+#: actions/register.php:429
+msgid "6 or more characters. Required."
 msgstr ""
 
-#: actions/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-msgid "Recipient user not found."
+#: actions/register.php:433
+msgid "Same as password above. Required."
 msgstr ""
 
-#: actions/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-msgid "Can't send direct messages to users who aren't your friend."
+#: actions/register.php:437 actions/register.php:441
+#: lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "電子信箱"
+
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
-#, php-format
-msgid "%s / Favorites from %s"
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
-#, php-format
-msgid "%s updates favorited by %s / %s."
+#: actions/register.php:493
+msgid "My text and files are available under "
 msgstr ""
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
-#, php-format
-msgid "%s added your notice as a favorite"
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
+#: actions/register.php:496
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr "不包含這些個人資料：密碼、電子信箱、線上即時通信箱、電話號碼"
+
+#: actions/register.php:537
 #, php-format
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
+"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/twittersettings.php:27
+#: actions/register.php:561
 msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
 msgstr ""
 
-#: actions/twittersettings.php:41 actions/twittersettings.php:60
-msgid "Twitter settings"
+#: actions/remotesubscribe.php:98
+#, php-format
+msgid ""
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-msgid "Twitter Account"
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
 msgstr ""
 
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-msgid "Current verified Twitter account."
+#: actions/remotesubscribe.php:124
+msgid "Subscribe to a remote user"
 msgstr ""
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
 msgstr ""
 
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-msgid "No spaces, please."
-msgstr ""
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr "你想成為誰的粉絲呢？請輸入他/她的暱稱。"
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
 msgstr ""
 
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-msgid "Automatically send my notices to Twitter."
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
-#: actions/twittersettings.php:75 actions/twittersettings.php:146
-msgid "Send local \"@\" replies to Twitter."
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:321
+msgid "Subscribe"
 msgstr ""
 
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-msgid "Subscribe to my Twitter friends here."
-msgstr ""
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr "個人資料連結無效(格式錯誤)"
 
-#: actions/twittersettings.php:122
+#: actions/remotesubscribe.php:168
 msgid ""
-"Username must have only numbers, upper- and lowercase letters, and "
-"underscore (_). 15 chars max."
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
 msgstr ""
 
-#: actions/twittersettings.php:128 actions/twittersettings.php:334
-msgid "Could not verify your Twitter credentials!"
+#: actions/remotesubscribe.php:176
+msgid "That’s a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/twittersettings.php:137
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "無法取得轉換標記"
+
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
 #, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgid "Replies to %s"
 msgstr ""
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-msgid "Unable to save your Twitter settings!"
+#: actions/replies.php:127
+#, php-format
+msgid "Replies to %s, page %d"
 msgstr ""
 
-#: actions/twittersettings.php:174 actions/twittersettings.php:376
-msgid "Twitter settings saved."
-msgstr ""
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "發送給%s好友的訂閱"
 
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-msgid "That is not your Twitter account."
-msgstr ""
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "發送給%s好友的訂閱"
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
-msgid "Couldn't remove Twitter user."
-msgstr ""
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "發送給%s好友的訂閱"
 
-#: actions/twittersettings.php:212 actions/twittersettings.php:407
-msgid "Twitter account removed."
+#: actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
 msgstr ""
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
-msgid "Couldn't save Twitter preferences."
+#: actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
 msgstr ""
 
-#: actions/twittersettings.php:245 actions/twittersettings.php:461
-msgid "Twitter preferences saved."
+#: actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: actions/userauthorization.php:84 actions/userauthorization.php:86
-msgid "Please check these details to make sure "
-msgstr ""
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "&s的微型部落格"
 
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
-msgid "The subscription has been authorized, but no "
-msgstr ""
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "無此通知"
 
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-msgid "The subscription has been rejected, but no "
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
 msgstr ""
 
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-msgid "Command results"
-msgstr ""
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "發送給%s好友的訂閱"
 
-#: classes/Channel.php:148 classes/Channel.php:204
-msgid "Command complete"
-msgstr ""
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "發送給%s好友的訂閱"
 
-#: classes/Channel.php:158 classes/Channel.php:215
-msgid "Command failed"
-msgstr ""
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "發送給%s好友的訂閱"
 
-#: classes/Command.php:39 classes/Command.php:44
-msgid "Sorry, this command is not yet implemented."
+#: actions/showfavorites.php:205
+msgid ""
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""
 
-#: classes/Command.php:96 classes/Command.php:113
+#: actions/showfavorites.php:207
 #, php-format
-msgid "Subscriptions: %1$s\n"
-msgstr ""
-
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
-msgid "User has no last notice"
-msgstr ""
-
-#: classes/Command.php:146 classes/Command.php:166
-msgid "Notice marked as fave."
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
 msgstr ""
 
-#: classes/Command.php:166 classes/Command.php:189
+#: actions/showfavorites.php:211
 #, php-format
-msgid "%1$s (%2$s)"
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
 msgstr ""
 
-#: classes/Command.php:169 classes/Command.php:192
-#, php-format
-msgid "Fullname: %s"
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
 msgstr ""
 
-#: classes/Command.php:172 classes/Command.php:195
+#: actions/showgroup.php:82 lib/groupnav.php:86
 #, php-format
-msgid "Location: %s"
+msgid "%s group"
 msgstr ""
 
-#: classes/Command.php:175 classes/Command.php:198
+#: actions/showgroup.php:84
 #, php-format
-msgid "Homepage: %s"
+msgid "%s group, page %d"
 msgstr ""
 
-#: classes/Command.php:178 classes/Command.php:201
-#, php-format
-msgid "About: %s"
-msgstr ""
+#: actions/showgroup.php:218
+#, fuzzy
+msgid "Group profile"
+msgstr "無此通知"
 
-#: classes/Command.php:200 classes/Command.php:228
-#, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
+msgid "URL"
 msgstr ""
 
-#: classes/Command.php:214 classes/Command.php:245
-#, php-format
-msgid "Direct message to %s sent"
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
+msgid "Note"
 msgstr ""
 
-#: classes/Command.php:216 classes/Command.php:247
-msgid "Error sending direct message."
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
 msgstr ""
 
-#: classes/Command.php:263 classes/Command.php:300
-msgid "Specify the name of the user to subscribe to"
+#: actions/showgroup.php:293
+msgid "Group actions"
 msgstr ""
 
-#: classes/Command.php:270 classes/Command.php:307
+#: actions/showgroup.php:328
 #, php-format
-msgid "Subscribed to %s"
+msgid "Notice feed for %s group (RSS 1.0)"
 msgstr ""
 
-#: classes/Command.php:288 classes/Command.php:328
-msgid "Specify the name of the user to unsubscribe from"
+#: actions/showgroup.php:334
+#, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
 msgstr ""
 
-#: classes/Command.php:295 classes/Command.php:335
+#: actions/showgroup.php:340
 #, php-format
-msgid "Unsubscribed from %s"
+msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
-msgid "Command not yet implemented."
-msgstr ""
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "無此通知"
 
-#: classes/Command.php:313 classes/Command.php:356
-msgid "Notification off."
-msgstr ""
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
+#, fuzzy
+msgid "Members"
+msgstr "何時加入會員的呢？"
 
-#: classes/Command.php:315 classes/Command.php:358
-msgid "Can't turn off notification."
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/tagcloudsection.php:71
+msgid "(None)"
 msgstr ""
 
-#: classes/Command.php:333 classes/Command.php:379
-msgid "Notification on."
+#: actions/showgroup.php:392
+msgid "All members"
 msgstr ""
 
-#: classes/Command.php:335 classes/Command.php:381
-msgid "Can't turn on notification."
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
 msgstr ""
 
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "新增"
+
+#: actions/showgroup.php:448
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: classes/Message.php:53 classes/Message.php:56
-msgid "Could not insert message."
+#: actions/showgroup.php:454
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
 msgstr ""
 
-#: classes/Message.php:63 classes/Message.php:66
-msgid "Could not update message with new URI."
+#: actions/showgroup.php:482
+msgid "Admins"
 msgstr ""
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
+#: actions/showmessage.php:81
+msgid "No such message."
 msgstr ""
 
-#: lib/mail.php:147 lib/mail.php:289
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: lib/mail.php:249 lib/mail.php:508
+#: actions/showmessage.php:108
 #, php-format
-msgid "New private message from %s"
+msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: lib/mail.php:253 lib/mail.php:512
+#: actions/showmessage.php:113
 #, php-format
-msgid ""
-"%1$s (%2$s) sent you a private message:\n"
-"\n"
+msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr ""
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "更新個人圖像"
 
-#: lib/openid.php:195 lib/openid.php:203
-msgid "This form should automatically submit itself. "
+#: actions/showstream.php:73
+#, php-format
+msgid " tagged %s"
 msgstr ""
 
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-msgid "Favorites"
+#: actions/showstream.php:79
+#, php-format
+msgid "%s, page %d"
 msgstr ""
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/showstream.php:122
 #, php-format
-msgid "%s's favorite notices"
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
 msgstr ""
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-msgid "User"
+#: actions/showstream.php:129
+#, php-format
+msgid "Notice feed for %s (RSS 1.0)"
 msgstr ""
 
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-msgid "Inbox"
+#: actions/showstream.php:136
+#, php-format
+msgid "Notice feed for %s (RSS 2.0)"
 msgstr ""
 
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-msgid "Your incoming messages"
+#: actions/showstream.php:143
+#, php-format
+msgid "Notice feed for %s (Atom)"
 msgstr ""
 
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-msgid "Outbox"
+#: actions/showstream.php:148
+#, php-format
+msgid "FOAF for %s"
 msgstr ""
 
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-msgid "Your sent messages"
+#: actions/showstream.php:191
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
 msgstr ""
 
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-msgid "Twitter"
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
 msgstr ""
 
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
+#: actions/showstream.php:198
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
 
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-msgid "To"
+#: actions/showstream.php:234
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-msgid "Could not parse message."
+#: actions/showstream.php:239
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
 msgstr ""
 
-#: actions/all.php:63 actions/facebookhome.php:162
-#, fuzzy, php-format
-msgid "%s and friends, page %d"
-msgstr "%s與好友"
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr ""
 
-#: actions/avatarsettings.php:76
-msgid "You can upload your personal avatar."
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/smssettings.php:91
 #, fuzzy
-msgid "Avatar settings"
-msgstr "線上即時通設定"
-
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-msgid "Original"
-msgstr ""
+msgid "SMS is not available."
+msgstr "個人首頁位址錯誤"
 
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-msgid "Preview"
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
-msgid "Crop"
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-msgid "There was a problem with your session token. "
+#: actions/smssettings.php:130
+msgid "Confirmation code"
 msgstr ""
 
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-msgid "Pick a square area of the image to be your avatar"
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
 msgstr ""
 
-#: actions/avatarsettings.php:327 actions/grouplogo.php:384
-msgid "Lost our file data."
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
 msgstr ""
 
-#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
-#, fuzzy
-msgid "Lost our file."
-msgstr "無此通知"
-
-#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
-#: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161
-msgid "Unknown file type"
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-msgid "No profile specified."
+#: actions/smssettings.php:174
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
 msgstr ""
 
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
-msgid "No profile with that ID."
+#: actions/smssettings.php:306
+msgid "No phone number."
 msgstr ""
 
-#: actions/block.php:111
-#, fuzzy
-msgid "Block user"
-msgstr "無此使用者"
-
-#: actions/block.php:129
-msgid "Are you sure you want to block this user? "
+#: actions/smssettings.php:311
+msgid "No carrier selected."
 msgstr ""
 
-#: actions/block.php:162
-msgid "You have already blocked this user."
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
 msgstr ""
 
-#: actions/block.php:167
-msgid "Failed to save block information."
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
 msgstr ""
 
-#: actions/confirmaddress.php:159
-#, php-format
-msgid "The address \"%s\" has been "
-msgstr ""
+#: actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr "確認信已寄到你的線上即時通信箱。%s送給你得訊息要先經過你的認可。"
 
-#: actions/deletenotice.php:73
-msgid "You are about to permanently delete a notice. "
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
 msgstr ""
 
-#: actions/disfavor.php:94
-msgid "Add to favorites"
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
 msgstr ""
 
-#: actions/editgroup.php:54
-#, php-format
-msgid "Edit %s group"
+#: actions/smssettings.php:465
+msgid "Mobile carrier"
 msgstr ""
 
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-msgid "Inboxes must be enabled for groups to work"
+#: actions/smssettings.php:469
+msgid "Select a carrier"
 msgstr ""
 
-#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-msgid "You must be logged in to create a group."
+#: actions/smssettings.php:476
+#, 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/editgroup.php:87 actions/grouplogo.php:87
-#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
-#, fuzzy
-msgid "No nickname"
-msgstr "無暱稱"
-
-#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
-#: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128
-#, fuzzy
-msgid "No such group"
-msgstr "無此通知"
-
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
-msgid "You must be an admin to edit the group"
+#: actions/smssettings.php:498
+msgid "No code entered"
 msgstr ""
 
-#: actions/editgroup.php:157
-msgid "Use this form to edit the group."
+#: actions/subedit.php:70
+msgid "You are not subscribed to that profile."
 msgstr ""
 
-#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+#: actions/subedit.php:83
 #, fuzzy
-msgid "Nickname must have only lowercase letters "
-msgstr "暱稱請用小寫字母或數字，勿加空格。"
+msgid "Could not save subscription."
+msgstr "註冊失敗"
 
-#: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/subscribe.php:55
 #, fuzzy
-msgid "description is too long (max 140 chars)."
-msgstr "自我介紹過長(共140個字元)"
+msgid "Not a local user."
+msgstr "無此使用者"
 
-#: actions/editgroup.php:218
+#: actions/subscribe.php:69
 #, fuzzy
-msgid "Could not update group."
-msgstr "無法更新使用者"
-
-#: actions/editgroup.php:226
-msgid "Options saved."
-msgstr ""
+msgid "Subscribed"
+msgstr "此帳號已註冊"
 
-#: actions/emailsettings.php:107 actions/imsettings.php:108
+#: actions/subscribers.php:50
 #, fuzzy, php-format
-msgid "Awaiting confirmation on this address. "
-msgstr "確認碼發生錯誤"
+msgid "%s subscribers"
+msgstr "此帳號已註冊"
 
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-msgid "Make a new email address for posting to; "
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %d"
 msgstr ""
 
-#: actions/emailsettings.php:157
-msgid "Send me email when someone "
+#: actions/subscribers.php:63
+msgid "These are the people who listen to your notices."
 msgstr ""
 
-#: actions/emailsettings.php:168
-msgid "Allow friends to nudge me and send me an email."
+#: actions/subscribers.php:67
+#, php-format
+msgid "These are the people who listen to %s's notices."
 msgstr ""
 
-#: actions/emailsettings.php:321
-#, fuzzy
-msgid "That email address already belongs "
-msgstr "此電子信箱已註冊過了"
-
-#: actions/emailsettings.php:343
-#, fuzzy
-msgid "A confirmation code was sent to the email address you added. "
-msgstr "確認信已寄到你的線上即時通信箱。%s送給你得訊息要先經過你的認可。"
-
-#: actions/facebookhome.php:110
-msgid "Server error - couldn't get user!"
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
 msgstr ""
 
-#: actions/facebookhome.php:196
+#: actions/subscribers.php:110
 #, php-format
-msgid "If you would like the %s app to automatically update "
+msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
 
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#: actions/subscribers.php:114
 #, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr ""
-
-#: actions/facebookhome.php:218
-msgid "Skip"
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
 msgstr ""
 
-#: actions/facebookhome.php:235
-#, fuzzy
-msgid "No notice content!"
-msgstr "無內容"
+#: actions/subscriptions.php:52
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "所有訂閱"
 
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-msgid "Pagination"
-msgstr ""
+#: actions/subscriptions.php:54
+#, fuzzy, php-format
+msgid "%s subscriptions, page %d"
+msgstr "所有訂閱"
 
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-msgid "After"
+#: actions/subscriptions.php:65
+msgid "These are the people whose notices you listen to."
 msgstr ""
 
-#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
-#, fuzzy
-msgid "Before"
-msgstr "之前的內容»"
-
-#: actions/facebookinvite.php:70
+#: actions/subscriptions.php:69
 #, php-format
-msgid "Thanks for inviting your friends to use %s"
-msgstr ""
-
-#: actions/facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
+msgid "These are the people whose notices %s listens to."
 msgstr ""
 
-#: actions/facebookinvite.php:96
+#: actions/subscriptions.php:121
 #, php-format
-msgid "You have been invited to %s"
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
 msgstr ""
 
-#: actions/facebookinvite.php:105
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
 #, fuzzy, php-format
-msgid "Invite your friends to use %s"
-msgstr "發送給%s好友的訂閱"
+msgid "%s is not listening to anyone."
+msgstr "現在%1$s在%2$s成為你的粉絲囉"
 
-#: actions/facebookinvite.php:113
-#, php-format
-msgid "Friends already using %s:"
+#: actions/subscriptions.php:194
+#, fuzzy
+msgid "Jabber"
+msgstr "查無此Jabber ID"
+
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
 msgstr ""
 
-#: actions/facebookinvite.php:130
+#: actions/tagother.php:33
+#, fuzzy
+msgid "Not logged in"
+msgstr "已登入"
+
+#: actions/tagother.php:39
+#, fuzzy
+msgid "No id argument."
+msgstr "無此文件"
+
+#: actions/tagother.php:65
 #, php-format
-msgid "Send invitations"
+msgid "Tag %s"
 msgstr ""
 
-#: actions/facebookremove.php:56
+#: actions/tagother.php:77 lib/userprofile.php:75
 #, fuzzy
-msgid "Couldn't remove Facebook user."
-msgstr "無法更新使用者"
+msgid "User profile"
+msgstr "無此通知"
 
-#: actions/facebooksettings.php:65
-msgid "There was a problem saving your sync preferences!"
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
 msgstr ""
 
-#: actions/facebooksettings.php:67
-msgid "Sync preferences saved."
+#: actions/tagother.php:141
+msgid "Tag user"
 msgstr ""
 
-#: actions/facebooksettings.php:90
-msgid "Automatically update my Facebook status with my notices."
+#: actions/tagother.php:151
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
 msgstr ""
 
-#: actions/facebooksettings.php:97
-msgid "Send \"@\" replies to Facebook."
+#: actions/tagother.php:193
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/facebooksettings.php:106
-msgid "Prefix"
-msgstr ""
+#: actions/tagother.php:200
+#, fuzzy
+msgid "Could not save tags."
+msgstr "無法存取個人圖像資料"
 
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
+#: actions/tagother.php:236
+msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/facebooksettings.php:124
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "&s的微型部落格"
+
+#: actions/tag.php:86
 #, php-format
-msgid "If you would like %s to automatically update "
+msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr ""
 
-#: actions/facebooksettings.php:147
-msgid "Sync preferences"
-msgstr ""
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "發送給%s好友的訂閱"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
-msgid "Disfavor favorite"
+#: actions/tag.php:98
+#, php-format
+msgid "Notice feed for tag %s (Atom)"
 msgstr ""
 
-#: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
+#: actions/tagrss.php:35
 #, fuzzy
-msgid "Popular notices"
-msgstr "無此通知"
-
-#: actions/favorited.php:67
-#, fuzzy, php-format
-msgid "Popular notices, page %d"
+msgid "No such tag."
 msgstr "無此通知"
 
-#: actions/favorited.php:79
-msgid "The most popular notices on the site right now."
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
 msgstr ""
 
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
-msgid "Featured users"
-msgstr ""
+#: actions/unsubscribe.php:77
+#, fuzzy
+msgid "No profile id in request."
+msgstr "無確認請求"
 
-#: actions/featured.php:71
-#, php-format
-msgid "Featured users, page %d"
+#: actions/unsubscribe.php:84
+msgid "No profile with that id."
 msgstr ""
 
-#: actions/featured.php:99
+#: actions/unsubscribe.php:98
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "此帳號已註冊"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
 #, php-format
-msgid "A selection of some of the great users on %s"
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "註冊確認"
+
+#: actions/userauthorization.php:110
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
 msgstr ""
 
-#: actions/groupbyid.php:79
-msgid "No ID"
+#: actions/userauthorization.php:188
+msgid "License"
 msgstr ""
 
-#: actions/grouplogo.php:138 actions/grouplogo.php:191
-msgid "Group logo"
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "接受"
+
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
 msgstr ""
 
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
+#: actions/userauthorization.php:211
+msgid "Reject"
 msgstr ""
 
-#: actions/grouplogo.php:448
+#: actions/userauthorization.php:212
 #, fuzzy
-msgid "Logo updated."
-msgstr "更新個人圖像"
+msgid "Reject this subscription"
+msgstr "所有訂閱"
 
-#: actions/grouplogo.php:450
-#, fuzzy
-msgid "Failed updating logo."
-msgstr "無法上傳個人圖像"
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
+msgstr "無確認請求"
 
-#: actions/groupmembers.php:93 lib/groupnav.php:91
-#, php-format
-msgid "%s group members"
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
 msgstr ""
 
-#: actions/groupmembers.php:96
-#, php-format
-msgid "%s group members, page %d"
+#: actions/userauthorization.php:249
+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/groupmembers.php:111
-msgid "A list of the users in this group."
+#: actions/userauthorization.php:259
+msgid "Subscription rejected"
 msgstr ""
 
-#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
-msgid "Groups"
+#: actions/userauthorization.php:261
+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/groups.php:64
+#: actions/userauthorization.php:296
 #, php-format
-msgid "Groups, page %d"
+msgid "Listener URI ‘%s’ not found here"
 msgstr ""
 
-#: actions/groups.php:90
+#: actions/userauthorization.php:301
 #, php-format
-msgid "%%%%site.name%%%% groups let you find and talk with "
+msgid "Listenee URI ‘%s’ is too long."
 msgstr ""
 
-#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-#, fuzzy
-msgid "Create a new group"
-msgstr "新增帳號"
-
-#: actions/groupsearch.php:57
+#: actions/userauthorization.php:307
 #, php-format
-msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-msgstr ""
-
-#: actions/groupsearch.php:63
-msgid "Group search"
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr ""
 
-#: actions/imsettings.php:70
-msgid "You can send and receive notices through "
-msgstr ""
-
-#: actions/imsettings.php:120
+#: actions/userauthorization.php:322
 #, php-format
-msgid "Jabber or GTalk address, "
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr ""
 
-#: actions/imsettings.php:147
-msgid "Send me replies through Jabber/GTalk "
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr ""
 
-#: actions/imsettings.php:321
+#: actions/userauthorization.php:343
 #, fuzzy, php-format
-msgid "A confirmation code was sent "
-msgstr "無確認碼"
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "無法讀取此%sURL的圖像"
 
-#: actions/joingroup.php:65
-msgid "You must be logged in to join a group."
+#: actions/userauthorization.php:348
+#, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr ""
 
-#: actions/joingroup.php:95
-msgid "You are already a member of that group"
+#: actions/userbyid.php:70
+msgid "No id."
 msgstr ""
 
-#: actions/joingroup.php:128
-#, fuzzy, php-format
-msgid "Could not join user %s to group %s"
-msgstr "無法連結到伺服器:%s"
-
-#: actions/joingroup.php:135
-#, php-format
-msgid "%s joined group %s"
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+msgid "Profile design"
 msgstr ""
 
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
 msgstr ""
 
-#: actions/leavegroup.php:65
-msgid "You must be logged in to leave a group."
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
 msgstr ""
 
-#: actions/leavegroup.php:88
-#, fuzzy
-msgid "No such group."
-msgstr "無此通知"
+#: actions/usergroups.php:64
+#, php-format
+msgid "%s groups, page %d"
+msgstr ""
 
-#: actions/leavegroup.php:95
-msgid "You are not a member of that group."
+#: actions/usergroups.php:130
+msgid "Search for more groups"
 msgstr ""
 
-#: actions/leavegroup.php:100
-msgid "You may not leave a group while you are its administrator."
+#: actions/usergroups.php:153
+#, php-format
+msgid "%s is not a member of any group."
 msgstr ""
 
-#: actions/leavegroup.php:130
-msgid "Could not find membership record."
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
 
-#: actions/leavegroup.php:138
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "無法從 %s 建立OpenID"
+#: classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
 
-#: actions/leavegroup.php:145
+#: classes/File.php:147
 #, php-format
-msgid "%s left group %s"
+msgid "A file this large would exceed your user quota of %d bytes."
 msgstr ""
 
-#: actions/login.php:225 lib/facebookaction.php:304
-msgid "Login to site"
+#: classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
-#: actions/microsummary.php:69
-msgid "No current status"
+#: classes/Message.php:55
+msgid "Could not insert message."
 msgstr ""
 
-#: actions/newgroup.php:53
-msgid "New group"
+#: classes/Message.php:65
+msgid "Could not update message with new URI."
 msgstr ""
 
-#: actions/newgroup.php:115
-msgid "Use this form to create a new group."
+#: classes/Notice.php:164
+#, php-format
+msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: actions/newgroup.php:177
+#: classes/Notice.php:179
 #, fuzzy
-msgid "Could not create group."
-msgstr "無法存取個人圖像資料"
+msgid "Problem saving notice. Too long."
+msgstr "儲存使用者發生錯誤"
 
-#: actions/newgroup.php:191
+#: classes/Notice.php:183
 #, fuzzy
-msgid "Could not set group membership."
-msgstr "註冊失敗"
-
-#: actions/newmessage.php:119 actions/newnotice.php:132
-msgid "That's too long. "
-msgstr ""
+msgid "Problem saving notice. Unknown user."
+msgstr "儲存使用者發生錯誤"
 
-#: actions/newmessage.php:134
-msgid "Don't send a message to yourself; "
+#: classes/Notice.php:188
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: actions/newnotice.php:166
-msgid "Notice posted"
+#: classes/Notice.php:194
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
 msgstr ""
 
-#: actions/newnotice.php:200 classes/Channel.php:163
-msgid "Ajax Error"
+#: classes/Notice.php:202
+msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: actions/nudge.php:85
-msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+#: classes/Notice.php:268 classes/Notice.php:293
+msgid "Problem saving notice."
 msgstr ""
 
-#: actions/nudge.php:94
-msgid "Nudge sent"
-msgstr ""
+#: classes/Notice.php:1120
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "增加回覆時,資料庫發生錯誤: %s"
 
-#: actions/nudge.php:97
-msgid "Nudge sent!"
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 
-#: actions/openidlogin.php:97
-msgid "OpenID login"
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
 msgstr ""
 
-#: actions/openidsettings.php:128
-msgid "Removing your only OpenID "
+#: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
 msgstr ""
 
-#: actions/othersettings.php:60
+#: lib/accountsettingsaction.php:112
 #, fuzzy
-msgid "Other Settings"
-msgstr "線上即時通設定"
-
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr ""
+msgid "Upload an avatar"
+msgstr "無法上傳個人圖像"
 
-#: actions/othersettings.php:93
-msgid "URL Auto-shortening"
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
 msgstr ""
 
-#: actions/othersettings.php:112
-msgid "Service"
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
 msgstr ""
 
-#: actions/othersettings.php:113
-msgid "Automatic shortening service to use."
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
+msgid "Design"
 msgstr ""
 
-#: actions/othersettings.php:144
+#: lib/accountsettingsaction.php:124
 #, fuzzy
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "地點過長（共255個字）"
-
-#: actions/passwordsettings.php:69
-#, fuzzy
-msgid "Change your password."
-msgstr "更改密碼"
+msgid "Design your profile"
+msgstr "無此通知"
 
-#: actions/passwordsettings.php:89
-msgid "Password change"
+#: lib/accountsettingsaction.php:128
+msgid "Other"
 msgstr ""
 
-#: actions/peopletag.php:35
-#, fuzzy, php-format
-msgid "Not a valid people tag: %s"
-msgstr "此信箱無效"
-
-#: actions/peopletag.php:47
-#, php-format
-msgid "Users self-tagged with %s - page %d"
+#: lib/accountsettingsaction.php:128
+msgid "Other options"
 msgstr ""
 
-#: actions/peopletag.php:91
+#: lib/action.php:144
 #, php-format
-msgid "These are users who have tagged themselves \"%s\" "
+msgid "%s - %s"
 msgstr ""
 
-#: actions/profilesettings.php:91
-msgid "Profile information"
+#: lib/action.php:159
+msgid "Untitled page"
 msgstr ""
 
-#: actions/profilesettings.php:124
-msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+#: lib/action.php:424
+msgid "Primary site navigation"
 msgstr ""
 
-#: actions/profilesettings.php:144
-msgid "Automatically subscribe to whoever "
-msgstr ""
+#: lib/action.php:430
+msgid "Home"
+msgstr "主頁"
 
-#: actions/profilesettings.php:229 actions/tagother.php:176
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "個人首頁連結%s無效"
+#: lib/action.php:430
+msgid "Personal profile and friends timeline"
+msgstr ""
 
-#: actions/profilesettings.php:311
+#: lib/action.php:432
 #, fuzzy
-msgid "Couldn't save tags."
-msgstr "無法儲存個人資料"
+msgid "Account"
+msgstr "關於"
 
-#: actions/public.php:107
-#, php-format
-msgid "Public timeline, page %d"
+#: lib/action.php:432
+msgid "Change your email, avatar, password, profile"
 msgstr ""
 
-#: actions/public.php:173
-msgid "Could not retrieve public stream."
-msgstr ""
+#: lib/action.php:435
+msgid "Connect"
+msgstr "連結"
 
-#: actions/public.php:220
-#, php-format
-msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
-msgstr ""
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "無法連結到伺服器:%s"
 
-#: actions/publictagcloud.php:57
-msgid "Public tag cloud"
+#: lib/action.php:439 lib/subgroupnav.php:105
+msgid "Invite"
 msgstr ""
 
-#: actions/publictagcloud.php:63
+#: lib/action.php:440 lib/subgroupnav.php:106
 #, php-format
-msgid "These are most popular recent tags on %s "
+msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: actions/publictagcloud.php:119
-msgid "Tag cloud"
-msgstr ""
+#: lib/action.php:445
+msgid "Logout"
+msgstr "登出"
 
-#: actions/register.php:139 actions/register.php:349
-msgid "Sorry, only invited people can register."
+#: lib/action.php:445
+msgid "Logout from the site"
 msgstr ""
 
-#: actions/register.php:149
-msgid "You can't register if you don't "
-msgstr ""
+#: lib/action.php:450
+#, fuzzy
+msgid "Create an account"
+msgstr "新增帳號"
 
-#: actions/register.php:286
-msgid "With this form you can create "
+#: lib/action.php:453
+msgid "Login to the site"
 msgstr ""
 
-#: actions/register.php:368
+#: lib/action.php:456 lib/action.php:719
+msgid "Help"
+msgstr "求救"
+
+#: lib/action.php:456
 #, fuzzy
-msgid "1-64 lowercase letters or numbers, "
-msgstr "1-64個小寫英文字母或數字，勿加標點符號或空格"
+msgid "Help me!"
+msgstr "求救"
 
-#: actions/register.php:382 actions/register.php:386
-msgid "Used only for updates, announcements, "
+#: lib/action.php:459
+msgid "Search"
 msgstr ""
 
-#: actions/register.php:398
-msgid "URL of your homepage, blog, "
+#: lib/action.php:459
+msgid "Search for people or text"
 msgstr ""
 
-#: actions/register.php:404
+#: lib/action.php:480
 #, fuzzy
-msgid "Describe yourself and your "
-msgstr "請在140個字以內描述你自己與你的興趣"
+msgid "Site notice"
+msgstr "新訊息"
 
-#: actions/register.php:410
-msgid "Where you are, like \"City, "
+#: lib/action.php:546
+msgid "Local views"
 msgstr ""
 
-#: actions/register.php:432
+#: lib/action.php:612
 #, fuzzy
-msgid " except this private data: password, "
-msgstr "不包含這些個人資料：密碼、電子信箱、線上即時通信箱、電話號碼"
+msgid "Page notice"
+msgstr "新訊息"
 
-#: actions/register.php:471
-#, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
+#: lib/action.php:714
+msgid "Secondary site navigation"
 msgstr ""
 
-#: actions/register.php:495
-msgid "(You should receive a message by email "
+#: lib/action.php:721
+msgid "About"
+msgstr "關於"
+
+#: lib/action.php:723
+msgid "FAQ"
+msgstr "常見問題"
+
+#: lib/action.php:727
+msgid "TOS"
 msgstr ""
 
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
+#: lib/action.php:730
+msgid "Privacy"
 msgstr ""
 
-#: actions/replies.php:118
-#, php-format
-msgid "Replies to %s, page %d"
+#: lib/action.php:732
+msgid "Source"
 msgstr ""
 
-#: actions/showfavorites.php:79
-#, php-format
-msgid "%s favorite notices, page %d"
+#: lib/action.php:734
+msgid "Contact"
+msgstr "好友名單"
+
+#: lib/action.php:736
+msgid "Badge"
 msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: lib/action.php:764
+msgid "StatusNet software license"
+msgstr ""
+
+#: lib/action.php:767
 #, php-format
-msgid "%s group"
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
+"**%%site.name%%**是由[%%site.broughtby%%](%%site.broughtbyurl%%)所提供的微型"
+"部落格服務"
 
-#: actions/showgroup.php:79
+#: lib/action.php:769
 #, php-format
-msgid "%s group, page %d"
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%**是個微型部落格"
+
+#: lib/action.php:771
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 
-#: actions/showgroup.php:206
+#: lib/action.php:785
 #, fuzzy
-msgid "Group profile"
-msgstr "無此通知"
+msgid "Site content license"
+msgstr "新訊息"
 
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
-msgid "URL"
+#: lib/action.php:794
+msgid "All "
 msgstr ""
 
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
-msgid "Note"
+#: lib/action.php:799
+msgid "license."
 msgstr ""
 
-#: actions/showgroup.php:270
-msgid "Group actions"
+#: lib/action.php:1052
+msgid "Pagination"
 msgstr ""
 
-#: actions/showgroup.php:323
-#, php-format
-msgid "Notice feed for %s group"
+#: lib/action.php:1061
+msgid "After"
 msgstr ""
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: lib/action.php:1069
 #, fuzzy
-msgid "Members"
-msgstr "何時加入會員的呢？"
+msgid "Before"
+msgstr "之前的內容»"
 
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
-msgid "(None)"
+#: lib/action.php:1117
+msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/showgroup.php:370
-msgid "All members"
+#: lib/attachmentlist.php:87
+msgid "Attachments"
 msgstr ""
 
-#: actions/showgroup.php:378
-#, php-format
-msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+#: lib/attachmentlist.php:265
+msgid "Author"
 msgstr ""
 
-#: actions/showmessage.php:98
-msgid "Only the sender and recipient "
+#: lib/attachmentlist.php:278
+msgid "Provider"
 msgstr ""
 
-#: actions/showstream.php:73
-#, php-format
-msgid "%s, page %d"
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
 msgstr ""
 
-#: actions/showstream.php:143
-#, fuzzy
-msgid "'s profile"
-msgstr "無此通知"
-
-#: actions/showstream.php:236 actions/tagother.php:77
-#, fuzzy
-msgid "User profile"
-msgstr "無此通知"
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
 
-#: actions/showstream.php:240 actions/tagother.php:81
-msgid "Photo"
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
 msgstr ""
 
-#: actions/showstream.php:317
-msgid "User actions"
+#: lib/channel.php:210
+msgid "Command complete"
 msgstr ""
 
-#: actions/showstream.php:342
-msgid "Send a direct message to this user"
+#: lib/channel.php:221
+msgid "Command failed"
 msgstr ""
 
-#: actions/showstream.php:343
-msgid "Message"
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: actions/showstream.php:451
-#, fuzzy
-msgid "All subscribers"
-msgstr "所有訂閱"
+#: lib/command.php:88
+#, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "無法更新使用者"
 
-#: actions/showstream.php:533
-msgid "All groups"
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: actions/showstream.php:542
+#: lib/command.php:99
 #, php-format
-msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+msgid "Nudge sent to %s"
 msgstr ""
 
-#: actions/smssettings.php:128
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, "
-msgstr "1-64個小寫英文字母或數字，勿加標點符號或空格"
-
-#: actions/smssettings.php:162
-msgid "Send me notices through SMS; "
+#: lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
 msgstr ""
 
-#: actions/smssettings.php:335
-#, fuzzy
-msgid "A confirmation code was sent to the phone number you added. "
-msgstr "確認信已寄到你的線上即時通信箱。%s送給你得訊息要先經過你的認可。"
-
-#: actions/smssettings.php:453
-msgid "Mobile carrier"
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
 msgstr ""
 
-#: actions/subedit.php:70
-msgid "You are not subscribed to that profile."
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
 msgstr ""
 
-#: actions/subedit.php:83
-#, fuzzy
-msgid "Could not save subscription."
-msgstr "註冊失敗"
-
-#: actions/subscribe.php:55
-#, fuzzy
-msgid "Not a local user."
-msgstr "無此使用者"
-
-#: actions/subscribe.php:69
-#, fuzzy
-msgid "Subscribed"
-msgstr "此帳號已註冊"
-
-#: actions/subscribers.php:50
-#, fuzzy, php-format
-msgid "%s subscribers"
-msgstr "此帳號已註冊"
+#: lib/command.php:190
+msgid "Notice marked as fave."
+msgstr ""
 
-#: actions/subscribers.php:52
+#: lib/command.php:315
 #, php-format
-msgid "%s subscribers, page %d"
+msgid "%1$s (%2$s)"
 msgstr ""
 
-#: actions/subscribers.php:63
-msgid "These are the people who listen to "
+#: lib/command.php:318
+#, php-format
+msgid "Fullname: %s"
 msgstr ""
 
-#: actions/subscribers.php:67
+#: lib/command.php:321
 #, php-format
-msgid "These are the people who "
+msgid "Location: %s"
 msgstr ""
 
-#: actions/subscriptions.php:52
-#, fuzzy, php-format
-msgid "%s subscriptions"
-msgstr "所有訂閱"
-
-#: actions/subscriptions.php:54
-#, fuzzy, php-format
-msgid "%s subscriptions, page %d"
-msgstr "所有訂閱"
-
-#: actions/subscriptions.php:65
-msgid "These are the people whose notices "
+#: lib/command.php:324
+#, php-format
+msgid "Homepage: %s"
 msgstr ""
 
-#: actions/subscriptions.php:69
+#: lib/command.php:327
 #, php-format
-msgid "These are the people whose "
+msgid "About: %s"
 msgstr ""
 
-#: actions/subscriptions.php:122
-#, fuzzy
-msgid "Jabber"
-msgstr "查無此Jabber ID"
-
-#: actions/tag.php:43
-#, fuzzy, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "&s的微型部落格"
-
-#: actions/tag.php:66
+#: lib/command.php:358 scripts/xmppdaemon.php:321
 #, php-format
-msgid "Messages tagged \"%s\", most recent first"
+msgid "Message too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: actions/tagother.php:33
-#, fuzzy
-msgid "Not logged in"
-msgstr "已登入"
-
-#: actions/tagother.php:39
-#, fuzzy
-msgid "No id argument."
-msgstr "無此文件"
+#: lib/command.php:377
+msgid "Error sending direct message."
+msgstr ""
 
-#: actions/tagother.php:65
+#: lib/command.php:431
 #, php-format
-msgid "Tag %s"
+msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: actions/tagother.php:141
-msgid "Tag user"
+#: lib/command.php:439
+#, php-format
+msgid "Reply to %s sent"
 msgstr ""
 
-#: actions/tagother.php:149
-msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
-msgstr ""
+#: lib/command.php:441
+msgid "Error saving notice."
+msgstr "儲存使用者發生錯誤"
 
-#: actions/tagother.php:164
-msgid "There was a problem with your session token."
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: actions/tagother.php:191
-msgid ""
-"You can only tag people you are subscribed to or who are subscribed to you."
+#: lib/command.php:502
+#, php-format
+msgid "Subscribed to %s"
 msgstr ""
 
-#: actions/tagother.php:198
-#, fuzzy
-msgid "Could not save tags."
-msgstr "無法存取個人圖像資料"
-
-#: actions/tagother.php:233
-msgid "Use this form to add tags to your subscribers or subscriptions."
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: actions/tagrss.php:35
-#, fuzzy
-msgid "No such tag."
-msgstr "無此通知"
-
-#: actions/tagrss.php:66
-#, fuzzy, php-format
-msgid "Microblog tagged with %s"
-msgstr "&s的微型部落格"
-
-#: actions/twitapiblocks.php:47
-msgid "Block user failed."
+#: lib/command.php:530
+#, php-format
+msgid "Unsubscribed from %s"
 msgstr ""
 
-#: actions/twitapiblocks.php:69
-msgid "Unblock user failed."
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
 msgstr ""
 
-#: actions/twitapiusers.php:48
-#, fuzzy
-msgid "Not found."
-msgstr "目前無請求"
-
-#: actions/twittersettings.php:71
-msgid "Add your Twitter account to automatically send "
+#: lib/command.php:551
+msgid "Notification off."
 msgstr ""
 
-#: actions/twittersettings.php:119
-msgid "Twitter user name"
+#: lib/command.php:553
+msgid "Can't turn off notification."
 msgstr ""
 
-#: actions/twittersettings.php:126
-#, fuzzy
-msgid "Twitter password"
-msgstr "新密碼"
-
-#: actions/twittersettings.php:228
-msgid "Twitter Friends"
+#: lib/command.php:574
+msgid "Notification on."
 msgstr ""
 
-#: actions/twittersettings.php:327
-msgid "Username must have only numbers, "
+#: lib/command.php:576
+msgid "Can't turn on notification."
 msgstr ""
 
-#: actions/twittersettings.php:341
+#: lib/command.php:597
 #, fuzzy, php-format
-msgid "Unable to retrieve account information "
-msgstr "無法取消信箱確認"
+msgid "Could not create login token for %s"
+msgstr "無法從 %s 建立OpenID"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
 
-#: actions/unblock.php:108
+#: lib/command.php:618
 #, fuzzy
-msgid "Error removing the block."
-msgstr "儲存使用者發生錯誤"
+msgid "You are not subscribed to anyone."
+msgstr "此帳號已註冊"
 
-#: actions/unsubscribe.php:50
+#: lib/command.php:620
 #, fuzzy
-msgid "No profile id in request."
-msgstr "無確認請求"
+msgid "You are subscribed to these people: "
+msgstr "此帳號已註冊"
 
-#: actions/unsubscribe.php:57
-msgid "No profile with that id."
-msgstr ""
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "無此訂閱"
 
-#: actions/unsubscribe.php:71
+#: lib/command.php:639
 #, fuzzy
-msgid "Unsubscribed"
+msgid "These people are subscribed to you: "
 msgstr "此帳號已註冊"
 
-#: actions/usergroups.php:63
-#, php-format
-msgid "%s groups"
-msgstr ""
-
-#: actions/usergroups.php:65
-#, php-format
-msgid "%s groups, page %d"
-msgstr ""
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "無法連結到伺服器:%s"
 
-#: classes/Notice.php:104
+#: lib/command.php:658
 #, fuzzy
-msgid "Problem saving notice. Unknown user."
-msgstr "儲存使用者發生錯誤"
+msgid "You are a member of these groups: "
+msgstr "無法連結到伺服器:%s"
 
-#: classes/Notice.php:109
+#: lib/command.php:670
 msgid ""
-"Too many notices too fast; take a breather and post again in a few minutes."
-msgstr ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+
+#: lib/common.php:192
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "無確認碼"
 
-#: classes/Notice.php:116
-msgid "You are banned from posting notices on this site."
+#: lib/common.php:193
+msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/accountsettingsaction.php:108
-#, fuzzy
-msgid "Upload an avatar"
-msgstr "無法上傳個人圖像"
-
-#: lib/accountsettingsaction.php:119
-msgid "Other"
+#: lib/common.php:194
+msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/accountsettingsaction.php:120
-msgid "Other options"
+#: lib/common.php:195
+msgid "Go to the installer."
 msgstr ""
 
-#: lib/action.php:130
-#, php-format
-msgid "%s - %s"
+#: lib/connectsettingsaction.php:110
+msgid "IM"
 msgstr ""
 
-#: lib/action.php:145
-msgid "Untitled page"
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
 msgstr ""
 
-#: lib/action.php:316
-msgid "Primary site navigation"
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
 msgstr ""
 
-#: lib/action.php:322
-msgid "Personal profile and friends timeline"
+#: lib/dberroraction.php:60
+msgid "Database error"
 msgstr ""
 
-#: lib/action.php:325
-msgid "Search for people or text"
+#: lib/designsettings.php:101
+msgid "Change background image"
 msgstr ""
 
-#: lib/action.php:328
+#: lib/designsettings.php:105
 #, fuzzy
-msgid "Account"
-msgstr "關於"
+msgid "Upload file"
+msgstr "無此通知"
 
-#: lib/action.php:328
-msgid "Change your email, avatar, password, profile"
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 
-#: lib/action.php:330
-msgid "Connect to IM, SMS, Twitter"
+#: lib/designsettings.php:139
+msgid "On"
 msgstr ""
 
-#: lib/action.php:332
-msgid "Logout from the site"
+#: lib/designsettings.php:155
+msgid "Off"
 msgstr ""
 
-#: lib/action.php:335
-msgid "Login to the site"
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
 msgstr ""
 
-#: lib/action.php:338
-#, fuzzy
-msgid "Create an account"
-msgstr "新增帳號"
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
 
-#: lib/action.php:341
+#: lib/designsettings.php:170
 #, fuzzy
-msgid "Login with OpenID"
-msgstr "無此OpenID"
+msgid "Change colours"
+msgstr "更改密碼"
 
-#: lib/action.php:344
-#, fuzzy
-msgid "Help me!"
-msgstr "求救"
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
 
-#: lib/action.php:362
+#: lib/designsettings.php:191
 #, fuzzy
-msgid "Site notice"
-msgstr "新訊息"
+msgid "Content"
+msgstr "連結"
 
-#: lib/action.php:417
-msgid "Local views"
+#: lib/designsettings.php:204
+msgid "Sidebar"
+msgstr ""
+
+#: lib/designsettings.php:217
+msgid "Text"
 msgstr ""
 
-#: lib/action.php:472
+#: lib/designsettings.php:230
 #, fuzzy
-msgid "Page notice"
-msgstr "新訊息"
+msgid "Links"
+msgstr "登入"
 
-#: lib/action.php:562
-msgid "Secondary site navigation"
+#: lib/designsettings.php:247
+msgid "Use defaults"
 msgstr ""
 
-#: lib/action.php:602 lib/action.php:623
-msgid "StatusNet software license"
+#: lib/designsettings.php:248
+msgid "Restore default designs"
 msgstr ""
 
-#: lib/action.php:630
-msgid "All "
+#: lib/designsettings.php:254
+msgid "Reset back to default"
 msgstr ""
 
-#: lib/action.php:635
-msgid "license."
+#: lib/designsettings.php:257
+msgid "Save design"
 msgstr ""
 
-#: lib/blockform.php:123 lib/blockform.php:153
-#, fuzzy
-msgid "Block this user"
-msgstr "無此使用者"
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
+msgstr ""
 
-#: lib/blockform.php:153
-msgid "Block"
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
 msgstr ""
 
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr ""
 
-#: lib/facebookaction.php:268
-#, php-format
-msgid "To use the %s Facebook Application you need to login "
-msgstr ""
-
-#: lib/facebookaction.php:271
-#, fuzzy
-msgid " a new account."
-msgstr "新增帳號"
-
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-msgid "Published"
-msgstr ""
-
 #: lib/favorform.php:114 lib/favorform.php:140
 #, fuzzy
 msgid "Favor this notice"
 msgstr "無此通知"
 
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr ""
+
 #: lib/feedlist.php:64
 msgid "Export data"
 msgstr ""
 
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr ""
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr ""
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr ""
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr ""
@@ -4453,60 +3891,85 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
+msgstr ""
+
+#: lib/galleryaction.php:140
 msgid "Tag"
 msgstr ""
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr ""
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr ""
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:168
 #, fuzzy
-msgid "Description"
-msgstr "所有訂閱"
+msgid "Describe the group or topic"
+msgstr "請在140個字以內描述你自己與你的興趣"
 
-#: lib/groupeditform.php:153
-#, fuzzy
-msgid "Describe the group or topic in 140 chars"
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
 msgstr "請在140個字以內描述你自己與你的興趣"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:172
+#, fuzzy
+msgid "Description"
+msgstr "所有訂閱"
+
+#: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr ""
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
-msgid "Group"
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:100
-msgid "Admin"
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
+msgid "Group"
 msgstr ""
 
 #: lib/groupnav.php:101
+#, fuzzy
+msgid "Blocked"
+msgstr "無此使用者"
+
+#: lib/groupnav.php:102
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "無此使用者"
+
+#: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
 msgstr ""
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:113
 #, fuzzy
 msgid "Logo"
 msgstr "登出"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:114
 #, php-format
 msgid "Add or edit %s logo"
 msgstr ""
 
+#: lib/groupnav.php:120
+#, php-format
+msgid "Add or edit %s design"
+msgstr ""
+
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr ""
@@ -4521,9 +3984,43 @@ msgid "Tags in %s group's notices"
 msgstr ""
 
 #: lib/htmloutputter.php:104
+msgid "This page is not available in a media type you accept"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr ""
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr ""
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr ""
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr ""
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr ""
+
+#: lib/imagefile.php:118
 #, fuzzy
-msgid "This page is not available in a "
-msgstr "個人首頁位址錯誤"
+msgid "Lost our file."
+msgstr "無此通知"
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr ""
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr ""
 
 #: lib/joinform.php:114
 #, fuzzy
@@ -4534,100 +4031,308 @@ msgstr "登入"
 msgid "Leave"
 msgstr ""
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:80
 #, fuzzy
 msgid "Login with a username and password"
 msgstr "使用者名稱或密碼無效"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:86
 #, fuzzy
 msgid "Sign up for a new account"
 msgstr "新增帳號"
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+msgid "from"
 msgstr ""
 
-#: lib/mail.php:175
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "確認信箱"
+
+#: lib/mail.php:174
 #, php-format
 msgid ""
 "Hey, %s.\n"
 "\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%s\n"
+"\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
 msgstr ""
 
-#: lib/mail.php:236
-#, fuzzy, php-format
-msgid "%1$s is now listening to "
+#: lib/mail.php:235
+#, php-format
+msgid "%1$s is now listening to your notices on %2$s."
 msgstr "現在%1$s在%2$s成為你的粉絲囉"
 
-#: lib/mail.php:254
+#: lib/mail.php:240
 #, fuzzy, php-format
-msgid "Location: %s\n"
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
 msgstr ""
+"現在%1$s在%2$s成為你的粉絲囉。\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"\n"
+"%4$s.\n"
+"敬上。\n"
+
+#: lib/mail.php:253
+#, fuzzy, php-format
+msgid "Location: %s\n"
+msgstr "地點"
 
-#: lib/mail.php:256
+#: lib/mail.php:255
 #, fuzzy, php-format
 msgid "Homepage: %s\n"
-msgstr ""
+msgstr "個人首頁"
 
-#: lib/mail.php:258
+#: lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
 "\n"
 msgstr ""
 
-#: lib/mail.php:461
+#: lib/mail.php:285
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: lib/mail.php:288
+#, 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 ""
+
+#: lib/mail.php:412
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: lib/mail.php:438
+msgid "SMS confirmation"
+msgstr ""
+
+#: lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr ""
 
-#: lib/mail.php:465
+#: lib/mail.php:466
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
+msgstr ""
+
+#: lib/mail.php:509
 #, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
+msgid "New private message from %s"
 msgstr ""
 
-#: lib/mail.php:555
+#: lib/mail.php:513
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%5$s\n"
+msgstr ""
+
+#: lib/mail.php:554
 #, fuzzy, php-format
-msgid "%1$s just added your notice from %2$s"
+msgid "%s (@%s) added your notice as a favorite"
 msgstr "現在%1$s在%2$s成為你的粉絲囉"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
-msgid "From"
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
 msgstr ""
 
-#: lib/messageform.php:110
-msgid "Send a direct notice"
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
 msgstr ""
 
-#: lib/noticeform.php:125
+#: lib/mail.php:613
+#, php-format
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+msgstr ""
+
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
 #, fuzzy
-msgid "Send a notice"
-msgstr "新訊息"
+msgid "Could not determine file's mime-type!"
+msgstr "無法更新使用者"
+
+#: lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
 
-#: lib/noticeform.php:152
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: lib/messageform.php:120
+msgid "Send a direct notice"
+msgstr ""
+
+#: lib/messageform.php:146
+msgid "To"
+msgstr ""
+
+#: lib/messageform.php:162 lib/noticeform.php:173
 #, fuzzy
 msgid "Available characters"
 msgstr "6個以上字元"
 
-#: lib/noticelist.php:426
-msgid "in reply to"
+#: lib/noticeform.php:145
+#, fuzzy
+msgid "Send a notice"
+msgstr "新訊息"
+
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
 msgstr ""
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
-msgid "Reply to this notice"
+#: lib/noticeform.php:180
+msgid "Attach"
 msgstr ""
 
-#: lib/noticelist.php:451
-msgid "Reply"
+#: lib/noticeform.php:184
+msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
-msgid "Delete this notice"
+#: lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "無內容"
+
+#: lib/noticelist.php:498
+msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:474
-msgid "Delete"
+#: lib/noticelist.php:499
+msgid "Reply"
 msgstr ""
 
 #: lib/nudgeform.php:116
@@ -4642,40 +4347,138 @@ msgstr ""
 msgid "Send a nudge to this user"
 msgstr ""
 
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "新的更人資料輸入錯誤"
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "個人圖像插入錯誤"
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "新增外部個人資料發生錯誤(Error inserting remote profile)"
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "新訊息"
+
+#: lib/oauthstore.php:487
+msgid "Couldn't insert new subscription."
+msgstr "無法新增訂閱"
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr ""
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr ""
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr ""
+
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr ""
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr ""
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr ""
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr ""
+
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/profilelist.php:182
-msgid "(none)"
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr ""
+
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "所有訂閱"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr ""
+
+#: lib/profileaction.php:157
+#, fuzzy
+msgid "All subscribers"
+msgstr "所有訂閱"
+
+#: lib/profileaction.php:177
+msgid "User ID"
+msgstr ""
+
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "何時加入會員的呢？"
+
+#: lib/profileaction.php:235
+msgid "All groups"
 msgstr ""
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:78
 msgid "Public"
 msgstr ""
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr ""
 
-#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr ""
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr ""
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr ""
 
+#: lib/searchaction.php:120
+msgid "Search site"
+msgstr ""
+
+#: lib/searchaction.php:162
+msgid "Search help"
+msgstr ""
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr ""
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr ""
+
 #: lib/searchgroupnav.php:82
 #, fuzzy
 msgid "Notice"
 msgstr "新訊息"
 
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr ""
+
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr ""
@@ -4684,34 +4487,64 @@ msgstr ""
 msgid "Untitled section"
 msgstr ""
 
-#: lib/subgroupnav.php:81
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: lib/subgroupnav.php:83
 #, fuzzy, php-format
 msgid "People %s subscribes to"
 msgstr "無此訂閱"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:91
 #, fuzzy, php-format
 msgid "People subscribed to %s"
 msgstr "此帳號已註冊"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:104
-#, php-format
-msgid "Invite friends and colleagues to join you on %s"
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
 msgstr ""
 
-#: lib/subs.php:53
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr ""
+
+#: lib/subs.php:48
+msgid "Already subscribed!"
+msgstr ""
+
+#: lib/subs.php:52
 msgid "User has blocked you."
 msgstr ""
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
+#: lib/subs.php:56
+msgid "Could not subscribe."
+msgstr ""
+
+#: lib/subs.php:75
+msgid "Could not subscribe other to you."
 msgstr ""
 
+#: lib/subs.php:124
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "此帳號已註冊"
+
+#: lib/subs.php:136
+msgid "Couldn't delete subscription."
+msgstr "無法刪除帳號"
+
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr ""
@@ -4720,33 +4553,106 @@ msgstr ""
 msgid "Top posters"
 msgstr ""
 
-#: lib/unblockform.php:120 lib/unblockform.php:150
-#, fuzzy
-msgid "Unblock this user"
-msgstr "無此使用者"
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+msgid "Unsubscribe from this user"
+msgstr ""
 
-#: lib/unblockform.php:150
-msgid "Unblock"
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
 msgstr ""
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
-msgid "Unsubscribe from this user"
+#: lib/userprofile.php:116
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "個人圖像"
+
+#: lib/userprofile.php:236
+msgid "User actions"
 msgstr ""
 
+#: lib/userprofile.php:248
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "新增帳號"
+msgid "Edit profile settings"
+msgstr "線上即時通設定"
+
+#: lib/userprofile.php:249
+msgid "Edit"
+msgstr ""
+
+#: lib/userprofile.php:272
+msgid "Send a direct message to this user"
+msgstr ""
+
+#: lib/userprofile.php:273
+msgid "Message"
+msgstr ""
+
+#: lib/util.php:821
+msgid "a few seconds ago"
+msgstr ""
+
+#: lib/util.php:823
+msgid "about a minute ago"
+msgstr ""
+
+#: lib/util.php:825
+#, php-format
+msgid "about %d minutes ago"
+msgstr ""
+
+#: lib/util.php:827
+msgid "about an hour ago"
+msgstr ""
+
+#: lib/util.php:829
+#, php-format
+msgid "about %d hours ago"
+msgstr ""
+
+#: lib/util.php:831
+msgid "about a day ago"
+msgstr ""
+
+#: lib/util.php:833
+#, php-format
+msgid "about %d days ago"
+msgstr ""
+
+#: lib/util.php:835
+msgid "about a month ago"
+msgstr ""
+
+#: lib/util.php:837
+#, php-format
+msgid "about %d months ago"
+msgstr ""
+
+#: lib/util.php:839
+msgid "about a year ago"
+msgstr ""
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "無法確認信箱"
+#: lib/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "個人首頁位址錯誤"
 
-#~ msgid "Email address"
-#~ msgstr "電子信箱"
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
 
-#~ msgid "Error inserting notice"
-#~ msgstr "新增訊息時發生錯誤"
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr ""
 
-#~ 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 "若忘記或遺失密碼，我們會寄新的密碼到你帳號中的信箱。"
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr ""
+
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr ""
diff --git a/plugins/Authentication/AuthenticationPlugin.php b/plugins/Authentication/AuthenticationPlugin.php
new file mode 100644
index 000000000..1b9084187
--- /dev/null
+++ b/plugins/Authentication/AuthenticationPlugin.php
@@ -0,0 +1,217 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Superclass for plugins that do authentication and/or authorization
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Plugin
+ * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Superclass for plugins that do authentication
+ *
+ * @category Plugin
+ * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+abstract class AuthenticationPlugin extends Plugin
+{
+    //is this plugin authoritative for authentication?
+    public $authoritative = false;
+    
+    //should accounts be automatically created after a successful login attempt?
+    public $autoregistration = false;
+
+    //can the user change their email address
+    public $password_changeable=true;
+
+    //unique name for this authentication provider
+    public $provider_name;
+
+    //------------Auth plugin should implement some (or all) of these methods------------\\
+    /**
+    * Check if a nickname/password combination is valid
+    * @param username
+    * @param password
+    * @return boolean true if the credentials are valid, false if they are invalid.
+    */
+    function checkPassword($username, $password)
+    {
+        return false;
+    }
+
+    /**
+    * Automatically register a user when they attempt to login with valid credentials.
+    * User::register($data) is a very useful method for this implementation
+    * @param username
+    * @return mixed instance of User, or false (if user couldn't be created)
+    */
+    function autoRegister($username)
+    {
+        $registration_data = array();
+        $registration_data['nickname'] = $username ;
+        return User::register($registration_data);
+    }
+
+    /**
+    * Change a user's password
+    * The old password has been verified to be valid by this plugin before this call is made
+    * @param username
+    * @param oldpassword
+    * @param newpassword
+    * @return boolean true if the password was changed, false if password changing failed for some reason
+    */
+    function changePassword($username,$oldpassword,$newpassword)
+    {
+        return false;
+    }
+
+    //------------Below are the methods that connect StatusNet to the implementing Auth plugin------------\\
+    function onInitializePlugin(){
+        if(!isset($this->provider_name)){
+            throw new Exception("must specify a provider_name for this authentication provider");
+        }
+    }
+
+    function onStartCheckPassword($nickname, $password, &$authenticatedUser){
+        //map the nickname to a username
+        $user_username = new User_username();
+        $user_username->username=$nickname;
+        $user_username->provider_name=$this->provider_name;
+        if($user_username->find() && $user_username->fetch()){
+            $username = $user_username->username;
+            $authenticated = $this->checkPassword($username, $password);
+            if($authenticated){
+                $authenticatedUser = User::staticGet('id', $user_username->user_id);
+                return false;
+            }
+        }else{
+            $user = User::staticGet('nickname', $nickname);
+            if($user){
+                //make sure a different provider isn't handling this nickname
+                $user_username = new User_username();
+                $user_username->username=$nickname;
+                if(!$user_username->find()){
+                    //no other provider claims this username, so it's safe for us to handle it
+                    $authenticated = $this->checkPassword($nickname, $password);
+                    if($authenticated){
+                        $authenticatedUser = User::staticGet('nickname', $nickname);
+                        User_username::register($authenticatedUser,$nickname,$this->provider_name);
+                        return false;
+                    }
+                }
+            }else{
+                if($this->autoregistration){
+                    $authenticated = $this->checkPassword($nickname, $password);
+                    if($authenticated){
+                        $user = $this->autoregister($nickname);
+                        if($user){
+                            $authenticatedUser = $user;
+                            User_username::register($authenticatedUser,$nickname,$this->provider_name);
+                            return false;
+                        }
+                    }
+                }
+            }
+        }
+        if($this->authoritative){
+            return false;
+        }else{
+            //we're not authoritative, so let other handlers try
+            return;
+        }
+    }
+
+    function onStartChangePassword($user,$oldpassword,$newpassword)
+    {
+        if($this->password_changeable){
+            $user_username = new User_username();
+            $user_username->user_id=$user->id;
+            $user_username->provider_name=$this->provider_name;
+            if($user_username->find() && $user_username->fetch()){
+                $authenticated = $this->checkPassword($user_username->username, $oldpassword);
+                if($authenticated){
+                    $result = $this->changePassword($user_username->username,$oldpassword,$newpassword);
+                    if($result){
+                        //stop handling of other handlers, because what was requested was done
+                        return false;
+                    }else{
+                        throw new Exception(_('Password changing failed'));
+                    }
+                }else{
+                    if($this->authoritative){
+                        //since we're authoritative, no other plugin could do this
+                        throw new Exception(_('Password changing failed'));
+                    }else{
+                        //let another handler try
+                        return null;
+                    }
+                }
+            }
+        }else{
+            if($this->authoritative){
+                //since we're authoritative, no other plugin could do this
+                throw new Exception(_('Password changing is not allowed'));
+            }
+        }
+    }
+
+    function onStartAccountSettingsPasswordMenuItem($widget)
+    {
+        if($this->authoritative && !$this->password_changeable){
+            //since we're authoritative, no other plugin could change passwords, so do not render the menu item
+            return false;
+        }
+    }
+
+    function onAutoload($cls)
+    {
+        switch ($cls)
+        {
+         case 'User_username':
+            require_once(INSTALLDIR.'/plugins/Authentication/User_username.php');
+            return false;
+         default:
+            return true;
+        }
+    }
+
+    function onCheckSchema() {
+        $schema = Schema::get();
+        $schema->ensureDataObject('User_username');
+        return true;
+    }
+
+    function onUserDeleteRelated($user, &$tables)
+    {
+        $tables[] = 'User_username';
+        return true;
+    }
+}
+
diff --git a/plugins/Authentication/User_username.php b/plugins/Authentication/User_username.php
new file mode 100644
index 000000000..6826f2681
--- /dev/null
+++ b/plugins/Authentication/User_username.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Table Definition for user_username
+ */
+require_once INSTALLDIR.'/classes/Plugin_DataObject.php';
+
+class User_username extends Plugin_DataObject
+{
+    ###START_AUTOCODE
+    /* the code below is auto generated do not remove the above tag */
+
+    public $__table = 'user_username';                     // table name
+    public $user_id;                        // int(4)  not_null
+    public $provider_name;                  // varchar(255)  primary_key not_null
+    public $username;                       // varchar(255)  primary_key not_null
+    public $created;                        // datetime()   not_null
+    public $modified;                       // timestamp()   not_null default_CURRENT_TIMESTAMP
+
+    /* Static get */
+    function staticGet($k,$v=null)
+    { return Memcached_DataObject::staticGet('User_username',$k,$v); }
+
+    /* the code above is auto generated do not remove the tag below */
+    ###END_AUTOCODE
+
+    /**
+    * Register a user with a username on a given provider
+    * @param User User object
+    * @param string username on the given provider
+    * @param provider_name string name of the provider
+    * @return mixed User_username instance if the registration succeeded, false if it did not
+    */
+    static function register($user, $username, $provider_name)
+    {
+        $user_username = new User_username();
+        $user_username->user_id = $user->id;
+        $user_username->provider_name = $provider_name;
+        $user_username->username = $username;
+        $user_username->created = DB_DataObject_Cast::dateTime();
+        if($user_username->insert()){
+            return $user_username;
+        }else{
+            return false;
+        }
+    }
+
+    /**
+    * Get the TableDef object that represents the table backing this class
+    * @return TableDef TableDef instance
+    */
+    function tableDef()
+    {
+        return new TableDef($this->__table,
+                             array(new ColumnDef('provider_name', 'varchar',
+                                                 '255', false, 'PRI'),
+                                   new ColumnDef('username', 'varchar',
+                                                 '255', false, 'PRI'),
+                                   new ColumnDef('user_id', 'integer',
+                                                 null, false),
+                                   new ColumnDef('created', 'datetime',
+                                                 null, false),
+                                   new ColumnDef('modified', 'timestamp')));
+    }
+}
diff --git a/plugins/Autocomplete/autocomplete.php b/plugins/Autocomplete/autocomplete.php
index aa57b3915..379390ffd 100644
--- a/plugins/Autocomplete/autocomplete.php
+++ b/plugins/Autocomplete/autocomplete.php
@@ -98,11 +98,10 @@ class AutocompleteAction extends Action
             $user = new User();
             $user->limit($limit);
             $user->whereAdd('nickname like \'' . trim($user->escape($q), '\'') . '%\'');
-            $user->find();
-            while($user->fetch()) {
-                $profile = Profile::staticGet($user->id);
-                $user->profile=$profile;
-                $this->users[]=$user;
+            if($user->find()){
+                while($user->fetch()) {
+                    $this->users[]=clone($user);
+                }
             }
         }
         if(substr($q,0,1)=='!'){
@@ -111,9 +110,10 @@ class AutocompleteAction extends Action
             $group = new User_group();
             $group->limit($limit);
             $group->whereAdd('nickname like \'' . trim($group->escape($q), '\'') . '%\'');
-            $group->find();
-            while($group->fetch()) {
-                $this->groups[]=$group;
+            if($group->find()){
+                while($group->fetch()) {
+                    $this->groups[]=clone($group);
+                }
             }
         }
         return true;
@@ -124,7 +124,8 @@ class AutocompleteAction extends Action
         parent::handle($args);
         $results = array();
         foreach($this->users as $user){
-            $results[]=array('nickname' => $user->nickname, 'fullname'=> $user->profile->fullname, 'type'=>'user');
+            $profile = $user->getProfile();
+            $results[]=array('nickname' => $user->nickname, 'fullname'=> $profile->fullname, 'type'=>'user');
         }
         foreach($this->groups as $group){
             $results[]=array('nickname' => $group->nickname, 'fullname'=> $group->fullname, 'type'=>'group');
diff --git a/plugins/BitlyUrl/BitlyUrlPlugin.php b/plugins/BitlyUrl/BitlyUrlPlugin.php
new file mode 100644
index 000000000..65d0f70e6
--- /dev/null
+++ b/plugins/BitlyUrl/BitlyUrlPlugin.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Plugin to push RSS/Atom updates to a PubSubHubBub hub
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Plugin
+ * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 Craig Andrews http://candrews.integralblue.com
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/plugins/UrlShortener/UrlShortenerPlugin.php';
+
+class BitlyUrlPlugin extends UrlShortenerPlugin
+{
+    public $serviceUrl;
+
+    function onInitializePlugin(){
+        parent::onInitializePlugin();
+        if(!isset($this->serviceUrl)){
+            throw new Exception("must specify a serviceUrl");
+        }
+    }
+
+    protected function shorten($url) {
+        $response = $this->http_get($url);
+        if(!$response) return;
+        return current(json_decode($response)->results)->hashUrl;
+    }
+}
+
+
diff --git a/plugins/BlogspamNetPlugin.php b/plugins/BlogspamNetPlugin.php
index c14569746..51236001a 100644
--- a/plugins/BlogspamNetPlugin.php
+++ b/plugins/BlogspamNetPlugin.php
@@ -22,6 +22,7 @@
  * @category  Plugin
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
+ * @author    Brion Vibber <brion@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -69,14 +70,12 @@ class BlogspamNetPlugin extends Plugin
     {
         $args = $this->testArgs($notice);
         common_debug("Blogspamnet args = " . print_r($args, TRUE));
-        $request = xmlrpc_encode_request('testComment', array($args));
-        $context = stream_context_create(array('http' => array('method' => "POST",
-                                                               'header' =>
-                                                               "Content-Type: text/xml\r\n".
-                                                               "User-Agent: " . $this->userAgent(),
-                                                               'content' => $request)));
-        $file = file_get_contents($this->baseUrl, false, $context);
-        $response = xmlrpc_decode($file);
+        $requestBody = xmlrpc_encode_request('testComment', array($args));
+
+        $request = HTTPClient::start();
+        $httpResponse = $request->post($this->baseUrl, array('Content-Type: text/xml'), $requestBody);
+
+        $response = xmlrpc_decode($httpResponse->getBody());
         if (xmlrpc_is_fault($response)) {
             throw new ServerException("$response[faultString] ($response[faultCode])", 500);
         } else {
diff --git a/plugins/EmailAuthentication/EmailAuthenticationPlugin.php b/plugins/EmailAuthentication/EmailAuthenticationPlugin.php
new file mode 100644
index 000000000..25e537735
--- /dev/null
+++ b/plugins/EmailAuthentication/EmailAuthenticationPlugin.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Plugin that uses the email address as a username, and checks the password as normal
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Plugin
+ * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 Craig Andrews http://candrews.integralblue.com
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+class EmailAuthenticationPlugin extends Plugin
+{
+    //---interface implementation---//
+
+    function onStartCheckPassword($nickname, $password, &$authenticatedUser)
+    {
+        if(strpos($nickname, '@'))
+        {
+            $user = User::staticGet('email',$nickname);
+            if($user && isset($user->email))
+            {
+                if(common_check_user($user->nickname,$password))
+                {
+                    $authenticatedUser = $user;
+                    return false;
+                }
+            }
+        }
+    }
+}
+
diff --git a/plugins/EmailAuthentication/README b/plugins/EmailAuthentication/README
new file mode 100644
index 000000000..320815689
--- /dev/null
+++ b/plugins/EmailAuthentication/README
@@ -0,0 +1,7 @@
+The Email Authentication plugin allows users to login using their email address.
+
+The provided email address is used to lookup the user's nickname, then that nickname and the provided password is checked.
+
+Installation
+============
+add "addPlugin('emailAuthentication');" to the bottom of your config.php
diff --git a/plugins/Facebook/FacebookPlugin.php b/plugins/Facebook/FacebookPlugin.php
index fc3adcfad..b68534b24 100644
--- a/plugins/Facebook/FacebookPlugin.php
+++ b/plugins/Facebook/FacebookPlugin.php
@@ -58,7 +58,7 @@ class FacebookPlugin extends Plugin
      * @return boolean hook return
      */
 
-    function onRouterInitialized(&$m)
+    function onRouterInitialized($m)
     {
 
         // Facebook App stuff
diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php
index f5ad3d06b..c852bbf5e 100644
--- a/plugins/Facebook/facebookaction.php
+++ b/plugins/Facebook/facebookaction.php
@@ -83,8 +83,8 @@ class FacebookAction extends Action
     function showStylesheets()
     {
         $this->cssLink('css/display.css', 'base');
-        $this->cssLink('css/display.css',null,'screen, projection, tv');
-        $this->cssLink('css/facebookapp.css', 'base');
+        $this->cssLink('css/display.css', null, 'screen, projection, tv');
+        $this->cssLink('plugins/Facebook/facebookapp.css');
     }
 
     function showScripts()
@@ -382,8 +382,7 @@ class FacebookAction extends Action
     {
         // Does a little before-after block for next/prev page
         if ($have_before || $have_after) {
-            $this->elementStart('div', array('class' => 'pagination'));
-            $this->elementStart('dl', null);
+            $this->elementStart('dl', 'pagination');
             $this->element('dt', null, _('Pagination'));
             $this->elementStart('dd', null);
             $this->elementStart('ul', array('class' => 'nav'));
@@ -408,7 +407,6 @@ class FacebookAction extends Action
             $this->elementEnd('ul');
             $this->elementEnd('dd');
             $this->elementEnd('dl');
-            $this->elementEnd('div');
         }
     }
 
diff --git a/theme/base/css/facebookapp.css b/plugins/Facebook/facebookapp.css
index e6b1c9ee5..8cd06f78a 100644
--- a/theme/base/css/facebookapp.css
+++ b/plugins/Facebook/facebookapp.css
@@ -5,8 +5,8 @@ font-family:"Lucida Sans Unicode", "Lucida Grande", sans-serif;
 
 #wrap {
 background-color:#F0F2F5;
-padding-left:18px;
-padding-right:18px;
+padding-left:1.795%;
+padding-right:1.795%;
 width:auto;
 }
 
@@ -15,8 +15,16 @@ h1,h2,h3,h4,h5,h6 {
 color:#000;
 }
 
+#header {
+width:131%;
+}
+
 #content {
-width:95%;
+width:92.7%;
+}
+
+#aside_primary {
+display:none;
 }
 
 #site_nav_local_views a {
@@ -26,6 +34,16 @@ background-color:#D0DFE7;
 background-color:#FAFBFC;
 }
 
+#form_notice .form_note + label,
+#form_notice #notice_data-attach {
+display:none;
+}
+
+#form_notice #notice_action-submit {
+height:47px !important;
+}
+
+
 span.facebook-button {
 border: 2px solid #aaa;
 padding: 3px;
diff --git a/plugins/Facebook/facebookhome.php b/plugins/Facebook/facebookhome.php
index 91c0cc6b8..ea141c2c2 100644
--- a/plugins/Facebook/facebookhome.php
+++ b/plugins/Facebook/facebookhome.php
@@ -244,8 +244,7 @@ class FacebookhomeAction extends FacebookAction
         // XXX: Fix so this uses common_local_url() if possible.
 
         if ($have_before || $have_after) {
-            $this->elementStart('div', array('class' => 'pagination'));
-            $this->elementStart('dl', null);
+            $this->elementStart('dl', 'pagination');
             $this->element('dt', null, _('Pagination'));
             $this->elementStart('dd', null);
             $this->elementStart('ul', array('class' => 'nav'));
@@ -270,7 +269,6 @@ class FacebookhomeAction extends FacebookAction
             $this->elementEnd('ul');
             $this->elementEnd('dd');
             $this->elementEnd('dl');
-            $this->elementEnd('div');
         }
     }
 
diff --git a/plugins/Facebook/facebookinvite.php b/plugins/Facebook/facebookinvite.php
index ecda1717c..3380b4c85 100644
--- a/plugins/Facebook/facebookinvite.php
+++ b/plugins/Facebook/facebookinvite.php
@@ -105,6 +105,7 @@ class FacebookinviteAction extends FacebookAction
         $multi_params = array('showborder' => 'false');
         $multi_params['actiontext'] = $actiontext;
         $multi_params['bypass'] = 'cancel';
+        $multi_params['cols'] = 4;
 
         // Get a list of users who are already using the app for exclusion
         $exclude_ids = $this->facebook->api_client->friends_getAppUsers();
diff --git a/plugins/GeoURLPlugin.php b/plugins/GeoURLPlugin.php
new file mode 100644
index 000000000..30ff2c278
--- /dev/null
+++ b/plugins/GeoURLPlugin.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Plugin to add ICBM metadata to HTML pages and report data to GeoURL.org
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Plugin to add ICBM metadata to HTML pages and report data to GeoURL.org
+ *
+ * Adds metadata to notice and profile pages that geourl.org and others
+ * understand. Also, pings geourl.org when a new notice is saved or
+ * a profile is changed.
+ *
+ * @category Plugin
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ *
+ * @seeAlso  Location
+ */
+
+class GeoURLPlugin extends Plugin
+{
+    public $ping = 'http://geourl.org/ping/';
+
+    /**
+     * Add extra <meta> headers for certain pages that geourl.org understands
+     *
+     * @param Action $action page being shown
+     *
+     * @return boolean event handler flag
+     */
+
+    function onEndShowHeadElements($action)
+    {
+        $name = $action->trimmed('action');
+
+        $location = null;
+
+        if ($name == 'showstream') {
+            $profile = $action->profile;
+            if (!empty($profile) && !empty($profile->lat) && !empty($profile->lon)) {
+                $location = $profile->lat . ', ' . $profile->lon;
+            }
+        } else if ($name == 'shownotice') {
+            $notice = $action->profile;
+            if (!empty($notice) && !empty($notice->lat) && !empty($notice->lon)) {
+                $location = $notice->lat . ', ' . $notice->lon;
+            }
+        }
+
+        if (!empty($location)) {
+            $action->element('meta', array('name' => 'ICBM',
+                                           'content' => $location));
+            $action->element('meta', array('name' => 'DC.title',
+                                           'content' => $action->title()));
+        }
+
+        return true;
+    }
+
+    /**
+     * Report local notices to GeoURL.org when they're created
+     *
+     * @param Notice &$notice queued notice
+     *
+     * @return boolean event handler flag
+     */
+
+    function onHandleQueuedNotice(&$notice)
+    {
+        if ($notice->is_local == 1) {
+
+            $request = HTTPClient::start();
+
+            $url = common_local_url('shownotice',
+                                    array('notice' => $notice->id));
+
+            try {
+                $request->post($this->ping,
+                               null,
+                               array('p' => $url));
+            } catch (HTTP_Request2_Exception $e) {
+                common_log(LOG_WARNING,
+                           "GeoURL.org ping failed for '$url' ($this->ping)");
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/plugins/GeonamesPlugin.php b/plugins/GeonamesPlugin.php
new file mode 100644
index 000000000..e18957c36
--- /dev/null
+++ b/plugins/GeonamesPlugin.php
@@ -0,0 +1,305 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Plugin to convert string locations to Geonames IDs and vice versa
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Plugin to convert string locations to Geonames IDs and vice versa
+ *
+ * This handles most of the events that Location class emits. It uses
+ * the geonames.org Web service to convert names like 'Montreal, Quebec, Canada'
+ * into IDs and lat/lon pairs.
+ *
+ * @category Plugin
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ *
+ * @seeAlso  Location
+ */
+
+class GeonamesPlugin extends Plugin
+{
+    const NAMESPACE = 1;
+
+    /**
+     * convert a name into a Location object
+     *
+     * @param string   $name      Name to convert
+     * @param string   $language  ISO code for anguage the name is in
+     * @param Location &$location Location object (may be null)
+     *
+     * @return boolean whether to continue (results in $location)
+     */
+
+    function onLocationFromName($name, $language, &$location)
+    {
+        $client = HTTPClient::start();
+
+        // XXX: break down a name by commas, narrow by each
+
+        $str = http_build_query(array('maxRows' => 1,
+                                      'q' => $name,
+                                      'lang' => $language,
+                                      'type' => 'json'));
+
+        $result = $client->get('http://ws.geonames.org/search?'.$str);
+
+        if ($result->isOk()) {
+            $rj = json_decode($result->getBody());
+            if (count($rj->geonames) > 0) {
+                $n = $rj->geonames[0];
+
+                $location = new Location();
+
+                $location->lat              = $n->lat;
+                $location->lon              = $n->lng;
+                $location->names[$language] = $n->name;
+                $location->location_id      = $n->geonameId;
+                $location->location_ns      = self::NAMESPACE;
+
+                // handled, don't continue processing!
+                return false;
+            }
+        }
+
+        // Continue processing; we don't have the answer
+        return true;
+    }
+
+    /**
+     * convert an id into a Location object
+     *
+     * @param string   $id        Name to convert
+     * @param string   $ns        Name to convert
+     * @param string   $language  ISO code for language for results
+     * @param Location &$location Location object (may be null)
+     *
+     * @return boolean whether to continue (results in $location)
+     */
+
+    function onLocationFromId($id, $ns, $language, &$location)
+    {
+        if ($ns != self::NAMESPACE) {
+            // It's not one of our IDs... keep processing
+            return true;
+        }
+
+        $client = HTTPClient::start();
+
+        $str = http_build_query(array('geonameId' => $id,
+                                      'lang' => $language));
+
+        $result = $client->get('http://ws.geonames.org/hierarchyJSON?'.$str);
+
+        if ($result->isOk()) {
+
+            $rj = json_decode($result->getBody());
+
+            if (count($rj->geonames) > 0) {
+
+                $parts = array();
+
+                foreach ($rj->geonames as $level) {
+                    if (in_array($level->fcode, array('PCLI', 'ADM1', 'PPL'))) {
+                        $parts[] = $level->name;
+                    }
+                }
+
+                $last = $rj->geonames[count($rj->geonames)-1];
+
+                if (!in_array($level->fcode, array('PCLI', 'ADM1', 'PPL'))) {
+                    $parts[] = $last->name;
+                }
+
+                $location = new Location();
+
+                $location->location_id      = $last->geonameId;
+                $location->location_ns      = self::NAMESPACE;
+                $location->lat              = $last->lat;
+                $location->lon              = $last->lng;
+                $location->names[$language] = implode(', ', array_reverse($parts));
+            }
+        }
+
+        // We're responsible for this NAMESPACE; nobody else
+        // can resolve it
+
+        return false;
+    }
+
+    /**
+     * convert a lat/lon pair into a Location object
+     *
+     * Given a lat/lon, we try to find a Location that's around
+     * it or nearby. We prefer populated places (cities, towns, villages).
+     *
+     * @param string   $lat       Latitude
+     * @param string   $lon       Longitude
+     * @param string   $language  ISO code for language for results
+     * @param Location &$location Location object (may be null)
+     *
+     * @return boolean whether to continue (results in $location)
+     */
+
+    function onLocationFromLatLon($lat, $lon, $language, &$location)
+    {
+        $client = HTTPClient::start();
+
+        $str = http_build_query(array('lat' => $lat,
+                                      'lng' => $lon,
+                                      'lang' => $language));
+
+        $result =
+          $client->get('http://ws.geonames.org/findNearbyPlaceNameJSON?'.$str);
+
+        if ($result->isOk()) {
+
+            $rj = json_decode($result->getBody());
+
+            if (count($rj->geonames) > 0) {
+
+                $n = $rj->geonames[0];
+
+                $parts = array();
+
+                $location = new Location();
+
+                $parts[] = $n->name;
+
+                if (!empty($n->adminName1)) {
+                    $parts[] = $n->adminName1;
+                }
+
+                if (!empty($n->countryName)) {
+                    $parts[] = $n->countryName;
+                }
+
+                $location->location_id = $n->geonameId;
+                $location->location_ns = self::NAMESPACE;
+                $location->lat         = $lat;
+                $location->lon         = $lon;
+
+                $location->names[$language] = implode(', ', $parts);
+
+                // Success! We handled it, so no further processing
+
+                return false;
+            }
+        }
+
+        // For some reason we don't know, so pass.
+
+        return true;
+    }
+
+    /**
+     * Human-readable name for a location
+     *
+     * Given a location, we try to retrieve a human-readable name
+     * in the target language.
+     *
+     * @param Location $location Location to get the name for
+     * @param string   $language ISO code for language to find name in
+     * @param string   &$name    Place to put the name
+     *
+     * @return boolean whether to continue
+     */
+
+    function onLocationNameLanguage($location, $language, &$name)
+    {
+        if ($location->location_ns != self::NAMESPACE) {
+            // It's not one of our IDs... keep processing
+            return true;
+        }
+
+        $client = HTTPClient::start();
+
+        $str = http_build_query(array('geonameId' => $id,
+                                      'lang' => $language));
+
+        $result = $client->get('http://ws.geonames.org/hierarchyJSON?'.$str);
+
+        if ($result->isOk()) {
+
+            $rj = json_decode($result->getBody());
+
+            if (count($rj->geonames) > 0) {
+
+                $parts = array();
+
+                foreach ($rj->geonames as $level) {
+                    if (in_array($level->fcode, array('PCLI', 'ADM1', 'PPL'))) {
+                        $parts[] = $level->name;
+                    }
+                }
+
+                $last = $rj->geonames[count($rj->geonames)-1];
+
+                if (!in_array($level->fcode, array('PCLI', 'ADM1', 'PPL'))) {
+                    $parts[] = $last->name;
+                }
+
+                if (count($parts)) {
+                    $name = implode(', ', array_reverse($parts));
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Human-readable name for a location
+     *
+     * Given a location, we try to retrieve a geonames.org URL.
+     *
+     * @param Location $location Location to get the url for
+     * @param string   &$url     Place to put the url
+     *
+     * @return boolean whether to continue
+     */
+
+    function onLocationUrl($location, &$url)
+    {
+        if ($location->location_ns != self::NAMESPACE) {
+            // It's not one of our IDs... keep processing
+            return true;
+        }
+
+        $url = 'http://www.geonames.org/' . $location->location_id;
+
+        // it's been filled, so don't process further.
+        return false;
+    }
+}
diff --git a/plugins/InfiniteScroll/infinitescroll.js b/plugins/InfiniteScroll/infinitescroll.js
index ae4d53d09..0dafef6d5 100644
--- a/plugins/InfiniteScroll/infinitescroll.js
+++ b/plugins/InfiniteScroll/infinitescroll.js
@@ -2,14 +2,20 @@ jQuery(document).ready(function($){
   $('notices_primary').infinitescroll({
     debug: true,
     infiniteScroll  : false,
-    nextSelector    : "li.nav_next a",
+    nextSelector    : 'body#public li.nav_next a,'+
+                      'body#all li.nav_next a,'+
+                      'body#showstream li.nav_next a,'+
+                      'body#replies li.nav_next a,'+
+                      'body#showfavorites li.nav_next a,'+
+                      'body#showgroup li.nav_next a,'+
+                      'body#favorited li.nav_next a',
     loadingImg      : $('address .url')[0].href+'plugins/InfiniteScroll/ajax-loader.gif',
     text            : "<em>Loading the next set of posts...</em>",
     donetext        : "<em>Congratulations, you\'ve reached the end of the Internet.</em>",
-    navSelector     : "div.pagination",
+    navSelector     : ".pagination",
     contentSelector : "#notices_primary ol.notices",
     itemSelector    : "#notices_primary ol.notices li"
     },function(){
-        NoticeAttachments();
+        SN.Init.Notices();
     });
 });
diff --git a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php
new file mode 100644
index 000000000..865154730
--- /dev/null
+++ b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Plugin to enable LDAP Authentication and Authorization
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Plugin
+ * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 Craig Andrews http://candrews.integralblue.com
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/plugins/Authentication/AuthenticationPlugin.php';
+require_once 'Net/LDAP2.php';
+
+class LdapAuthenticationPlugin extends AuthenticationPlugin
+{
+    public $host=null;
+    public $port=null;
+    public $version=null;
+    public $starttls=null;
+    public $binddn=null;
+    public $bindpw=null;
+    public $basedn=null;
+    public $options=null;
+    public $filter=null;
+    public $scope=null;
+    public $attributes=array();
+
+    function onInitializePlugin(){
+        parent::onInitializePlugin();
+        if(!isset($this->host)){
+            throw new Exception("must specify a host");
+        }
+        if(!isset($this->basedn)){
+            throw new Exception("must specify a basedn");
+        }
+        if(!isset($this->attributes['nickname'])){
+            throw new Exception("must specify a nickname attribute");
+        }
+        if(!isset($this->attributes['username'])){
+            throw new Exception("must specify a username attribute");
+        }
+    }
+    
+    //---interface implementation---//
+
+    function checkPassword($username, $password)
+    {
+        $ldap = $this->ldap_get_connection();
+        if(!$ldap){
+            return false;
+        }
+        $entry = $this->ldap_get_user($username);
+        if(!$entry){
+            return false;
+        }else{
+            $config = $this->ldap_get_config();
+            $config['binddn']=$entry->dn();
+            $config['bindpw']=$password;
+            if($this->ldap_get_connection($config)){
+                return true;
+            }else{
+                return false;
+            }
+        }
+    }
+
+    function autoRegister($username)
+    {
+        $entry = $this->ldap_get_user($username,$this->attributes);
+        if($entry){
+            $registration_data = array();
+            foreach($this->attributes as $sn_attribute=>$ldap_attribute){
+                $registration_data[$sn_attribute]=$entry->getValue($ldap_attribute,'single');
+            }
+            if(isset($registration_data['email']) && !empty($registration_data['email'])){
+                $registration_data['email_confirmed']=true;
+            }
+            //set the database saved password to a random string.
+            $registration_data['password']=common_good_rand(16);
+            return User::register($registration_data);
+        }else{
+            //user isn't in ldap, so we cannot register him
+            return false;
+        }
+    }
+
+    function changePassword($username,$oldpassword,$newpassword)
+    {
+        //TODO implement this
+        throw new Exception(_('Sorry, changing LDAP passwords is not supported at this time'));
+
+        return false;
+    }
+    
+    //---utility functions---//
+    function ldap_get_config(){
+        $config = array();
+        $keys = array('host','port','version','starttls','binddn','bindpw','basedn','options','filter','scope');
+        foreach($keys as $key){
+            $value = $this->$key;
+            if($value!==null){
+                $config[$key]=$value;
+            }
+        }
+        return $config;
+    }
+    
+    function ldap_get_connection($config = null){
+        if($config == null){
+            $config = $this->ldap_get_config();
+        }
+        
+        //cannot use Net_LDAP2::connect() as StatusNet uses
+        //PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError');
+        //PEAR handling can be overridden on instance objects, so we do that.
+        $ldap = new Net_LDAP2($config);
+        $ldap->setErrorHandling(PEAR_ERROR_RETURN);
+        $err=$ldap->bind();
+        if (Net_LDAP2::isError($err)) {
+            common_log(LOG_WARNING, 'Could not connect to LDAP server: '.$err->getMessage());
+            return false;
+        }
+        return $ldap;
+    }
+    
+    /**
+     * get an LDAP entry for a user with a given username
+     * 
+     * @param string $username
+     * $param array $attributes LDAP attributes to retrieve
+     * @return string DN
+     */
+    function ldap_get_user($username,$attributes=array()){
+        $ldap = $this->ldap_get_connection();
+        $filter = Net_LDAP2_Filter::create($this->attributes['username'], 'equals',  $username);
+        $options = array(
+            'scope' => 'sub',
+            'attributes' => $attributes
+        );
+        $search = $ldap->search(null,$filter,$options);
+        
+        if (PEAR::isError($search)) {
+            common_log(LOG_WARNING, 'Error while getting DN for user: '.$search->getMessage());
+            return false;
+        }
+
+        if($search->count()==0){
+            return false;
+        }else if($search->count()==1){
+            $entry = $search->shiftEntry();
+            return $entry;
+        }else{
+            common_log(LOG_WARNING, 'Found ' . $search->count() . ' ldap user with the username: ' . $username);
+            return false;
+        }
+    }
+}
diff --git a/plugins/LdapAuthentication/README b/plugins/LdapAuthentication/README
new file mode 100644
index 000000000..dc3f4ba88
--- /dev/null
+++ b/plugins/LdapAuthentication/README
@@ -0,0 +1,76 @@
+The LDAP Authentication plugin allows for StatusNet to handle authentication
+through LDAP.
+
+Installation
+============
+add "addPlugin('ldapAuthentication',
+    array('setting'=>'value', 'setting2'=>'value2', ...);"
+to the bottom of your config.php
+
+Settings
+========
+provider_name*: a unique name for this authentication provider.
+authoritative (false): Set to true if LDAP's responses are authoritative
+    (if authorative and LDAP fails, no other password checking will be done).
+autoregistration (false): Set to true if users should be automatically created
+    when they attempt to login.
+email_changeable (true): Are users allowed to change their email address?
+    (true or false)
+password_changeable (true): Are users allowed to change their passwords?
+    (true or false)
+
+host*: LDAP server name to connect to. You can provide several hosts in an
+    array in which case the hosts are tried from left to right.
+    See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php
+port: Port on the server.
+    See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php
+version: LDAP version.
+    See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php
+starttls: TLS is started after connecting.
+    See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php
+binddn: The distinguished name to bind as (username).
+    See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php
+bindpw: Password for the binddn.
+    See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php
+basedn*: LDAP base name (root directory).
+    See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php
+options: See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php
+filter: Default search filter.
+    See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php
+scope: Default search scope.
+    See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php
+
+attributes: an array that relates StatusNet user attributes to LDAP ones
+    username*: LDAP attribute value entered when authenticating to StatusNet
+    nickname*: LDAP attribute value shown as the user's nickname
+    email
+    fullname
+    homepage
+    location
+
+* required
+default values are in (parenthesis)
+
+For most LDAP installations, the "nickname" and "username" attributes should
+    be the same.
+
+Example
+=======
+Here's an example of an LDAP plugin configuration that connects to
+    Microsoft Active Directory.
+
+addPlugin('ldapAuthentication', array(
+    'provider_name'=>'Example',
+    'authoritative'=>true,
+    'autoregistration'=>true,
+    'binddn'=>'username',
+    'bindpw'=>'password',
+    'basedn'=>'OU=Users,OU=StatusNet,OU=US,DC=americas,DC=global,DC=loc',
+    'host'=>array('server1', 'server2'),
+    'attributes'=>array(
+        'username'=>'sAMAccountName',
+        'nickname'=>'sAMAccountName',
+        'email'=>'mail',
+        'fullname'=>'displayName')
+));
+
diff --git a/plugins/LilUrl/LilUrlPlugin.php b/plugins/LilUrl/LilUrlPlugin.php
index 7665b6c1e..e906751e8 100644
--- a/plugins/LilUrl/LilUrlPlugin.php
+++ b/plugins/LilUrl/LilUrlPlugin.php
@@ -31,34 +31,31 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once(INSTALLDIR.'/lib/Shorturl_api.php');
+require_once INSTALLDIR.'/plugins/UrlShortener/UrlShortenerPlugin.php';
 
-class LilUrlPlugin extends Plugin
+class LilUrlPlugin extends UrlShortenerPlugin
 {
-    function __construct()
-    {
-        parent::__construct();
-    }
+    public $serviceUrl;
 
     function onInitializePlugin(){
-        $this->registerUrlShortener(
-            'ur1.ca',
-            array('freeService'=>true),
-            array('LilUrl',array('http://ur1.ca/'))
-        );
+        parent::onInitializePlugin();
+        if(!isset($this->serviceUrl)){
+            throw new Exception("must specify a serviceUrl");
+        }
     }
-}
 
-class LilUrl extends ShortUrlApi
-{
-    protected function shorten_imp($url) {
-        $data['longurl'] = $url;
-        $response = $this->http_post($data);
-        if (!$response) return $url;
-        $y = @simplexml_load_string($response);
-        if (!isset($y->body)) return $url;
+    protected function shorten($url) {
+        $data = array('longurl' => $url);
+        
+        $responseBody = $this->http_post($this->serviceUrl,$data);
+        
+        if (!$responseBody) return;
+        $y = @simplexml_load_string($responseBody);
+        if (!isset($y->body)) return;
         $x = $y->body->p[0]->a->attributes();
-        if (isset($x['href'])) return $x['href'];
-        return $url;
+        if (isset($x['href'])) {
+            return $x['href'];
+        }
     }
 }
+
diff --git a/plugins/LinkbackPlugin.php b/plugins/LinkbackPlugin.php
index 60f7a60c7..915d15c07 100644
--- a/plugins/LinkbackPlugin.php
+++ b/plugins/LinkbackPlugin.php
@@ -129,18 +129,12 @@ class LinkbackPlugin extends Plugin
             }
         }
 
-        $request = xmlrpc_encode_request('pingback.ping', $args);
-        $context = stream_context_create(array('http' => array('method' => "POST",
-                                                               'header' =>
-                                                               "Content-Type: text/xml\r\n".
-                                                               "User-Agent: " . $this->userAgent(),
-                                                               'content' => $request)));
-        $file = file_get_contents($endpoint, false, $context);
-        if (!$file) {
-            common_log(LOG_WARNING,
-	               "Pingback request failed for '$url' ($endpoint)");
-        } else {
-            $response = xmlrpc_decode($file);
+        $request = HTTPClient::start();
+        try {
+            $response = $request->post($endpoint,
+                array('Content-Type: text/xml'),
+                xmlrpc_encode_request('pingback.ping', $args));
+            $response = xmlrpc_decode($response->getBody());
             if (xmlrpc_is_fault($response)) {
                 common_log(LOG_WARNING,
                        "Pingback error for '$url' ($endpoint): ".
@@ -150,6 +144,9 @@ class LinkbackPlugin extends Plugin
                        "Pingback success for '$url' ($endpoint): ".
                        "'$response'");
             }
+        } catch (HTTP_Request2_Exception $e) {
+            common_log(LOG_WARNING,
+                   "Pingback request failed for '$url' ($endpoint)");
         }
     }
 
diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php
index a933a1155..6dd8a3f5a 100644
--- a/plugins/OpenID/OpenIDPlugin.php
+++ b/plugins/OpenID/OpenIDPlugin.php
@@ -62,17 +62,59 @@ class OpenIDPlugin extends Plugin
      * @return boolean hook return
      */
 
-    function onRouterInitialized(&$m)
+    function onStartInitializeRouter($m)
     {
         $m->connect('main/openid', array('action' => 'openidlogin'));
+        $m->connect('main/openidtrust', array('action' => 'openidtrust'));
         $m->connect('settings/openid', array('action' => 'openidsettings'));
-        $m->connect('xrds', array('action' => 'publicxrds'));
         $m->connect('index.php?action=finishopenidlogin', array('action' => 'finishopenidlogin'));
         $m->connect('index.php?action=finishaddopenid', array('action' => 'finishaddopenid'));
-
+        $m->connect('main/openidserver', array('action' => 'openidserver'));
+        
         return true;
     }
 
+    function onEndPublicXRDS($action, &$xrdsOutputter)
+    {
+        $xrdsOutputter->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
+                                          'xmlns:simple' => 'http://xrds-simple.net/core/1.0',
+                                          'version' => '2.0'));
+        $xrdsOutputter->element('Type', null, 'xri://$xrds*simple');
+        //consumer
+        foreach (array('finishopenidlogin', 'finishaddopenid') as $finish) {
+            $xrdsOutputter->showXrdsService(Auth_OpenID_RP_RETURN_TO_URL_TYPE,
+                                common_local_url($finish));
+        }
+        //provider
+        $xrdsOutputter->showXrdsService('http://specs.openid.net/auth/2.0/server',
+                            common_local_url('openidserver'),
+                            null,
+                            null,
+                            'http://specs.openid.net/auth/2.0/identifier_select');
+        $xrdsOutputter->elementEnd('XRD');
+    }
+
+    function onEndUserXRDS($action, &$xrdsOutputter)
+    {
+        $xrdsOutputter->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
+                                          'xml:id' => 'openid',
+                                          'xmlns:simple' => 'http://xrds-simple.net/core/1.0',
+                                          'version' => '2.0'));
+        $xrdsOutputter->element('Type', null, 'xri://$xrds*simple');
+        
+        //consumer
+        $xrdsOutputter->showXrdsService('http://specs.openid.net/auth/2.0/return_to',
+                            common_local_url('finishopenidlogin'));
+                            
+        //provider
+        $xrdsOutputter->showXrdsService('http://specs.openid.net/auth/2.0/signon',
+                            common_local_url('openidserver'),
+                            null,
+                            null,
+                            common_profile_url($action->user->nickname));
+        $xrdsOutputter->elementEnd('XRD');
+    }
+
     function onEndLoginGroupNav(&$action)
     {
         $action_name = $action->trimmed('action');
@@ -107,11 +149,16 @@ class OpenIDPlugin extends Plugin
          case 'XrdsAction':
          case 'PublicxrdsAction':
          case 'OpenidsettingsAction':
+         case 'OpenidserverAction':
+         case 'OpenidtrustAction':
             require_once(INSTALLDIR.'/plugins/OpenID/' . strtolower(mb_substr($cls, 0, -6)) . '.php');
             return false;
          case 'User_openid':
             require_once(INSTALLDIR.'/plugins/OpenID/User_openid.php');
             return false;
+         case 'User_openid_trustroot':
+            require_once(INSTALLDIR.'/plugins/OpenID/User_openid_trustroot.php');
+            return false;
          default:
             return true;
         }
@@ -136,6 +183,7 @@ class OpenIDPlugin extends Plugin
         {
          case 'openidlogin':
          case 'finishopenidlogin':
+         case 'openidserver':
             $login = true;
             return false;
          default:
@@ -150,11 +198,19 @@ class OpenIDPlugin extends Plugin
      * @return void
      */
 
-    function onEndHeadChildren($action)
+    function onEndShowHeadElements($action)
     {
-        // for client side of OpenID authentication
-        $action->element('meta', array('http-equiv' => 'X-XRDS-Location',
-                                       'content' => common_local_url('publicxrds')));
+        if($action instanceof ShowstreamAction){
+            $action->element('link', array('rel' => 'openid2.provider',
+                                           'href' => common_local_url('openidserver')));
+            $action->element('link', array('rel' => 'openid2.local_id',
+                                           'href' => $action->profile->profileurl));
+            $action->element('link', array('rel' => 'openid.server',
+                                           'href' => common_local_url('openidserver')));
+            $action->element('link', array('rel' => 'openid.delegate',
+                                           'href' => $action->profile->profileurl));
+        }
+        return true;
     }
 
     /**
@@ -225,16 +281,15 @@ class OpenIDPlugin extends Plugin
 
     function onCheckSchema() {
         $schema = Schema::get();
-        $schema->ensureTable('user_openid',
-                             array(new ColumnDef('canonical', 'varchar',
-                                                 '255', false, 'PRI'),
-                                   new ColumnDef('display', 'varchar',
-                                                 '255', false),
-                                   new ColumnDef('user_id', 'integer',
-                                                 null, false, 'MUL'),
-                                   new ColumnDef('created', 'datetime',
-                                                 null, false),
-                                   new ColumnDef('modified', 'timestamp')));
+        $schema->ensureDataObject('User_openid');
+        $schema->ensureDataObject('User_openid_trustroot');
+        return true;
+    }
+
+    function onUserDeleteRelated($user, &$tables)
+    {
+        $tables[] = 'User_openid';
+        $tables[] = 'User_openid_trustroot';
         return true;
     }
 }
diff --git a/plugins/OpenID/User_openid.php b/plugins/OpenID/User_openid.php
index 338e0f6e9..c3624118e 100644
--- a/plugins/OpenID/User_openid.php
+++ b/plugins/OpenID/User_openid.php
@@ -2,9 +2,9 @@
 /**
  * Table Definition for user_openid
  */
-require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
+require_once INSTALLDIR.'/classes/Plugin_DataObject.php';
 
-class User_openid extends Memcached_DataObject
+class User_openid extends Plugin_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -33,4 +33,22 @@ class User_openid extends Memcached_DataObject
 
         return ($cnt > 0);
     }
+
+    /**
+    * Get the TableDef object that represents the table backing this class
+    * @return TableDef TableDef instance
+    */
+    function tableDef()
+    {
+        return new TableDef($this->__table,
+                             array(new ColumnDef('canonical', 'varchar',
+                                                 '255', false, 'PRI'),
+                                   new ColumnDef('display', 'varchar',
+                                                 '255', false),
+                                   new ColumnDef('user_id', 'integer',
+                                                 null, false, 'MUL'),
+                                   new ColumnDef('created', 'datetime',
+                                                 null, false),
+                                   new ColumnDef('modified', 'timestamp')));
+    }
 }
diff --git a/plugins/OpenID/User_openid_trustroot.php b/plugins/OpenID/User_openid_trustroot.php
new file mode 100644
index 000000000..b208dddfd
--- /dev/null
+++ b/plugins/OpenID/User_openid_trustroot.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Table Definition for user_openid_trustroot
+ */
+require_once INSTALLDIR.'/classes/Plugin_DataObject.php';
+
+class User_openid_trustroot extends Plugin_DataObject
+{
+    ###START_AUTOCODE
+    /* the code below is auto generated do not remove the above tag */
+
+    public $__table = 'user_openid_trustroot';                     // table name
+    public $trustroot;                         // varchar(255) primary_key not_null
+    public $user_id;                         // int(4)  primary_key not_null
+    public $created;                         // datetime()   not_null
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
+
+    /* Static get */
+    function staticGet($k,$v=null)
+    { return Memcached_DataObject::staticGet('User_openid_trustroot',$k,$v); }
+
+    /* the code above is auto generated do not remove the tag below */
+    ###END_AUTOCODE
+    
+    function &pkeyGet($kv)
+    {
+        return Memcached_DataObject::pkeyGet('User_openid_trustroot', $kv);
+    }
+
+    /**
+    * Get the TableDef object that represents the table backing this class
+    * @return TableDef TableDef instance
+    */
+    function tableDef()
+    {
+        return new TableDef($this->__table,
+                             array(new ColumnDef('trustroot', 'varchar',
+                                                 '255', false, 'PRI'),
+                                   new ColumnDef('user_id', 'integer',
+                                                 null, false, 'PRI'),
+                                   new ColumnDef('created', 'datetime',
+                                                 null, false),
+                                   new ColumnDef('modified', 'timestamp')));
+    }
+}
diff --git a/plugins/OpenID/finishopenidlogin.php b/plugins/OpenID/finishopenidlogin.php
index 50a9c15c8..ff0b451d3 100644
--- a/plugins/OpenID/finishopenidlogin.php
+++ b/plugins/OpenID/finishopenidlogin.php
@@ -265,7 +265,7 @@ class FinishopenidloginAction extends Action
             $fullname = '';
         }
 
-        if (!empty($sreg['email']) && Validate::email($sreg['email'], true)) {
+        if (!empty($sreg['email']) && Validate::email($sreg['email'], common_config('email', 'check_domain'))) {
             $email = $sreg['email'];
         } else {
             $email = '';
diff --git a/plugins/OpenID/openid.php b/plugins/OpenID/openid.php
index 0944117c0..dd628e773 100644
--- a/plugins/OpenID/openid.php
+++ b/plugins/OpenID/openid.php
@@ -23,6 +23,7 @@ require_once(INSTALLDIR.'/plugins/OpenID/User_openid.php');
 
 require_once('Auth/OpenID.php');
 require_once('Auth/OpenID/Consumer.php');
+require_once('Auth/OpenID/Server.php');
 require_once('Auth/OpenID/SReg.php');
 require_once('Auth/OpenID/MySQLStore.php');
 
@@ -50,6 +51,13 @@ function oid_consumer()
     return $consumer;
 }
 
+function oid_server()
+{
+    $store = oid_store();
+    $server = new Auth_OpenID_Server($store, common_local_url('openidserver'));
+    return $server;
+}
+
 function oid_clear_last()
 {
     oid_set_last('');
@@ -241,7 +249,7 @@ function oid_update_user(&$user, &$sreg)
 
     $orig_user = clone($user);
 
-    if ($sreg['email'] && Validate::email($sreg['email'], true)) {
+    if ($sreg['email'] && Validate::email($sreg['email'], common_config('email', 'check_domain'))) {
         $user->email = $sreg['email'];
     }
 
@@ -272,6 +280,11 @@ class AutosubmitAction extends Action
     function showContent()
     {
         $this->raw($this->form_html);
+    }
+    
+    function showScripts()
+    {
+        parent::showScripts();
         $this->element('script', null,
                        '$(document).ready(function() { ' .
                        '    $(\'#'. $this->form_id .'\').submit(); '.
diff --git a/plugins/OpenID/openidserver.php b/plugins/OpenID/openidserver.php
new file mode 100644
index 000000000..dab97c93e
--- /dev/null
+++ b/plugins/OpenID/openidserver.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Settings for OpenID
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Settings
+ * @package   StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @copyright 2008-2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/action.php';
+require_once INSTALLDIR.'/plugins/OpenID/openid.php';
+require_once(INSTALLDIR.'/plugins/OpenID/User_openid_trustroot.php');
+
+/**
+ * Settings for OpenID
+ *
+ * Lets users add, edit and delete OpenIDs from their account
+ *
+ * @category Settings
+ * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+class OpenidserverAction extends Action
+{
+    var $oserver;
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+        $this->oserver = oid_server();
+        return true;
+    }
+
+    function handle($args)
+    {
+        parent::handle($args);
+        $request = $this->oserver->decodeRequest();
+        if (in_array($request->mode, array('checkid_immediate',
+            'checkid_setup'))) {
+            $user = common_current_user();
+            if(!$user){
+                if($request->immediate){
+                    //cannot prompt the user to login in immediate mode, so answer false
+                    $response = $this->generateDenyResponse($request);
+                }else{
+                    /* Go log in, and then come back. */
+                    common_set_returnto($_SERVER['REQUEST_URI']);
+                    common_redirect(common_local_url('login'));
+                    return;
+                }
+            }else if(common_profile_url($user->nickname) == $request->identity || $request->idSelect()){
+                $user_openid_trustroot = User_openid_trustroot::pkeyGet(
+                                                array('user_id'=>$user->id, 'trustroot'=>$request->trust_root));
+                if(empty($user_openid_trustroot)){
+                    if($request->immediate){
+                        //cannot prompt the user to trust this trust root in immediate mode, so answer false
+                        $response = $this->generateDenyResponse($request);
+                    }else{
+                        common_ensure_session();
+                        $_SESSION['openid_trust_root'] = $request->trust_root;
+                        $allowResponse = $this->generateAllowResponse($request, $user);
+                        $this->oserver->encodeResponse($allowResponse); //sign the response
+                        $denyResponse = $this->generateDenyResponse($request);
+                        $this->oserver->encodeResponse($denyResponse); //sign the response
+                        $_SESSION['openid_allow_url'] = $allowResponse->encodeToUrl();
+                        $_SESSION['openid_deny_url'] = $denyResponse->encodeToUrl();
+                        //ask the user to trust this trust root
+                        common_redirect(common_local_url('openidtrust'));
+                        return;
+                    }
+                }else{
+                    //user has previously authorized this trust root
+                    $response = $this->generateAllowResponse($request, $user);
+                    //$response = $request->answer(true, null, common_profile_url($user->nickname));
+                }
+            } else if ($request->immediate) {
+                $response = $this->generateDenyResponse($request);
+            } else {
+                //invalid
+                $this->clientError(sprintf(_('You are not authorized to use the identity %s'),$request->identity),$code=403);
+            }
+        } else {
+            $response = $this->oserver->handleRequest($request);
+        }
+
+        if($response){
+            $response = $this->oserver->encodeResponse($response);
+            if ($response->code != AUTH_OPENID_HTTP_OK) {
+                header(sprintf("HTTP/1.1 %d ", $response->code),
+                       true, $response->code);
+            }
+
+            if($response->headers){
+                foreach ($response->headers as $k => $v) {
+                    header("$k: $v");
+                }
+            }
+            $this->raw($response->body);
+        }else{
+            $this->clientError(_('Just an OpenID provider. Nothing to see here, move along...'),$code=500);
+        }
+    }
+
+    function generateAllowResponse($request, $user){
+        $response = $request->answer(true, null, common_profile_url($user->nickname));
+        
+        $profile = $user->getProfile();
+        $sreg_data = array(
+            'fullname' => $profile->fullname,
+            'nickname' => $user->nickname,
+            'email' => $user->email,
+            'language' => $user->language,
+            'timezone' => $user->timezone);
+        $sreg_request = Auth_OpenID_SRegRequest::fromOpenIDRequest($request);
+        $sreg_response = Auth_OpenID_SRegResponse::extractResponse(
+                              $sreg_request, $sreg_data);
+        $sreg_response->toMessage($response->fields);
+        return $response;
+    }
+
+    function generateDenyResponse($request){
+        $response = $request->answer(false);
+        return $response;
+    }
+}
diff --git a/plugins/OpenID/openidtrust.php b/plugins/OpenID/openidtrust.php
new file mode 100644
index 000000000..29c7bdc23
--- /dev/null
+++ b/plugins/OpenID/openidtrust.php
@@ -0,0 +1,142 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+
+require_once INSTALLDIR.'/plugins/OpenID/openid.php';
+require_once(INSTALLDIR.'/plugins/OpenID/User_openid_trustroot.php');
+
+class OpenidtrustAction extends Action
+{
+    var $trust_root;
+    var $allowUrl;
+    var $denyUrl;
+    var $user;
+
+    /**
+     * Is this a read-only action?
+     *
+     * @return boolean false
+     */
+
+    function isReadOnly($args)
+    {
+        return false;
+    }
+
+    /**
+     * Title of the page
+     *
+     * @return string title of the page
+     */
+
+    function title()
+    {
+        return _('OpenID Identity Verification');
+    }
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+        common_ensure_session();
+        $this->user = common_current_user();
+        if(empty($this->user)){
+            /* Go log in, and then come back. */
+            common_set_returnto($_SERVER['REQUEST_URI']);
+            common_redirect(common_local_url('login'));
+            return;
+        }
+        $this->trust_root = $_SESSION['openid_trust_root'];
+        $this->allowUrl = $_SESSION['openid_allow_url'];
+        $this->denyUrl = $_SESSION['openid_deny_url'];
+        if(empty($this->trust_root) || empty($this->allowUrl) || empty($this->denyUrl)){
+            $this->clientError(_('This page should only be reached during OpenID processing, not directly.'));
+            return;
+        }
+        return true;
+    }
+    
+    function handle($args)
+    {
+        parent::handle($args);
+        if($_SERVER['REQUEST_METHOD'] == 'POST'){
+            $this->handleSubmit();
+        }else{
+            $this->showPage();
+        }
+    }
+
+    function handleSubmit()
+    {
+        unset($_SESSION['openid_trust_root']);
+        unset($_SESSION['openid_allow_url']);
+        unset($_SESSION['openid_deny_url']);
+        if($this->arg('allow'))
+        {
+            //save to database
+            $user_openid_trustroot = new User_openid_trustroot();
+            $user_openid_trustroot->user_id = $this->user->id;
+            $user_openid_trustroot->trustroot = $this->trust_root;
+            $user_openid_trustroot->created = DB_DataObject_Cast::dateTime();
+            if (!$user_openid_trustroot->insert()) {
+                $err = PEAR::getStaticProperty('DB_DataObject','lastError');
+                common_debug('DB error ' . $err->code . ': ' . $err->message, __FILE__);
+            }
+            common_redirect($this->allowUrl, $code=302);
+        }else{
+            common_redirect($this->denyUrl, $code=302);
+        }
+    }
+
+    /**
+     * Show page notice
+     *
+     * Display a notice for how to use the page, or the
+     * error if it exists.
+     *
+     * @return void
+     */
+
+    function showPageNotice()
+    {
+        $this->element('p',null,sprintf(_('%s  has asked to verify your identity. Click Continue to verify your identity and login without creating a new password.'),$this->trust_root));
+    }
+
+    /**
+     * Core of the display code
+     *
+     * Shows the login form.
+     *
+     * @return void
+     */
+
+    function showContent()
+    {
+        $this->elementStart('form', array('method' => 'post',
+                                   'id' => 'form_openidtrust',
+                                   'class' => 'form_settings',
+                                   'action' => common_local_url('openidtrust')));
+        $this->elementStart('fieldset');
+        $this->submit('allow', _('Continue'));
+        $this->submit('deny', _('Cancel'));
+        
+        $this->elementEnd('fieldset');
+        $this->elementEnd('form');
+    }
+}
diff --git a/plugins/PtitUrl/PtitUrlPlugin.php b/plugins/PtitUrl/PtitUrlPlugin.php
index f00d3e2f2..ef453e96d 100644
--- a/plugins/PtitUrl/PtitUrlPlugin.php
+++ b/plugins/PtitUrl/PtitUrlPlugin.php
@@ -30,33 +30,28 @@
 if (!defined('STATUSNET')) {
     exit(1);
 }
+require_once INSTALLDIR.'/plugins/UrlShortener/UrlShortenerPlugin.php';
 
-class PtitUrlPlugin extends Plugin
+class PtitUrlPlugin extends UrlShortenerPlugin
 {
-    function __construct()
-    {
-        parent::__construct();
-    }
+    public $serviceUrl;
 
     function onInitializePlugin(){
-        $this->registerUrlShortener(
-            'ptiturl.com',
-            array(),
-            array('PtitUrl',array('http://ptiturl.com/?creer=oui&action=Reduire&url='))
-        );
+        parent::onInitializePlugin();
+        if(!isset($this->serviceUrl)){
+            throw new Exception("must specify a serviceUrl");
+        }
     }
-}
 
-class PtitUrl extends ShortUrlApi
-{
-    protected function shorten_imp($url) {
-        $response = $this->http_get($url);
-        if (!$response) return $url;
+    protected function shorten($url)
+    {
+        $response = $this->http_get(sprintf($this->serviceUrl,urlencode($url)));
+        if (!$response) return;
         $response = $this->tidy($response);
         $y = @simplexml_load_string($response);
-        if (!isset($y->body)) return $url;
+        if (!isset($y->body)) return;
         $xml = $y->body->center->table->tr->td->pre->a->attributes();
         if (isset($xml['href'])) return $xml['href'];
-        return $url;
     }
 }
+
diff --git a/plugins/PubSubHubBub/PubSubHubBubPlugin.php b/plugins/PubSubHubBub/PubSubHubBubPlugin.php
index e1e82e352..d15a869cb 100644
--- a/plugins/PubSubHubBub/PubSubHubBubPlugin.php
+++ b/plugins/PubSubHubBub/PubSubHubBubPlugin.php
@@ -65,21 +65,21 @@ class PubSubHubBubPlugin extends Plugin
         $feeds = array();
 
         //public timeline feeds
-        $feeds[]=common_local_url('api',array('apiaction' => 'statuses','method' => 'public_timeline.rss'));
-        $feeds[]=common_local_url('api',array('apiaction' => 'statuses','method' => 'public_timeline.atom'));
+        $feeds[]=common_local_url('ApiTimelinePublic',array('format' => 'rss'));
+        $feeds[]=common_local_url('ApiTimelinePublic',array('format' => 'atom'));
 
         //author's own feeds
         $user = User::staticGet('id',$notice->profile_id);
-        $feeds[]=common_local_url('api',array('apiaction' => 'statuses','method' => 'user_timeline','argument' => $user->nickname.'.rss'));
-        $feeds[]=common_local_url('api',array('apiaction' => 'statuses','method' => 'user_timeline','argument' => $user->nickname.'.atom'));
+        $feeds[]=common_local_url('ApiTimelineUser',array('id' => $user->nickname, 'format'=>'rss'));
+        $feeds[]=common_local_url('ApiTimelineUser',array('id' => $user->nickname, 'format'=>'atom'));
 
         //tag feeds
         $tag = new Notice_tag();
         $tag->notice_id = $notice->id;
         if ($tag->find()) {
             while ($tag->fetch()) {
-                $feeds[]=common_local_url('api',array('apiaction' => 'tags','method' => 'timeline', 'argument'=>$tag->tag.'.atom'));
-                $feeds[]=common_local_url('api',array('apiaction' => 'tags','method' => 'timeline', 'argument'=>$tag->tag.'.rss'));
+                $feeds[]=common_local_url('ApiTimelineTag',array('tag'=>$tag->tag, 'format'=>'rss'));
+                $feeds[]=common_local_url('ApiTimelineTag',array('tag'=>$tag->tag, 'format'=>'atom'));
             }
         }
 
@@ -89,8 +89,8 @@ class PubSubHubBubPlugin extends Plugin
         if ($group_inbox->find()) {
             while ($group_inbox->fetch()) {
                 $group = User_group::staticGet('id',$group_inbox->group_id);
-                $feeds[]=common_local_url('api',array('apiaction' => 'groups','method' => 'timeline','argument' => $group->nickname.'.rss'));
-                $feeds[]=common_local_url('api',array('apiaction' => 'groups','method' => 'timeline','argument' => $group->nickname.'.atom'));
+                $feeds[]=common_local_url('ApiTimelineGroup',array('id' => $group->nickname,'format'=>'rss'));
+                $feeds[]=common_local_url('ApiTimelineGroup',array('id' => $group->nickname,'format'=>'atom'));
             }
         }
 
@@ -100,18 +100,17 @@ class PubSubHubBubPlugin extends Plugin
         if ($notice_inbox->find()) {
             while ($notice_inbox->fetch()) {
                 $user = User::staticGet('id',$notice_inbox->user_id);
-                $feeds[]=common_local_url('api',array('apiaction' => 'statuses','method' => 'user_timeline','argument' => $user->nickname.'.rss'));
-                $feeds[]=common_local_url('api',array('apiaction' => 'statuses','method' => 'user_timeline','argument' => $user->nickname.'.atom'));
+                $feeds[]=common_local_url('ApiTimelineUser',array('id' => $user->nickname, 'format'=>'rss'));
+                $feeds[]=common_local_url('ApiTimelineUser',array('id' => $user->nickname, 'format'=>'atom'));
             }
         }
 
-        /* TODO: when the reply page gets RSS and ATOM feeds, implement this
         //feed of user replied to
         if($notice->reply_to){
                 $user = User::staticGet('id',$notice->reply_to);
-                $feeds[]=common_local_url('api',array('apiaction' => 'statuses','method' => 'user_timeline','argument' => $user->nickname.'.rss'));
-                $feeds[]=common_local_url('api',array('apiaction' => 'statuses','method' => 'user_timeline','argument' => $user->nickname.'.atom'));
-        }*/
+                $feeds[]=common_local_url('ApiTimelineMentions',array('id' => $user->nickname,'format'=>'rss'));
+                $feeds[]=common_local_url('ApiTimelineMentions',array('id' => $user->nickname,'format'=>'atom'));
+        }
 
         foreach(array_unique($feeds) as $feed){
             if(! $publisher->publish_update($feed)){
diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index 9371326fe..9b9991b9e 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -1,5 +1,31 @@
-// add a notice encoded as JSON into the current timeline
-//
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2008, StatusNet, Inc.
+ *
+ * Add a notice encoded as JSON into the current timeline
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Plugin
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
 // TODO: i18n
 
 RealtimeUpdate = {
@@ -19,15 +45,9 @@ RealtimeUpdate = {
         DT = document.title;
 
         $(window).blur(function() {
-          $('#notices_primary .notice').css({
-            'border-top-color':$('#notices_primary .notice:last').css('border-top-color'),
-            'border-top-style':'dotted'
-          });
+          $('#notices_primary .notice').removeClass('mark-top');
 
-          $('#notices_primary .notice:first').css({
-            'border-top-color':'#AAAAAA',
-            'border-top-style':'solid'
-          });
+          $('#notices_primary .notice:first').addClass('mark-top');
 
           RealtimeUpdate._updatecounter = 0;
           document.title = DT;
@@ -50,7 +70,7 @@ RealtimeUpdate = {
               $("#notices_primary .notices").prepend(noticeItem);
               $("#notices_primary .notice:first").css({display:"none"});
               $("#notices_primary .notice:first").fadeIn(1000);
-              NoticeReply();
+              SN.U.NoticeReply();
 
               RealtimeUpdate._updatecounter += 1;
               document.title = '('+RealtimeUpdate._updatecounter+') ' + DT;
@@ -137,12 +157,14 @@ RealtimeUpdate = {
 
      addPopup: function(url, timeline, iconurl)
      {
-         $('#notices_primary').css({'position':'relative'});
-         $('#notices_primary').prepend('<button id="realtime_timeline" title="Pop up in a window">Pop up</button>');
+         var NP = $('#notices_primary');
+         NP.css({'position':'relative'});
+         NP.prepend('<button id="realtime_timeline" title="Pop up in a window">Pop up</button>');
 
-         $('#realtime_timeline').css({
+         var RT = $('#realtime_timeline');
+         RT.css({
              'margin':'0 0 11px 0',
-             'background':'transparent url('+ iconurl + ') no-repeat 0% 30%',
+             'background':'transparent url('+ iconurl + ') no-repeat 0 30%',
              'padding':'0 0 0 20px',
              'display':'block',
              'position':'absolute',
@@ -150,15 +172,16 @@ RealtimeUpdate = {
              'right':'0',
              'border':'none',
              'cursor':'pointer',
-             'color':$("a").css("color"),
+             'color':$('a').css('color'),
              'font-weight':'bold',
              'font-size':'1em'
          });
+         $('#showstream #notices_primary').css({'margin-top':'18px'});
 
-         $('#realtime_timeline').click(function() {
+         RT.click(function() {
              window.open(url,
                          timeline,
-                         'toolbar=no,resizable=yes,scrollbars=yes,status=yes');
+                         'toolbar=no,resizable=yes,scrollbars=yes,status=yes,width=500,height=550');
 
              return false;
          });
@@ -166,7 +189,6 @@ RealtimeUpdate = {
 
      initPopupWindow: function()
      {
-         window.resizeTo(500, 550);
          $('address').hide();
          $('#content').css({'width':'93.5%'});
 
diff --git a/plugins/recaptcha/LICENSE b/plugins/Recaptcha/LICENSE
index b612f71f0..b612f71f0 100644
--- a/plugins/recaptcha/LICENSE
+++ b/plugins/Recaptcha/LICENSE
diff --git a/plugins/Recaptcha/README b/plugins/Recaptcha/README
new file mode 100644
index 000000000..49c4b9c27
--- /dev/null
+++ b/plugins/Recaptcha/README
@@ -0,0 +1,28 @@
+StatusNet reCAPTCHA plugin 0.3 11/16/09
+=======================================
+Adds a captcha to your registration page to reduce automated spam bots registering.
+
+Use:
+1. Get an API key from http://recaptcha.net
+
+2. In config.php add:
+addPlugin('recaptcha', array('private_key' => 'YourKeyHere',
+                              'public_key' => 'ReplaceWithYourKey'));
+or
+addPlugin('recaptcha', array('private_key' => 'YourKeyHere',
+                              'public_key' => 'ReplaceWithYourKey',
+                              'display_errors' => true));
+Changelog
+=========
+0.1 initial release
+0.2 Work around for webkit browsers
+0.3 Moved to new plugin arch for SN
+    **YOU WILL NEED TO CHANGE YOUR CONFIG.PHP!**
+
+reCAPTCHA Lib README
+====================
+
+The reCAPTCHA PHP Lirary helps you use the reCAPTCHA API. Documentation
+for this library can be found at
+
+	http://recaptcha.net/plugins/php
diff --git a/plugins/recaptcha/recaptcha.php b/plugins/Recaptcha/RecaptchaPlugin.php
index 94cf0ccd1..1a51b16be 100644
--- a/plugins/recaptcha/recaptcha.php
+++ b/plugins/Recaptcha/RecaptchaPlugin.php
@@ -33,7 +33,9 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 define('RECAPTCHA', '0.2');
 
-class recaptcha extends Plugin
+require_once(INSTALLDIR.'/plugins/Recaptcha/recaptchalib.php');
+
+class RecaptchaPlugin extends Plugin
 {
     var $private_key;
     var $public_key;
@@ -41,13 +43,13 @@ class recaptcha extends Plugin
     var $failed;
     var $ssl;
 
-    function __construct($public_key, $private_key, $display_errors=false)
-    {
-        parent::__construct();
-        require_once(INSTALLDIR.'/plugins/recaptcha/recaptchalib.php');
-        $this->public_key = $public_key;
-        $this->private_key = $private_key; 
-        $this->display_errors = $display_errors;
+    function onInitializePlugin(){
+        if(!isset($this->private_key)){
+            common_log(LOG_ERR, "Recaptcha: Must specify private_key in config.php");
+        }
+        if(!isset($this->public_key)){
+            common_log(LOG_ERR, "Recaptcha: Must specify public_key in config.php");
+        }
     }
 
     function checkssl(){
diff --git a/plugins/recaptcha/recaptchalib.php b/plugins/Recaptcha/recaptchalib.php
index 897c50981..897c50981 100644
--- a/plugins/recaptcha/recaptchalib.php
+++ b/plugins/Recaptcha/recaptchalib.php
diff --git a/plugins/ReverseUsernameAuthentication/README b/plugins/ReverseUsernameAuthentication/README
new file mode 100644
index 000000000..e9160ed9b
--- /dev/null
+++ b/plugins/ReverseUsernameAuthentication/README
@@ -0,0 +1,26 @@
+The Reverse Username Authentication plugin allows for StatusNet to handle authentication by checking if the provided password is the same as the reverse of the username.
+
+THIS PLUGIN IS FOR TESTING PURPOSES ONLY
+
+Installation
+============
+add "addPlugin('reverseUsernameAuthentication', array('setting'=>'value', 'setting2'=>'value2', ...);" to the bottom of your config.php
+
+Settings
+========
+provider_name*: a unique name for this authentication provider.
+password_changeable*: must be set to false. This plugin does not support changing passwords.
+authoritative (false): Set to true if this plugin's responses are authoritative (meaning if this fails, do check any other plugins or the internal password database).
+autoregistration (false): Set to true if users should be automatically created when they attempt to login.
+
+* required
+default values are in (parenthesis)
+
+Example
+=======
+addPlugin('reverseUsernameAuthentication', array(
+    'provider_name'=>'Example',
+    'password_changeable'=>false,
+    'authoritative'=>true,
+    'autoregistration'=>true
+));
diff --git a/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php b/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php
new file mode 100644
index 000000000..d48283b2e
--- /dev/null
+++ b/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Plugin that checks if the password is the reverse of username
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Plugin
+ * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 Craig Andrews http://candrews.integralblue.com
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/plugins/Authentication/AuthenticationPlugin.php';
+
+class ReverseUsernameAuthenticationPlugin extends AuthenticationPlugin
+{
+    //---interface implementation---//
+
+    function onInitializePlugin(){
+        parent::onInitializePlugin();
+        if(!isset($this->password_changeable) && $this->password_changeable){
+            throw new Exception("password_changeable cannot be set to true. This plugin does not support changing passwords.");
+        }
+    }
+
+    function checkPassword($username, $password)
+    {
+        return $username == strrev($password);
+    }
+
+    function autoRegister($username)
+    {
+        $registration_data = array();
+        $registration_data['nickname'] = $username ;
+        return User::register($registration_data);
+    }
+}
diff --git a/plugins/SimpleUrl/SimpleUrlPlugin.php b/plugins/SimpleUrl/SimpleUrlPlugin.php
index 82d772048..45b745b07 100644
--- a/plugins/SimpleUrl/SimpleUrlPlugin.php
+++ b/plugins/SimpleUrl/SimpleUrlPlugin.php
@@ -31,49 +31,21 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-class SimpleUrlPlugin extends Plugin
+require_once INSTALLDIR.'/plugins/UrlShortener/UrlShortenerPlugin.php';
+
+class SimpleUrlPlugin extends UrlShortenerPlugin
 {
-    function __construct()
-    {
-        parent::__construct();
-    }
+    public $serviceUrl;
 
     function onInitializePlugin(){
-        $this->registerUrlShortener(
-            'is.gd',
-            array(),
-            array('SimpleUrl',array('http://is.gd/api.php?longurl='))
-        );
-        $this->registerUrlShortener(
-            'snipr.com',
-            array(),
-            array('SimpleUrl',array('http://snipr.com/site/snip?r=simple&link='))
-        );
-        $this->registerUrlShortener(
-            'metamark.net',
-            array(),
-            array('SimpleUrl',array('http://metamark.net/api/rest/simple?long_url='))
-        );
-        $this->registerUrlShortener(
-            'tinyurl.com',
-            array(),
-            array('SimpleUrl',array('http://tinyurl.com/api-create.php?url='))
-        );
+        parent::onInitializePlugin();
+        if(!isset($this->serviceUrl)){
+            throw new Exception("must specify a serviceUrl");
+        }
     }
-}
 
-class SimpleUrl extends ShortUrlApi
-{
-    protected function shorten_imp($url) {
-        $curlh = curl_init();
-        curl_setopt($curlh, CURLOPT_CONNECTTIMEOUT, 20); // # seconds to wait
-        curl_setopt($curlh, CURLOPT_USERAGENT, 'StatusNet');
-        curl_setopt($curlh, CURLOPT_RETURNTRANSFER, true);
-
-        curl_setopt($curlh, CURLOPT_URL, $this->service_url.urlencode($url));
-        $short_url = curl_exec($curlh);
-
-        curl_close($curlh);
-        return $short_url;
+    protected function shorten($url) {
+        return $this->http_get(sprintf($this->serviceUrl,urlencode($url)));
     }
 }
+
diff --git a/plugins/SphinxSearch/README b/plugins/SphinxSearch/README
new file mode 100644
index 000000000..5a2c063bd
--- /dev/null
+++ b/plugins/SphinxSearch/README
@@ -0,0 +1,45 @@
+You can get a significant boost in performance using Sphinx Search
+instead of your database server to search for users and notices.
+<http://sphinxsearch.com/>.
+
+Configuration
+-------------
+
+In StatusNet's configuration, you can adjust the following settings
+under 'sphinx':
+
+enabled: Set to true to enable. Default false.
+server: a string with the hostname of the sphinx server.
+port: an integer with the port number of the sphinx server.
+
+
+Requirements
+------------
+
+To use a Sphinx server to search users and notices, you also need
+to install, compile and enable the sphinx pecl extension for php on the
+client side, which itself depends on the sphinx development files.
+"pecl install sphinx" should take care of that. Add "extension=sphinx.so"
+to your php.ini and reload apache to enable it.
+
+You can update your MySQL or Postgresql databases to drop their fulltext
+search indexes, since they're now provided by sphinx.
+
+
+You will also need a Sphinx server to serve the search queries.
+
+On the sphinx server side, a script reads the main database and build
+the keyword index. A cron job reads the database and keeps the sphinx
+indexes up to date. scripts/sphinx-cron.sh should be called by cron
+every 5 minutes, for example. scripts/sphinx.sh is an init.d script
+to start and stop the sphinx search daemon.
+
+
+Server configuration
+--------------------
+scripts/gen_config.php can generate a sphinx.conf file listing MySQL
+data sources for your databases. You may need to tweak paths afterwards.
+
+  $ plugins/SphinxSearch/scripts/gen_config.php > sphinx.conf
+
+If you wish, you can build a full config yourself based on sphinx.conf.sample
diff --git a/plugins/SphinxSearch/SphinxSearchPlugin.php b/plugins/SphinxSearch/SphinxSearchPlugin.php
new file mode 100644
index 000000000..7a27a4c04
--- /dev/null
+++ b/plugins/SphinxSearch/SphinxSearchPlugin.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Plugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+// Set defaults if not already set in the config array...
+global $config;
+$sphinxDefaults =
+    array('enabled' => true,
+          'server' => 'localhost',
+          'port' => 3312);
+foreach($sphinxDefaults as $key => $val) {
+    if (!isset($config['sphinx'][$key])) {
+        $config['sphinx'][$key] = $val;
+    }
+}
+
+
+
+/**
+ * Plugin for Sphinx search backend.
+ *
+ * @category Plugin
+ * @package  StatusNet
+ * @author   Brion Vibber <brion@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ * @link     http://twitter.com/
+ */
+
+class SphinxSearchPlugin extends Plugin
+{
+    /**
+     * Automatically load any classes used
+     *
+     * @param string $cls the class
+     * @return boolean hook return
+     */
+    function onAutoload($cls)
+    {
+        switch ($cls) {
+        case 'SphinxSearch':
+            include_once INSTALLDIR . '/plugins/SphinxSearch/' .
+              strtolower($cls) . '.php';
+            return false;
+        default:
+            return true;
+        }
+    }
+
+    /**
+     * Create sphinx search engine object for the given table type.
+     *
+     * @param Memcached_DataObject $target
+     * @param string $table
+     * @param out &$search_engine SearchEngine object on output if successful
+     * @ return boolean hook return
+     */
+    function onGetSearchEngine(Memcached_DataObject $target, $table, &$search_engine)
+    {
+        if (common_config('sphinx', 'enabled')) {
+            if (!class_exists('SphinxClient')) {
+                throw new ServerException('Sphinx PHP extension must be installed.');
+            }
+            $engine = new SphinxSearch($target, $table);
+            if ($engine->is_connected()) {
+                $search_engine = $engine;
+                return false;
+            }
+        }
+        // Sphinx disabled or disconnected
+        return true;
+    }
+}
diff --git a/plugins/SphinxSearch/scripts/gen_config.php b/plugins/SphinxSearch/scripts/gen_config.php
new file mode 100755
index 000000000..d5a00b6b6
--- /dev/null
+++ b/plugins/SphinxSearch/scripts/gen_config.php
@@ -0,0 +1,126 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.     If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
+
+$longoptions = array('base=', 'network');
+
+$helptext = <<<END_OF_TRIM_HELP
+Generates sphinx.conf file based on StatusNet configuration.
+    --base               Base dir to Sphinx install
+                         (default /usr/local)
+    --network            Use status_network global config table
+                         (non-functional at present)
+
+
+END_OF_TRIM_HELP;
+
+require_once INSTALLDIR . '/scripts/commandline.inc';
+require dirname(__FILE__) . '/sphinx-utils.php';
+
+
+$timestamp = date('r');
+print <<<END
+#
+# Sphinx configuration for StatusNet
+# Generated {$timestamp}
+#
+
+END;
+
+sphinx_iterate_sites('sphinx_site_template');
+
+print <<<END
+
+indexer
+{
+    mem_limit               = 300M
+}
+
+searchd
+{
+    port                    = 3312
+    log                     = {$base}/log/searchd.log
+    query_log               = {$base}/log/query.log
+    read_timeout            = 5
+    max_children            = 30
+    pid_file                = {$base}/log/searchd.pid
+    max_matches             = 1000
+    seamless_rotate         = 1
+    preopen_indexes         = 0
+    unlink_old              = 1
+}
+
+END;
+
+
+
+/**
+ * Build config entries for a single site
+ * @fixme we only seem to have master DB currently available...
+ */
+function sphinx_site_template($sn)
+{
+    return
+        sphinx_template($sn,
+            'profile',
+            'SELECT id, UNIX_TIMESTAMP(created) as created_ts, nickname, fullname, location, bio, homepage FROM profile',
+            'SELECT * FROM profile where id = $id') .
+        sphinx_template($sn,
+            'notice',
+            'SELECT id, UNIX_TIMESTAMP(created) as created_ts, content FROM notice',
+            'SELECT * FROM notice where notice.id = $id AND notice.is_local != -2');
+}
+
+function sphinx_template($sn, $table, $query, $query_info)
+{
+    $base = sphinx_base();
+    $dbtype = common_config('db', 'type');
+
+    print <<<END
+
+#
+# {$sn->sitename}
+#
+source {$sn->dbname}_src_{$table}
+{
+    type                    = {$dbtype}
+    sql_host                = {$sn->dbhost}
+    sql_user                = {$sn->dbuser}
+    sql_pass                = {$sn->dbpass}
+    sql_db                  = {$sn->dbname}
+    sql_query_pre           = SET NAMES utf8;
+    sql_query               = {$query}
+    sql_query_info          = {$query_info}
+    sql_attr_timestamp      = created_ts
+}
+
+index {$sn->dbname}_{$table}
+{
+    source                  = {$sn->dbname}_src_{$table}
+    path                    = {$base}/data/{$sn->dbname}_{$table}
+    docinfo                 = extern
+    charset_type            = utf-8
+    min_word_len            = 3
+}
+
+
+END;
+}
diff --git a/plugins/SphinxSearch/scripts/index_update.php b/plugins/SphinxSearch/scripts/index_update.php
new file mode 100755
index 000000000..23c60ced7
--- /dev/null
+++ b/plugins/SphinxSearch/scripts/index_update.php
@@ -0,0 +1,61 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.     If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
+
+$longoptions = array('base=', 'network');
+
+$helptext = <<<END_OF_TRIM_HELP
+Runs Sphinx search indexer.
+    --rotate             Have Sphinx run index update in background and
+                         rotate updated indexes into place as they finish.
+    --base               Base dir to Sphinx install
+                         (default /usr/local)
+    --network            Use status_network global config table for site list
+                         (non-functional at present)
+
+
+END_OF_TRIM_HELP;
+
+require_once INSTALLDIR . '/scripts/commandline.inc';
+require dirname(__FILE__) . '/sphinx-utils.php';
+
+sphinx_iterate_sites('sphinx_index_update');
+
+function sphinx_index_update($sn)
+{
+    $base = sphinx_base();
+    
+    $baseIndexes = array('notice', 'profile');
+    $params = array();
+    
+    if (have_option('rotate')) {
+        $params[] = '--rotate';
+    }
+    foreach ($baseIndexes as $index) {
+        $params[] = "{$sn->dbname}_{$index}";
+    }
+    
+    $params = implode(' ', $params);
+    $cmd = "$base/bin/indexer --config $base/etc/sphinx.conf $params";
+    
+    print "$cmd\n";
+    system($cmd);
+}
diff --git a/plugins/SphinxSearch/scripts/sphinx-utils.php b/plugins/SphinxSearch/scripts/sphinx-utils.php
new file mode 100644
index 000000000..7bbc25270
--- /dev/null
+++ b/plugins/SphinxSearch/scripts/sphinx-utils.php
@@ -0,0 +1,63 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.     If not, see <http://www.gnu.org/licenses/>.
+ */
+
+function sphinx_use_network()
+{
+    return have_option('network');
+}
+
+function sphinx_base()
+{
+    if (have_option('base')) {
+        return get_option_value('base');
+    } else {
+        return "/usr/local/sphinx";
+    }
+}
+
+function sphinx_iterate_sites($callback)
+{
+    if (sphinx_use_network()) {
+        // @fixme this should use, like, some kind of config
+        Status_network::setupDB('localhost', 'statusnet', 'statuspass', 'statusnet');
+        $sn = new Status_network();
+        if (!$sn->find()) {
+            die("Confused... no sites in status_network table or lookup failed.\n");
+        }
+        while ($sn->fetch()) {
+            $callback($sn);
+        }
+    } else {
+        if (preg_match('!^(mysqli?|pgsql)://(.*?):(.*?)@(.*?)/(.*?)$!',
+                common_config('db', 'database'), $matches)) {
+            list(/*all*/, $dbtype, $dbuser, $dbpass, $dbhost, $dbname) = $matches;
+            $sn = (object)array(
+                'sitename' => common_config('site', 'name'),
+                'dbhost' => $dbhost,
+                'dbuser' => $dbuser,
+                'dbpass' => $dbpass,
+                'dbname' => $dbname);
+            $callback($sn);
+        } else {
+            print "Unrecognized database configuration string in config.php\n";
+            exit(1);
+        }
+    }
+}
+
diff --git a/scripts/sphinx.sh b/plugins/SphinxSearch/scripts/sphinx.sh
index b8edeb302..b8edeb302 100755
--- a/scripts/sphinx.sh
+++ b/plugins/SphinxSearch/scripts/sphinx.sh
diff --git a/sphinx.conf.sample b/plugins/SphinxSearch/sphinx.conf.sample
index 3de62f637..3de62f637 100644
--- a/sphinx.conf.sample
+++ b/plugins/SphinxSearch/sphinx.conf.sample
diff --git a/plugins/SphinxSearch/sphinxsearch.php b/plugins/SphinxSearch/sphinxsearch.php
new file mode 100644
index 000000000..71f330828
--- /dev/null
+++ b/plugins/SphinxSearch/sphinxsearch.php
@@ -0,0 +1,96 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+class SphinxSearch extends SearchEngine
+{
+    private $sphinx;
+    private $connected;
+
+    function __construct($target, $table)
+    {
+        $fp = @fsockopen(common_config('sphinx', 'server'), common_config('sphinx', 'port'));
+        if (!$fp) {
+            $this->connected = false;
+            return;
+        }
+        fclose($fp);
+        parent::__construct($target, $table);
+        $this->sphinx = new SphinxClient;
+        $this->sphinx->setServer(common_config('sphinx', 'server'), common_config('sphinx', 'port'));
+        $this->connected = true;
+    }
+
+    function is_connected()
+    {
+        return $this->connected;
+    }
+
+    function limit($offset, $count, $rss = false)
+    {
+        //FIXME without LARGEST_POSSIBLE, the most recent results aren't returned
+        //      this probably has a large impact on performance
+        $LARGEST_POSSIBLE = 1e6;
+
+        if ($rss) {
+            $this->sphinx->setLimits($offset, $count, $count, $LARGEST_POSSIBLE);
+        }
+        else {
+            // return at most 50 pages of results
+            $this->sphinx->setLimits($offset, $count, 50 * ($count - 1), $LARGEST_POSSIBLE);
+        }
+
+        return $this->target->limit(0, $count);
+    }
+
+    function query($q)
+    {
+        $result = $this->sphinx->query($q, $this->remote_table());
+        if (!isset($result['matches'])) return false;
+        $id_set = join(', ', array_keys($result['matches']));
+        $this->target->whereAdd("id in ($id_set)");
+        return true;
+     }
+
+    function set_sort_mode($mode)
+    {
+        if ('chron' === $mode) {
+            $this->sphinx->SetSortMode(SPH_SORT_ATTR_DESC, 'created_ts');
+            return $this->target->orderBy('created desc');
+        }
+    }
+
+    function remote_table()
+    {
+        return $this->dbname() . '_' . $this->table;
+    }
+
+    function dbname()
+    {
+        // @fixme there should be a less dreadful way to do this.
+        // DB objects won't give database back until they connect, it's confusing
+        if (preg_match('!^.*?://.*?:.*?@.*?/(.*?)$!', common_config('db', 'database'), $matches)) {
+            return $matches[1];
+        }
+        throw new ServerException("Sphinx search could not identify database name");
+    }
+}
diff --git a/plugins/TemplatePlugin.php b/plugins/TemplatePlugin.php
index cfa051162..5f3ad81f5 100644
--- a/plugins/TemplatePlugin.php
+++ b/plugins/TemplatePlugin.php
@@ -32,7 +32,7 @@ class TemplatePlugin extends Plugin {
   // capture the RouterInitialized event
   // and connect a new API method
   // for updating the template
-  function onRouterInitialized( &$m ) {
+  function onRouterInitialized( $m ) {
     $m->connect( 'template/update', array(
       'action'      => 'template',
     ));
diff --git a/plugins/TightUrl/TightUrlPlugin.php b/plugins/TightUrl/TightUrlPlugin.php
index 48efb355f..56414c8c8 100644
--- a/plugins/TightUrl/TightUrlPlugin.php
+++ b/plugins/TightUrl/TightUrlPlugin.php
@@ -31,32 +31,27 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-class TightUrlPlugin extends Plugin
+require_once INSTALLDIR.'/plugins/UrlShortener/UrlShortenerPlugin.php';
+
+class TightUrlPlugin extends UrlShortenerPlugin
 {
-    function __construct()
-    {
-        parent::__construct();
-    }
+    public $serviceUrl;
 
     function onInitializePlugin(){
-        $this->registerUrlShortener(
-            '2tu.us',
-            array('freeService'=>true),
-            array('TightUrl',array('http://2tu.us/?save=y&url='))
-        );
+        parent::onInitializePlugin();
+        if(!isset($this->serviceUrl)){
+            throw new Exception("must specify a serviceUrl");
+        }
     }
-}
 
-class TightUrl extends ShortUrlApi
-{
-    protected function shorten_imp($url) {
-        $response = $this->http_get($url);
-        if (!$response) return $url;
+    protected function shorten($url)
+    {
+        $response = $this->http_get(sprintf($this->serviceUrl,urlencode($url)));
+        if (!$response) return;
         $response = $this->tidy($response);
         $y = @simplexml_load_string($response);
-        if (!isset($y->body)) return $url;
+        if (!isset($y->body)) return;
         $xml = $y->body->p[0]->code[0]->a->attributes();
         if (isset($xml['href'])) return $xml['href'];
-        return $url;
     }
 }
diff --git a/plugins/TwitterBridge/README b/plugins/TwitterBridge/README
index 09352188e..d3bcda598 100644
--- a/plugins/TwitterBridge/README
+++ b/plugins/TwitterBridge/README
@@ -11,8 +11,7 @@ Installation
 
 To enable the plugin, add the following to your config.php:
 
-    require_once(INSTALLDIR . '/plugins/TwitterBridge/TwitterBridgePlugin.php');
-    $tb = new TwitterBridgePlugin();
+    addPlugin("TwitterBridge");
 
 OAuth is used to to access protected resources on Twitter (as opposed to
 HTTP Basic Auth)*.  To use Twitter bridging you will need to register
diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php
index e69567fc7..ad3c2e551 100644
--- a/plugins/TwitterBridge/TwitterBridgePlugin.php
+++ b/plugins/TwitterBridge/TwitterBridgePlugin.php
@@ -60,12 +60,12 @@ class TwitterBridgePlugin extends Plugin
      *
      * Hook for RouterInitialized event.
      *
-     * @param Net_URL_Mapper &$m path-to-action mapper
+     * @param Net_URL_Mapper $m path-to-action mapper
      *
      * @return boolean hook return
      */
 
-    function onRouterInitialized(&$m)
+    function onRouterInitialized($m)
     {
         $m->connect('twitter/authorization',
                     array('action' => 'twitterauthorization'));
diff --git a/plugins/TwitterBridge/daemons/synctwitterfriends.php b/plugins/TwitterBridge/daemons/synctwitterfriends.php
index ed2bf48a2..671e3c7af 100755
--- a/plugins/TwitterBridge/daemons/synctwitterfriends.php
+++ b/plugins/TwitterBridge/daemons/synctwitterfriends.php
@@ -152,8 +152,8 @@ class SyncTwitterFriendsDaemon extends ParallelizingDaemon
             $friends_ids = $client->friendsIds();
         } catch (Exception $e) {
             common_log(LOG_WARNING, $this->name() .
-                       ' - cURL error getting friend ids ' .
-                       $e->getCode() . ' - ' . $e->getMessage());
+                       ' - error getting friend ids: ' .
+                       $e->getMessage());
             return $friends;
         }
 
diff --git a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
index 81bbbc7c5..b5428316b 100755
--- a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
+++ b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
@@ -109,12 +109,16 @@ class TwitterStatusFetcher extends ParallelizingDaemon
         $flink->find();
 
         $flinks = array();
+        common_log(LOG_INFO, "hello");
 
         while ($flink->fetch()) {
 
             if (($flink->noticesync & FOREIGN_NOTICE_RECV) ==
                 FOREIGN_NOTICE_RECV) {
                 $flinks[] = clone($flink);
+                common_log(LOG_INFO, "sync: foreign id $flink->foreign_id");
+            } else {
+                common_log(LOG_INFO, "nothing to sync");
             }
         }
 
@@ -515,31 +519,32 @@ class TwitterStatusFetcher extends ParallelizingDaemon
         return $id;
     }
 
+    /**
+     * Fetch a remote avatar image and save to local storage.
+     *
+     * @param string $url avatar source URL
+     * @param string $filename bare local filename for download
+     * @return bool true on success, false on failure
+     */
     function fetchAvatar($url, $filename)
     {
-        $avatarfile = Avatar::path($filename);
+        common_debug($this->name() . " - Fetching Twitter avatar: $url");
 
-        $out = fopen($avatarfile, 'wb');
-        if (!$out) {
-            common_log(LOG_WARNING, $this->name() .
-                       " - Couldn't open file $filename");
+        $request = HTTPClient::start();
+        $response = $request->get($url);
+        if ($response->isOk()) {
+            $avatarfile = Avatar::path($filename);
+            $ok = file_put_contents($avatarfile, $response->getBody());
+            if (!$ok) {
+                common_log(LOG_WARNING, $this->name() .
+                           " - Couldn't open file $filename");
+                return false;
+            }
+        } else {
             return false;
         }
 
-        common_debug($this->name() . " - Fetching Twitter avatar: $url");
-
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $url);
-        curl_setopt($ch, CURLOPT_FILE, $out);
-        curl_setopt($ch, CURLOPT_BINARYTRANSFER, true);
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 0);
-        $result = curl_exec($ch);
-        curl_close($ch);
-
-        fclose($out);
-
-        return $result;
+        return true;
     }
 }
 
diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php
index 1a5248a9b..3c6803e49 100644
--- a/plugins/TwitterBridge/twitter.php
+++ b/plugins/TwitterBridge/twitter.php
@@ -215,7 +215,7 @@ function broadcast_basicauth($notice, $flink)
 
     try {
         $status = $client->statusesUpdate($statustxt);
-    } catch (BasicAuthCurlException $e) {
+    } catch (HTTP_Request2_Exception $e) {
         return process_error($e, $flink);
     }
 
diff --git a/plugins/TwitterBridge/twitterauthorization.php b/plugins/TwitterBridge/twitterauthorization.php
index 2a93ff13e..f1daefab1 100644
--- a/plugins/TwitterBridge/twitterauthorization.php
+++ b/plugins/TwitterBridge/twitterauthorization.php
@@ -125,7 +125,7 @@ class TwitterauthorizationAction extends Action
 
             $auth_link = $client->getAuthorizeLink($req_tok);
 
-        } catch (TwitterOAuthClientException $e) {
+        } catch (OAuthClientException $e) {
             $msg = sprintf('OAuth client cURL error - code: %1s, msg: %2s',
                            $e->getCode(), $e->getMessage());
             $this->serverError(_('Couldn\'t link your Twitter account.'));
diff --git a/plugins/TwitterBridge/twitterbasicauthclient.php b/plugins/TwitterBridge/twitterbasicauthclient.php
index 1040d72fb..d1cf45aec 100644
--- a/plugins/TwitterBridge/twitterbasicauthclient.php
+++ b/plugins/TwitterBridge/twitterbasicauthclient.php
@@ -32,26 +32,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 }
 
 /**
- * Exception wrapper for cURL errors
- *
- * @category Integration
- * @package  StatusNet
- * @author Adrian Lang <mail@adrianlang.de>
- * @author Brenda Wallace <shiny@cpan.org>
- * @author Craig Andrews <candrews@integralblue.com>
- * @author Dan Moore <dan@moore.cx>
- * @author Evan Prodromou <evan@status.net>
- * @author mEDI <medi@milaro.net>
- * @author Sarven Capadisli <csarven@status.net>
- * @author Zach Copley <zach@status.net> * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
- *
- */
-class BasicAuthCurlException extends Exception
-{
-}
-
-/**
  * Class for talking to the Twitter API with HTTP Basic Auth.
  *
  * @category Integration
@@ -198,45 +178,27 @@ class TwitterBasicAuthClient
      */
     function httpRequest($url, $params = null, $auth = true)
     {
-        $options = array(
-                         CURLOPT_RETURNTRANSFER => true,
-                         CURLOPT_FAILONERROR    => true,
-                         CURLOPT_HEADER         => false,
-                         CURLOPT_FOLLOWLOCATION => true,
-                         CURLOPT_USERAGENT      => 'StatusNet',
-                         CURLOPT_CONNECTTIMEOUT => 120,
-                         CURLOPT_TIMEOUT        => 120,
-                         CURLOPT_HTTPAUTH       => CURLAUTH_ANY,
-                         CURLOPT_SSL_VERIFYPEER => false,
-
-                         // Twitter is strict about accepting invalid "Expect" headers
-
-                         CURLOPT_HTTPHEADER => array('Expect:')
-                         );
-
-        if (isset($params)) {
-            $options[CURLOPT_POST]       = true;
-            $options[CURLOPT_POSTFIELDS] = $params;
-        }
+        $request = HTTPClient::start();
+        $request->setConfig(array(
+            'follow_redirects' => true,
+            'connect_timeout' => 120,
+            'timeout' => 120,
+            'ssl_verifypeer' => false,
+        ));
 
         if ($auth) {
-            $options[CURLOPT_USERPWD] = $this->screen_name .
-              ':' . $this->password;
+            $request->setAuth($this->screen_name, $this->password);
         }
 
-        $ch = curl_init($url);
-        curl_setopt_array($ch, $options);
-        $response = curl_exec($ch);
-
-        if ($response === false) {
-            $msg  = curl_error($ch);
-            $code = curl_errno($ch);
-            throw new BasicAuthCurlException($msg, $code);
+        if (isset($params)) {
+            // Twitter is strict about accepting invalid "Expect" headers
+            $headers = array('Expect:');
+            $response = $request->post($url, $headers, $params);
+        } else {
+            $response = $request->get($url);
         }
 
-        curl_close($ch);
-
-        return $response;
+        return $response->getBody();
     }
 
 }
diff --git a/plugins/UrlShortener/UrlShortenerPlugin.php b/plugins/UrlShortener/UrlShortenerPlugin.php
new file mode 100644
index 000000000..37206aa89
--- /dev/null
+++ b/plugins/UrlShortener/UrlShortenerPlugin.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Superclass for plugins that do URL shortening
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Plugin
+ * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Superclass for plugins that do URL shortening
+ *
+ * @category Plugin
+ * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+abstract class UrlShortenerPlugin extends Plugin
+{
+    public $shortenerName;
+    public $freeService=false;
+    //------------Url Shortener plugin should implement some (or all) of these methods------------\\
+
+    /**
+    * Short a URL
+    * @param url
+    * @return string shortened version of the url, or null if URL shortening failed
+    */
+    protected abstract function shorten($url);
+
+    //------------These methods may help you implement your plugin------------\\
+    protected function http_get($url)
+    {
+        $request = HTTPClient::start();
+        $response = $request->get($url);
+        return $response->getBody();
+    }
+
+    protected function http_post($url,$data)
+    {
+        $request = HTTPClient::start();
+        $response = $request->post($url, null, $data);
+        return $response->getBody();
+    }
+
+    protected function tidy($response) {
+        $response = str_replace('&nbsp;', ' ', $response);
+        $config = array('output-xhtml' => true);
+        $tidy = new tidy;
+        $tidy->parseString($response, $config, 'utf8');
+        $tidy->cleanRepair();
+        return (string)$tidy;
+    }
+    //------------Below are the methods that connect StatusNet to the implementing Url Shortener plugin------------\\
+
+    function onInitializePlugin(){
+        if(!isset($this->shortenerName)){
+            throw new Exception("must specify a shortenerName");
+        }
+    }
+
+    function onGetUrlShorteners(&$shorteners)
+    {
+        $shorteners[$this->shortenerName]=array('freeService'=>$this->freeService);
+    }
+
+    function onStartShortenUrl($url,$shortenerName,&$shortenedUrl)
+    {
+        if($shortenerName == $this->shortenerName && strlen($url) >= common_config('site', 'shorturllength')){
+            $result = $this->shorten($url);
+            if(isset($result) && $result != null && $result !== false){
+                $shortenedUrl=$result;
+                common_log(LOG_INFO, __CLASS__ . ": $this->shortenerName shortened $url to $shortenedUrl");
+                return false;
+            }
+        }
+    }
+}
diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php
new file mode 100644
index 000000000..c276c4b9f
--- /dev/null
+++ b/plugins/UserFlag/UserFlagPlugin.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Allows users to flag content and accounts as offensive/spam/whatever
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Plugin
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Allows users to flag content and accounts as offensive/spam/whatever
+ *
+ * @category Plugin
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class UserFlagPlugin extends Plugin
+{
+    function onCheckSchema()
+    {
+        $schema = Schema::get();
+
+        // For storing user-submitted flags on profiles
+        $schema->ensureDataObject('User_flag_profile');
+
+        return true;
+    }
+
+    function onInitializePlugin()
+    {
+        // XXX: do something here?
+        return true;
+    }
+
+    function onRouterInitialized(&$m) {
+        $m->connect('main/flag/profile', array('action' => 'flagprofile'));
+        $m->connect('admin/profile/flag', array('action' => 'adminprofileflag'));
+        return true;
+    }
+
+   function onAutoload($cls)
+    {
+        switch ($cls)
+        {
+        case 'FlagprofileAction':
+        case 'AdminprofileflagAction':
+            require_once(INSTALLDIR.'/plugins/UserFlag/' . strtolower(mb_substr($cls, 0, -6)) . '.php');
+            return false;
+        case 'FlagProfileForm':
+            require_once(INSTALLDIR.'/plugins/UserFlag/' . strtolower($cls . '.php'));
+            return false;
+        case 'User_flag_profile':
+            require_once(INSTALLDIR.'/plugins/UserFlag/'.$cls.'.php');
+            return false;
+        default:
+            return true;
+        }
+    }
+
+    function onEndProfilePageActionsElements(&$action, $profile)
+    {
+        $user = common_current_user();
+
+        if (!empty($user)) {
+
+            $action->elementStart('li', 'entity_flag');
+
+            if (User_flag_profile::exists($profile->id, $user->id)) {
+                $action->element('p', 'flagged', _('Flagged'));
+            } else {
+                $form = new FlagProfileForm($action, $profile,
+                                        array('action' => 'showstream',
+                                              'nickname' => $profile->nickname));
+                $form->show();
+            }
+
+            $action->elementEnd('li');
+        }
+
+        return true;
+    }
+
+    function onEndProfileListItemActionElements($item)
+    {
+        $user = common_current_user();
+
+        if (!empty($user)) {
+
+            list($action, $args) = $item->action->returnToArgs();
+
+            $args['action'] = $action;
+
+            $form = new FlagProfileForm($item->action, $item->profile, $args);
+
+            $item->action->elementStart('li', 'entity_flag');
+            $form->show();
+            $item->action->elementEnd('li');
+        }
+
+        return true;
+    }
+
+    function onEndShowStatusNetStyles($action)
+    {
+        $action->elementStart('style', array('type' => 'text/css'));
+        $action->raw('.entity_flag input, .entity_flag p {'.
+            ' background:url('.common_path('plugins/UserFlag/flag.gif').') 5px 5px no-repeat;'.
+            ' }');
+        $action->elementEnd('style');
+
+        return true;
+    }
+
+    function onEndShowScripts($action)
+    {
+        $action->elementStart('script', array('type' => 'text/javascript'));
+        $action->raw('/*<![CDATA[*/ SN.U.FormXHR($(".form_entity_flag")); /*]]>*/');
+        $action->elementEnd('script');
+        return true;
+    }
+}
diff --git a/plugins/UserFlag/User_flag_profile.php b/plugins/UserFlag/User_flag_profile.php
new file mode 100644
index 000000000..2fb27912d
--- /dev/null
+++ b/plugins/UserFlag/User_flag_profile.php
@@ -0,0 +1,85 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/classes/Plugin_DataObject.php';
+
+class User_flag_profile extends Plugin_DataObject
+{
+    ###START_AUTOCODE
+    /* the code below is auto generated do not remove the above tag */
+
+    public $__table = 'user_flag_profile';               // table name
+    public $profile_id;                      // int(4)  primary_key not_null
+    public $user_id;                         // int(4)  primary_key not_null
+    public $created;                         // datetime   not_null default_0000-00-00%2000%3A00%3A00
+    public $cleared;                         // datetime   not_null default_0000-00-00%2000%3A00%3A00
+
+    /* Static get */
+    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('User_flag_profile',$k,$v); }
+
+    /* the code above is auto generated do not remove the tag below */
+    ###END_AUTOCODE
+
+    function table() {
+        return array(
+                     'profile_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
+                     'user_id'    => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
+                     'created'    => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL,
+                     'cleared'    => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME
+                     );
+    }
+
+    function keys() {
+        return array('profile_id' => 'N', 'user_id' => 'N');
+    }
+
+    function &pkeyGet($kv)
+    {
+        return Memcached_DataObject::pkeyGet('User_flag_profile', $kv);
+    }
+
+    static function exists($profile_id, $user_id)
+    {
+        $ufp = User_flag_profile::pkeyGet(array('profile_id' => $profile_id,
+                                                'user_id' => $user_id));
+
+        return !empty($ufp);
+    }
+
+    /**
+    * Get the TableDef object that represents the table backing this class
+    * @return TableDef TableDef instance
+    */
+    function tableDef()
+    {
+        return new TableDef($this->__table,
+                             array(new ColumnDef('profile_id', 'integer', null,
+                                                 false, 'PRI'),
+                                   new ColumnDef('user_id', 'integer', null,
+                                                 false, 'PRI'),
+                                   new ColumnDef('created', 'datetime', null,
+                                                 false, 'MUL'),
+                                   new ColumnDef('cleared', 'datetime', null,
+                                                 true, 'MUL')));
+    }
+}
diff --git a/plugins/UserFlag/adminprofileflag.php b/plugins/UserFlag/adminprofileflag.php
new file mode 100644
index 000000000..1ac76b506
--- /dev/null
+++ b/plugins/UserFlag/adminprofileflag.php
@@ -0,0 +1,201 @@
+<?php
+/**
+ * Show latest and greatest profile flags
+ *
+ * PHP version 5
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Show the latest and greatest profile flags
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ */
+
+class AdminprofileflagAction extends Action
+{
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        return true;
+    }
+
+    /**
+     * Handle request
+     *
+     * @param array $args $_REQUEST args; handled in prepare()
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        $this->showPage();
+    }
+
+    function title() {
+        return _('Flagged profiles');
+    }
+
+    /**
+     * save the profile flag
+     *
+     * @return void
+     */
+
+    function showContent()
+    {
+        $profile = $this->getProfiles();
+
+        $pl = new FlaggedProfileList($profile, $this);
+
+        $pl->show();
+    }
+
+    function getProfiles()
+    {
+        $ufp = new User_flag_profile();
+
+        $ufp->selectAdd();
+        $ufp->selectAdd('profile_id');
+        $ufp->selectAdd('count(*) as flag_count');
+
+        $ufp->whereAdd('cleared is NULL');
+
+        $ufp->groupBy('profile_id');
+        $ufp->orderBy('flag_count DESC');
+
+        $profiles = array();
+
+        if ($ufp->find()) {
+            while ($ufp->fetch()) {
+                $profile = Profile::staticGet('id', $ufp->profile_id);
+                if (!empty($profile)) {
+                    $profiles[] = $profile;
+                }
+            }
+        }
+
+        $ufp->free();
+
+        return new ArrayWrapper($profiles);
+    }
+}
+
+class FlaggedProfileList extends ProfileList {
+
+    function newListItem($profile)
+    {
+        return new FlaggedProfileListItem($this->profile, $this->action);
+    }
+}
+
+class FlaggedProfileListItem extends ProfileListItem
+{
+    var $user = null;
+    var $r2args = null;
+
+    function showActions()
+    {
+        $this->user = common_current_user();
+
+        list($action, $this->r2args) = $this->out->returnToArgs();
+
+        $this->r2args['action'] = $action;
+
+        $this->startActions();
+        if (Event::handle('StartProfileListItemActionElements', array($this))) {
+            $this->showSandboxButton();
+            $this->showSilenceButton();
+            $this->showDeleteButton();
+            $this->showClearButton();
+            Event::handle('EndProfileListItemActionElements', array($this));
+        }
+        $this->endActions();
+    }
+
+    function showSandboxButton()
+    {
+        if ($this->user->hasRight(Right::SANDBOXUSER)) {
+            $this->out->elementStart('li', 'entity_sandbox');
+            if ($this->profile->isSandboxed()) {
+                $usf = new UnSandboxForm($this->out, $this->profile, $this->r2args);
+                $usf->show();
+            } else {
+                $sf = new SandboxForm($this->out, $this->profile, $this->r2args);
+                $sf->show();
+            }
+            $this->out->elementEnd('li');
+        }
+    }
+
+    function showSilenceButton()
+    {
+        if ($this->user->hasRight(Right::SILENCEUSER)) {
+            $this->out->elementStart('li', 'entity_silence');
+            if ($this->profile->isSilenced()) {
+                $usf = new UnSilenceForm($this->out, $this->profile, $this->r2args);
+                $usf->show();
+            } else {
+                $sf = new SilenceForm($this->out, $this->profile, $this->r2args);
+                $sf->show();
+            }
+            $this->out->elementEnd('li');
+        }
+    }
+
+    function showDeleteButton()
+    {
+
+        if ($this->user->hasRight(Right::DELETEUSER)) {
+            $this->out->elementStart('li', 'entity_delete');
+            $df = new DeleteUserForm($this->out, $this->profile, $this->r2args);
+            $df->show();
+            $this->out->elementEnd('li');
+        }
+    }
+
+    function showClearButton()
+    {
+    }
+}
diff --git a/plugins/UserFlag/flag.gif b/plugins/UserFlag/flag.gif
new file mode 100644
index 000000000..68c8aee25
--- /dev/null
+++ b/plugins/UserFlag/flag.gif
diff --git a/plugins/UserFlag/flagprofile.php b/plugins/UserFlag/flagprofile.php
new file mode 100644
index 000000000..8ff2f1f72
--- /dev/null
+++ b/plugins/UserFlag/flagprofile.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * Add a flag to a profile
+ *
+ * PHP version 5
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Action to flag a profile.
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ */
+
+class FlagprofileAction extends ProfileFormAction
+{
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     */
+
+    function prepare($args)
+    {
+        if (!parent::prepare($args)) {
+            return false;
+        }
+
+        $user = common_current_user();
+
+        assert(!empty($user)); // checked above
+        assert(!empty($this->profile)); // checked above
+
+        if (User_flag_profile::exists($this->profile->id,
+                                      $user->id))
+        {
+            $this->clientError(_('Flag already exists.'));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Handle POST
+     *
+     * @return void
+     */
+
+    function handlePost()
+    {
+        $user = common_current_user();
+
+        assert(!empty($user));
+        assert(!empty($this->profile));
+
+        $ufp = new User_flag_profile();
+
+        $ufp->profile_id = $this->profile->id;
+        $ufp->user_id    = $user->id;
+        $ufp->created    = common_sql_now();
+
+        if (!$ufp->insert()) {
+            throw new ServerException(sprintf(_("Couldn't flag profile '%s' for review."),
+                                              $this->profile->nickname));
+        }
+
+        $ufp->free();
+    }
+
+    function ajaxResults() {
+        header('Content-Type: text/xml;charset=utf-8');
+        $this->xw->startDocument('1.0', 'UTF-8');
+        $this->elementStart('html');
+        $this->elementStart('head');
+        $this->element('title', null, _('Flagged for review'));
+        $this->elementEnd('head');
+        $this->elementStart('body');
+        $this->element('p', 'flagged', _('Flagged'));
+        $this->elementEnd('body');
+        $this->elementEnd('html');
+    }
+}
+
diff --git a/plugins/UserFlag/flagprofileform.php b/plugins/UserFlag/flagprofileform.php
new file mode 100644
index 000000000..262dad4a7
--- /dev/null
+++ b/plugins/UserFlag/flagprofileform.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Form for flagging a profile
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Form
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/form.php';
+
+/**
+ * Form for flagging a profile
+ *
+ * A form for flagging a profile
+ *
+ * @category Form
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class FlagProfileForm extends ProfileActionForm
+{
+    /**
+     * Action this form provides
+     *
+     * @return string Name of the action, lowercased.
+     */
+
+    function target()
+    {
+        return 'flagprofile';
+    }
+
+    /**
+     * Title of the form
+     *
+     * @return string Title of the form, internationalized
+     */
+
+    function title()
+    {
+        return _('Flag');
+    }
+
+    /**
+     * Description of the form
+     *
+     * @return string description of the form, internationalized
+     */
+
+    function description()
+    {
+        return _('Flag profile for review');
+    }
+}
diff --git a/plugins/WikiHashtagsPlugin.php b/plugins/WikiHashtagsPlugin.php
index 0c5649aa4..334fc13ba 100644
--- a/plugins/WikiHashtagsPlugin.php
+++ b/plugins/WikiHashtagsPlugin.php
@@ -68,14 +68,13 @@ class WikiHashtagsPlugin extends Plugin
                 $editurl = sprintf('http://hashtags.wikia.com/index.php?title=%s&action=edit',
                                    urlencode($tag));
 
-                $context = stream_context_create(array('http' => array('method' => "GET",
-                                                                       'header' =>
-                                                                       "User-Agent: " . $this->userAgent())));
-                $html = @file_get_contents($url, false, $context);
+                $request = HTTPClient::start();
+                $response = $request->get($url);
+                $html = $response->getBody();
 
                 $action->elementStart('div', array('id' => 'wikihashtags', 'class' => 'section'));
 
-                if (!empty($html)) {
+                if ($response->isOk() && !empty($html)) {
                     $action->element('style', null,
                                      "span.editsection { display: none }\n".
                                      "table.toc { display: none }");
@@ -100,10 +99,4 @@ class WikiHashtagsPlugin extends Plugin
 
         return true;
     }
-
-    function userAgent()
-    {
-        return 'WikiHashtagsPlugin/'.WIKIHASHTAGSPLUGIN_VERSION .
-          ' StatusNet/' . STATUSNET_VERSION;
-    }
 }
diff --git a/plugins/recaptcha/README b/plugins/recaptcha/README
deleted file mode 100644
index b996f96cc..000000000
--- a/plugins/recaptcha/README
+++ /dev/null
@@ -1,23 +0,0 @@
-StatusNet reCAPTCHA plugin 0.2 8/3/09
-====================================
-Adds a captcha to your registration page to reduce automated spam bots registering.
-
-Use:
-1. Get an API key from http://recaptcha.net
-
-2. In config.php add:
-include_once('plugins/recaptcha/recaptcha.php');
-$captcha = new recaptcha(publickey, privatekey, showErrors);
-
-Changelog
-=========
-0.1 initial release
-0.2 Work around for webkit browsers
-
-reCAPTCHA README
-================
-
-The reCAPTCHA PHP Lirary helps you use the reCAPTCHA API. Documentation
-for this library can be found at
-
-	http://recaptcha.net/plugins/php
diff --git a/scripts/console.php b/scripts/console.php
new file mode 100755
index 000000000..41dd43f28
--- /dev/null
+++ b/scripts/console.php
@@ -0,0 +1,162 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+# Abort if called from a web server
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+
+$helptext = <<<ENDOFHELP
+console.php - provide an interactive PHP interpreter for testing
+
+ENDOFHELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+if (function_exists('posix_isatty')) {
+    define('CONSOLE_INTERACTIVE', posix_isatty(0));
+} else {
+    // Windows? Assume we're on a terminal. :P
+    define('CONSOLE_INTERACTIVE', false);
+}
+if (CONSOLE_INTERACTIVE) {
+    define('CONSOLE_READLINE', function_exists('readline'));
+}
+
+if (CONSOLE_READLINE && CONSOLE_INTERACTIVE && file_exists(CONSOLE_HISTORY)) {
+    define(CONSOLE_HISTORY, getenv("HOME") . "/.statusnet_console_history");
+    readline_read_history(CONSOLE_HISTORY);
+}
+
+function read_input_line($prompt)
+{
+    if (CONSOLE_INTERACTIVE) {
+        if (CONSOLE_READLINE) {
+            $line = readline($prompt);
+            readline_add_history($line);
+            return $line;
+        } else {
+            return readline_emulation($prompt);
+        }
+    } else {
+        return fgets(STDIN);
+    }
+}
+
+/**
+ * On Unix-like systems where PHP readline extension isn't present,
+ * -cough- Mac OS X -cough- we can shell out to bash to do it for us.
+ * This lets us at least handle things like arrow keys, but we don't
+ * get any entry history. :(
+ *
+ * Shamelessly ripped from when I wrote the same code for MediaWiki. :)
+ * @author Brion Vibber <brion@status.net>
+ *
+ * @param string $prompt
+ * @return mixed string on success, false on fail or EOF
+ */
+function readline_emulation($prompt)
+{
+    if(file_exists(trim(shell_exec('which bash')))) {
+        $encPrompt = escapeshellarg($prompt);
+        $command = "read -er -p $encPrompt && echo \"\$REPLY\"";
+        $encCommand = escapeshellarg($command);
+        $metaCommand = "bash -c $encCommand";
+
+        // passthru passes our STDIN and TTY to the child...
+        // We can pull the returned string via output buffering.
+        ob_start();
+        $retval = false;
+        passthru($metaCommand, $retval);
+        $line = ob_get_contents();
+        ob_end_clean();
+
+        if ($retval == 0) {
+            return $line;
+        } elseif ($retval == 127) {
+            // Couldn't execute bash even though we thought we saw it.
+            // Shell probably spit out an error message, sorry :(
+            // Fall through to fgets()...
+        } else {
+            // EOF/ctrl+D
+            return false;
+        }
+    }
+
+    // Fallback... we'll have no editing controls, EWWW
+    if (feof(STDIN)) {
+        return false;
+    }
+    print $prompt;
+    return fgets(STDIN);
+}
+
+function console_help()
+{
+    print "Welcome to StatusNet's interactive PHP console!\n";
+    print "Type some PHP code and it'll execute...\n";
+    print "\n";
+    print "Hint: return a value of any type to output it via var_export():\n";
+    print "  \$profile = new Profile();\n";
+    print "  \$profile->find();\n";
+    print "  \$profile->fetch();\n";
+    print "  return \$profile;\n";
+    print "\n";
+    print "Note that PHP is cranky and you can easily kill your session by mistyping.\n";
+    print "\n";
+    print "Type ctrl+D or enter 'exit' to exit.\n";
+}
+
+
+print "StatusNet interactive PHP console... type ctrl+D or enter 'exit' to exit.\n";
+$prompt = common_config('site', 'name') . '> ';
+while (!feof(STDIN)) {
+    $line = read_input_line($prompt);
+    if ($line === false) {
+        print "\n";
+        break;
+    } elseif ($line !== '') {
+        try {
+            if (trim($line) == 'exit') {
+                break;
+            } elseif (trim($line) == 'help') {
+                console_help();
+                continue;
+            }
+            
+            // Let's do this!
+            $result = eval($line);
+            if ($result === false) {
+                // parse error
+            } elseif ($result === null) {
+                // no return
+            } else {
+                // return value from eval'd code
+                var_export($result);
+            }
+        } catch(Exception $e) {
+            print get_class($e) . ": " . $e->getMessage() . "\n";
+        }
+    }
+    print "\n";
+}
+
+if (CONSOLE_READLINE && CONSOLE_INTERACTIVE) {
+    @readline_write_history(CONSOLE_HISTORY);
+}
diff --git a/scripts/deleteuser.php b/scripts/deleteuser.php
index 52389123c..52389123c 100644..100755
--- a/scripts/deleteuser.php
+++ b/scripts/deleteuser.php
diff --git a/scripts/enjitqueuehandler.php b/scripts/enjitqueuehandler.php
index 08f733b07..afcac539a 100755
--- a/scripts/enjitqueuehandler.php
+++ b/scripts/enjitqueuehandler.php
@@ -46,8 +46,8 @@ class EnjitQueueHandler extends QueueHandler
 
     function start()
     {
-                $this->log(LOG_INFO, "Starting EnjitQueueHandler");
-                $this->log(LOG_INFO, "Broadcasting to ".common_config('enjit', 'apiurl'));
+        $this->log(LOG_INFO, "Starting EnjitQueueHandler");
+        $this->log(LOG_INFO, "Broadcasting to ".common_config('enjit', 'apiurl'));
         return true;
     }
 
@@ -56,16 +56,16 @@ class EnjitQueueHandler extends QueueHandler
 
         $profile = Profile::staticGet($notice->profile_id);
 
-                $this->log(LOG_INFO, "Posting Notice ".$notice->id." from ".$profile->nickname);
+        $this->log(LOG_INFO, "Posting Notice ".$notice->id." from ".$profile->nickname);
 
-                if ( ! $notice->is_local ) {
-                    $this->log(LOG_INFO, "Skipping remote notice");
-                    return "skipped";
-                }
+        if ( ! $notice->is_local ) {
+            $this->log(LOG_INFO, "Skipping remote notice");
+            return "skipped";
+        }
 
-                #
-                # Build an Atom message from the notice
-                #
+        #
+        # Build an Atom message from the notice
+        #
         $noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
         $msg = $profile->nickname . ': ' . $notice->content;
 
@@ -86,36 +86,18 @@ class EnjitQueueHandler extends QueueHandler
         $atom .= "<updated>".common_date_w3dtf($notice->modified)."</updated>\n";
         $atom .= "</entry>\n";
 
-                $url  = common_config('enjit', 'apiurl') . "/submit/". common_config('enjit','apikey');
-                $data = "msg=$atom";
+        $url  = common_config('enjit', 'apiurl') . "/submit/". common_config('enjit','apikey');
+        $data = array(
+            'msg' => $atom,
+        );
 
-                #
-                # POST the message to $config['enjit']['apiurl']
-                #
-        $ch   = curl_init();
+        #
+        # POST the message to $config['enjit']['apiurl']
+        #
+        $request = HTTPClient::start();
+        $response = $request->post($url, null, $data);
 
-        curl_setopt($ch, CURLOPT_URL, $url);
-
-                curl_setopt($ch, CURLOPT_HEADER, 1);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($ch, CURLOPT_POST, 1) ;
-        curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
-
-                # SSL and Debugging options
-                #
-        # curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
-        # curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
-                # curl_setopt($ch, CURLOPT_VERBOSE, 1);
-
-        $result = curl_exec($ch);
-
-        $code = curl_getinfo($ch, CURLINFO_HTTP_CODE );
-
-                $this->log(LOG_INFO, "Response Code: $code");
-
-        curl_close($ch);
-
-                return $code;
+        return $response->isOk();
     }
 
 }
diff --git a/scripts/maildaemon.php b/scripts/maildaemon.php
index 84dff8912..b4e4d9f08 100755
--- a/scripts/maildaemon.php
+++ b/scripts/maildaemon.php
@@ -29,6 +29,7 @@ END_OF_HELP;
 require_once INSTALLDIR.'/scripts/commandline.inc';
 
 require_once(INSTALLDIR . '/lib/mail.php');
+require_once(INSTALLDIR . '/lib/mediafile.php');
 require_once('Mail/mimeDecode.php');
 
 # FIXME: we use both Mail_mimeDecode and mailparse
@@ -71,43 +72,27 @@ class MailerDaemon
                                           'Max notice size is %d chars.'),
                                         Notice::maxContent()));
         }
-        $fileRecords = array();
-        foreach($attachments as $attachment){
-            $mimetype = $this->getUploadedFileType($attachment);
-            $stream  = stream_get_meta_data($attachment);
-            if (!$this->isRespectsQuota($user,filesize($stream['uri']))) {
-                die('error() should trigger an exception before reaching here.');
-            }
-            $filename = $this->saveFile($user, $attachment,$mimetype);
-
-            fclose($attachment);
-
-            if (empty($filename)) {
-                $this->error($from,_('Couldn\'t save file.'));
-            }
 
-            $fileRecord = $this->storeFile($filename, $mimetype);
-            $fileRecords[] = $fileRecord;
-            $fileurl = common_local_url('attachment',
-                array('attachment' => $fileRecord->id));
+        $mediafiles = array();
 
-            // not sure this is necessary -- Zach
-            $this->maybeAddRedir($fileRecord->id, $fileurl);
+        foreach($attachments as $attachment){
 
-            $short_fileurl = common_shorten_url($fileurl);
-            $msg .= ' ' . $short_fileurl;
+            $mf = null;
 
-            if (Notice::contentTooLong($msg)) {
-                $this->deleteFile($filename);
-                $this->error($from, sprintf(_('Max notice size is %d chars, including attachment URL.'),
-                                            Notice::maxContent()));
+            try {
+                $mf = MediaFile::fromFileHandle($attachment, $user);
+            } catch(ClientException $ce) {
+                $this->error($from, $ce->getMessage());
             }
 
-            // Also, not sure this is necessary -- Zach
-            $this->maybeAddRedir($fileRecord->id, $short_fileurl);
+            $msg .= ' ' . $mf->shortUrl();
+
+            array_push($mediafiles, $mf);
+            fclose($attachment);
         }
 
-        $err = $this->add_notice($user, $msg, $fileRecords);
+        $err = $this->add_notice($user, $msg, $mediafiles);
+
         if (is_string($err)) {
             $this->error($from, $err);
             return false;
@@ -116,89 +101,6 @@ class MailerDaemon
         }
     }
 
-    function saveFile($user, $attachment, $mimetype) {
-
-        $filename = File::filename($user->getProfile(), "email", $mimetype);
-
-        $filepath = File::path($filename);
-
-        $stream  = stream_get_meta_data($attachment);
-        if (copy($stream['uri'], $filepath) && chmod($filepath,0664)) {
-            return $filename;
-        } else {
-            $this->error(null,_('File could not be moved to destination directory.' . $stream['uri'] . ' ' . $filepath));
-        }
-    }
-
-    function storeFile($filename, $mimetype) {
-
-        $file = new File;
-        $file->filename = $filename;
-
-        $file->url = File::url($filename);
-
-        $filepath = File::path($filename);
-
-        $file->size = filesize($filepath);
-        $file->date = time();
-        $file->mimetype = $mimetype;
-
-        $file_id = $file->insert();
-
-        if (!$file_id) {
-            common_log_db_error($file, "INSERT", __FILE__);
-            $this->error(null,_('There was a database error while saving your file. Please try again.'));
-        }
-
-        return $file;
-    }
-
-    function maybeAddRedir($file_id, $url)
-    {
-        $file_redir = File_redirection::staticGet('url', $url);
-
-        if (empty($file_redir)) {
-            $file_redir = new File_redirection;
-            $file_redir->url = $url;
-            $file_redir->file_id = $file_id;
-
-            $result = $file_redir->insert();
-
-            if (!$result) {
-                common_log_db_error($file_redir, "INSERT", __FILE__);
-                $this->error(null,_('There was a database error while saving your file. Please try again.'));
-            }
-        }
-    }
-
-    function getUploadedFileType($fileHandle) {
-        require_once 'MIME/Type.php';
-
-        $cmd = &PEAR::getStaticProperty('MIME_Type', 'fileCmd');
-        $cmd = common_config('attachments', 'filecommand');
-
-        $stream  = stream_get_meta_data($fileHandle);
-        $filetype = MIME_Type::autoDetect($stream['uri']);
-        if (in_array($filetype, common_config('attachments', 'supported'))) {
-            return $filetype;
-        }
-        $media = MIME_Type::getMedia($filetype);
-        if ('application' !== $media) {
-            $hint = sprintf(_(' Try using another %s format.'), $media);
-        } else {
-            $hint = '';
-        }
-        $this->error(null,sprintf(
-            _('%s is not a supported filetype on this server.'), $filetype) . $hint);
-    }
-
-    function isRespectsQuota($user,$fileSize) {
-        $file = new File;
-        $ret = $file->isRespectsQuota($user,$fileSize);
-        if (true === $ret) return true;
-        $this->error(null,$ret);
-    }
-
     function error($from, $msg)
     {
         file_put_contents("php://stderr", $msg . "\n");
@@ -258,7 +160,7 @@ class MailerDaemon
         common_log($level, 'MailDaemon: '.$msg);
     }
 
-    function add_notice($user, $msg, $fileRecords)
+    function add_notice($user, $msg, $mediafiles)
     {
         try {
             $notice = Notice::saveNew($user->id, $msg, 'mail');
@@ -266,8 +168,8 @@ class MailerDaemon
             $this->log(LOG_ERR, $e->getMessage());
             return $e->getMessage();
         }
-        foreach($fileRecords as $fileRecord){
-            $this->attachFile($notice, $fileRecord);
+        foreach($mediafiles as $mf){
+            $mf->attachToNotice($notice);
         }
         common_broadcast_notice($notice);
         $this->log(LOG_INFO,
@@ -275,14 +177,6 @@ class MailerDaemon
         return true;
     }
 
-    function attachFile($notice, $filerec)
-    {
-        File_to_post::processNew($filerec->id, $notice->id);
-
-        $this->maybeAddRedir($filerec->id,
-            common_local_url('file', array('notice' => $notice->id)));
-    }
-
     function parse_message($fname)
     {
         $contents = file_get_contents($fname);
diff --git a/scripts/makegroupadmin.php b/scripts/makegroupadmin.php
new file mode 100644
index 000000000..a68798451
--- /dev/null
+++ b/scripts/makegroupadmin.php
@@ -0,0 +1,89 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+
+$shortoptions = 'g:n:';
+$longoptions = array('nickname=', 'group=');
+
+$helptext = <<<END_OF_MAKEGROUPADMIN_HELP
+makegroupadmin.php [options]
+makes a user the admin of a group
+
+  -g --group    group to add an admin to
+  -n --nickname nickname of the new admin
+
+END_OF_MAKEGROUPADMIN_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+$nickname = get_option_value('n', 'nickname');
+$groupname = get_option_value('g', 'group');
+
+if (empty($nickname) || empty($groupname)) {
+    print "Must provide a nickname and group.\n";
+    exit(1);
+}
+
+try {
+
+    $user = User::staticGet('nickname', $nickname);
+
+    if (empty($user)) {
+        throw new Exception("No user named '$nickname'.");
+    }
+
+    $group = User_group::staticGet('nickname', $groupname);
+
+    if (empty($group)) {
+        throw new Exception("No group named '$groupname'.");
+    }
+
+    $member = Group_member::pkeyGet(array('group_id' => $group->id,
+                                          'profile_id' => $user->id));
+
+    if (empty($member)) {
+        $member = new Group_member();
+
+        $member->group_id   = $group->id;
+        $member->profile_id = $user->id;
+        $member->created    = common_sql_now();
+
+        if (!$member->insert()) {
+            throw new Exception("Can't add '$nickname' to '$groupname'.");
+        }
+    }
+
+    if ($member->is_admin) {
+        throw new Exception("'$nickname' is already an admin of '$groupname'.");
+    }
+
+    $orig = clone($member);
+
+    $member->is_admin = 1;
+
+    if (!$member->update($orig)) {
+        throw new Exception("Can't make '$nickname' admin of '$groupname'.");
+    }
+
+} catch (Exception $e) {
+    print $e->getMessage() . "\n";
+    exit(1);
+}
diff --git a/scripts/registeruser.php b/scripts/registeruser.php
new file mode 100644
index 000000000..5d9c8862d
--- /dev/null
+++ b/scripts/registeruser.php
@@ -0,0 +1,81 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+
+$shortoptions = 'n:w:f:e:';
+$longoptions = array('nickname=', 'password=', 'fullname=', 'email=');
+
+$helptext = <<<END_OF_REGISTERUSER_HELP
+registeruser.php [options]
+registers a user in the database
+
+  -n --nickname nickname of the new user
+  -w --password password of the new user
+  -f --fullname full name of the new user (optional)
+  -e --email    email address of the new user (optional)
+
+END_OF_REGISTERUSER_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+$nickname = get_option_value('n', 'nickname');
+$password = get_option_value('w', 'password');
+$fullname = get_option_value('f', 'fullname');
+
+$email = get_option_value('e', 'email');
+
+if (empty($nickname) || empty($password)) {
+    print "Must provide a username and password.\n";
+    exit(1);
+}
+
+try {
+
+    $user = User::staticGet('nickname', $nickname);
+
+    if (!empty($user)) {
+        throw new Exception("A user named '$nickname' already exists.");
+    }
+
+    $user = User::register(array('nickname' => $nickname,
+                                 'password' => $password,
+                                 'fullname' => $fullname));
+
+    if (empty($user)) {
+        throw new Exception("Can't register user '$nickname' with password '$password' and fullname '$fullname'.");
+    }
+
+    if (!empty($email)) {
+
+        $orig = clone($user);
+
+        $user->email = $email;
+
+        if (!$user->updateKeys($orig)) {
+            print "Failed!\n";
+            throw new Exception("Can't update email address.");
+        }
+    }
+
+} catch (Exception $e) {
+    print $e->getMessage() . "\n";
+    exit(1);
+}
diff --git a/scripts/sphinx-cron.sh b/scripts/sphinx-cron.sh
deleted file mode 100755
index bc537af1a..000000000
--- a/scripts/sphinx-cron.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-# StatusNet - a distributed open-source microblogging tool
-
-# Copyright (C) 2008, 2009, StatusNet, Inc.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# This program tries to start the daemons for StatusNet.
-# Note that the 'maildaemon' needs to run as a mail filter.
-
-/usr/local/bin/indexer --config /usr/local/etc/sphinx.conf --all --rotate
-
diff --git a/scripts/sphinx-indexer.sh b/scripts/sphinx-indexer.sh
deleted file mode 100755
index 1ec0826be..000000000
--- a/scripts/sphinx-indexer.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-# StatusNet - a distributed open-source microblogging tool
-
-# Copyright (C) 2008, 2009, StatusNet, Inc.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# This program tries to start the daemons for StatusNet.
-# Note that the 'maildaemon' needs to run as a mail filter.
-
-/usr/local/bin/indexer --config /usr/local/etc/sphinx.conf --all
-
diff --git a/scripts/update_translations.php b/scripts/update_translations.php
index f145c1f0b..580c472ee 100755
--- a/scripts/update_translations.php
+++ b/scripts/update_translations.php
@@ -39,12 +39,47 @@ set_time_limit(60);
 $languages = get_all_languages();
 
 /* Update the languages */
+// Language code conversion for translatewiki.net (these are MediaWiki codes)
+$codeMap = array(
+	'nb'    => 'no',
+	'pt_BR' => 'pt-br',
+	'zh_CN' => 'zh-hans',
+	'zh_TW' => 'zh-hant'
+);
+
+$doneCodes = array();
 
 foreach ($languages as $language) {
+	$code = $language['lang'];
+
+	// Skip export of source language
+	// and duplicates
+	if( $code == 'en' || $code == 'no' ) {
+		continue;
+	}
+
+	// Do not export codes twice (happens for 'nb')
+	if( in_array( $code, $doneCodes ) ) {
+		continue;
+	} else {
+		$doneCodes[] = $code;
+	}
+
+	// Convert code if needed
+	if( isset( $codeMap[$code] ) ) {
+		$twnCode = $codeMap[$code];
+	} else {
+		$twnCode = str_replace('_', '-', strtolower($code)); // pt_BR -> pt-br
+	}
+
+    // Fetch updates from translatewiki.net...
+    $file_url = 'http://translatewiki.net/w/i.php?' .
+        http_build_query(array(
+            'title' => 'Special:Translate',
+            'task' => 'export-to-file',
+            'group' => 'out-statusnet',
+            'language' => $twnCode));
 
-    $code = $language['lang'];
-    $file_url = 'http://status.net/pootle/' . $code .
-        '/statusnet/LC_MESSAGES/statusnet.po';
     $lcdir = INSTALLDIR . '/locale/' . $code;
     $msgdir = "$lcdir/LC_MESSAGES";
     $pofile = "$msgdir/statusnet.po";
@@ -72,7 +107,8 @@ foreach ($languages as $language) {
     if (sha1($new_file) != $existingSHA1 || !file_exists($mofile)) {
         echo "Updating ".$code."\n";
         file_put_contents($pofile, $new_file);
-        system(sprintf('msgmerge -U %s %s', $pofile, $statusnet_pot));
+        // --backup=off is workaround for Mac OS X fail
+        system(sprintf('msgmerge -U --backup=off %s %s', $pofile, $statusnet_pot));
         system(sprintf('msgfmt -f -o %s %s', $mofile, $pofile));
     } else {
         echo "Unchanged - ".$code."\n";
diff --git a/scripts/userrole.php b/scripts/userrole.php
new file mode 100644
index 000000000..7b6a9b3fd
--- /dev/null
+++ b/scripts/userrole.php
@@ -0,0 +1,85 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+
+$shortoptions = 'i:n:r:d';
+$longoptions = array('id=', 'nickname=', 'role=', 'delete');
+
+$helptext = <<<END_OF_USERROLE_HELP
+userrole.php [options]
+modifies a role for the given user
+
+  -d --delete   delete the role
+  -i --id       ID of the user
+  -n --nickname nickname of the user
+  -r --role     role to add (or delete)
+
+END_OF_USERROLE_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+if (have_option('i', 'id')) {
+    $id = get_option_value('i', 'id');
+    $user = User::staticGet('id', $id);
+    if (empty($user)) {
+        print "Can't find user with ID $id\n";
+        exit(1);
+    }
+} else if (have_option('n', 'nickname')) {
+    $nickname = get_option_value('n', 'nickname');
+    $user = User::staticGet('nickname', $nickname);
+    if (empty($user)) {
+        print "Can't find user with nickname '$nickname'\n";
+        exit(1);
+    }
+} else {
+    print "You must provide either an ID or a nickname.\n";
+    exit(1);
+}
+
+$role = get_option_value('r', 'role');
+
+if (empty($role)) {
+    print "You must provide a role.\n";
+    exit(1);
+}
+
+if (have_option('d', 'delete')) {
+    print "Revoking role '$role' from user '$user->nickname' ($user->id)...";
+    try {
+        $user->revokeRole($role);
+        print "OK\n";
+    } catch (Exception $e) {
+        print "FAIL\n";
+        print $e->getMessage();
+        print "\n";
+    }
+} else {
+    print "Granting role '$role' to user '$user->nickname' ($user->id)...";
+    try {
+        $user->grantRole($role);
+        print "OK\n";
+    } catch (Exception $e) {
+        print "FAIL\n";
+        print $e->getMessage();
+        print "\n";
+    }
+}
diff --git a/scripts/xmppconfirmhandler.php b/scripts/xmppconfirmhandler.php
index c7ed15e49..2e3974136 100755
--- a/scripts/xmppconfirmhandler.php
+++ b/scripts/xmppconfirmhandler.php
@@ -34,8 +34,6 @@ require_once INSTALLDIR.'/scripts/commandline.inc';
 require_once INSTALLDIR . '/lib/jabber.php';
 require_once INSTALLDIR . '/lib/xmppqueuehandler.php';
 
-define('CLAIM_TIMEOUT', 1200);
-
 class XmppConfirmHandler extends XmppQueueHandler
 {
     var $_id = 'confirm';
diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index b2efc07c3..e52e2a6af 100755
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -187,7 +187,7 @@ class XMPPDaemon extends Daemon
             return;
         }
         if ($this->handle_command($user, $pl['body'])) {
-            $this->log(LOG_INFO, "Command messag by $from handled.");
+            $this->log(LOG_INFO, "Command message by $from handled.");
             return;
         } else if ($this->is_autoreply($pl['body'])) {
             $this->log(LOG_INFO, 'Ignoring auto reply from ' . $from);
diff --git a/tests/LocationTest.php b/tests/LocationTest.php
new file mode 100644
index 000000000..62849eb9f
--- /dev/null
+++ b/tests/LocationTest.php
@@ -0,0 +1,87 @@
+<?php
+
+if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
+    print "This script must be run from the command line\n";
+    exit();
+}
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('STATUSNET', true);
+
+require_once INSTALLDIR . '/lib/common.php';
+
+// Make sure this is loaded
+// XXX: how to test other plugins...?
+
+addPlugin('Geonames');
+
+class LocationTest extends PHPUnit_Framework_TestCase
+{
+
+    /**
+     * @dataProvider locationNames
+     */
+
+    public function testLocationFromName($name, $language, $location)
+    {
+        $result = Location::fromName($name, $language);
+        $this->assertEquals($result, $location);
+    }
+
+    static public function locationNames()
+    {
+        return array(array('Montreal', 'en', null),
+                     array('San Francisco, CA', 'en', null),
+                     array('Paris, France', 'en', null),
+                     array('Paris, Texas', 'en', null));
+    }
+
+    /**
+     * @dataProvider locationIds
+     */
+
+    public function testLocationFromId($id, $ns, $language, $location)
+    {
+        $result = Location::fromId($id, $ns, $language);
+        $this->assertEquals($result, $location);
+    }
+
+    static public function locationIds()
+    {
+        return array(array(6077243, GeonamesPlugin::NAMESPACE, 'en', null),
+                     array(5391959, GeonamesPlugin::NAMESPACE, 'en', null));
+    }
+
+    /**
+     * @dataProvider locationLatLons
+     */
+
+    public function testLocationFromLatLon($lat, $lon, $language, $location)
+    {
+        $result = Location::fromLatLon($lat, $lon, $language);
+        $this->assertEquals($result, $location);
+    }
+
+    static public function locationLatLons()
+    {
+        return array(array(37.77493, -122.41942, 'en', null),
+                     array(45.509, -73.588, 'en', null));
+    }
+
+    /**
+     * @dataProvider nameOfLocation
+     */
+
+    public function testLocationGetName($location, $language, $name)
+    {
+        $result = $location->getName($language);
+        $this->assertEquals($result, $name);
+    }
+
+    static public function nameOfLocation()
+    {
+        return array(array(new Location(), 'en', 'Montreal'),
+                     array(new Location(), 'fr', 'Montréal'));
+    }
+}
+
diff --git a/tests/URLDetectionTest.php b/tests/URLDetectionTest.php
index 0cc03ccce..d83f9faf5 100644
--- a/tests/URLDetectionTest.php
+++ b/tests/URLDetectionTest.php
@@ -185,12 +185,12 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
                      array('http://example.com/path/(foo)/bar',
                            '<a href="http://example.com/path/(foo)/bar" title="http://example.com/path/(foo)/bar" rel="external">http://example.com/path/(foo)/bar</a>'),
                      array('http://example.com/path/[foo]/bar',
-                           '<a href="http://example.com/path/[foo]/bar" title="http://example.com/path/[foo]/bar" rel="external">http://example.com/path/[foo]/bar</a>'),
+                           '<a href="http://example.com/path/" title="http://example.com/path/" rel="external">http://example.com/path/</a>[foo]/bar'),
                      array('http://example.com/path/foo/(bar)',
                            '<a href="http://example.com/path/foo/(bar)" title="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>'),
                      //Not a valid url - urls cannot contain unencoded square brackets
                      array('http://example.com/path/foo/[bar]',
-                           '<a href="http://example.com/path/foo/[bar]" title="http://example.com/path/foo/[bar]" rel="external">http://example.com/path/foo/[bar]</a>'),
+                           '<a href="http://example.com/path/foo/" title="http://example.com/path/foo/" rel="external">http://example.com/path/foo/</a>[bar]'),
                      array('Hey, check out my cool site http://example.com okay?',
                            'Hey, check out my cool site <a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a> okay?'),
                      array('What about parens (e.g. http://example.com/path/foo/(bar))?',
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index d9dca9815..a6a93c405 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -93,14 +93,17 @@ border-radius:4px;
 -webkit-border-radius:4px;
 margin-bottom:18px;
 }
+
+.xoxo li {
+list-style-type:none;
+}
+
 form label.submit {
 display:none;
 }
-
 .form_settings {
 clear:both;
 }
-
 .form_settings fieldset {
 margin-bottom:29px;
 }
@@ -432,21 +435,21 @@ border-width:1px;
 border-style:solid;
 }
 
-#form_notice {
+.form_notice {
 width:45%;
 float:left;
 position:relative;
 line-height:1;
 }
-#form_notice fieldset {
+.form_notice fieldset {
 border:0;
 padding:0;
 position:relative;
 }
-#form_notice legend {
+.form_notice legend {
 display:none;
 }
-#form_notice textarea {
+.form_notice textarea {
 float:left;
 border-radius:7px;
 -moz-border-radius:7px;
@@ -458,44 +461,44 @@ padding:7px 7px 16px 7px;
 position:relative;
 z-index:2;
 }
-#form_notice label {
+.form_notice label {
 display:block;
 float:left;
 font-size:1.3em;
 margin-bottom:7px;
 }
-#form_notice label[for=notice_data-attach],
-#form_notice #notice_data-attach {
+.form_notice label[for=notice_data-attach],
+.form_notice #notice_data-attach {
 position:absolute;
 top:25px;
 right:10.5%;
 cursor:pointer;
 }
-#form_notice label[for=notice_data-attach] {
+.form_notice label[for=notice_data-attach] {
 text-indent:-9999px;
 width:16px;
 height:16px;
 }
-#form_notice #notice_data-attach {
+.form_notice #notice_data-attach {
 padding:0;
 height:16px;
 }
-#form_notice .form_note {
+.form_notice .form_note {
 position:absolute;
 bottom:2px;
 right:21.715%;
 z-index:9;
 }
-#form_notice .form_note dt {
+.form_notice .form_note dt {
 font-weight:bold;
 display:none;
 }
-#notice_text-count {
+.form_notice #notice_text-count {
 font-weight:bold;
 line-height:1.15;
 padding:1px 2px;
 }
-#form_notice #notice_action-submit {
+.form_notice #notice_action-submit {
 width:14%;
 height:47px;
 padding:0;
@@ -503,24 +506,24 @@ position:absolute;
 bottom:0;
 right:0;
 }
-#form_notice label[for=to] {
+.form_notice label[for=to] {
 margin-top:7px;
 }
-#form_notice select[id=to] {
+.form_notice select[id=to] {
 margin-bottom:7px;
 margin-left:18px;
 float:left;
 max-width:322px;
 }
-#form_notice .error,
-#form_notice .success {
+.form_notice .error,
+.form_notice .success {
 float:left;
 clear:both;
 width:81.5%;
 margin-bottom:0;
 line-height:1.618;
 }
-#form_notice #notice_data-attach_selected code {
+.form_notice #notice_data-attach_selected code {
 float:left;
 width:90%;
 display:block;
@@ -528,11 +531,21 @@ font-size:1.1em;
 line-height:1.8;
 overflow:auto;
 }
-#form_notice #notice_data-attach_selected button {
+.form_notice #notice_data-attach_selected button {
 float:right;
 font-size:0.8em;
 }
 
+button.close {
+width:16px;
+height:16px;
+text-indent:-9999px;
+padding:0;
+border:0;
+text-align:center;
+font-weight:bold;
+}
+
 /* entity_profile */
 .entity_profile {
 position:relative;
@@ -582,14 +595,18 @@ margin-left:0;
 font-size:1.1em;
 font-weight:bold;
 }
-.entity_profile .entity_fn dd:before {
+.entity_profile .fn:before {
 content: "(";
 font-weight:normal;
 }
-.entity_profile .entity_fn dd:after {
+.entity_profile .fn:after {
 content: ")";
 font-weight:normal;
 }
+.entity_profile .nickname:after,
+.entity_profile .nickname:before {
+content:"";
+}
 .entity_profile dt,
 .entity_profile h2 {
 display:none;
@@ -604,7 +621,8 @@ font-style:italic;
 .entity_actions {
 float:right;
 margin-left:2.35%;
-max-width:25%;
+margin-bottom:18px;
+width:21%;
 }
 .entity_actions h2 {
 display:none;
@@ -613,7 +631,7 @@ display:none;
 list-style-type:none;
 }
 .entity_actions li {
-margin-bottom:4px;
+margin-bottom:7px;
 }
 .entity_actions li:first-child {
 border-top:0;
@@ -632,30 +650,28 @@ text-align:left;
 width:100%;
 }
 .entity_actions a,
-.entity_nudge p,
 .entity_remote_subscribe {
 text-decoration:none;
 font-weight:bold;
 display:block;
 }
+.entity_actions a,
+.entity_actions input {
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+}
 
-.form_user_block input.submit,
-.form_user_unblock input.submit,
-.form_group_block input.submit,
-.form_group_unblock input.submit,
-.entity_send-a-message a,
-.entity_edit a,
-.form_user_nudge input.submit,
-.entity_nudge p,
-.form_make_admin input.submit {
+.entity_actions a,
+.entity_actions input,
+.entity_actions p {
 border:0;
-padding-left:20px;
+padding-left:23px;
 }
 
-.entity_edit a,
-.entity_send-a-message a,
-.entity_nudge p {
-padding:4px 4px 4px 23px;
+.entity_actions a,
+.entity_actions p {
+padding:1px 4px 1px 26px;
 }
 
 .entity_remote_subscribe {
@@ -670,6 +686,40 @@ border-radius:4px;
 margin-bottom:18px;
 }
 
+
+.entity_send-a-message button {
+position:absolute;
+top:3px;
+right:3px;
+}
+
+.entity_send-a-message .form_notice {
+position:absolute;
+top:34px;
+right:-1px;
+padding:1.795%;
+width:65%;
+z-index:2;
+ border-radius:7px;
+-moz-border-radius:7px;
+-webkit-border-radius:7px;
+border-width:1px;
+border-style:solid;
+}
+.entity_send-a-message .form_notice legend {
+display:block;
+margin-bottom:11px;
+}
+
+.entity_send-a-message .form_notice label,
+.entity_send-a-message .form_notice select {
+display:none;
+}
+.entity_send-a-message .form_notice input.submit {
+text-align:center;
+}
+
+
 .entity_tags ul {
 list-style-type:none;
 display:inline;
@@ -738,18 +788,22 @@ display:none;
 .profiles {
 list-style-type:none;
 }
-.profile .entity_profile .entity_location {
+.profile .entity_profile .fn.nickname,
+.profile .entity_profile .url[rel~=contact] {
+margin-left:0;
+display:inline;
+}
+
+.profile .entity_profile .fn,
+.profile .entity_profile .location {
+margin-left:11px;
+margin-bottom:4px;
 width:auto;
 clear:none;
-margin-left:11px;
-}
-.profile .entity_profile dl,
-.profile .entity_profile dd {
-display:inline;
-float:none;
 }
-.profile .entity_profile .entity_note,
-.profile .entity_profile .entity_url,
+
+.profile .entity_profile .note,
+.profile .entity_profile .url,
 .profile .entity_profile .entity_tags,
 .profile .entity_profile .form_subscription_edit {
 margin-left:59px;
@@ -788,6 +842,10 @@ margin-left:2%;
 width:98%;
 float:left;
 }
+.mark-top {
+border-top-width:1px;
+border-top-style:solid;
+}
 
 /* NOTICES */
 #notices_primary {
@@ -921,11 +979,14 @@ border:0;
 .notice-options .notice_reply,
 .notice-options .notice_delete {
 text-decoration:none;
-padding-left:16px;
 }
 .notice-options form input.submit {
 width:16px;
-padding:2px 0;
+height:16px;
+padding:0;
+border-radius:0;
+-moz-border-radius:0;
+-webkit-border-radius:0;
 }
 .notice-options .form_favor legend,
 .notice-options .form_disfavor legend {
@@ -936,6 +997,10 @@ display:none;
 border:0;
 padding:0;
 }
+.notice-options a {
+width:16px;
+height:16px;
+}
 
 .notice .attachment {
 position:relative;
@@ -991,11 +1056,6 @@ margin-bottom:11px;
 position:absolute;
 top:0;
 right:0;
-width:29px;
-height:29px;
-text-align:center;
-font-weight:bold;
-padding:0;
 }
 #jOverlayContent h1 {
 max-width:425px;
@@ -1295,3 +1355,13 @@ display:none;
 .guide {
 clear:both;
 }
+
+#bookmarklet address {
+display:none;
+}
+#bookmarklet .form_notice {
+width:auto;
+}
+#bookmarklet #wrap {
+min-width:0;
+}
diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
index 3e128b84e..4e50aadbe 100644
--- a/theme/base/css/ie.css
+++ b/theme/base/css/ie.css
@@ -3,10 +3,10 @@ input.checkbox,
 input.radio {
 top:0;
 }
-#form_notice textarea {
+.form_notice textarea {
 width:78%;
 }
-#form_notice .form_note + label {
+.form_notice .form_note + label {
 position:absolute;
 top:25px;
 left:83%;
@@ -15,23 +15,20 @@ height:16px;
 width:16px;
 display:block;
 }
-#form_notice #notice_action-submit {
+.form_notice #notice_action-submit {
 width:17%;
 max-width:17%;
 }
-#form_notice #notice_data-attach_selected {
+.form_notice #notice_data-attach_selected {
 width:78.5%;
 }
-#form_notice #notice_data-attach_selected button {
+.form_notice #notice_data-attach_selected button {
 padding:0 4px;
 }
 .notice-options input.submit {
 font-size:0;
-margin-top:3px;
-height:16px;
 text-align:right;
 text-indent:0;
-width:24px;
 }
 .notice div.entry-content .timestamp a {
 margin-right:4px;
diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif
new file mode 100644
index 000000000..f19d6a3f6
--- /dev/null
+++ b/theme/base/images/icons/icons-01.gif
diff --git a/theme/base/images/icons/icons-01.png b/theme/base/images/icons/icons-01.png
deleted file mode 100644
index c4e371330..000000000
--- a/theme/base/images/icons/icons-01.png
+++ /dev/null
diff --git a/theme/base/images/icons/twotone/green/minus.gif b/theme/base/images/icons/twotone/green/minus.gif
new file mode 100644
index 000000000..461cd8cb2
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/minus.gif
diff --git a/theme/base/images/icons/twotone/green/plus.gif b/theme/base/images/icons/twotone/green/plus.gif
new file mode 100644
index 000000000..4407d0b2d
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/plus.gif
diff --git a/theme/base/images/icons/twotone/green/x.gif b/theme/base/images/icons/twotone/green/x.gif
new file mode 100644
index 000000000..ffb2efea0
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/x.gif
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 6833373b4..8799b0b09 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -18,7 +18,7 @@ font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 font-size:1em;
 }
 address {
-margin-right:5.8%;
+margin-right:5.7%;
 }
 
 input, textarea, select, option {
@@ -28,7 +28,10 @@ input, textarea, select,
 .entity_remote_subscribe {
 border-color:#AAAAAA;
 }
-#filter_tags ul li {
+#filter_tags ul li,
+.entity_send-a-message .form_notice,
+.pagination .nav_prev a,
+.pagination .nav_next a {
 border-color:#DDDDDD;
 }
 
@@ -37,35 +40,48 @@ background:none;
 }
 
 input.submit,
-#form_notice.warning #notice_text-count,
+.form_notice.warning #notice_text-count,
 .form_settings .form_note,
-.entity_remote_subscribe {
+.entity_remote_subscribe,
+.entity_actions .form_notice input.submit {
 background-color:#9BB43E;
 }
-
-input:focus, textarea:focus, select:focus,
-#form_notice.warning #notice_data-text {
-border-color:#9BB43E;
+input.submit,
+.form_notice.warning #notice_text-count,
+.form_settings .form_note,
+.entity_remote_subscribe,
+.entity_actions a,
+.entity_actions input,
+button.close {
+background-color:#9BB43E;
 box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 -moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 -webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 }
-input.submit,
+.entity_actions a,
+.entity_actions input,
+.entity_actions p {
+border-color:transparent;
+background-color:transparent;
+}
+input:focus, textarea:focus, select:focus,
+.form_notice.warning #notice_data-text,
+.form_notice.warning #notice_text-count,
+.form_settings .form_note,
 .entity_remote_subscribe {
+border-color:#9BB43E;
+}
+input.submit,
+.entity_remote_subscribe,
+.entity_actions .form_notice input.submit {
 color:#FFFFFF;
 }
 
 a,
-div.notice-options input,
-.form_user_block input.submit,
-.form_user_unblock input.submit,
-.form_group_block input.submit,
-.form_group_unblock input.submit,
-.entity_send-a-message a,
-.form_user_nudge input.submit,
-.entity_nudge p,
 .form_settings input.form_action-primary,
-.form_make_admin input.submit {
+.notice-options input,
+.entity_actions a,
+.entity_actions input {
 color:#002FA7;
 }
 
@@ -84,16 +100,47 @@ background-color:#C8D1D5;
 #notice_text-count {
 color:#333333;
 }
-#form_notice.warning #notice_text-count {
+.form_notice.warning #notice_text-count {
 color:#000000;
 }
-#form_notice label[for=notice_data-attach] {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -328px;
+.form_notice label[for=notice_data-attach] {
+background-position:0 -328px;
 }
-#form_notice #notice_data-attach {
+.form_notice #notice_data-attach {
 opacity:0;
 }
 
+.form_notice label[for=notice_data-attach],
+#export_data li a.rss,
+#export_data li a.atom,
+#export_data li a.foaf,
+.entity_edit a,
+.entity_send-a-message a,
+.entity_nudge p,
+.form_user_nudge input.submit,
+.form_user_block input.submit,
+.form_user_unblock input.submit,
+.form_group_block input.submit,
+.form_group_unblock input.submit,
+.form_make_admin input.submit,
+.notice .attachment,
+.notice-options .notice_reply,
+.notice-options form.form_favor input.submit,
+.notice-options form.form_disfavor input.submit,
+.notice-options .notice_delete,
+#new_group a,
+.pagination .nav_prev a,
+.pagination .nav_next a,
+button.close,
+.form_group_leave input.submit,
+.form_user_unsubscribe input.submit,
+.form_group_join input.submit,
+.form_user_subscribe input.submit {
+background-image:url(../../base/images/icons/icons-01.gif);
+background-repeat:no-repeat;
+background-color:transparent;
+}
+
 #wrap form.processing input.submit {
 background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 cursor:wait;
@@ -112,7 +159,8 @@ box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
 border-color:transparent;
 }
 #content,
-#site_nav_local_views .current a {
+#site_nav_local_views .current a,
+.entity_send-a-message .form_notice {
 background-color:#FFFFFF;
 }
 
@@ -138,6 +186,10 @@ background-color:#F7E8E8;
 background-color:#EFF3DC;
 }
 
+button.close {
+background-position:0 -1120px;
+}
+
 #anon_notice {
 background-color:#87B4C8;
 color:#FFFFFF;
@@ -152,86 +204,75 @@ background-color:#9BB43E;
 background-repeat:no-repeat;
 }
 #export_data li a.rss {
-background-image:url(../../base/images/icons/icons-01.png);
 background-position:0 -130px;
 }
 #export_data li a.atom {
-background-image:url(../../base/images/icons/icons-01.png);
 background-position:0 -64px;
 }
 #export_data li a.foaf {
-background-image:url(../../base/images/icons/icons-01.png);
 background-position:0 1px;
 }
 
-.entity_edit a,
-.entity_send-a-message a,
-.form_user_nudge input.submit,
-.form_user_block input.submit,
-.form_user_unblock input.submit,
-.form_group_block input.submit,
-.form_group_unblock input.submit,
-.entity_nudge p,
-.form_make_admin input.submit {
-background-repeat: no-repeat;
-background-color:transparent;
-}
 .form_group_join input.submit,
-.form_group_leave input.submit
+.form_group_leave input.submit,
 .form_user_subscribe input.submit,
 .form_user_unsubscribe input.submit {
-background-color:#9BB43E;
+background-color:#AAAAAA;
 color:#FFFFFF;
 }
-.form_user_unsubscribe input.submit,
 .form_group_leave input.submit,
-.form_user_authorization input.reject {
-background-color:#87B4C8;
+.form_user_unsubscribe input.submit {
+background-position:5px -1246px;
+}
+.form_group_join input.submit,
+.form_user_subscribe input.submit {
+background-position:5px -1181px;
 }
 
 .entity_edit a {
-background-image:url(../../base/images/icons/icons-01.png);
-background-position: 0 -718px;
+background-position: 5px -718px;
 }
 .entity_send-a-message a {
-background-image:url(../../base/images/icons/icons-01.png);
-background-position: 0 -849px;
+background-position: 5px -852px;
 }
+.entity_send-a-message .form_notice {
+box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
+-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
+-webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
+}
+
 .entity_nudge p,
 .form_user_nudge input.submit {
-background-image:url(../../base/images/icons/icons-01.png);
-background-position: 0 -785px;
+background-position: 5px -785px;
 }
 .form_user_block input.submit,
 .form_user_unblock input.submit,
 .form_group_block input.submit,
 .form_group_unblock input.submit {
-background-image:url(../../base/images/icons/icons-01.png);
-background-position: 0 -918px;
+background-position: 5px -918px;
 }
 .form_make_admin input.submit {
-background-image:url(../../base/images/icons/icons-01.png);
-background-position: 0 -983px;
+background-position: 5px -983px;
 }
 
 /* NOTICES */
 .notice .attachment {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -394px;
+background-position:0 -394px;
 }
 #attachments .attachment {
 background:none;
 }
 .notice-options .notice_reply {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -589px;
+background-position:0 -592px;
 }
 .notice-options form.form_favor input.submit {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -457px;
+background-position:0 -460px;
 }
 .notice-options form.form_disfavor input.submit {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -523px;
+background-position:0 -526px;
 }
 .notice-options .notice_delete {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -655px;
+background-position:0 -658px;
 }
 
 .notices div.entry-content,
@@ -242,9 +283,12 @@ opacity:0.4;
 .notices li:hover div.notice-options {
 opacity:1;
 }
-div.notice-options a,
-div.notice-options input {
+.notice-options a,
+.notice-options input {
 font-family:sans-serif;
+box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 }
 #content .notices li:hover {
 background-color:rgba(240, 240, 240, 0.2);
@@ -268,19 +312,19 @@ background-color:rgba(200, 200, 200, 0.300);
 /*END: NOTICES */
 
 #new_group a {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -1054px;
+background-position:0 -1054px;
 }
 
 .pagination .nav_prev a,
 .pagination .nav_next a {
 background-repeat:no-repeat;
-border-color:#C8D1D5;
+box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 }
 .pagination .nav_prev a {
-background-image:url(../../base/images/icons/icons-01.png);
 background-position:10% -187px;
 }
 .pagination .nav_next a {
-background-image:url(../../base/images/icons/icons-01.png);
 background-position:105% -252px;
 }
diff --git a/theme/default/css/ie.css b/theme/default/css/ie.css
index cbbd49ce6..a0d3cd682 100644
--- a/theme/default/css/ie.css
+++ b/theme/default/css/ie.css
@@ -6,9 +6,9 @@ color:#FFFFFF;
 #site_nav_local_views a {
 background-color:#C8D1D5;
 }
-#form_notice .form_note + label {
+.form_notice .form_note + label {
 background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
 }
-#form_notice #notice_data-attach {
+.form_notice #notice_data-attach {
 filter: alpha(opacity=0);
 }
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 6339c9314..94bef339f 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -28,7 +28,10 @@ input, textarea, select,
 .entity_remote_subscribe {
 border-color:#AAAAAA;
 }
-#filter_tags ul li {
+#filter_tags ul li,
+.entity_send-a-message .form_notice,
+.pagination .nav_prev a,
+.pagination .nav_next a {
 border-color:#DDDDDD;
 }
 
@@ -37,35 +40,47 @@ background:none;
 }
 
 input.submit,
-#form_notice.warning #notice_text-count,
+.form_notice.warning #notice_text-count,
 .form_settings .form_note,
-.entity_remote_subscribe {
+.entity_remote_subscribe,
+.entity_actions .form_notice input.submit {
 background-color:#9BB43E;
 }
-
-input:focus, textarea:focus, select:focus,
-#form_notice.warning #notice_data-text {
-border-color:#9BB43E;
+input.submit,
+.form_notice.warning #notice_text-count,
+.form_settings .form_note,
+.entity_remote_subscribe,
+.entity_actions a,
+.entity_actions input,
+button.close {
 box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 -moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 -webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 }
-input.submit,
+.entity_actions a,
+.entity_actions input,
+.entity_actions p {
+border-color:transparent;
+background-color:transparent;
+}
+input:focus, textarea:focus, select:focus,
+.form_notice.warning #notice_data-text,
+.form_notice.warning #notice_text-count,
+.form_settings .form_note,
 .entity_remote_subscribe {
+border-color:#9BB43E;
+}
+input.submit,
+.entity_remote_subscribe,
+.entity_actions .form_notice input.submit {
 color:#FFFFFF;
 }
 
 a,
-div.notice-options input,
-.form_user_block input.submit,
-.form_user_unblock input.submit,
-.form_group_block input.submit,
-.form_group_unblock input.submit,
-.entity_send-a-message a,
-.form_user_nudge input.submit,
-.entity_nudge p,
 .form_settings input.form_action-primary,
-.form_make_admin input.submit {
+.notice-options input,
+.entity_actions a,
+.entity_actions input {
 color:#002FA7;
 }
 
@@ -84,16 +99,48 @@ background-color:#CEE1E9;
 #notice_text-count {
 color:#333333;
 }
-#form_notice.warning #notice_text-count {
+.form_notice.warning #notice_text-count {
 color:#000000;
 }
-#form_notice label[for=notice_data-attach] {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -328px;
+.form_notice label[for=notice_data-attach] {
+background-position:0 -328px;
 }
-#form_notice #notice_data-attach {
+.form_notice #notice_data-attach {
 opacity:0;
 }
 
+.form_notice label[for=notice_data-attach],
+#export_data li a.rss,
+#export_data li a.atom,
+#export_data li a.foaf,
+.entity_edit a,
+.entity_send-a-message a,
+.entity_nudge p,
+.form_user_nudge input.submit,
+.form_user_block input.submit,
+.form_user_unblock input.submit,
+.form_group_block input.submit,
+.form_group_unblock input.submit,
+.form_make_admin input.submit,
+.notice .attachment,
+.notice-options .notice_reply,
+.notice-options form.form_favor input.submit,
+.notice-options form.form_disfavor input.submit,
+.notice-options .notice_delete,
+#new_group a,
+.pagination .nav_prev a,
+.pagination .nav_next a,
+button.close,
+.form_group_leave input.submit,
+.form_user_unsubscribe input.submit,
+.form_group_join input.submit,
+.form_user_subscribe input.submit,
+.entity_subscribe a {
+background-image:url(../../base/images/icons/icons-01.gif);
+background-repeat:no-repeat;
+background-color:transparent;
+}
+
 #wrap form.processing input.submit {
 background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 cursor:wait;
@@ -112,7 +159,8 @@ box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
 border-color:transparent;
 }
 #content,
-#site_nav_local_views .current a {
+#site_nav_local_views .current a,
+.entity_send-a-message .form_notice {
 background-color:#FFFFFF;
 }
 
@@ -130,6 +178,11 @@ background-color:rgba(255, 255, 255, 0.7);
 #site_nav_local_views .current a {
 text-shadow: rgba(194,194,194,0.5) 1px 1px 1px;
 }
+.processing {
+background-image:url(../../base/images/icons/icon_processing.gif);
+background-repeat:no-repeat;
+background-position:47% 47%;
+}
 
 .error {
 background-color:#F7E8E8;
@@ -138,6 +191,10 @@ background-color:#F7E8E8;
 background-color:#EFF3DC;
 }
 
+button.close {
+background-position:0 -1120px;
+}
+
 #anon_notice {
 background-color:#87B4C8;
 color:#FFFFFF;
@@ -152,86 +209,77 @@ background-color:#9BB43E;
 background-repeat:no-repeat;
 }
 #export_data li a.rss {
-background-image:url(../../base/images/icons/icons-01.png);
 background-position:0 -130px;
 }
 #export_data li a.atom {
-background-image:url(../../base/images/icons/icons-01.png);
 background-position:0 -64px;
 }
 #export_data li a.foaf {
-background-image:url(../../base/images/icons/icons-01.png);
 background-position:0 1px;
 }
 
-.entity_edit a,
-.entity_send-a-message a,
-.form_user_nudge input.submit,
-.form_user_block input.submit,
-.form_user_unblock input.submit,
-.form_group_block input.submit,
-.form_group_unblock input.submit,
-.entity_nudge p,
-.form_make_admin input.submit {
-background-repeat: no-repeat;
-background-color:transparent;
-}
 .form_group_join input.submit,
-.form_group_leave input.submit
+.form_group_leave input.submit,
 .form_user_subscribe input.submit,
-.form_user_unsubscribe input.submit {
-background-color:#9BB43E;
+.form_user_unsubscribe input.submit,
+.entity_subscribe a {
+background-color:#AAAAAA;
 color:#FFFFFF;
 }
-.form_user_unsubscribe input.submit,
 .form_group_leave input.submit,
-.form_user_authorization input.reject {
-background-color:#87B4C8;
+.form_user_unsubscribe input.submit {
+background-position:5px -1246px;
+}
+.form_group_join input.submit,
+.form_user_subscribe input.submit,
+.entity_subscribe a {
+background-position:5px -1181px;
 }
 
 .entity_edit a {
-background-image:url(../../base/images/icons/icons-01.png);
-background-position: 0 -718px;
+background-position: 5px -718px;
 }
 .entity_send-a-message a {
-background-image:url(../../base/images/icons/icons-01.png);
-background-position: 0 -849px;
+background-position: 5px -852px;
+}
+.entity_send-a-message .form_notice {
+box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
+-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
+-webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
 }
+
 .entity_nudge p,
 .form_user_nudge input.submit {
-background-image:url(../../base/images/icons/icons-01.png);
-background-position: 0 -785px;
+background-position: 5px -785px;
 }
 .form_user_block input.submit,
 .form_user_unblock input.submit,
 .form_group_block input.submit,
 .form_group_unblock input.submit {
-background-image:url(../../base/images/icons/icons-01.png);
-background-position: 0 -918px;
+background-position: 5px -918px;
 }
 .form_make_admin input.submit {
-background-image:url(../../base/images/icons/icons-01.png);
-background-position: 0 -983px;
+background-position: 5px -983px;
 }
 
 /* NOTICES */
 .notice .attachment {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -394px;
+background-position:0 -394px;
 }
 #attachments .attachment {
 background:none;
 }
 .notice-options .notice_reply {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -589px;
+background-position:0 -592px;
 }
 .notice-options form.form_favor input.submit {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -457px;
+background-position:0 -460px;
 }
 .notice-options form.form_disfavor input.submit {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -523px;
+background-position:0 -526px;
 }
 .notice-options .notice_delete {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -655px;
+background-position:0 -658px;
 }
 
 .notices div.entry-content,
@@ -242,9 +290,12 @@ opacity:0.4;
 .notices li:hover div.notice-options {
 opacity:1;
 }
-div.notice-options a,
-div.notice-options input {
+.notice-options a,
+.notice-options input {
 font-family:sans-serif;
+box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 }
 #content .notices li:hover {
 background-color:rgba(240, 240, 240, 0.2);
@@ -268,19 +319,33 @@ background-color:rgba(200, 200, 200, 0.300);
 /*END: NOTICES */
 
 #new_group a {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -1054px;
+background-position:0 -1054px;
 }
 
 .pagination .nav_prev a,
 .pagination .nav_next a {
 background-repeat:no-repeat;
-border-color:#CEE1E9;
+box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 }
 .pagination .nav_prev a {
-background-image:url(../../base/images/icons/icons-01.png);
 background-position:10% -187px;
 }
 .pagination .nav_next a {
-background-image:url(../../base/images/icons/icons-01.png);
 background-position:105% -252px;
 }
+.pagination .nav .processing {
+background-image:url(../../base/images/icons/icon_processing.gif);
+box-shadow:none;
+-moz-box-shadow:none;
+-webkit-box-shadow:none;
+outline:none;
+}
+.pagination .nav_next a.processing {
+background-position:90% 47%;
+}
+.pagination .nav_prev a.processing {
+background-position:10% 47%;
+}
+
diff --git a/theme/identica/css/ie.css b/theme/identica/css/ie.css
index 044c32ff1..9ede1e324 100644
--- a/theme/identica/css/ie.css
+++ b/theme/identica/css/ie.css
@@ -6,10 +6,10 @@ color:#FFFFFF;
 #site_nav_local_views a {
 background-color:#D9DADB;
 }
-#form_notice .form_note + label {
+.form_notice .form_note + label {
 background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -328px;
 }
-#form_notice #notice_data-attach {
+.form_notice #notice_data-attach {
 filter: alpha(opacity=0);
 }
 .notice-options form.form_favor input.submit {